Hello community,
here is the log from the commit of package policycoreutils for openSUSE:Factory
checked in at 2019-12-24 14:29:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/policycoreutils (Old)
and /work/SRC/openSUSE:Factory/.policycoreutils.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "policycoreutils"
Tue Dec 24 14:29:14 2019 rev:53 rq:757540 version:2.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/policycoreutils/policycoreutils.changes
2019-09-25 01:46:13.733604624 +0200
+++
/work/SRC/openSUSE:Factory/.policycoreutils.new.6675/policycoreutils.changes
2019-12-24 14:29:17.690556343 +0100
@@ -1,0 +2,6 @@
+Tue Dec 17 10:36:49 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.cDfUcg/_old 2019-12-24 14:29:18.594556781 +0100
+++ /var/tmp/diff_new_pack.cDfUcg/_new 2019-12-24 14:29:18.594556781 +0100
@@ -40,6 +40,7 @@
Source8:
https://github.com/SELinuxProject/selinux/releases/download/%{tstamp}/semodule-utils-%{version}.tar.gz
Patch0: make_targets.patch
Patch1: run_init_use_pam_keyinit.patch
+Patch2: chcat_join.patch
BuildRequires: audit-devel >= %{libaudit_ver}
BuildRequires: bison
BuildRequires: dbus-1-glib-devel
@@ -159,6 +160,7 @@
semodule_utils_pwd="$PWD/semodule-utils-%{version}"
%patch0 -p1
%patch1 -p1
+%patch2 -p1
mv ${setools_python_pwd}/audit2allow ${setools_python_pwd}/chcat
${setools_python_pwd}/semanage ${setools_python_pwd}/sepolgen
${setools_python_pwd}/sepolicy .
mv ${semodule_utils_pwd}/semodule_expand ${semodule_utils_pwd}/semodule_link
${semodule_utils_pwd}/semodule_package .
++++++ chcat_join.patch ++++++
Index: policycoreutils-2.9/selinux-python-2.9/chcat/chcat
===================================================================
--- policycoreutils-2.9.orig/selinux-python-2.9/chcat/chcat 2019-03-15
10:32:30.000000000 +0000
+++ policycoreutils-2.9/selinux-python-2.9/chcat/chcat 2019-12-17
10:31:24.683910599 +0000
@@ -246,7 +246,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],
",".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]
