Hello community,

here is the log from the commit of package apparmor for openSUSE:Factory 
checked in at 2017-10-27 13:47:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apparmor (Old)
 and      /work/SRC/openSUSE:Factory/.apparmor.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "apparmor"

Fri Oct 27 13:47:52 2017 rev:107 rq:536621 version:2.11.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes        2017-10-23 
16:40:36.248311678 +0200
+++ /work/SRC/openSUSE:Factory/.apparmor.new/apparmor.changes   2017-10-27 
13:47:54.913895720 +0200
@@ -1,0 +2,22 @@
+Wed Oct 25 19:36:55 UTC 2017 - suse-b...@cboltz.de
+
+- update to AppArmor 2.11.1
+  - add permissions to several profiles and abstractions (including
+    lp#1650827 and boo#1057900)
+  - several fixes in the aa-* tools (including lp#1689667, lp#1628286,
+    lp#1661766 and boo#1062667)
+  - fix downgrading/converting of 'unix' rules (will be supported in
+    kernel 4.15) to 'network unix' rules in apparmor_parser (boo#1061195)
+  - see http://wiki.apparmor.net/index.php/ReleaseNotes_2_11_1 for
+    upstream changelog
+- remove upstream(ed) patches
+  - upstream-changes-r3616..3628.diff
+  - upstream-changes-r3629..3648.diff
+  - parser-tests-dbus-duplicated-conditionals.diff
+  - apparmor-fix-podsyntax.patch
+  - sshd-profile-drop-local-include-r3615.diff
+- refresh apparmor-yast-cleanup.patch
+- add utils-fix-sorted-save_profiles-regression.diff to fix a regression
+  in displaying the "changed profiles" list in aa-logprof
+
+-------------------------------------------------------------------
@@ -4 +26 @@
-- add nameservice-libtirpc.diff to fix NIS/YP logins
+- add nameservice-libtirpc.diff to fix NIS/YP logins (boo#1062244)
--- /work/SRC/openSUSE:Factory/apparmor/libapparmor.changes     2017-02-19 
00:45:49.403972712 +0100
+++ /work/SRC/openSUSE:Factory/.apparmor.new/libapparmor.changes        
2017-10-27 13:47:54.953893850 +0200
@@ -1,0 +2,8 @@
+Wed Oct 25 19:36:55 UTC 2017 - suse-b...@cboltz.de
+
+- update to AppArmor 2.11.1
+  - mostly test-related changes in libapparmor
+  - see http://wiki.apparmor.net/index.php/ReleaseNotes_2_11_1 for
+    upstream changelog
+
+-------------------------------------------------------------------

Old:
----
  apparmor-2.11.0.tar.gz
  apparmor-2.11.0.tar.gz.asc
  apparmor-fix-podsyntax.patch
  parser-tests-dbus-duplicated-conditionals.diff
  sshd-profile-drop-local-include-r3615.diff
  upstream-changes-r3616..3628.diff
  upstream-changes-r3629..3648.diff

New:
----
  apparmor-2.11.1.tar.gz
  apparmor-2.11.1.tar.gz.asc
  utils-fix-sorted-save_profiles-regression.diff

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

Other differences:
------------------
++++++ apparmor.spec ++++++
--- /var/tmp/diff_new_pack.IER7pb/_old  2017-10-27 13:47:56.449823934 +0200
+++ /var/tmp/diff_new_pack.IER7pb/_new  2017-10-27 13:47:56.449823934 +0200
@@ -35,7 +35,7 @@
 %define apache_module_path %(/usr/sbin/apxs2 -q LIBEXECDIR)
 
 Name:           apparmor
-Version:        2.11.0
+Version:        2.11.1
 Release:        0
 Summary:        AppArmor userlevel parser utility
 License:        GPL-2.0+
@@ -50,6 +50,7 @@
 Source7:        apparmor-rpmlintrc
 Source8:        apparmor.service
 Source9:        apparmor.systemd
+
 # enable caching of profiles (= massive performance speedup when loading 
profiles)
 Patch1:         apparmor-enable-profile-cache.diff
 
@@ -69,32 +70,20 @@
 # bug 906858 - confine lessopen.sh (submitted upstream 2014-12-21)
 Patch7:         apparmor-lessopen-profile.patch
 
-# drop local/ include from sshd profile to prevent failure in "make check" 
(taken from upstream bzr trunk r3615)
-Patch8:         sshd-profile-drop-local-include-r3615.diff
-
-# upstream changes (trunk r3616..3628)
-Patch9:         upstream-changes-r3616..3628.diff
-
-# upstream changes (trunk r3629..3648)
-Patch10:        upstream-changes-r3629..3648.diff
-
-# add some exceptions to utils/test/test-parser-simple-tests.py (submitted 
upstream 2017-03-25)
-Patch11:        parser-tests-dbus-duplicated-conditionals.diff
-
 # add JSON support to aa-logprof and aa-genprof (will be in upstream 2.12)
 Patch12:        apparmor-yast-cleanup.patch
 Patch13:        apparmor-json-support.patch
 
-# https://marc.info/?l=apparmor-dev&m=150151113011870&q=p7
-Patch14:        apparmor-fix-podsyntax.patch
-
 # temporary solution for unix dgram and unix stream - boo#1061195 (sent for 
upstream review, but will probably stay openSUSE only)
 # TODO: replace with proper unix rules when Kernel 4.15 arrives
 Patch15:        profiles-sockets-temporary-fix.patch
 
-# fix NIS/YP logins - libtirpc needs to read /etc/netconfig
+# fix NIS/YP logins - libtirpc needs to read /etc/netconfig - commited 
upstream 2017-10-20 (trunk r3716, 2.11 r3682, 2.10 r3408, 2.9 r3069)
 Patch16:        nameservice-libtirpc.diff
 
+# Fix sorted() regression in save_profiles() - submitted upstream 2017-10-22
+Patch17:        utils-fix-sorted-save_profiles-regression.diff
+
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define apparmor_bin_prefix /lib/apparmor
@@ -387,23 +376,14 @@
 %patch1 -p1
 %patch2
 %patch3 -p1
-
-# Ruby 2.0 mkmf prefixes every path with $(DESTDIR)
 %patch5 -p1
-
 %patch6
 %patch7 -p1
-%patch8
-%patch9
-%patch10
-# patch10 (upstream-changes-r3629..3648.diff) fails to create empty files, do 
it manually
-touch libraries/libapparmor/testsuite/test_multi/unconfined-change_hat.err
-%patch11
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 %patch15 -p1
 %patch16
+%patch17
 
 # search for left-over multiline rules
 test -z "$(grep -r '^\s*\(unix\|dbus\)[^,]\(([^)]*)\)*[^,]*$' 
profiles/apparmor.d/)"

++++++ libapparmor.spec ++++++
--- /var/tmp/diff_new_pack.IER7pb/_old  2017-10-27 13:47:56.473822813 +0200
+++ /var/tmp/diff_new_pack.IER7pb/_new  2017-10-27 13:47:56.477822626 +0200
@@ -18,7 +18,7 @@
 
 
 Name:           libapparmor
-Version:        2.11.0
+Version:        2.11.1
 Release:        0
 Summary:        Utility library for AppArmor
 License:        LGPL-2.1+

++++++ apparmor-2.11.0.tar.gz -> apparmor-2.11.1.tar.gz ++++++
++++ 6829 lines of diff (skipped)

++++++ apparmor-yast-cleanup.patch ++++++
--- /var/tmp/diff_new_pack.IER7pb/_old  2017-10-27 13:47:57.409779068 +0200
+++ /var/tmp/diff_new_pack.IER7pb/_new  2017-10-27 13:47:57.413778881 +0200
@@ -179,7 +179,7 @@
      finishing = False
      # Check for finished
      save_profiles()
-@@ -1958,78 +1876,50 @@ def save_profiles():
+@@ -1958,80 +1876,52 @@ def save_profiles():
      changed_list = sorted(changed.keys())
  
      if changed_list:
@@ -188,13 +188,15 @@
 +        q.explanation = _('The following local profiles were changed. Would 
you like to save them?')
 +        q.functions = ['CMD_SAVE_CHANGES', 'CMD_SAVE_SELECTED', 
'CMD_VIEW_CHANGES', 'CMD_VIEW_CHANGES_CLEAN', 'CMD_ABORT']
 +        q.default = 'CMD_VIEW_CHANGES'
-+        q.options = changed
 +        q.selected = 0
 +        ans = ''
 +        arg = None
 +        while ans != 'CMD_SAVE_CHANGES':
 +            if not changed:
 +                return
++
++            q.options = sorted(changed.keys())
++
 +            ans, arg = q.promptUser()
 +            if ans == 'CMD_SAVE_SELECTED':
 +                profile_name = list(changed.keys())[arg]
@@ -233,13 +235,15 @@
 -            q.explanation = _('The following local profiles were changed. 
Would you like to save them?')
 -            q.functions = ['CMD_SAVE_CHANGES', 'CMD_SAVE_SELECTED', 
'CMD_VIEW_CHANGES', 'CMD_VIEW_CHANGES_CLEAN', 'CMD_ABORT']
 -            q.default = 'CMD_VIEW_CHANGES'
--            q.options = changed
 -            q.selected = 0
 -            ans = ''
 -            arg = None
 -            while ans != 'CMD_SAVE_CHANGES':
 -                if not changed:
 -                    return
+-
+-                q.options = sorted(changed.keys())
+-
 -                ans, arg = q.promptUser()
 -                if ans == 'CMD_SAVE_SELECTED':
 -                    profile_name = list(changed.keys())[arg]


++++++ utils-fix-sorted-save_profiles-regression.diff ++++++
--- utils/apparmor/aa.py        2017-10-11 21:20:00.789641479 +0200
+++ utils/apparmor/aa.py        2017-10-22 14:15:00.412193634 +0200
@@ -1827,16 +1827,18 @@
             if not changed:
                 return
 
-            q.options = sorted(changed.keys())
+            options = sorted(changed.keys())
+            q.options = options
 
             ans, arg = q.promptUser()
+
+            which = options[arg]
+
             if ans == 'CMD_SAVE_SELECTED':
-                profile_name = list(changed.keys())[arg]
-                write_profile_ui_feedback(profile_name)
-                reload_base(profile_name)
+                write_profile_ui_feedback(which)
+                reload_base(which)
 
             elif ans == 'CMD_VIEW_CHANGES':
-                which = list(changed.keys())[arg]
                 oldprofile = None
                 if aa[which][which].get('filename', False):
                     oldprofile = aa[which][which]['filename']
@@ -1852,7 +1854,6 @@
                 display_changes_with_comments(oldprofile, newprofile)
 
             elif ans == 'CMD_VIEW_CHANGES_CLEAN':
-                which = list(changed.keys())[arg]
                 oldprofile = serialize_profile(original_aa[which], which, '')
                 newprofile = serialize_profile(aa[which], which, '')
 

Reply via email to