pool/apparmor
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 458503 from home:matejcik:branches:security:apparmor

Browse Source 
- add python3-drop-re-locale.patch: remove deprecated re.LOCALE
  flag in Python UI as it was dropped from Python 3.6

OBS-URL: https://build.opensuse.org/request/show/458503
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=169
This commit is contained in:
Christian Boltz 2017-02-18 12:29:18 +00:00 committed by Git OBS Bridge
parent 7314b9e327
commit 14d5404240
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apparmor.changes
View File

@ -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
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 30 21:37:48 UTC 2017 - suse-beta@cboltz.de Mon Jan 30 21:37:48 UTC 2017 - suse-beta@cboltz.de

6
apparmor.spec
View File

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

15
python3-drop-re-locale.patch Normal file
View File

@ -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)