Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package docker for openSUSE:Factory checked
in at 2024-11-15 15:38:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker (Old)
and /work/SRC/openSUSE:Factory/.docker.new.2017 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker"
Fri Nov 15 15:38:04 2024 rev:155 rq:1224334 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/docker/docker.changes 2024-11-01
21:47:08.777759680 +0100
+++ /work/SRC/openSUSE:Factory/.docker.new.2017/docker.changes 2024-11-15
15:38:13.657825258 +0100
@@ -1,0 +2,7 @@
+Tue Nov 12 06:34:28 UTC 2024 - Aleksa Sarai <asa...@suse.com>
+
+- Remove DOCKER_NETWORK_OPTS from docker.service. This was removed from
+ sysconfig a long time ago, and apparently this causes issues with systemd in
+ some cases.
+
+-------------------------------------------------------------------
@@ -19,0 +27 @@
+ bsc#1232999
@@ -67,2 +75,2 @@
- * CVE-2023-47108. bsc#1217070
- * CVE-2023-45142. bsc#1228553
+ * CVE-2023-47108. bsc#1217070 bsc#1229806
+ * CVE-2023-45142. bsc#1228553 bsc#1229806
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docker.spec ++++++
--- /var/tmp/diff_new_pack.4KiA4f/_old 2024-11-15 15:38:14.429857594 +0100
+++ /var/tmp/diff_new_pack.4KiA4f/_new 2024-11-15 15:38:14.433857761 +0100
@@ -16,12 +16,13 @@
#
# nodebuginfo
+
+%bcond_without apparmor
+
# The flavour is defined with a macro to try to keep docker and docker-stable
# as similar as possible, to make maintenance a little easier.
%define flavour %{nil}
-%bcond_without apparmor
-
# Where important update information will be stored, such that an administrator
# is guaranteed to see the relevant warning.
%define update_messages
%{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}
@@ -96,18 +97,18 @@
%if %{with apparmor}
BuildRequires: libapparmor-devel
%endif
+BuildRequires: fish
+BuildRequires: go-go-md2man
BuildRequires: libbtrfs-devel >= 3.8
BuildRequires: libseccomp-devel >= 2.2
BuildRequires: libtool
BuildRequires: linux-glibc-devel
BuildRequires: procps
BuildRequires: sqlite3-devel
-BuildRequires: zsh
-BuildRequires: fish
-BuildRequires: go-go-md2man
-BuildRequires: pkgconfig(libsystemd)
BuildRequires: sysuser-tools
+BuildRequires: zsh
BuildRequires: golang(API) = 1.21
+BuildRequires: pkgconfig(libsystemd)
%if %{with apparmor}
%if 0%{?sle_version} >= 150000
# This conditional only works on rpm>=4.13, which SLE 12 doesn't have. But we
@@ -163,8 +164,8 @@
# configured to use lvm and the user doesn't explicitly provide a
# different storage-driver than devicemapper
Recommends: lvm2 >= 2.2.89
-Recommends: git-core >= 1.7
Recommends: %{name}-rootless-extras
+Recommends: git-core >= 1.7
ExcludeArch: s390 ppc
%description
@@ -209,9 +210,9 @@
Summary: Rootless support for Docker
Group: System/Management
Requires: %{name} = %{docker_version}
-Requires: slirp4netns >= 0.4
Requires: fuse-overlayfs >= 0.7
Requires: rootlesskit
+Requires: slirp4netns >= 0.4
BuildArch: noarch
# docker-stable cannot be used alongside docker.
%if "%{name}" == "docker-stable"
++++++ docker.service ++++++
--- /var/tmp/diff_new_pack.4KiA4f/_old 2024-11-15 15:38:14.569863457 +0100
+++ /var/tmp/diff_new_pack.4KiA4f/_new 2024-11-15 15:38:14.569863457 +0100
@@ -16,7 +16,7 @@
# enabled by default because enabling socket activation means that on boot your
# containers won't start until someone tries to administer the Docker daemon.
Type=notify
-ExecStart=/usr/bin/dockerd --add-runtime oci=/usr/sbin/runc
$DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
+ExecStart=/usr/bin/dockerd --add-runtime oci=/usr/sbin/runc $DOCKER_OPTS
ExecReload=/bin/kill -s HUP $MAINPID
# Having non-zero Limit*s causes performance problems due to accounting
overhead
