Hello community,

here is the log from the commit of package docker for openSUSE:Factory checked 
in at 2019-06-30 10:19:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker (Old)
 and      /work/SRC/openSUSE:Factory/.docker.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "docker"

Sun Jun 30 10:19:13 2019 rev:91 rq:712298 version:18.09.7_ce

Changes:
--------
--- /work/SRC/openSUSE:Factory/docker/docker.changes    2019-06-24 
21:47:19.635825748 +0200
+++ /work/SRC/openSUSE:Factory/.docker.new.4615/docker.changes  2019-06-30 
10:19:15.499411120 +0200
@@ -1,0 +2,13 @@
+Fri Jun 28 01:21:19 UTC 2019 - Aleksa Sarai <[email protected]>
+
+- Update to Docker 18.09.7-ce. See upstream changelog in the packaged
+  /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1139649
+- Remove upstreamed patches:
+  - CVE-2018-15664.patch
+
+-------------------------------------------------------------------
+Thu Jun 27 07:12:57 UTC 2019 - Aleksa Sarai <[email protected]>
+
+- Use %config(noreplace) for /etc/docker/daemon.json. bsc#1138920
+
+-------------------------------------------------------------------

Old:
----
  CVE-2018-15664.patch
  docker-18.09.6_ce_481bc7715621.tar.xz

New:
----
  docker-18.09.7_ce_2d0083d657f8.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ docker.spec ++++++
--- /var/tmp/diff_new_pack.8CrHqj/_old  2019-06-30 10:19:18.435415681 +0200
+++ /var/tmp/diff_new_pack.8CrHqj/_new  2019-06-30 10:19:18.483415756 +0200
@@ -42,17 +42,17 @@
 # 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 481bc7715621
-%define git_commit_epoch 1556935084
+%define git_version 2d0083d657f8
+%define git_commit_epoch 1561655613
 
 # 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 bb71b10fd8f58240ca47fbb579b9d1028eea7c84
-%define required_dockerrunc 2b18fe1d885ee5083ef9f0838fee39b62d653e30
-%define required_libnetwork 872f0a83c98add6cae255c8859e29532febc0039
+%define required_containerd 894b81a4b802e4eb2a91d1ce216b8817763c29fb
+%define required_dockerrunc 425e105d5a03fabd737a126ad93d62a9eeede87f
+%define required_libnetwork e7933d41e7b206756115aa9df5e0599fc5169742
 
 Name:           %{realname}%{name_suffix}
-Version:        18.09.6_ce
+Version:        18.09.7_ce
 Release:        0
 Summary:        The Moby-project Linux container runtime
 License:        Apache-2.0
@@ -87,8 +87,6 @@
 Patch404:       
bsc1001161-0001-oci-include-the-domainname-in-kernel.domainname.patch
 # SUSE-BACKPORT: Backport of https://github.com/docker/cli/pull/1130. 
bsc#1001161
 Patch405:       bsc1001161-0002-cli-add-a-separate-domainname-flag.patch
-# SUSE-BACKPORT: Backport of https://github.com/moby/moby/pull/39292. 
CVE-2018-15664 bsc#1096726
-Patch406:       CVE-2018-15664.patch
 # SUSE-FEATURE: Add support to mirror inofficial/private registries
 #               (https://github.com/docker/docker/pull/34319)
 Patch500:       private-registry-0001-Add-private-registry-mirror-support.patch
@@ -275,8 +273,6 @@
 # bsc#1001161
 %patch404 -p1
 %patch405 -p1
-#  CVE-2018-15664 bsc#1096726
-%patch406 -p1
 %if "%flavour" == "kubic"
 # PATCH-SUSE: Mirror patch.
 %patch500 -p1
@@ -469,17 +465,21 @@
 %{_bindir}/docker
 %{_bindir}/dockerd
 %{_sbindir}/rcdocker
+%dir %{_localstatedir}/lib/docker/
+
 %{_unitdir}/%{realname}.service
 %if "%flavour" == "kubic"
 %dir %{_unitdir}/%{realname}.service.d/
 %{_unitdir}/%{realname}.service.d/90-kubic.conf
 %endif
+
 %dir %{_sysconfdir}/docker
-%config %{_sysconfdir}/docker/daemon.json
+%config(noreplace) %{_sysconfdir}/docker/daemon.json
+%{_fillupdir}/sysconfig.docker
+
 %config %{_sysconfdir}/audit/rules.d/%{realname}.rules
 %{_udevrulesdir}/80-%{realname}.rules
-%{_fillupdir}/sysconfig.docker
-%dir %{_localstatedir}/lib/docker/
+
 %{_mandir}/man1/docker-*.1%{ext_man}
 %{_mandir}/man1/docker.1%{ext_man}
 %{_mandir}/man5/Dockerfile.5%{ext_man}

++++++ _service ++++++
--- /var/tmp/diff_new_pack.8CrHqj/_old  2019-06-30 10:19:19.215416893 +0200
+++ /var/tmp/diff_new_pack.8CrHqj/_new  2019-06-30 10:19:19.243416936 +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">18.09.6_ce_%h</param>
-    <param name="revision">v18.09.6</param>
+    <param name="versionformat">18.09.7_ce_%h</param>
+    <param name="revision">v18.09.7</param>
     <param name="filename">docker</param>
   </service>
   <service name="recompress" mode="disabled">

++++++ docker-18.09.6_ce_481bc7715621.tar.xz -> 
docker-18.09.7_ce_2d0083d657f8.tar.xz ++++++
/work/SRC/openSUSE:Factory/docker/docker-18.09.6_ce_481bc7715621.tar.xz 
/work/SRC/openSUSE:Factory/.docker.new.4615/docker-18.09.7_ce_2d0083d657f8.tar.xz
 differ: char 26, line 1


Reply via email to