Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2018-09-05 13:46:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docker" Wed Sep 5 13:46:40 2018 rev:80 rq:632984 version:18.06.1_ce Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2018-08-03 12:29:15.766857516 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2018-09-05 13:46:43.130072804 +0200 @@ -1,0 +2,73 @@ +Tue Sep 4 08:32:43 UTC 2018 - rbrown@suse.com + +- ExcludeArch i586 for entire docker-kubic flavour + +------------------------------------------------------------------- +Tue Sep 4 07:32:47 UTC 2018 - rbrown@suse.com + +- ExcludeArch i586 for docker-kubic-kubeadm-criconfig subpackage + +------------------------------------------------------------------- +Fri Aug 24 08:17:41 UTC 2018 - asarai@suse.com + +- Add patch to make package reproducible, which is a backport of + https://github.com/docker/cli/pull/1306. boo#1047218 + + bsc1047218-0001-man-obey-SOURCE_DATE_EPOCH-when-generating-man-pages.patch + +------------------------------------------------------------------- +Wed Aug 22 09:54:57 UTC 2018 - asarai@suse.com + +- Upgrade to docker-ce v18.06.1-ce. Upstream changelog: + https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce bsc#1102522 +- Remove patches that were merged upstream: + - bsc1102522-0001-18.06-disable-containerd-CRI-plugin.patch + +------------------------------------------------------------------- +Tue Aug 21 09:50:01 UTC 2018 - asarai@suse.com + +- Add a backport of https://github.com/docker/engine/pull/29 for the 18.06.0-ce + upgrade. This is a potential security issue (the CRI plugin was enabled by + default, which listens on a TCP port bound to 0.0.0.0) that will be fixed + upstream in the 18.06.1-ce upgrade. bsc#1102522 + + bsc1102522-0001-18.06-disable-containerd-CRI-plugin.patch + +------------------------------------------------------------------- +Tue Aug 21 09:39:57 UTC 2018 - rbrown@suse.com + +- Kubic: Make crio default, docker as alternative runtime + (boo#1104821) +- Provide kubernetes CRI config with docker-kubic-kubeadm-criconfig + subpackage + +------------------------------------------------------------------- +Thu Aug 16 02:00:31 UTC 2018 - asarai@suse.com + +- Merge -kubic packages back into the main Virtualization:containers packages. + This is done using _multibuild to add a "kubic" flavour, which is then used + to conditionally compile patches and other kubic-specific features. + bsc#1105000 +- Rework docker-rpmlintrc with the new _multibuild setup. + +------------------------------------------------------------------- +Wed Aug 1 09:40:59 UTC 2018 - asarai@suse.com + +- Enable seccomp support on SLE12, since libseccomp is now a new enough vintage + to work with Docker and containerd. fate#325877 + +------------------------------------------------------------------- +Tue Jul 31 09:48:16 UTC 2018 - asarai@suse.com + +- Upgrade to docker-ce v18.06.0-ce. bsc#1102522 +- Remove systemd-service dependency on containerd, which is now being started + by dockerd to align with upstream defaults. +- Removed the following patches as they are merged upstream: + - bsc1021227-0001-pkg-devmapper-dynamically-load-dm_task_deferred_remo.patch + - bsc1055676-0001-daemon-oci-obey-CL_UNPRIVILEGED-for-user-namespaced-.patch +- Rebased the following patches: + * bsc1073877-0001-apparmor-allow-receiving-of-signals-from-docker-kill.patch + * bsc1073877-0002-apparmor-clobber-docker-default-profile-on-start.patch + * bsc1100727-0001-build-add-buildmode-pie.patch + * secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch + * secrets-0002-SUSE-implement-SUSE-container-secrets.patch + +------------------------------------------------------------------- @@ -18,5 +90,0 @@ -Wed Jun 13 10:19:23 UTC 2018 - dcassany@suse.com - -- Make use of %license macro - -------------------------------------------------------------------- @@ -29,0 +98,5 @@ +Tue Jun 5 08:41:07 UTC 2018 - dcassany@suse.com + +- Make use of %license macro + +------------------------------------------------------------------- @@ -44,0 +118,12 @@ +Wed May 16 10:12:56 UTC 2018 - jmassaguerpla@suse.com + +- Review Obsoletes to fix bsc#1080978 + +------------------------------------------------------------------- +Thu Apr 12 12:49:25 UTC 2018 - fcastelli@suse.com + +- Put docker under the podruntime slice. This the recommended + deployment to allow fine resource control on Kubernetes. + bsc#1086185 + +------------------------------------------------------------------- @@ -69,0 +155,7 @@ +Thu Mar 8 13:14:54 UTC 2018 - vrothberg@suse.com + +- Fix private-registry-0001-Add-private-registry-mirror-support.patch to + deal corretly with TLS configs of 3rd party registries. + fix bsc#1084533 + +------------------------------------------------------------------- @@ -77,0 +170 @@ + * private-registry-0001-Add-private-registry-mirror-support.patch @@ -79,0 +173,30 @@ + +------------------------------------------------------------------- +Mon Feb 12 10:52:33 UTC 2018 - rbrown@suse.com + +- Add ${version} to equivalent non-kubic package provides + +------------------------------------------------------------------- +Thu Feb 8 12:34:51 UTC 2018 - rbrown@suse.com + +- Add Provides for equivalent non-kubic packages + +------------------------------------------------------------------- +Tue Jan 30 12:27:44 UTC 2018 - vrothberg@suse.com + +- Disable all tests for docker/client and docker/pkg/discovery. The unit tests + of those packages broke reproducibly the builds in IBS. + +------------------------------------------------------------------- +Mon Jan 29 14:39:02 UTC 2018 - vrothberg@suse.com + +- Disable flaky tests github.com/docker/docker/pkg/discovery/kv. + +------------------------------------------------------------------- +Fri Jan 26 07:15:53 UTC 2018 - vrothberg@suse.com + +- Add patch to support mirroring of private/non-upstream registries. As soon as + the upstream PR (https://github.com/moby/moby/pull/34319) is merged, this + patch will be replaced by the backported one from upstream. + + private-registry-0001-Add-private-registry-mirror-support.patch + fix bsc#1074971 Old: ---- bsc1021227-0001-pkg-devmapper-dynamically-load-dm_task_deferred_remo.patch bsc1055676-0001-daemon-oci-obey-CL_UNPRIVILEGED-for-user-namespaced-.patch docker-17.09.1_ce.tar.xz New: ---- _multibuild bsc1047218-0001-man-obey-SOURCE_DATE_EPOCH-when-generating-man-pages.patch docker-18.06.1_ce.tar.xz docker-kubic-service.conf kubelet.env private-registry-0001-Add-private-registry-mirror-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.kP6hxQ/_old 2018-09-05 13:46:44.246074675 +0200 +++ /var/tmp/diff_new_pack.kP6hxQ/_new 2018-09-05 13:46:44.246074675 +0200 @@ -26,32 +26,46 @@ %define _fillupdir /var/adm/fillup-templates %endif +# Handle _multibuild magic. +%define flavour @BUILD_FLAVOR@%{nil} + +# We split the Name: into "realname" and "name_suffix". +%define realname docker +%if "%flavour" == "" +%define name_suffix %{nil} +%else +%define name_suffix -%{flavour} +%endif + # Used when generating the "build" information for Docker version. The value of # git_commit_epoch is unused here (we use SOURCE_DATE_EPOCH, which rpm # helpfully injects into our build environment from the changelog). If you want # to generate a new git_commit_epoch, use this: # $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s' -%define git_version f4ffd2511ce9 -%define git_commit_epoch 1508606827 +%define git_version e68fc7a215d7 +%define git_commit_epoch 1534871791 # These are the git commits required. We verify them against the source to make # sure we didn't miss anything important when doing upgrades. -%define required_containerd 06b9cb35161009dcb7123345749fef02f7cea8e0 -%define required_dockerrunc 3f2f8b84a77f73d38244dd690525642a72156c64 -%define required_libnetwork 7b2b1feb1de4817d522cc372af149ff48d25028e +%define required_containerd 468a545b9edcd5932818eb9de8e72413e616e86e +%define required_dockerrunc 69663f0bd4b60df09991c08812a60108003fa340 +%define required_libnetwork 3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b -Name: docker -Version: 17.09.1_ce +Name: %{realname}%{name_suffix} +Version: 18.06.1_ce Release: 0 Summary: The Linux container runtime License: Apache-2.0 Group: System/Management Url: http://www.docker.io # TODO(VR): check those SOURCE files below -Source: %{name}-%{version}.tar.xz +Source: %{realname}-%{version}.tar.xz Source1: docker.service +# bsc#1086185 -- but we only apply this on Kubic. +Source2: docker-kubic-service.conf Source3: 80-docker.rules Source4: sysconfig.docker +Source5: kubelet.env Source6: docker-rpmlintrc Source7: README_SUSE.md Source8: docker-audit.rules @@ -62,16 +76,17 @@ # branch in http://github.com/suse/docker.mirror. Patch200: secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch Patch201: secrets-0002-SUSE-implement-SUSE-container-secrets.patch -# SUSE-BACKPORT: Backport of https://github.com/moby/moby/pull/35205. bsc#1055676 -Patch400: bsc1055676-0001-daemon-oci-obey-CL_UNPRIVILEGED-for-user-namespaced-.patch -# SUSE-BACKPORT: Backport of https://github.com/moby/moby/pull/35518. bsc#1021227 bsc#1029320 bsc#1058173 -Patch401: bsc1021227-0001-pkg-devmapper-dynamically-load-dm_task_deferred_remo.patch # SUSE-BACKPORT: Backport of https://github.com/moby/moby/pull/36822. bsc#1073877 -Patch402: bsc1073877-0001-apparmor-allow-receiving-of-signals-from-docker-kill.patch +Patch400: bsc1073877-0001-apparmor-allow-receiving-of-signals-from-docker-kill.patch # SUSE-BACKPORT: Backport of https://github.com/moby/moby/pull/37353. bsc#1099277 -Patch403: bsc1073877-0002-apparmor-clobber-docker-default-profile-on-start.patch +Patch401: bsc1073877-0002-apparmor-clobber-docker-default-profile-on-start.patch # SUSE-BACKPORT: Backport of https://github.com/docker/cli/pull/1242. bsc#1100727 -Patch404: bsc1100727-0001-build-add-buildmode-pie.patch +Patch402: bsc1100727-0001-build-add-buildmode-pie.patch +# SUSE-BACKPORT: Backport of https://github.com/docker/cli/pull/1306. boo#1047218 +Patch403: bsc1047218-0001-man-obey-SOURCE_DATE_EPOCH-when-generating-man-pages.patch +# SUSE-FEATURE: Add support to mirror inofficial/private registries +# (https://github.com/moby/moby/pull/34319) +Patch500: private-registry-0001-Add-private-registry-mirror-support.patch BuildRequires: audit BuildRequires: bash-completion BuildRequires: ca-certificates @@ -79,21 +94,7 @@ BuildRequires: glibc-devel-static BuildRequires: libapparmor-devel BuildRequires: libbtrfs-devel >= 3.8 -# enable libseccomp for sle >= sle12sp2 -%if 0%{?sle_version} >= 120200 -%define with_libseccomp 1 -%endif -# enable libseccomp for leap >= 42.2 -%if 0%{?leap_version} >= 420200 -%define with_libseccomp 1 -%endif -# enable libseccomp for Factory -%if 0%{?suse_version} > 1320 -%define with_libseccomp 1 -%endif -%if 0%{?with_libseccomp} -BuildRequires: libseccomp-devel -%endif +BuildRequires: libseccomp-devel >= 2.2 BuildRequires: libtool BuildRequires: procps BuildRequires: sqlite3-devel @@ -104,14 +105,14 @@ # Required in order for networking to work. fix_bsc_1057743 is a work-around # for some old packaging issues (where rpm would delete a binary that was # installed by docker-libnetwork). See bsc#1057743 for more details. -Requires: docker-libnetwork-git = %{required_libnetwork} +Requires: docker-libnetwork%{name_suffix}-git = %{required_libnetwork} Requires: fix_bsc_1057743 # Containerd and runC are required as they are the only currently supported # execdrivers of Docker. NOTE: The version pinning here matches upstream's # vendor.conf to ensure that we don't use a slightly incompatible version of # runC or containerd (which would be bad). -Requires: containerd-git = %{required_containerd} -Requires: docker-runc-git = %{required_dockerrunc} +Requires: containerd%{name_suffix}-git = %{required_containerd} +Requires: docker-runc%{name_suffix}-git = %{required_dockerrunc} # Needed for --init support. We don't use "tini", we use our own implementation # which handles edge-cases better. Requires: catatonit @@ -134,11 +135,26 @@ # different storage-driver than devicemapper Recommends: lvm2 >= 2.2.89 Conflicts: lxc < 1.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 ppc -# Make sure we build with go 1.8 +# Make sure we build with go 1.10 BuildRequires: go-go-md2man -BuildRequires: golang(API) = 1.8 +BuildRequires: golang(API) = 1.10 +# KUBIC-SPECIFIC: This was required when upgrading from the original kubic +# packaging, when everything was renamed to -kubic. It also is +# used to ensure that nothing complains too much when using +# -kubic packages. Hopfully it can be removed one day. +%if "%flavour" == "kubic" +# Obsolete old packege without the -kubic suffix +Obsoletes: %{realname} = 1.12.6 +Obsoletes: %{realname}_1_12_6 +# Conflict with non-kubic package, and provide equivalent +Conflicts: %{realname} +Provides: %{realname} = %{version} +# Kubernetes requires cri-runtime, which should be provided only by the -kubic flavour of this package +Provides: cri-runtime +# No i586 Kubernetes, so docker-kubic must not be built for i586 also +ExcludeArch: i586 +%endif %description Docker complements LXC with a high-level API which operates at the process @@ -153,8 +169,19 @@ Summary: Bash Completion for %{name} Group: System/Management Requires: %{name} = %{version} -Supplements: packageand(docker:bash-completion) +Supplements: packageand(%{name}:bash-completion) BuildArch: noarch +# KUBIC-SPECIFIC: This was required when upgrading from the original kubic +# packaging, when everything was renamed to -kubic. It also is +# used to ensure that nothing complains too much when using +# -kubic packages. Hopfully it can be removed one day. +%if "%flavour" == "kubic" +# Obsolete old packege without the -kubic suffix +Obsoletes: %{realname}-bash-completion = 1.12.6 +# Conflict with non-kubic package, and provide equivalent +Conflicts: %{realname}-bash-completion > 1.12.6 +Provides: %{realname}-bash-completion = %{version} +%endif %description bash-completion Bash command line completion support for %{name}. @@ -163,8 +190,19 @@ Summary: Zsh Completion for %{name} Group: System/Management Requires: %{name} = %{version} -Supplements: packageand(docker:zsh) +Supplements: packageand(%{name}:zsh) BuildArch: noarch +# KUBIC-SPECIFIC: This was required when upgrading from the original kubic +# packaging, when everything was renamed to -kubic. It also is +# used to ensure that nothing complains too much when using +# -kubic packages. Hopfully it can be removed one day. +%if "%flavour" == "kubic" +# Obsolete old packege without the -kubic suffix +Obsoletes: %{realname}-zsh-completion = 1.12.6 +# Conflict with non-kubic package, and provide equivalent +Conflicts: %{realname}-zsh-completion > 1.12.6 +Provides: %{realname}-zsh-completion = %{version} +%endif %description zsh-completion Zsh command line completion support for %{name}. @@ -183,12 +221,37 @@ Requires: procps Requires: sqlite3-devel Requires: golang(API) = 1.8 +# KUBIC-SPECIFIC: This was required when upgrading from the original kubic +# packaging, when everything was renamed to -kubic. It also is +# used to ensure that nothing complains too much when using +# -kubic packages. Hopfully it can be removed one day. +%if "%flavour" == "kubic" +# Obsolete old packege without the -kubic suffix +Obsoletes: %{realname}-test = 1.12.6 +# Conflict with non-kubic package, and provide equivalent +Conflicts: %{realname}-test > 1.12.6 +Provides: %{realname}-test = %{version} +%endif %description test Test package for docker. It contains the source code and the tests. +%if "%flavour" == "kubic" +%package kubeadm-criconfig +Summary: docker container runtime configuration for kubeadm +Group: System/Management +Requires: kubernetes-kubeadm +Requires(post): %fillup_prereq +Supplements: docker-kubic +Provides: kubernetes-kubeadm-criconfig +Conflicts: cri-o-kubeadm-criconfig + +%description kubeadm-criconfig +docker container runtime configuration for kubeadm +%endif + %prep -%setup -q +%setup -q -n %{realname}-%{version} %if 0%{?is_opensuse} # nothing %else @@ -196,25 +259,24 @@ %patch200 -p1 %patch201 -p1 %endif -# bsc#1055676 +# bsc#1073877 %patch400 -p1 -# bsc#1021227 bsc#1029320 bsc#1058173 +# bsc#1099277 %patch401 -p1 -# bsc#1073877 +# bsc#1100727 %patch402 -p1 -# bsc#1099277 +# boo#1047218 %patch403 -p1 -# bsc#1100727 -%patch404 -p1 +%if "%flavour" == "kubic" +# PATCH-SUSE: Mirror patch. +%patch500 -p1 +%endif cp %{SOURCE7} . cp %{SOURCE9} . %build -BUILDTAGS="exclude_graphdriver_aufs apparmor selinux pkcs11" -%if 0%{?with_libseccomp} -BUILDTAGS="seccomp $BUILDTAGS" -%endif +BUILDTAGS="exclude_graphdriver_aufs apparmor selinux seccomp pkcs11" %if 0%{?sle_version} == 120000 # Provided by patch406, to allow us to build with older distros but still # have deferred removal support at runtime. We only use this when building @@ -279,9 +341,9 @@ # of the upstream vendoring scripts. This is done on-build to make sure that # someone doing an update didn't miss anything. cd components/engine -grep 'RUNC_COMMIT=%{required_dockerrunc}' hack/dockerfile/binaries-commits -grep 'CONTAINERD_COMMIT=%{required_containerd}' hack/dockerfile/binaries-commits -grep 'LIBNETWORK_COMMIT=%{required_libnetwork}' hack/dockerfile/binaries-commits +grep 'RUNC_COMMIT=%{required_dockerrunc}' hack/dockerfile/install/runc.installer +grep 'CONTAINERD_COMMIT=%{required_containerd}' hack/dockerfile/install/containerd.installer +grep 'LIBNETWORK_COMMIT=%{required_libnetwork}' hack/dockerfile/install/proxy.installer %install install -d %{buildroot}%{go_contribdir} @@ -293,8 +355,8 @@ %{buildroot}%{_sysconfdir}/init.d \ %{buildroot}%{_sbindir} -install -D -m0644 components/cli/contrib/completion/bash/docker "%{buildroot}%{_sysconfdir}/bash_completion.d/%{name}" -install -D -m0644 components/cli/contrib/completion/zsh/_docker "%{buildroot}%{_sysconfdir}/zsh_completion.d/%{name}" +install -D -m0644 components/cli/contrib/completion/bash/docker "%{buildroot}%{_sysconfdir}/bash_completion.d/%{realname}" +install -D -m0644 components/cli/contrib/completion/zsh/_docker "%{buildroot}%{_sysconfdir}/zsh_completion.d/%{realname}" # copy all for the test package install -d %{buildroot}%{_prefix}/src/docker/ cp -a components/engine/. %{buildroot}%{_prefix}/src/docker/engine @@ -303,17 +365,20 @@ # # systemd service # -install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service +install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{realname}.service +%if "%flavour" == "kubic" +install -D -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{realname}.service.d/90-kubic.conf +%endif ln -sf service %{buildroot}%{_sbindir}/rcdocker # # udev rules that prevents dolphin to show all docker devices and slows down # upstream report https://bugs.kde.org/show_bug.cgi?id=329930 # -install -D -m 0644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/80-%{name}.rules +install -D -m 0644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/80-%{realname}.rules # audit rules -install -D -m 0640 %{SOURCE8} %{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules +install -D -m 0640 %{SOURCE8} %{buildroot}%{_sysconfdir}/audit/rules.d/%{realname}.rules # sysconfig file install -D -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.docker @@ -326,21 +391,42 @@ install -d %{buildroot}%{_mandir}/man8 install -p -m 644 components/cli/man/man8/*.8 %{buildroot}%{_mandir}/man8 +%if "%flavour" == "kubic" +# place kubelet.env in fillupdir (for kubeadm-criconfig) +install -D -m 0644 %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.kubelet +%endif + %fdupes %{buildroot} %pre getent group docker >/dev/null || groupadd -r docker -%service_add_pre %{name}.service +%service_add_pre %{realname}.service %post -%service_add_post %{name}.service +%service_add_post %{realname}.service %{fillup_only -n docker} +# NOTE: This is a pretty hacky way of getting around the fact we've removed +# containerd.service and now everything is spawned underneath Docker. In +# order to force containerd.service to be stopped on the upgrade we need +# to trick the systemd macros into thinking that this is an "uninstall". +# Hopefully we can remove this soon. +( + FIRST_ARG=0 + %service_del_preun containerd.service containerd.socket + %service_del_postun containerd.service containerd.socket +) + +%if "%flavour" == "kubic" +%post kubeadm-criconfig +%fillup_only -n kubelet +%endif + %preun -%service_del_preun %{name}.service +%service_del_preun %{realname}.service %postun -%service_del_postun %{name}.service +%service_del_postun %{realname}.service %files %defattr(-,root,root) @@ -349,9 +435,13 @@ %{_bindir}/docker %{_bindir}/dockerd %{_sbindir}/rcdocker -%{_unitdir}/%{name}.service -%config %{_sysconfdir}/audit/rules.d/%{name}.rules -%{_udevrulesdir}/80-%{name}.rules +%{_unitdir}/%{realname}.service +%if "%flavour" == "kubic" +%dir %{_unitdir}/%{realname}.service.d/ +%{_unitdir}/%{realname}.service.d/90-kubic.conf +%endif +%config %{_sysconfdir}/audit/rules.d/%{realname}.rules +%{_udevrulesdir}/80-%{realname}.rules %{_fillupdir}/sysconfig.docker %dir %{_localstatedir}/lib/docker/ %{_mandir}/man1/docker-*.1%{ext_man} @@ -361,11 +451,11 @@ %files bash-completion %defattr(-,root,root) -%config %{_sysconfdir}/bash_completion.d/%{name} +%config %{_sysconfdir}/bash_completion.d/%{realname} %files zsh-completion %defattr(-,root,root) -%config %{_sysconfdir}/zsh_completion.d/%{name} +%config %{_sysconfdir}/zsh_completion.d/%{realname} %files test %defattr(-,root,root) @@ -379,4 +469,10 @@ %exclude %{_prefix}/src/docker/engine/contrib/init/sysvinit-redhat %exclude %{_prefix}/src/docker/engine/contrib/init/upstart +%if "%flavour" == "kubic" +%files kubeadm-criconfig +%defattr(-,root,root) +%{_fillupdir}/sysconfig.kubelet +%endif + %changelog ++++++ _multibuild ++++++ <multibuild> <package>kubic</package> </multibuild> ++++++ _service ++++++ --- /var/tmp/diff_new_pack.kP6hxQ/_old 2018-09-05 13:46:44.322074802 +0200 +++ /var/tmp/diff_new_pack.kP6hxQ/_new 2018-09-05 13:46:44.326074810 +0200 @@ -3,8 +3,8 @@ <param name="url">https://github.com/docker/docker-ce.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">17.09.1_ce</param> - <param name="revision">v17.09.1-ce</param> + <param name="versionformat">18.06.1_ce</param> + <param name="revision">v18.06.1-ce</param> <param name="filename">docker</param> </service> <service name="recompress" mode="disabled"> ++++++ bsc1047218-0001-man-obey-SOURCE_DATE_EPOCH-when-generating-man-pages.patch ++++++
From d84d2f13c475bf5ff0ce7b080b759b0239d5d345 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai
Date: Thu, 23 Aug 2018 19:53:55 +1000 Subject: [PATCH] man: obey SOURCE_DATE_EPOCH when generating man pages
Previously our man pages included the current time each time they were
generated. This causes an issue for reproducible builds, since each
re-build of a package that includes the man pages will have different
times listed in the man pages.
To fix this, add support for SOURCE_DATE_EPOCH (which is a standardised
packaging environment variable, designed to be used specifically for
this purpose[1]). spf13/cobra doesn't support this natively yet (though
I will push a patch for that as well), but it's simpler to fix it
directly in docker/cli.
[1]: https://reproducible-builds.org/specs/source-date-epoch/
SUSE-Bugs: boo#1047218
Signed-off-by: Aleksa Sarai