[kubernetes] Bump to upstream 64e07f7fe03d8692c685b09770c45f364967a119
by Eric Paris
commit e29c554706bd2e189677b9617fa89fa9937c29fd
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Nov 25 09:52:05 2014 -0500
Bump to upstream 64e07f7fe03d8692c685b09770c45f364967a119
.gitignore | 1 +
kubernetes.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e9a0090..7011050 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/kubernetes-c6158b8.tar.gz
/kubernetes-3f74a1e.tar.gz
/kubernetes-162e498.tar.gz
+/kubernetes-64e07f7.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index c8baba0..e4b0f40 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -1,7 +1,7 @@
#debuginfo not supported with Go
%global debug_package %{nil}
%global import_path github.com/GoogleCloudPlatform/kubernetes
-%global commit 162e4983b947d2f6f858ca7607869d70627f5dff
+%global commit 64e07f7fe03d8692c685b09770c45f364967a119
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -11,7 +11,7 @@
Name: kubernetes
Version: 0.5
-Release: 125.0.git%{shortcommit}%{?dist}
+Release: 174.0.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -81,7 +81,7 @@ BuildRequires: golang(gopkg.in/v1/yaml)
%build
export KUBE_GIT_TREE_STATE="clean"
export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.5-125-g162e4983b947d2
+export KUBE_GIT_VERSION=v0.5-174-g64e07f7fe03d86
%if 0%{?fedora}
export KUBE_GIT_TREE_STATE="dirty"
@@ -180,6 +180,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Tue Nov 25 2014 Eric Paris <eparis(a)redhat.com> - 0.5-174.0.git64e07f7
+- Bump to upstream 64e07f7fe03d8692c685b09770c45f364967a119
+
* Mon Nov 24 2014 Eric Paris <eparis(a)redhat.com> - 0.5-125.0.git162e498
- Bump to upstream 162e4983b947d2f6f858ca7607869d70627f5dff
diff --git a/sources b/sources
index 409762a..f18ef1b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8fc57cd5d197fb56894e2d7393f6d127 kubernetes-162e498.tar.gz
+057edca29d9a88b690216deee57662ad kubernetes-64e07f7.tar.gz
9 years, 6 months
[kubernetes] fix some deps to be more RHEL friendly
by Eric Paris
commit e56bdacb1c01e84657407ca404dea960738aea1c
Author: Eric Paris <eparis(a)redhat.com>
Date: Mon Nov 24 09:19:59 2014 -0500
fix some deps to be more RHEL friendly
kubernetes.spec | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/kubernetes.spec b/kubernetes.spec
index 28e8486..c8baba0 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -30,17 +30,18 @@ Requires: docker-io
%endif
Requires: etcd
-Requires: cadvisor
Requires(pre): shadow-utils
BuildRequires: git
BuildRequires: golang >= 1.2-7
BuildRequires: systemd
-BuildRequires: golang-cover
BuildRequires: etcd
%if 0%{?fedora}
+# needed for go cover. Not available in RHEL/CentOS (available in Fedora/EPEL)
+BuildRequires: golang-cover
+
BuildRequires: golang(code.google.com/p/gcfg)
BuildRequires: golang(code.google.com/p/goauth2)
BuildRequires: golang(code.google.com/p/go.net/context)
@@ -78,6 +79,7 @@ BuildRequires: golang(gopkg.in/v1/yaml)
%autosetup -Sgit -n %{name}-%{commit}
%build
+export KUBE_GIT_TREE_STATE="clean"
export KUBE_GIT_COMMIT=%{commit}
export KUBE_GIT_VERSION=v0.5-125-g162e4983b947d2
9 years, 6 months
[docker-io/el6] v1.3.2, fixes CVE-2014-6407, CVE-2014-6408
by Lokesh Mandvekar
commit 8f557b8ca4a4042648ae7e7120bf01dd66611249
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Nov 25 04:12:40 2014 -0800
v1.3.2, fixes CVE-2014-6407, CVE-2014-6408
NVR: docker-io-1.3.2-2
use vendor dir for golang deps
TODO: fix golang dep rpms
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 237 +++++++++++++++++++++++++++++---------------------------
sources | 2 +-
2 files changed, 125 insertions(+), 114 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 2927282..e2fdb03 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,11 +10,11 @@
%global repo %{project}
%global import_path github.com/docker/docker
-%global commit c78088fe3d1b90640c637d8c3457de3caa0c7a24
+%global commit 39fa2faad2f3d6fa5133de4eb740677202f53ef4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: %{repo}-io
-Version: 1.3.1
+Version: 1.3.2
Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -30,21 +30,22 @@ Source2: docker-storage.sysconfig
# https://github.com/docker/docker/commit/640d2ef6f54d96ac4fc3f0f745cb1e6a3...
Source3: docker.sysvinit
BuildRequires: glibc-static
-BuildRequires: golang >= 1.3.3
+#BuildRequires: golang >= 1.3.3
# for gorilla/mux and kr/pty https://github.com/dotcloud/docker/pull/5950
-BuildRequires: golang(github.com/gorilla/mux) >= 0-0.13
-BuildRequires: golang(github.com/kr/pty) >= 0-0.19
-BuildRequires: golang(github.com/godbus/dbus)
+#BuildRequires: golang(github.com/gorilla/mux) >= 0-0.13
+#BuildRequires: golang(github.com/kr/pty) >= 0-0.19
+#BuildRequires: golang(github.com/godbus/dbus)
# for coreos/go-systemd https://github.com/dotcloud/docker/pull/5981
-BuildRequires: golang(github.com/coreos/go-systemd) >= 2-1
-BuildRequires: golang(code.google.com/p/go.net/websocket)
-BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
+#BuildRequires: golang(github.com/coreos/go-systemd) >= 2-1
+#BuildRequires: golang(code.google.com/p/go.net/websocket)
+#BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
# RHBZ#1109039 use syndtr/gocapability >= 0-0.7
-BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.7
-BuildRequires: golang(github.com/docker/libcontainer) >= 1.2.0
-BuildRequires: golang(github.com/tchap/go-patricia/patricia)
-BuildRequires: golang(github.com/docker/libtrust)
-BuildRequires: golang(github.com/docker/libtrust/trustgraph)
+#BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.7
+#BuildRequires: golang(github.com/docker/libcontainer) >= 1.2.0
+#BuildRequires: golang(github.com/tchap/go-patricia/patricia)
+#BuildRequires: golang(github.com/docker/libtrust)
+#BuildRequires: golang(github.com/docker/libtrust/trustgraph)
+BuildRequires: sqlite-devel
BuildRequires: go-md2man
BuildRequires: device-mapper-devel
Requires(post): chkconfig
@@ -58,6 +59,9 @@ Requires: xz
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
# No longer needed in Fedora because of libcontainer
Requires: libcgroup
@@ -76,78 +80,98 @@ servers, OpenStack clusters, public instances, or combinations of the above.
%package devel
BuildRequires: golang >= 1.2.1-3
-Requires: golang >= 1.2.1-3
-Requires: docker-io-pkg-devel
-Summary: A golang registry for global request variables (source libraries)
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/api) = %{version}-%{release}
-Provides: golang(%{import_path}/api/client) = %{version}-%{release}
-Provides: golang(%{import_path}/api/server) = %{version}-%{release}
-Provides: golang(%{import_path}/archive) = %{version}-%{release}
-Provides: golang(%{import_path}/builtins) = %{version}-%{release}
-Provides: golang(%{import_path}/contrib) = %{version}-%{release}
-Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}
-Provides: golang(%{import_path}/contrib/host-integration) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver/native/configuration) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver/btrfs) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver/devmapper) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver/graphtest) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver/vfs) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/networkdriver) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/networkdriver/bridge) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/networkdriver/ipallocator) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/networkdriver/portallocator) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/networkdriver/portmapper) = %{version}-%{release}
-Provides: golang(%{import_path}/dockerversion) = %{version}-%{release}
-Provides: golang(%{import_path}/engine) = %{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}
-Provides: golang(%{import_path}/registry) = %{version}-%{release}
-Provides: golang(%{import_path}/runconfig) = %{version}-%{release}
-Provides: golang(%{import_path}/utils) = %{version}-%{release}
-Provides: golang(%{import_path}/utils/broadcastwriter) = %{version}-%{release}
+Requires: golang >= 1.2.1-3
+Requires: docker-io-pkg-devel
+Summary: A golang registry for global request variables (source libraries)
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path}/api) = %{version}-%{release}
+Provides: golang(%{import_path}/api/client) = %{version}-%{release}
+Provides: golang(%{import_path}/api/server) = %{version}-%{release}
+Provides: golang(%{import_path}/builder) = %{version}-%{release}
+Provides: golang(%{import_path}/builder/parser) = %{version}-%{release}
+Provides: golang(%{import_path}/builder/parser/dumper) = %{version}-%{release}
+Provides: golang(%{import_path}/builtins) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/host-integration) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/execdriver) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/graphdriver) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/graphdriver/btrfs) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/graphdriver/devmapper) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/graphdriver/graphtest) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/graphdriver/vfs) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/networkdriver) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/networkdriver/bridge) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/networkdriver/ipallocator) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/networkdriver/portallocator) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon/networkdriver/portmapper) = %{version}-%{release}
+Provides: golang(%{import_path}/dockerversion) = %{version}-%{release}
+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}
+Provides: golang(%{import_path}/registry) = %{version}-%{release}
+Provides: golang(%{import_path}/runconfig) = %{version}-%{release}
+Provides: golang(%{import_path}/trust) = %{version}-%{release}
+Provides: golang(%{import_path}/utils) = %{version}-%{release}
+Provides: golang(%{import_path}/volumes) = %{version}-%{release}
+
%description devel
This is the source libraries for docker.
%package pkg-devel
BuildRequires: golang >= 1.2.1-3
-Requires: golang >= 1.2.1-3
-Summary: A golang registry for global request variables (source libraries)
-Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/listenbuffer) = %{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}
-Provides: golang(%{import_path}/pkg/namesgenerator) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/networkfs/etchosts) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/networkfs/resolvconf) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/proxy) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/signal) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/symlink) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/sysinfo) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/system) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/systemd) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/tailfile) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/term) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/testutils) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/truncindex) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/units) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/user) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/version) = %{version}-%{release}
+Requires: golang >= 1.2.1-3
+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/fileutils) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/httputils) = %{version}-%{release}
+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}
+Provides: golang(%{import_path}/pkg/namesgenerator) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/networkfs/etchosts) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/networkfs/resolvconf) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/parsers) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/parsers/filters) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/parsers/kernel) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/parsers/operatingsystem) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/pools) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/promise) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/proxy) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/reexec) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/signal) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/stdcopy) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/symlink) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/sysinfo) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/system) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/systemd) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/tailfile) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/tarsum) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/term) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/testutils) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/timeutils) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/truncindex) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/units) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/version) = %{version}-%{release}
%description pkg-devel
These source librariees are provided by docker, but are independent of docker specific logic.
@@ -155,10 +179,10 @@ The import paths of %{import_path}/pkg/...
%prep
%setup -q -n docker-%{version}
-rm -rf vendor
-find . -name "*.go" \
- -print |\
- xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g'
+#rm -rf vendor
+#find . -name "*.go" \
+# -print |\
+# xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g'
%build
# set up temporary build gopath, and put our directory there
@@ -167,7 +191,7 @@ ln -s $(pwd) ./_build/src/github.com/docker/docker
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
#export DOCKER_BUILDTAGS='selinux'
-export GOPATH=$(pwd)/_build:%{gopath}
+export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs'
hack/make.sh dynbinary
@@ -225,8 +249,11 @@ install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
install -d -p %{buildroot}/%{gopath}/src/%{import_path}
rm -rf pkg/symlink/testdata
-for dir in api builtins daemon dockerversion engine graph \
- image links nat opts pkg registry runconfig utils
+for dir in api builder builtins contrib/docker-device-tool \
+ contrib/host-integration daemon docker dockerinit \
+ dockerversion engine events graph \
+ image links nat opts pkg registry runconfig \
+ trust utils volumes
do
cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
done
@@ -289,39 +316,23 @@ fi
%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}/*
-%dir %{gopath}/src/%{import_path}/*/*
-%dir %{gopath}/src/%{import_path}/*/*/*
-%dir %{gopath}/src/%{import_path}/*/*/*/*
-%{gopath}/src/%{import_path}/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/README.md
-%{gopath}/src/%{import_path}/*/*.go
-%{gopath}/src/%{import_path}/*/*/*.go
-%{gopath}/src/%{import_path}/*/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/*/*/*.go
-%{gopath}/src/%{import_path}/*/*/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/*/*/README.md
-%{gopath}/src/%{import_path}/*/*/*/*/*.go
+%{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
-%dir %{gopath}/src/%{import_path}/pkg/*
-%dir %{gopath}/src/%{import_path}/pkg/*/*
-%dir %{gopath}/src/%{import_path}/pkg/*/*/*
-%{gopath}/src/%{import_path}/pkg/README.md
-%{gopath}/src/%{import_path}/pkg/*/MAINTAINER*
-%{gopath}/src/%{import_path}/pkg/*/LICENSE
-%{gopath}/src/%{import_path}/pkg/*/README.md
-%{gopath}/src/%{import_path}/pkg/*/*.go
-%{gopath}/src/%{import_path}/pkg/*/*/*.tar
-%{gopath}/src/%{import_path}/pkg/*/*/*.go
-%{gopath}/src/%{import_path}/pkg/*/*/*/json
-%{gopath}/src/%{import_path}/pkg/*/*/*/*.tar
+%{gopath}/src/%{import_path}/pkg/*
%changelog
+* 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
+- Resolves: rhbz#1167506 - CVE-2014-6408
+- use vendor dir for golang deps (fix their rpms soon)
+- keep NVRs in sync with rest of fedora
+
* Fri Oct 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.1-2
- Remove pandoc from build reqs
diff --git a/sources b/sources
index f2eaa15..bf5a889 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-098c366f9c8eb82ba537b93eec66303e v1.3.1.tar.gz
+09af621b62626dd18a2f2994435236ca v1.3.2.tar.gz
9 years, 6 months
[docker-io/f19] use pandoc for manpages on f19
by Lokesh Mandvekar
commit 7ad2d5b219622a91e2460489567fdc26253a5577
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Nov 25 05:16:39 2014 -0800
use pandoc for manpages on f19
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index a531e4a..73701d0 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -188,6 +188,7 @@ The import paths of import_path/pkg/...
# -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
# set up temporary build gopath, and put our directory there
@@ -307,6 +308,7 @@ exit 0
%changelog
* Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-2
- install sources skipped prior
+- use pandoc for manpages
* Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-1
- Resolves: rhbz#1167642 - Update to upstream v1.3.2
9 years, 6 months
[docker-io/f19] disable selinux for f19
by Lokesh Mandvekar
commit cf7cd0719219ee2863ce947a07ac377e8cf9b24b
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Nov 25 04:15:02 2014 -0800
disable selinux for f19
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 541b40e..a531e4a 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -195,7 +195,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='selinux'
export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
hack/make.sh dynbinary
9 years, 6 months
[Bug 1164851] CVE-2014-5277 docker: fallback to HTTP when HTTPS connections to the registry fail [epel-6]
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1164851
Lokesh Mandvekar <lsm5(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |CLOSED
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,
| |mgoldman(a)redhat.com,
| |miminar(a)redhat.com,
| |s(a)shk.io,
| |thrcka(a)redhat.com,
| |vbatts(a)redhat.com
Component|docker |docker-io
Resolution|--- |CURRENTRELEASE
Assignee|andreas.bierfert@lowlatency |lsm5(a)fedoraproject.org
|.de |
Last Closed| |2014-11-25 06:48:29
--- Comment #3 from Lokesh Mandvekar <lsm5(a)redhat.com> ---
yes 1.3.1 was shipped and currently in stable
--
You are receiving this mail because:
You are on the CC list for the bug.
9 years, 6 months
[docker-io/f19] v1.3.2, fixes CVE-2014-6407, CVE-2014-6408
by Lokesh Mandvekar
commit 1b0997e199eb5c2a4e793386a128adc83400575a
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Nov 25 03:28:25 2014 -0800
v1.3.2, fixes CVE-2014-6407, CVE-2014-6408
NVR: docker-io-1.3.2-2
use vendor dir for golang deps
TODO: fix the golang rpms soon
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 43 ++++++++++++++-----------------------------
1 files changed, 14 insertions(+), 29 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 25aed89..541b40e 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -15,7 +15,7 @@
Name: %{repo}-io
Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -86,8 +86,10 @@ Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/api) = %{version}-%{release}
Provides: golang(%{import_path}/api/client) = %{version}-%{release}
Provides: golang(%{import_path}/api/server) = %{version}-%{release}
+Provides: golang(%{import_path}/builder) = %{version}-%{release}
+Provides: golang(%{import_path}/builder/parser) = %{version}-%{release}
+Provides: golang(%{import_path}/builder/parser/dumper) = %{version}-%{release}
Provides: golang(%{import_path}/builtins) = %{version}-%{release}
-Provides: golang(%{import_path}/contrib) = %{version}-%{release}
Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}
Provides: golang(%{import_path}/contrib/host-integration) = %{version}-%{release}
Provides: golang(%{import_path}/daemon) = %{version}-%{release}
@@ -248,8 +250,11 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker-storage
install -d -p %{buildroot}/%{gopath}/src/%{import_path}
rm -rf pkg/symlink/testdata
-for dir in api builtins daemon dockerversion engine graph \
- image links nat opts pkg registry runconfig utils
+for dir in api builder builtins contrib/docker-device-tool \
+ contrib/host-integration daemon docker dockerinit \
+ dockerversion engine events graph \
+ image links nat opts pkg registry runconfig \
+ trust utils volumes
do
cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
done
@@ -290,39 +295,19 @@ exit 0
%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}/*
-%dir %{gopath}/src/%{import_path}/*/*
-%dir %{gopath}/src/%{import_path}/*/*/*
-%dir %{gopath}/src/%{import_path}/*/*/*/*
-%{gopath}/src/%{import_path}/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/README.md
-%{gopath}/src/%{import_path}/*/*.go
-%{gopath}/src/%{import_path}/*/*/*.go
-%{gopath}/src/%{import_path}/*/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/*/*/*.go
-%{gopath}/src/%{import_path}/*/*/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/*/*/README.md
-%{gopath}/src/%{import_path}/*/*/*/*/*.go
+%{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
-%dir %{gopath}/src/%{import_path}/pkg/*
-%dir %{gopath}/src/%{import_path}/pkg/*/*
-%dir %{gopath}/src/%{import_path}/pkg/*/*/*
-%{gopath}/src/%{import_path}/pkg/README.md
-%{gopath}/src/%{import_path}/pkg/*/MAINTAINER*
-%{gopath}/src/%{import_path}/pkg/*/LICENSE
-%{gopath}/src/%{import_path}/pkg/*/README.md
-%{gopath}/src/%{import_path}/pkg/*/*.go
-%{gopath}/src/%{import_path}/pkg/*/*/*.tar
-%{gopath}/src/%{import_path}/pkg/*/*/*.go
-%{gopath}/src/%{import_path}/pkg/*/*/*/json
-%{gopath}/src/%{import_path}/pkg/*/*/*/*.tar
+%{gopath}/src/%{import_path}/pkg/*
%changelog
+* Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-2
+- install sources skipped prior
+
* Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-1
- Resolves: rhbz#1167642 - Update to upstream v1.3.2
- Resolves: rhbz#1167505, rhbz#1167507 - CVE-2014-6407
9 years, 6 months
[docker-io/f20] v1.3.2, fixes CVE-2014-6407, CVE-2014-6408
by Lokesh Mandvekar
commit e4c3cecf4527c98d903972ebf9ac79b08f2d0479
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Nov 25 03:28:25 2014 -0800
v1.3.2, fixes CVE-2014-6407, CVE-2014-6408
NVR: docker-io-1.3.2-2
use vendor dir for golang deps
TODO: fix the golang rpms soon
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 43 ++++++++++++++-----------------------------
1 files changed, 14 insertions(+), 29 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 1c9b734..0d92cc6 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -15,7 +15,7 @@
Name: %{repo}-io
Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -88,8 +88,10 @@ Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/api) = %{version}-%{release}
Provides: golang(%{import_path}/api/client) = %{version}-%{release}
Provides: golang(%{import_path}/api/server) = %{version}-%{release}
+Provides: golang(%{import_path}/builder) = %{version}-%{release}
+Provides: golang(%{import_path}/builder/parser) = %{version}-%{release}
+Provides: golang(%{import_path}/builder/parser/dumper) = %{version}-%{release}
Provides: golang(%{import_path}/builtins) = %{version}-%{release}
-Provides: golang(%{import_path}/contrib) = %{version}-%{release}
Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}
Provides: golang(%{import_path}/contrib/host-integration) = %{version}-%{release}
Provides: golang(%{import_path}/daemon) = %{version}-%{release}
@@ -250,8 +252,11 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker-storage
install -d -p %{buildroot}/%{gopath}/src/%{import_path}
rm -rf pkg/symlink/testdata
-for dir in api builtins daemon dockerversion engine graph \
- image links nat opts pkg registry runconfig utils
+for dir in api builder builtins contrib/docker-device-tool \
+ contrib/host-integration daemon docker dockerinit \
+ dockerversion engine events graph \
+ image links nat opts pkg registry runconfig \
+ trust utils volumes
do
cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
done
@@ -292,39 +297,19 @@ exit 0
%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}/*
-%dir %{gopath}/src/%{import_path}/*/*
-%dir %{gopath}/src/%{import_path}/*/*/*
-%dir %{gopath}/src/%{import_path}/*/*/*/*
-%{gopath}/src/%{import_path}/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/README.md
-%{gopath}/src/%{import_path}/*/*.go
-%{gopath}/src/%{import_path}/*/*/*.go
-%{gopath}/src/%{import_path}/*/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/*/*/*.go
-%{gopath}/src/%{import_path}/*/*/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/*/*/README.md
-%{gopath}/src/%{import_path}/*/*/*/*/*.go
+%{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
-%dir %{gopath}/src/%{import_path}/pkg/*
-%dir %{gopath}/src/%{import_path}/pkg/*/*
-%dir %{gopath}/src/%{import_path}/pkg/*/*/*
-%{gopath}/src/%{import_path}/pkg/README.md
-%{gopath}/src/%{import_path}/pkg/*/MAINTAINER*
-%{gopath}/src/%{import_path}/pkg/*/LICENSE
-%{gopath}/src/%{import_path}/pkg/*/README.md
-%{gopath}/src/%{import_path}/pkg/*/*.go
-%{gopath}/src/%{import_path}/pkg/*/*/*.tar
-%{gopath}/src/%{import_path}/pkg/*/*/*.go
-%{gopath}/src/%{import_path}/pkg/*/*/*/json
-%{gopath}/src/%{import_path}/pkg/*/*/*/*.tar
+%{gopath}/src/%{import_path}/pkg/*
%changelog
+* Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-2
+- install sources skipped prior
+
* Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-1
- Resolves: rhbz#1167642 - Update to upstream v1.3.2
- Resolves: rhbz#1167505, rhbz#1167507 - CVE-2014-6407
9 years, 6 months
[docker-io/f21] v1.3.2, fixes CVE-2014-6407, CVE-2014-6408
by Lokesh Mandvekar
commit 3efa0e09d5abc506b382161c8afdea9a443d5c55
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Nov 25 03:28:25 2014 -0800
v1.3.2, fixes CVE-2014-6407, CVE-2014-6408
NVR: docker-io-1.3.2-2
use vendor dir for golang deps
TODO: fix the golang rpms soon
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 43 ++++++++++++++-----------------------------
1 files changed, 14 insertions(+), 29 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 1c9b734..0d92cc6 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -15,7 +15,7 @@
Name: %{repo}-io
Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -88,8 +88,10 @@ Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/api) = %{version}-%{release}
Provides: golang(%{import_path}/api/client) = %{version}-%{release}
Provides: golang(%{import_path}/api/server) = %{version}-%{release}
+Provides: golang(%{import_path}/builder) = %{version}-%{release}
+Provides: golang(%{import_path}/builder/parser) = %{version}-%{release}
+Provides: golang(%{import_path}/builder/parser/dumper) = %{version}-%{release}
Provides: golang(%{import_path}/builtins) = %{version}-%{release}
-Provides: golang(%{import_path}/contrib) = %{version}-%{release}
Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}
Provides: golang(%{import_path}/contrib/host-integration) = %{version}-%{release}
Provides: golang(%{import_path}/daemon) = %{version}-%{release}
@@ -250,8 +252,11 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker-storage
install -d -p %{buildroot}/%{gopath}/src/%{import_path}
rm -rf pkg/symlink/testdata
-for dir in api builtins daemon dockerversion engine graph \
- image links nat opts pkg registry runconfig utils
+for dir in api builder builtins contrib/docker-device-tool \
+ contrib/host-integration daemon docker dockerinit \
+ dockerversion engine events graph \
+ image links nat opts pkg registry runconfig \
+ trust utils volumes
do
cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
done
@@ -292,39 +297,19 @@ exit 0
%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}/*
-%dir %{gopath}/src/%{import_path}/*/*
-%dir %{gopath}/src/%{import_path}/*/*/*
-%dir %{gopath}/src/%{import_path}/*/*/*/*
-%{gopath}/src/%{import_path}/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/README.md
-%{gopath}/src/%{import_path}/*/*.go
-%{gopath}/src/%{import_path}/*/*/*.go
-%{gopath}/src/%{import_path}/*/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/*/*/*.go
-%{gopath}/src/%{import_path}/*/*/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/*/*/README.md
-%{gopath}/src/%{import_path}/*/*/*/*/*.go
+%{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
-%dir %{gopath}/src/%{import_path}/pkg/*
-%dir %{gopath}/src/%{import_path}/pkg/*/*
-%dir %{gopath}/src/%{import_path}/pkg/*/*/*
-%{gopath}/src/%{import_path}/pkg/README.md
-%{gopath}/src/%{import_path}/pkg/*/MAINTAINER*
-%{gopath}/src/%{import_path}/pkg/*/LICENSE
-%{gopath}/src/%{import_path}/pkg/*/README.md
-%{gopath}/src/%{import_path}/pkg/*/*.go
-%{gopath}/src/%{import_path}/pkg/*/*/*.tar
-%{gopath}/src/%{import_path}/pkg/*/*/*.go
-%{gopath}/src/%{import_path}/pkg/*/*/*/json
-%{gopath}/src/%{import_path}/pkg/*/*/*/*.tar
+%{gopath}/src/%{import_path}/pkg/*
%changelog
+* Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-2
+- install sources skipped prior
+
* Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-1
- Resolves: rhbz#1167642 - Update to upstream v1.3.2
- Resolves: rhbz#1167505, rhbz#1167507 - CVE-2014-6407
9 years, 6 months