Hello community,

here is the log from the commit of package policycoreutils for 
openSUSE:Leap:15.2 checked in at 2020-02-06 21:36:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/policycoreutils (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.policycoreutils.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "policycoreutils"

Thu Feb  6 21:36:52 2020 rev:25 rq:770281 version:2.8

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/policycoreutils/policycoreutils.changes        
2020-01-15 15:44:34.331293638 +0100
+++ 
/work/SRC/openSUSE:Leap:15.2/.policycoreutils.new.26092/policycoreutils.changes 
    2020-02-06 21:37:02.664120725 +0100
@@ -1,0 +2,6 @@
+Tue Dec 17 10:55:08 UTC 2019 - Johannes Segitz <[email protected]>
+
+- Added chcat_join.patch to prevent joining non-existing categories
+  (bsc#1159262)
+
+-------------------------------------------------------------------

New:
----
  chcat_join.patch

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

Other differences:
------------------
++++++ policycoreutils.spec ++++++
--- /var/tmp/diff_new_pack.FAOTdf/_old  2020-02-06 21:37:03.588121117 +0100
+++ /var/tmp/diff_new_pack.FAOTdf/_new  2020-02-06 21:37:03.604121124 +0100
@@ -40,6 +40,7 @@
 Source8:        
https://github.com/SELinuxProject/selinux/releases/download/%{tstamp}/semodule-utils-%{version}.tar.gz
 Patch0:         make_targets.patch
 Patch1:         python3.patch
+Patch2:         chcat_join.patch
 BuildRequires:  audit-devel >= %{libaudit_ver}
 BuildRequires:  bison
 BuildRequires:  dbus-1-glib-devel
@@ -155,6 +156,7 @@
 
 %prep
 %setup -q -T -D -b 1 -n selinux-python-%{version}
+%patch2 -p1
 setools_python_pwd=`pwd`
 %setup -q -T -D -b 8 -n semodule-utils-%{version}
 semodule_utils_pwd=`pwd`

++++++ chcat_join.patch ++++++
Index: selinux-python-2.8/chcat/chcat
===================================================================
--- selinux-python-2.8.orig/chcat/chcat 2018-05-24 18:21:09.000000000 +0000
+++ selinux-python-2.8/chcat/chcat      2019-12-17 11:01:17.056766838 +0000
@@ -247,7 +247,10 @@ def chcat_user_replace(newcat, users):
             add_ind = 1
             user = seusers["__default__"]
         serange = user[1].split("-")
-        new_serange = "%s-%s:%s" % (serange[0], newcat[0], 
string.join(newcat[1:], ","))
+        if len(newcat[1:]) > 0:
+            new_serange = "%s-%s:%s" % (serange[0], newcat[0], 
",".join(newcat[1:]))
+        else:
+            new_serange = "%s-%s" % (serange[0], newcat[0])
         if new_serange[-1:] == ":":
             new_serange = new_serange[:-1]
 


Reply via email to