December 2014 - golang - Fedora Mailing-Lists

[PkgDB] adimania:docker-io watchbugzilla set to Approved

by Fedora PackageDB

user: adimania set for adimania acl: watchbugzilla of package: docker-io from: to: Approved on branch: f20 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/package/docker-io

9 years, 5 months

1
0
0 / 0

[docker-io/el6] update to v1.4.0

by Lokesh Mandvekar

commit b0a09142de9dd72f84cb980ee167a1b666b108a7 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Fri Dec 12 08:35:05 2014 +0000 update to v1.4.0 NVR: docker-io-1.4.0 - Resolves: rhbz#1173325 - Resolves: rhbz#1172761 - CVE-2014-9356 - Resolves: rhbz#1172782 - CVE-2014-9357 - Resolves: rhbz#1172787 - CVE-2014-9358 - update to upstream v1.4.0 - override DOCKER_CERT_PATH in sysconfig instead of patching the source - update metaprovides - define PR_SET_CHILD_SUBREAPER as per newer kernel-headers Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org> docker-io.spec | 38 ++++++++++++++++++++++++-------------- docker.sysconfig | 6 ++++++ sources | 2 +- 3 files changed, 31 insertions(+), 15 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index e2fdb03..bb4837d 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -9,13 +9,13 @@ %global project docker %global repo %{project} -%global import_path github.com/docker/docker -%global commit 39fa2faad2f3d6fa5133de4eb740677202f53ef4 +%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +%global commit 4595d4fb03093acf87b905bebc5ba4964d7c0707 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo}-io -Version: 1.3.2 -Release: 2%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.docker.com @@ -52,21 +52,20 @@ Requires(post): chkconfig Requires(preun): chkconfig Requires(postun): initscripts # need xz to work with ubuntu images -# https://bugzilla.redhat.com/show_bug.cgi?id=1045220 -Requires: xz -# https://bugzilla.redhat.com/show_bug.cgi?id=1035436 -# this won't be needed for rhel7+ -Requires: bridge-utils -Requires: lxc +# Resolves: rhbz#1045220 +Requires: xz +# Resolves: rhbz#1035436 +Requires: bridge-utils +Requires: lxc # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 -# https://bugzilla.redhat.com/show_bug.cgi?id=1034919 +# Resolves: rhbz#1034919 # No longer needed in Fedora because of libcontainer -Requires: libcgroup +Requires: libcgroup -Provides: lxc-docker = %{version} +Provides: lxc-docker = %{version} %description Docker is an open-source engine that automates the deployment of any @@ -183,6 +182,8 @@ The import paths of %{import_path}/pkg/... #find . -name "*.go" \ # -print |\ # xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g' +sed -i '/getopt.h/a\\n\#ifndef PR_SET_CHILD_SUBREAPER\n\#define PR_SET_CHILD_SUBREAPER 36\n\#endif' \ + vendor/src/github.com/docker/libcontainer/namespaces/nsenter/nsenter.c %build # set up temporary build gopath, and put our directory there @@ -190,7 +191,6 @@ mkdir -p ./_build/src/github.com/docker ln -s $(pwd) ./_build/src/github.com/docker/docker export DOCKER_GITCOMMIT="%{shortcommit}/%{version}" -#export DOCKER_BUILDTAGS='selinux' export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath} export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs' @@ -326,6 +326,16 @@ fi %{gopath}/src/%{import_path}/pkg/* %changelog +* Thu Dec 11 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.4.0-1 +- Resolves: rhbz#1173325 +- Resolves: rhbz#1172761 - CVE-2014-9356 +- Resolves: rhbz#1172782 - CVE-2014-9357 +- Resolves: rhbz#1172787 - CVE-2014-9358 +- update to upstream v1.4.0 +- override DOCKER_CERT_PATH in sysconfig instead of patching the source +- update metaprovides +- define PR_SET_CHILD_SUBREAPER as per newer kernel-headers + * Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-2 - Resolves: rhbz#1167642 - Update to upstream v1.3.2 - Resolves: rhbz#1167505, rhbz#1167508 - CVE-2014-6407 diff --git a/docker.sysconfig b/docker.sysconfig index 7078b4a..369e4eb 100644 --- a/docker.sysconfig +++ b/docker.sysconfig @@ -5,3 +5,9 @@ # to the arguments list passed to docker -d other_args= +DOCKER_CERT_PATH=/etc/docker + +# Location used for temporary files, such as those created by +# # docker load and build operations. Default is /var/lib/docker/tmp +# # Can be overriden by setting the following environment variable. +# # DOCKER_TMPDIR=/var/tmp diff --git a/sources b/sources index bf5a889..519b8fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09af621b62626dd18a2f2994435236ca v1.3.2.tar.gz +12cbf5b15af99ff348f574ed7b0847c0 v1.4.0.tar.gz

9 years, 5 months

1
0
0 / 0

[Bug 1167507] New: CVE-2014-6407 docker-io: docker: symbolic and hardlink issues leading to privilege escalation [fedora-all]

by Red Hat Bugzilla

https://bugzilla.redhat.com/show_bug.cgi?id=1167507 Bug ID: 1167507 Summary: CVE-2014-6407 docker-io: docker: symbolic and hardlink issues leading to privilege escalation [fedora-all] Product: Fedora Version: 20 Component: docker-io Keywords: Security, SecurityTracking Severity: low Priority: low Assignee: lsm5(a)fedoraproject.org Reporter: mmcallis(a)redhat.com QA Contact: extras-qa(a)fedoraproject.org CC: admiller(a)redhat.com, golang(a)lists.fedoraproject.org, hushan.jia(a)gmail.com, jchaloup(a)redhat.com, jperrin(a)centos.org, lsm5(a)fedoraproject.org, mattdm(a)redhat.com, mgoldman(a)redhat.com, miminar(a)redhat.com, s(a)shk.io, thrcka(a)redhat.com, vbatts(a)redhat.com Blocks: 1167505 (CVE-2014-6407) This is an automatically created tracking bug! It was created to ensure that one or more security vulnerabilities are fixed in affected versions of Fedora. For comments that are specific to the vulnerability please use bugs filed against the "Security Response" product referenced in the "Blocks" field. For more information see: http://fedoraproject.org/wiki/Security/TrackingBugs When submitting as an update, use the fedpkg template provided in the next comment(s). This will include the bug IDs of this tracking bug as well as the relevant top-level CVE bugs. Please also mention the CVE IDs being fixed in the RPM changelog and the fedpkg commit message. NOTE: this issue affects multiple supported versions of Fedora. While only one tracking bug has been filed, please correct all affected versions at the same time. If you need to fix the versions independent of each other, you may clone this bug as appropriate. [bug automatically created by: add-tracking-bugs] Referenced Bugs: https://bugzilla.redhat.com/show_bug.cgi?id=1167505 [Bug 1167505] CVE-2014-6407 docker: symbolic and hardlink issues leading to privilege escalation -- You are receiving this mail because: You are on the CC list for the bug.

9 years, 5 months

1
18
0 / 0

[docker-io/f19] update to v1.4.0

by Lokesh Mandvekar

commit 610290263a4b15af2f5220e961befc88b37b2500 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Fri Dec 12 07:38:54 2014 +0000 update to v1.4.0 NVR: docker-io-1.4.0-1 - Resolves: rhbz#1173324 - Resolves: rhbz#1172761 - CVE-2014-9356 - Resolves: rhbz#1172782 - CVE-2014-9357 - Resolves: rhbz#1172787 - CVE-2014-9358 - update to upstream v1.4.0 - override DOCKER_CERT_PATH in sysconfig instead of patching the source - update metaprovides Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org> docker-io.spec | 3 ++- docker.sysconfig | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 300789d..8142213 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -193,7 +193,7 @@ mkdir -p ./_build/src/github.com/docker ln -s $(pwd) ./_build/src/%{import_path} export DOCKER_GITCOMMIT="%{shortcommit}/%{version}" -#export DOCKER_BUILDTAGS='selinux' +export DOCKER_BUILDTAGS='btrfs_noversion' export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath} hack/make.sh dynbinary @@ -312,6 +312,7 @@ exit 0 - update to upstream v1.4.0 - override DOCKER_CERT_PATH in sysconfig instead of patching the source - update metaprovides +- disable btrfs version check * Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-2 - install sources skipped prior diff --git a/docker.sysconfig b/docker.sysconfig index c8c301a..a63b304 100644 --- a/docker.sysconfig +++ b/docker.sysconfig @@ -1 +1,7 @@ -OPTIONS=--selinux-enabled +OPTIONS= +DOCKER_CERT_PATH=/etc/docker + +# Location used for temporary files, such as those created by +# docker load and build operations. Default is /var/lib/docker/tmp +# Can be overriden by setting the following environment variable. +# DOCKER_TMPDIR=/var/tmp

9 years, 5 months

1
0
0 / 0

[docker-io/f19] update to v1.4.0

by Lokesh Mandvekar

commit ec098f8523b5b3c46a41398956f20a453daf0df9 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Fri Dec 12 05:45:09 2014 +0000 update to v1.4.0 NVR: docker-io-1.4.0-1 - Resolves: rhbz#1173324 - Resolves: rhbz#1172761 - CVE-2014-9356 - Resolves: rhbz#1172782 - CVE-2014-9357 - Resolves: rhbz#1172787 - CVE-2014-9358 - update to upstream v1.4.0 - override DOCKER_CERT_PATH in sysconfig instead of patching the source - update metaprovides Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org> docker-io.spec | 21 ++++++++++++++------- sources | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 73701d0..300789d 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -10,12 +10,12 @@ %global repo %{project} %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 39fa2faad2f3d6fa5133de4eb740677202f53ef4 +%global commit 4595d4fb03093acf87b905bebc5ba4964d7c0707 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo}-io -Version: 1.3.2 -Release: 2%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.docker.com @@ -114,8 +114,6 @@ Provides: golang(%{import_path}/engine) = %{version}-%{release} Provides: golang(%{import_path}/events) = %{version}-%{release} Provides: golang(%{import_path}/graph) = %{version}-%{release} Provides: golang(%{import_path}/image) = %{version}-%{release} -Provides: golang(%{import_path}/integration) = %{version}-%{release} -Provides: golang(%{import_path}/integration-cli) = %{version}-%{release} Provides: golang(%{import_path}/links) = %{version}-%{release} Provides: golang(%{import_path}/nat) = %{version}-%{release} Provides: golang(%{import_path}/opts) = %{version}-%{release} @@ -137,6 +135,7 @@ Summary: A golang registry for global request variables (source libraries) Provides: golang(%{import_path}/pkg/archive) = %{version}-%{release} Provides: golang(%{import_path}/pkg/broadcastwriter) = %{version}-%{release} Provides: golang(%{import_path}/pkg/chrootarchive) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/devicemapper) = %{version}-%{release} Provides: golang(%{import_path}/pkg/fileutils) = %{version}-%{release} Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release} Provides: golang(%{import_path}/pkg/httputils) = %{version}-%{release} @@ -144,7 +143,6 @@ Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release} Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release} Provides: golang(%{import_path}/pkg/jsonlog) = %{version}-%{release} Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/log) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mflag) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mflag/example) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mount) = %{version}-%{release} @@ -187,7 +185,6 @@ The import paths of import_path/pkg/... #find . -name "*.go" \ # -print |\ # xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g' -sed -i 's/\!bash//g' contrib/completion/bash/docker sed -i 's/go-md2man -in "$FILE" -out/pandoc -s -t man "$FILE" -o/g' docs/man/md2man-all.sh %build @@ -306,6 +303,16 @@ exit 0 %{gopath}/src/%{import_path}/pkg/* %changelog + +* Thu Dec 11 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.4.0-1 +- Resolves: rhbz#1173324 +- Resolves: rhbz#1172761 - CVE-2014-9356 +- Resolves: rhbz#1172782 - CVE-2014-9357 +- Resolves: rhbz#1172787 - CVE-2014-9358 +- update to upstream v1.4.0 +- override DOCKER_CERT_PATH in sysconfig instead of patching the source +- update metaprovides + * Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-2 - install sources skipped prior - use pandoc for manpages diff --git a/sources b/sources index bf5a889..519b8fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09af621b62626dd18a2f2994435236ca v1.3.2.tar.gz +12cbf5b15af99ff348f574ed7b0847c0 v1.4.0.tar.gz

9 years, 5 months

1
0
0 / 0

[docker-io/f20] Update to v1.4.0

by Lokesh Mandvekar

commit e4cdc5be02aa59f4a9ec6852dab2fc264b365657 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Fri Dec 12 05:06:02 2014 +0000 Update to v1.4.0 NVR: docker-io-1.4.0-1 - Resolves: rhbz#1173324 - Resolves: rhbz#1172761 - CVE-2014-9356 - Resolves: rhbz#1172782 - CVE-2014-9357 - Resolves: rhbz#1172787 - CVE-2014-9358 - update to upstream v1.4.0 - override DOCKER_CERT_PATH in sysconfig instead of patching the source - create dockerroot user if doesn't exist prior - update metaprovides Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org> docker-io.spec | 40 ++++++++++++++++++++++------------------ docker.sysconfig | 6 ++++++ sources | 2 +- 3 files changed, 29 insertions(+), 19 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index be29354..643f27c 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -10,13 +10,12 @@ %global repo %{project} %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -# This commit resolves rhbz#1169151 -%global commit 39fa2faad2f3d6fa5133de4eb740677202f53ef4 +%global commit 4595d4fb03093acf87b905bebc5ba4964d7c0707 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo}-io -Version: 1.3.2 -Release: 4%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.docker.com @@ -49,12 +48,12 @@ BuildRequires: btrfs-progs-devel BuildRequires: pkgconfig(systemd) # Use appropriate NVR for systemd-units to ensure SocketUser and SocketGroup are available %if 0%{?fedora} >= 21 -Requires: systemd-units >= 214 +Requires: systemd >= 214 %else %if 0%{?fedora} == 20 -Requires: systemd-units >= 208-20 +Requires: systemd >= 208-20 %else -Requires: systemd-units >= 204-20 +Requires: systemd >= 204-20 %endif %endif %if 0%{?fedora} >= 21 || 0%{?rhel} >= 6 @@ -62,13 +61,13 @@ Requires: systemd-units >= 204-20 Requires: device-mapper-libs >= 1.02.90-1 %endif # Resolves: rhbz#1045220 -Requires: xz -Provides: lxc-docker = %{version}-%{release} +Requires: xz +Provides: lxc-docker = %{version}-%{release} # permitted by https://fedorahosted.org/fpc/ticket/341#comment:7 # In F22, the whole package should be renamed to be just "docker" and # this changed to "Provides: docker-io". %if 0%{?fedora} >= 21 -Provides: %{repo} = %{version}-%{release} +Provides: %{repo} = %{version}-%{release} %endif %description @@ -120,8 +119,6 @@ Provides: golang(%{import_path}/engine) = %{version}-%{release} Provides: golang(%{import_path}/events) = %{version}-%{release} Provides: golang(%{import_path}/graph) = %{version}-%{release} Provides: golang(%{import_path}/image) = %{version}-%{release} -Provides: golang(%{import_path}/integration) = %{version}-%{release} -Provides: golang(%{import_path}/integration-cli) = %{version}-%{release} Provides: golang(%{import_path}/links) = %{version}-%{release} Provides: golang(%{import_path}/nat) = %{version}-%{release} Provides: golang(%{import_path}/opts) = %{version}-%{release} @@ -143,6 +140,7 @@ Summary: A golang registry for global request variables (source libraries) Provides: golang(%{import_path}/pkg/archive) = %{version}-%{release} Provides: golang(%{import_path}/pkg/broadcastwriter) = %{version}-%{release} Provides: golang(%{import_path}/pkg/chrootarchive) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/devicemapper) = %{version}-%{release} Provides: golang(%{import_path}/pkg/fileutils) = %{version}-%{release} Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release} Provides: golang(%{import_path}/pkg/httputils) = %{version}-%{release} @@ -150,7 +148,6 @@ Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release} Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release} Provides: golang(%{import_path}/pkg/jsonlog) = %{version}-%{release} Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/log) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mflag) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mflag/example) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mount) = %{version}-%{release} @@ -193,7 +190,6 @@ rm -rf vendor/src/github.com/{coreos,godbus,gorilla,kr,Sirupsen,syndtr,tchap} find . -name "*.go" \ -print |\ xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g' -sed -i 's/\!bash//g' contrib/completion/bash/docker %build # set up temporary build gopath, and put our directory there @@ -300,17 +296,25 @@ exit 0 %files devel %doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%dir %{gopath}/src/%{import_path} -%{gopath}/src/%{import_path}/* +%{gopath}/src/%{import_path} %files pkg-devel %doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %dir %{gopath}/src/%{import_path} -%dir %{gopath}/src/%{import_path}/pkg -%{gopath}/src/%{import_path}/pkg/* +%{gopath}/src/%{import_path}/pkg %changelog +* Thu Dec 11 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.4.0-1 +- Resolves: rhbz#1173324 +- Resolves: rhbz#1172761 - CVE-2014-9356 +- Resolves: rhbz#1172782 - CVE-2014-9357 +- Resolves: rhbz#1172787 - CVE-2014-9358 +- update to upstream v1.4.0 +- override DOCKER_CERT_PATH in sysconfig instead of patching the source +- create dockerroot user if doesn't exist prior +- update metaprovides + * Mon Dec 01 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-4 - Revert to using upstream v1.3.2 release diff --git a/docker.sysconfig b/docker.sysconfig index c8c301a..9a8aca7 100644 --- a/docker.sysconfig +++ b/docker.sysconfig @@ -1 +1,7 @@ OPTIONS=--selinux-enabled +DOCKER_CERT_PATH=/etc/docker + +# Location used for temporary files, such as those created by +# docker load and build operations. Default is /var/lib/docker/tmp +# Can be overriden by setting the following environment variable. +# DOCKER_TMPDIR=/var/tmp diff --git a/sources b/sources index bf5a889..519b8fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09af621b62626dd18a2f2994435236ca v1.3.2.tar.gz +12cbf5b15af99ff348f574ed7b0847c0 v1.4.0.tar.gz

9 years, 5 months

1
0
0 / 0

[docker-io/f21] Update to v1.4.0

by Lokesh Mandvekar

commit da9dffb83d55d08cff6f64f72b5233f9e80770a6 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Fri Dec 12 05:06:02 2014 +0000 Update to v1.4.0 NVR: docker-io-1.4.0-1 - Resolves: rhbz#1173324 - Resolves: rhbz#1172761 - CVE-2014-9356 - Resolves: rhbz#1172782 - CVE-2014-9357 - Resolves: rhbz#1172787 - CVE-2014-9358 - update to upstream v1.4.0 - override DOCKER_CERT_PATH in sysconfig instead of patching the source - create dockerroot user if doesn't exist prior - update metaprovides Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org> docker-io.spec | 40 ++++++++++++++++++++++------------------ docker.sysconfig | 6 ++++++ sources | 2 +- 3 files changed, 29 insertions(+), 19 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index be29354..643f27c 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -10,13 +10,12 @@ %global repo %{project} %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -# This commit resolves rhbz#1169151 -%global commit 39fa2faad2f3d6fa5133de4eb740677202f53ef4 +%global commit 4595d4fb03093acf87b905bebc5ba4964d7c0707 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo}-io -Version: 1.3.2 -Release: 4%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.docker.com @@ -49,12 +48,12 @@ BuildRequires: btrfs-progs-devel BuildRequires: pkgconfig(systemd) # Use appropriate NVR for systemd-units to ensure SocketUser and SocketGroup are available %if 0%{?fedora} >= 21 -Requires: systemd-units >= 214 +Requires: systemd >= 214 %else %if 0%{?fedora} == 20 -Requires: systemd-units >= 208-20 +Requires: systemd >= 208-20 %else -Requires: systemd-units >= 204-20 +Requires: systemd >= 204-20 %endif %endif %if 0%{?fedora} >= 21 || 0%{?rhel} >= 6 @@ -62,13 +61,13 @@ Requires: systemd-units >= 204-20 Requires: device-mapper-libs >= 1.02.90-1 %endif # Resolves: rhbz#1045220 -Requires: xz -Provides: lxc-docker = %{version}-%{release} +Requires: xz +Provides: lxc-docker = %{version}-%{release} # permitted by https://fedorahosted.org/fpc/ticket/341#comment:7 # In F22, the whole package should be renamed to be just "docker" and # this changed to "Provides: docker-io". %if 0%{?fedora} >= 21 -Provides: %{repo} = %{version}-%{release} +Provides: %{repo} = %{version}-%{release} %endif %description @@ -120,8 +119,6 @@ Provides: golang(%{import_path}/engine) = %{version}-%{release} Provides: golang(%{import_path}/events) = %{version}-%{release} Provides: golang(%{import_path}/graph) = %{version}-%{release} Provides: golang(%{import_path}/image) = %{version}-%{release} -Provides: golang(%{import_path}/integration) = %{version}-%{release} -Provides: golang(%{import_path}/integration-cli) = %{version}-%{release} Provides: golang(%{import_path}/links) = %{version}-%{release} Provides: golang(%{import_path}/nat) = %{version}-%{release} Provides: golang(%{import_path}/opts) = %{version}-%{release} @@ -143,6 +140,7 @@ Summary: A golang registry for global request variables (source libraries) Provides: golang(%{import_path}/pkg/archive) = %{version}-%{release} Provides: golang(%{import_path}/pkg/broadcastwriter) = %{version}-%{release} Provides: golang(%{import_path}/pkg/chrootarchive) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/devicemapper) = %{version}-%{release} Provides: golang(%{import_path}/pkg/fileutils) = %{version}-%{release} Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release} Provides: golang(%{import_path}/pkg/httputils) = %{version}-%{release} @@ -150,7 +148,6 @@ Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release} Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release} Provides: golang(%{import_path}/pkg/jsonlog) = %{version}-%{release} Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/log) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mflag) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mflag/example) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mount) = %{version}-%{release} @@ -193,7 +190,6 @@ rm -rf vendor/src/github.com/{coreos,godbus,gorilla,kr,Sirupsen,syndtr,tchap} find . -name "*.go" \ -print |\ xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g' -sed -i 's/\!bash//g' contrib/completion/bash/docker %build # set up temporary build gopath, and put our directory there @@ -300,17 +296,25 @@ exit 0 %files devel %doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%dir %{gopath}/src/%{import_path} -%{gopath}/src/%{import_path}/* +%{gopath}/src/%{import_path} %files pkg-devel %doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %dir %{gopath}/src/%{import_path} -%dir %{gopath}/src/%{import_path}/pkg -%{gopath}/src/%{import_path}/pkg/* +%{gopath}/src/%{import_path}/pkg %changelog +* Thu Dec 11 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.4.0-1 +- Resolves: rhbz#1173324 +- Resolves: rhbz#1172761 - CVE-2014-9356 +- Resolves: rhbz#1172782 - CVE-2014-9357 +- Resolves: rhbz#1172787 - CVE-2014-9358 +- update to upstream v1.4.0 +- override DOCKER_CERT_PATH in sysconfig instead of patching the source +- create dockerroot user if doesn't exist prior +- update metaprovides + * Mon Dec 01 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-4 - Revert to using upstream v1.3.2 release diff --git a/docker.sysconfig b/docker.sysconfig index c8c301a..9a8aca7 100644 --- a/docker.sysconfig +++ b/docker.sysconfig @@ -1 +1,7 @@ OPTIONS=--selinux-enabled +DOCKER_CERT_PATH=/etc/docker + +# Location used for temporary files, such as those created by +# docker load and build operations. Default is /var/lib/docker/tmp +# Can be overriden by setting the following environment variable. +# DOCKER_TMPDIR=/var/tmp diff --git a/sources b/sources index bf5a889..519b8fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09af621b62626dd18a2f2994435236ca v1.3.2.tar.gz +12cbf5b15af99ff348f574ed7b0847c0 v1.4.0.tar.gz

9 years, 5 months

1
0
0 / 0

[docker-io] update metaprovides

by Lokesh Mandvekar

commit 2a5bd1bee9e253acd3b134d136188672939f736b Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Fri Dec 12 04:21:15 2014 +0000 update metaprovides NVR: docker-io-1.4.0-2 Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org> docker-io.spec | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 226182e..7c7d82d 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -15,7 +15,7 @@ Name: %{repo}-io Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.docker.com @@ -120,8 +120,6 @@ Provides: golang(%{import_path}/engine) = %{version}-%{release} Provides: golang(%{import_path}/events) = %{version}-%{release} Provides: golang(%{import_path}/graph) = %{version}-%{release} Provides: golang(%{import_path}/image) = %{version}-%{release} -Provides: golang(%{import_path}/integration) = %{version}-%{release} -Provides: golang(%{import_path}/integration-cli) = %{version}-%{release} Provides: golang(%{import_path}/links) = %{version}-%{release} Provides: golang(%{import_path}/nat) = %{version}-%{release} Provides: golang(%{import_path}/opts) = %{version}-%{release} @@ -143,6 +141,7 @@ Summary: A golang registry for global request variables (source libraries) Provides: golang(%{import_path}/pkg/archive) = %{version}-%{release} Provides: golang(%{import_path}/pkg/broadcastwriter) = %{version}-%{release} Provides: golang(%{import_path}/pkg/chrootarchive) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/devicemapper) = %{version}-%{release} Provides: golang(%{import_path}/pkg/fileutils) = %{version}-%{release} Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release} Provides: golang(%{import_path}/pkg/httputils) = %{version}-%{release} @@ -150,7 +149,6 @@ Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release} Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release} Provides: golang(%{import_path}/pkg/jsonlog) = %{version}-%{release} Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/log) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mflag) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mflag/example) = %{version}-%{release} Provides: golang(%{import_path}/pkg/mount) = %{version}-%{release} @@ -301,17 +299,18 @@ exit 0 %files devel %doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%dir %{gopath}/src/%{import_path} -%{gopath}/src/%{import_path}/* +%{gopath}/src/%{import_path} %files pkg-devel %doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %dir %{gopath}/src/%{import_path} -%dir %{gopath}/src/%{import_path}/pkg -%{gopath}/src/%{import_path}/pkg/* +%{gopath}/src/%{import_path}/pkg %changelog +* Thu Dec 11 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.4.0-2 +- update metaprovides + * Thu Dec 11 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.4.0-1 - Resolves: rhbz#1173324 - Resolves: rhbz#1172761 - CVE-2014-9356

9 years, 5 months

1
0
0 / 0

[docker-io] Update to v1.4.0

by Lokesh Mandvekar

commit 631ab063155aa64500c71d95512ef07d39c87512 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Fri Dec 12 03:28:24 2014 +0000 Update to v1.4.0 NVR: docker-io-1.4.0-1 - Resolves: rhbz#1173324 - Resolves: rhbz#1172761 - CVE-2014-9356 - Resolves: rhbz#1172782 - CVE-2014-9357 - Resolves: rhbz#1172787 - CVE-2014-9358 - update to upstream v1.4.0 - override DOCKER_CERT_PATH in sysconfig instead of patching the source - create dockerroot user if doesn't exist prior Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org> docker-io.spec | 36 ++++++++++++++++++++++-------------- docker.sysconfig | 1 + sources | 2 +- 3 files changed, 24 insertions(+), 15 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 719162d..226182e 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -10,19 +10,19 @@ %global repo %{project} %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit bb24f99d741cd8d6a8b882afc929c15c633c39cb +%global commit 4595d4fb03093acf87b905bebc5ba4964d7c0707 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo}-io -Version: 1.3.2 -Release: 6.git%{shortcommit}%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.docker.com # only x86_64 for now: https://github.com/docker/docker/issues/136 ExclusiveArch: x86_64 -#Source0: https://%{import_path}/archive/v%{version}.tar.gz -Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source0: https://%{import_path}/archive/v%{version}.tar.gz +#Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: %{repo}.service Source2: %{repo}.sysconfig Source3: %{repo}-storage.sysconfig @@ -49,7 +49,7 @@ BuildRequires: btrfs-progs-devel BuildRequires: pkgconfig(systemd) # Use appropriate NVR for systemd-units to ensure SocketUser and SocketGroup are available %if 0%{?fedora} >= 21 -Requires: systemd >= 214 +Requires: systemd >= 214 %else %if 0%{?fedora} == 20 Requires: systemd >= 208-20 @@ -62,13 +62,13 @@ Requires: systemd >= 204-20 Requires: device-mapper-libs >= 1.02.90-1 %endif # Resolves: rhbz#1045220 -Requires: xz -Provides: lxc-docker = %{version}-%{release} +Requires: xz +Provides: lxc-docker = %{version}-%{release} # permitted by https://fedorahosted.org/fpc/ticket/341#comment:7 # In F22, the whole package should be renamed to be just "docker" and # this changed to "Provides: docker-io". %if 0%{?fedora} >= 21 -Provides: %{repo} = %{version}-%{release} +Provides: %{repo} = %{version}-%{release} %endif %description @@ -189,13 +189,11 @@ specific logic. The import paths of import_path/pkg/... %prep -%setup -qn %{repo}-%{commit} +%setup -qn %{repo}-%{version} rm -rf vendor/src/github.com/{coreos,godbus,gorilla,kr,Sirupsen,syndtr,tchap} find . -name "*.go" \ -print |\ xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g' -sed -i 's/\.docker/\/etc\/docker/g' docker/flags.go -sed -i 's/\!bash//g' contrib/completion/bash/docker %build # set up temporary build gopath, and put our directory there @@ -214,11 +212,11 @@ cp contrib/syntax/vim/README.md README-vim-syntax.md %install # install binary install -d %{buildroot}%{_bindir} -install -p -m 755 bundles/%{version}-dev/dynbinary/docker-%{version}-dev %{buildroot}%{_bindir}/docker +install -p -m 755 bundles/%{version}/dynbinary/docker-%{version} %{buildroot}%{_bindir}/docker # install dockerinit install -d %{buildroot}%{_libexecdir}/docker -install -p -m 755 bundles/%{version}-dev/dynbinary/dockerinit-%{version}-dev %{buildroot}%{_libexecdir}/docker/dockerinit +install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit # install manpages install -d %{buildroot}%{_mandir}/man1 @@ -269,6 +267,7 @@ done %pre getent group docker > /dev/null || %{_sbindir}/groupadd -r docker +getent passwd dockerroot > /dev/null || %{_sbindir}/useradd -r -g docker -d %{_sharedstatedir}/docker -s /sbin/nologin -c "Docker User" dockerroot exit 0 %post @@ -313,6 +312,15 @@ exit 0 %{gopath}/src/%{import_path}/pkg/* %changelog +* Thu Dec 11 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.4.0-1 +- Resolves: rhbz#1173324 +- Resolves: rhbz#1172761 - CVE-2014-9356 +- Resolves: rhbz#1172782 - CVE-2014-9357 +- Resolves: rhbz#1172787 - CVE-2014-9358 +- update to upstream v1.4.0 +- override DOCKER_CERT_PATH in sysconfig instead of patching the source +- create dockerroot user if doesn't exist prior + * Tue Dec 09 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-6.gitbb24f99 - use /etc/docker instead of /.docker - use upstream master commit bb24f99d741cd8d6a8b882afc929c15c633c39cb diff --git a/docker.sysconfig b/docker.sysconfig index 405ee91..9a8aca7 100644 --- a/docker.sysconfig +++ b/docker.sysconfig @@ -1,4 +1,5 @@ OPTIONS=--selinux-enabled +DOCKER_CERT_PATH=/etc/docker # Location used for temporary files, such as those created by # docker load and build operations. Default is /var/lib/docker/tmp diff --git a/sources b/sources index 7973e03..519b8fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9564e24470361a28373da1b4d1d4acd docker-bb24f99.tar.gz +12cbf5b15af99ff348f574ed7b0847c0 v1.4.0.tar.gz

9 years, 5 months

1
0
0 / 0

File v1.4.0.tar.gz uploaded to lookaside cache by lsm5

by Lokesh Mandvekar

A file has been added to the lookaside cache for docker-io: 12cbf5b15af99ff348f574ed7b0847c0 v1.4.0.tar.gz

9 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

golang December 2014