Hello community,

here is the log from the commit of package NetworkManager for openSUSE:Factory 
checked in at 2020-07-05 01:11:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old)
 and      /work/SRC/openSUSE:Factory/.NetworkManager.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "NetworkManager"

Sun Jul  5 01:11:27 2020 rev:213 rq:818352 version:1.24.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes    
2020-06-08 23:49:29.570375176 +0200
+++ /work/SRC/openSUSE:Factory/.NetworkManager.new.3060/NetworkManager.changes  
2020-07-05 01:11:59.223775207 +0200
@@ -1,0 +2,5 @@
+Thu Jul  2 02:54:36 UTC 2020 - Jonathan Kang <[email protected]>
+
+- Rebase nm-add-CAP_SYS_ADMIN-permission.patch.
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.eq4zhN/_old  2020-07-05 01:12:06.219799081 +0200
+++ /var/tmp/diff_new_pack.eq4zhN/_new  2020-07-05 01:12:06.223799095 +0200
@@ -49,7 +49,7 @@
 Patch5:         NetworkManager-1.10.6-netconfig.patch
 # PATCH-FIX-UPSTREAM 
0001-Coerce-connectivity-LIMITED-to-NONE-when-device-is-d.patch boo#1103678
 Patch6:         0001-Coerce-connectivity-LIMITED-to-NONE-when-device-is-d.patch
-# PATCH-NEEDS-REBASE nm-add-CAP_SYS_ADMIN-permission.patch bsc#1129587 
[email protected] -- Add CAP_SYS_ADMIN which netconfig needs to call 
setdomainname WAS PATCH-FIX-OPENSUSE
+# PATCH-FIX-OPENSUSE nm-add-CAP_SYS_ADMIN-permission.patch bsc#1129587 
[email protected] -- Add CAP_SYS_ADMIN which netconfig needs to call setdomainname
 Patch7:         nm-add-CAP_SYS_ADMIN-permission.patch
 
 BuildRequires:  dnsmasq
@@ -185,7 +185,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-#patch7 -p1
+%patch7 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh

++++++ nm-add-CAP_SYS_ADMIN-permission.patch ++++++
--- /var/tmp/diff_new_pack.eq4zhN/_old  2020-07-05 01:12:06.323799436 +0200
+++ /var/tmp/diff_new_pack.eq4zhN/_new  2020-07-05 01:12:06.327799450 +0200
@@ -1,14 +1,13 @@
-Index: NetworkManager-1.16.2/data/NetworkManager.service.in
+Index: NetworkManager-1.24.2/data/NetworkManager.service.in
 ===================================================================
---- NetworkManager-1.16.2.orig/data/NetworkManager.service.in
-+++ NetworkManager-1.16.2/data/NetworkManager.service.in
-@@ -17,7 +17,8 @@ KillMode=process
- CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW 
CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE 
CAP_KILL CAP_SYS_CHROOT
- 
- # ibft settings plugin calls iscsiadm which needs CAP_SYS_ADMIN
--#CapabilityBoundingSet=CAP_SYS_ADMIN
-+# netconfig calls setdomainname which needs CAP_SYS_ADMIN
-+CapabilityBoundingSet=CAP_SYS_ADMIN
+--- NetworkManager-1.24.2.orig/data/NetworkManager.service.in
++++ NetworkManager-1.24.2/data/NetworkManager.service.in
+@@ -14,7 +14,7 @@ ExecStart=@sbindir@/NetworkManager --no-
+ Restart=on-failure
+ # NM doesn't want systemd to kill its children for it
+ KillMode=process
+-CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW 
CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE 
CAP_KILL CAP_SYS_CHROOT
++CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW 
CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE 
CAP_KILL CAP_SYS_CHROOT CAP_SYS_ADMIN
  
  ProtectSystem=true
  ProtectHome=read-only


Reply via email to