From b7d13d40954367366e835a9d68f9ac35a0248981 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sep 10 2015 17:49:49 +0000 Subject: EVR: - 1:1.9.0-5.git11b81f9 - built docker @rhatdan/fedora-1.9 commit#11b81f9 - built d-s-s master commit#6898d43 - built docker-selinux master commit#b5281b7 Signed-off-by: Lokesh Mandvekar --- diff --git a/.gitignore b/.gitignore index 12b4554..564cf4d 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ /docker-566d2be.tar.gz /docker-selinux-6267b83.tar.gz /docker-storage-setup-d3b9ba7.tar.gz +/docker-11b81f9.tar.gz +/docker-selinux-b5281b7.tar.gz +/docker-storage-setup-6898d43.tar.gz diff --git a/add-debug-info.patch b/add-debug-info.patch index 30d8a55..123bdaf 100644 --- a/add-debug-info.patch +++ b/add-debug-info.patch @@ -1,6 +1,6 @@ -From dd711a57c9d2c50382da7cfc2538b995edd86a2a Mon Sep 17 00:00:00 2001 +From e99aa95d537595dc2de0dd0cbd675db9c7c5e946 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar -Date: Wed, 12 Aug 2015 19:02:33 +0000 +Date: Thu, 10 Sep 2015 12:16:51 -0500 Subject: [PATCH] debuginfo patch From: Jan Chaloupka @@ -8,75 +8,78 @@ Signed-off-by: Lokesh Mandvekar --- hack/make/.dockerinit | 1 + hack/make/.dockerinit-gccgo | 1 + - hack/make/.ensure-httpserver | 5 ++++- + hack/make/.ensure-httpserver | 9 ++++++--- hack/make/binary | 1 + hack/make/gccgo | 1 + - 5 files changed, 8 insertions(+), 1 deletion(-) + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hack/make/.dockerinit b/hack/make/.dockerinit -index 4a62ee1..d77c998 100644 +index 4a62ee1..50c2fc4 100644 --- a/hack/make/.dockerinit +++ b/hack/make/.dockerinit @@ -12,6 +12,7 @@ go build \ $LDFLAGS $LDFLAGS_STATIC -extldflags \"$EXTLDFLAGS_STATIC\" -+ -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ++ -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') " \ ./dockerinit diff --git a/hack/make/.dockerinit-gccgo b/hack/make/.dockerinit-gccgo -index 9890863..608a138 100644 +index 3caa526..6939e7b 100644 --- a/hack/make/.dockerinit-gccgo +++ b/hack/make/.dockerinit-gccgo @@ -13,6 +13,7 @@ go build --compiler=gccgo \ -Wl,--no-export-dynamic - $EXTLDFLAGS_STATIC_DOCKER + $EXTLDFLAGS_STATIC -lnetgo -+ -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ++ -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') " \ ./dockerinit diff --git a/hack/make/.ensure-httpserver b/hack/make/.ensure-httpserver -index 38659ed..006ffd0 100644 +index 38659ed..89a775d 100644 --- a/hack/make/.ensure-httpserver +++ b/hack/make/.ensure-httpserver -@@ -8,7 +8,10 @@ dir="$DEST/httpserver" +@@ -8,8 +8,11 @@ dir="$DEST/httpserver" mkdir -p "$dir" ( cd "$dir" - GOOS=linux GOARCH=amd64 go build -o httpserver github.com/docker/docker/contrib/httpserver +- cp ../../../../contrib/httpserver/Dockerfile . +- docker build -qt httpserver . > /dev/null + GOOS=linux GOARCH=amd64 go build \ + -ldflags \ + "-B -0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" \ + -o httpserver github.com/docker/docker/contrib/httpserver - cp ../../../../contrib/httpserver/Dockerfile . - docker build -qt httpserver . > /dev/null ++ cp ../../../../contrib/httpserver/Dockerfile . ++ docker build -qt httpserver . > /dev/null ) + rm -rf "$dir" diff --git a/hack/make/binary b/hack/make/binary -index 7a3067f..1a8c671 100644 +index 7a3067f..8fa6d7d 100644 --- a/hack/make/binary +++ b/hack/make/binary @@ -26,6 +26,7 @@ go build \ -ldflags " $LDFLAGS $LDFLAGS_STATIC_DOCKER -+ -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ++ -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') " \ ./docker ) diff --git a/hack/make/gccgo b/hack/make/gccgo -index 972934a..d12bf79 100644 +index 10b1152..d792afe 100644 --- a/hack/make/gccgo +++ b/hack/make/gccgo @@ -18,6 +18,7 @@ go build -compiler=gccgo \ - $EXTLDFLAGS_STATIC_DOCKER + $EXTLDFLAGS_STATIC -Wl,--no-export-dynamic -ldl -+ -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ++ -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') " \ ./docker -- -2.4.3 +2.5.1 diff --git a/docker.spec b/docker.spec index b0df58c..1bc6569 100644 --- a/docker.spec +++ b/docker.spec @@ -30,7 +30,7 @@ # docker builds in a checksum of dockerinit into docker, # so stripping the binaries breaks docker -%global debug_package %{nil} +%global debug_package %%{nil} %global provider github %global provider_tld com %global project docker @@ -39,17 +39,15 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # docker stuff (prefix with d_) -%global d_commit 566d2be0920655a5d6248ebc91a2079e138c59dd +%global d_commit 11b81f9b47b1df8bc1d1d3d8103beeb1923bfd48 %global d_shortcommit %(c=%{d_commit}; echo ${c:0:7}) %global d_dist %(echo %{?dist} | sed 's/./-/') # d-s-s stuff (prefix with dss_) %global dss_libdir %{_prefix}/lib/docker-storage-setup -%global dss_commit d3b9ba74525192f02cefc993b77a476b879974fb +%global dss_commit 6898d433f7c7666475656ab89565ec02d08c4c55 %global dss_shortcommit %(c=%{dss_commit}; echo ${c:0:7}) -#%global tar_import_path code.google.com/p/go/src/pkg/archive/tar - %global utils_commit dab51acd1b1a77f7cb01a1b7e2129ec85c846b71 # docker-selinux conditional @@ -85,7 +83,7 @@ Name: %{repo} Epoch: 1 Version: 1.9.0 -Release: 4.git%{d_shortcommit}%{?dist} +Release: 5.git%{d_shortcommit}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.%{repo}.com @@ -93,7 +91,6 @@ URL: http://www.%{repo}.com # non-x86_64 architectures can be removed/added based on available # arch specific files in seccomp and vishvananda/netns projects ExclusiveArch: %{gccgo_arches} %{arm} %{ix86} x86_64 -#Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source0: https://github.com/rhatdan/%{repo}/archive/%{d_commit}/%{repo}-%{d_shortcommit}.tar.gz Source1: %{repo}.service Source2: %{repo}.sysconfig @@ -180,7 +177,6 @@ BuildRequires: gcc-go >= %{gccgo_min_vers} Provides: %{repo}-io-devel = %{epoch}:%{version}-%{release} Provides: %{repo}-pkg-devel = %{epoch}:%{version}-%{release} Provides: %{repo}-io-pkg-devel = %{epoch}:%{version}-%{release} -#Provides: golang(%{import_path}/vendor/src/%{tar_import_path}) = %{epoch}:%{version}-%{release} Summary: A golang registry for global request variables (source libraries) Provides: golang(%{import_path}) = %{epoch}:%{version}-%{release} Provides: golang(%{import_path}/builder) = %{epoch}:%{version}-%{release} @@ -632,6 +628,11 @@ fi %{_bindir}/%{repo}tarsum %changelog +* Thu Sep 10 2015 Lokesh Mandvekar - 1:1.9.0-5.git11b81f9 +- built docker @rhatdan/fedora-1.9 commit#11b81f9 +- built d-s-s master commit#6898d43 +- built docker-selinux master commit#b5281b7 + * Wed Sep 02 2015 Lokesh Mandvekar - 1:1.9.0-4.git566d2be - Resolves: rhbz#1259427 diff --git a/sources b/sources index 833ddc2..d2a35ee 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 41de66f15f8151b1cb81b8d88c14d0e1 dab51acd1b1a77f7cb01a1b7e2129ec85c846b71.tar.gz -b4a207578aeef08fb50d498f54ef8cec docker-566d2be.tar.gz -226d2fc08263e698fb46cb52e414bea1 docker-selinux-6267b83.tar.gz -0c2ffbf32223f5a0d56cd282a4743294 docker-storage-setup-d3b9ba7.tar.gz +a412608c81bab1458bd752cf985235c8 docker-11b81f9.tar.gz +515e080a1f14036d762797d89f8b2caa docker-selinux-b5281b7.tar.gz +7c4fa628f7ee14d88785f36c2163da64 docker-storage-setup-6898d43.tar.gz