Accepting request 458843 from security:apparmor

- add python3-drop-re-locale.patch: remove deprecated re.LOCALE
  flag in Python UI as it was dropped from Python 3.6 (lp#1661766)

- Fix RPM groups

OBS-URL: https://build.opensuse.org/request/show/458843
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=99

apparmor.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 16 14:08:55 UTC 2017 - jmatejek@suse.com
+
+- add python3-drop-re-locale.patch: remove deprecated re.LOCALE
+  flag in Python UI as it was dropped from Python 3.6 (lp#1661766)
+
 -------------------------------------------------------------------
 Mon Jan 30 21:37:48 UTC 2017 - suse-beta@cboltz.de
 

apparmor.spec

@@ -85,6 +85,9 @@ Patch8:         sshd-profile-drop-local-include-r3615.diff
 # upstream changes (trunk r3616..3628)
 Patch9:         upstream-changes-r3616..3628.diff
 
+# drop deprecated re.LOCALE flag from regexps
+Patch10:        python3-drop-re-locale.patch
+
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{distro} == "suse"
@@ -392,6 +395,9 @@ SubDomain.
 %patch7 -p1
 %patch8
 %patch9
+%if %{with python3}
+%patch10 -p1
+%endif
 
 # search for left-over multiline rules
 test -z "$(grep -r '^\s*\(unix\|dbus\)[^,]\(([^)]*)\)*[^,]*$' profiles/apparmor.d/)"

libapparmor.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Feb 11 11:33:16 UTC 2017 - jengelh@inai.de
+
+- Fix RPM groups
+
 -------------------------------------------------------------------
 Sat Jan 28 21:40:11 UTC 2017 - suse-beta@cboltz.de
 

libapparmor.spec

@@ -40,7 +40,7 @@ well as functions to parse AppArmor log messages.
 
 %package -n libapparmor1
 Summary:        Utility library for AppArmor
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
 %ifarch ppc64
 Obsoletes:      libapparmor-64bit < 2.9
 Provides:       libapparmor-64bit = %{version}

python3-drop-re-locale.patch

@@ -0,0 +1,15 @@
+Index: apparmor-2.11.0/utils/apparmor/ui.py
+===================================================================
+--- apparmor-2.11.0.orig/utils/apparmor/ui.py
++++ apparmor-2.11.0/utils/apparmor/ui.py
+@@ -64,8 +64,8 @@ def get_translated_hotkey(translated, cm
+     msg = 'PromptUser: ' + _('Invalid hotkey for')
+ 
+     # Originally (\S) was used but with translations it would not work :(
+-    if re.search('\((\S+)\)', translated, re.LOCALE):
+-        return re.search('\((\S+)\)', translated, re.LOCALE).groups()[0]
++    if re.search('\((\S+)\)', translated):
++        return re.search('\((\S+)\)', translated).groups()[0]
+     else:
+         if cmsg:
+             raise AppArmorException(cmsg)