commit apparmor for openSUSE:Factory

25 Mar 2011

Hello community,

here is the log from the commit of package apparmor for openSUSE:Factory
checked in at Fri Mar 25 09:04:50 CET 2011.



--------

--- apparmor/apparmor.changes	2011-03-01 11:03:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/apparmor/apparmor.changes	2011-03-24 21:33:19.000000000 +0100
@@ -1,0 +2,26 @@
+Thu Mar 24 21:30:15 CET 2011 - jeffm@suse.de
+
+- Added alias from Immunix::SubDomain to Immunix:AppArmor to allow
+  older users of perl-apparmor to work properly.
+
+-------------------------------------------------------------------
+Tue Mar 22 21:29:49 CET 2011 - jeffm@suse.de
+
+- Properly re-created links to old utility names.
+
+-------------------------------------------------------------------
+Mon Mar 14 19:24:02 CET 2011 - jeffm@suse.de
+
+- Added /etc/ethers and /var/run/dnsmasq-forwarders to
+  usr.sbin.dnsmasq (bnc#678749)
+
+-------------------------------------------------------------------
+Mon Mar 14 16:48:53 CET 2011 - jeffm@suse.de
+
+- Update to 2.6.0
+  - 19 patches eliminated
+  - Lots of minor fixes.
+  - Split out more common abstractions
+  - Added more local includes
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  apparmor-2.5-r1445
  apparmor-2.5.1-dnsmasq-libvirt-profile-fix
  apparmor-2.5.1-firefox-proc-fix
  apparmor-2.5.1-network-fixes
  apparmor-2.5.1-ntpd-proc-fixes
  apparmor-2.5.1-unconfined-fixes
  apparmor-2.5.1.tar.bz2
  apparmor-docs-techdoc-grammar-fixes
  apparmor-parser-string-fixes
  apparmor-perl
  apparmor-swig-build-fix
  apparmor-translation-fixes
  apparmor-utils-SubDomain
  apparmor-utils-cleanup-on-abort
  apparmor-utils-inherit-flags-during-profile-generation
  apparmor-utils-null-path-fix
  apparmor-utils-translation-unification
  apparmorapplet-gnome-build-fix
  mod_apparmor-includes
  pam-apparmor-include
  tomcat-build-fixes

New:
----
  apparmor-2.6.0.tar.bz2
  apparmor-profiles-usr.sbin.dnsmasq
  apparmor-utils-subdomain-compat

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

Other differences:
------------------
++++++ apparmor.spec ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:22.000000000 +0100
@@ -32,9 +32,6 @@
 %define JAR_FILE changeHatValve.jar
 %define apache_module_path %(/usr/sbin/apxs2 -q LIBEXECDIR)
 
-%define srcversion 2.5.1
-%define bzr_commit r1445
-
 Name:           apparmor
 %if ! %{?distro:1}0
 %if %{?suse_version:1}0
@@ -48,52 +45,35 @@
   %define distro suse
 %endif
 Summary:        AppArmor userlevel parser utility
-Version:        %{srcversion}.%{bzr_commit}
-Release:        55
+Version:        2.6.0
+Release:        1
 Group:          Productivity/Networking/Security
-Source0:        apparmor-%{srcversion}.tar.bz2
+Source0:        apparmor-%{version}.tar.bz2
 Source1:        %{name}-profile-editor.png
 Source2:        %{name}-profile-editor.desktop
 Source3:        update-trans.sh
-Patch:          apparmor-2.5-%{bzr_commit}
-Patch1:         pam-apparmor-include
-Patch2:         mod_apparmor-includes
-Patch3:         tomcat-build-fixes
-Patch4:         apparmor-swig-build-fix
-Patch5:         apparmor-scripts
-Patch6:         apparmor-translation-fixes
-Patch7:         apparmor-perl
-Patch8:         apparmor-no-caching-test
-Patch9:         apparmorapplet-gnome-build-fix
-Patch10:        apparmor-utils-SubDomain
-Patch11:        apparmor-utils-cleanup-on-abort
-Patch12:        apparmor-utils-translation-unification
-Patch13:        apparmor-utils-add-log-types
-Patch14:        apparmor-utils-filenames-in-slash
-Patch15:        apparmor-utils-null-path-fix
-Patch16:        apparmor-utils-string-split
-Patch17:        apparmor-profiles-cupsd-fix
-Patch18:        apparmor-profiles-sshd-fix
-Patch19:        apparmor-profiles-syslog-ng-fix
-Patch20:        apparmor-docs-techdoc-grammar-fixes
-Patch21:        apparmor-parser-string-fixes
-Patch22:        apparmor-startproc.patch
-Patch23:        apparmor-2.5.1-unified-build
-Patch24:        apparmor-2.5.1-rpmlint-asprintf
-Patch25:        apparmor-2.5.1-ntpd-proc-fixes
-Patch26:        apparmor-2.5.1-edirectory-profile
-Patch27:        apparmor-2.5.1-firefox-proc-fix
-Patch28:        apparmor-2.5.1-unconfined-fixes
-Patch29:        apparmor-utils-inherit-flags-during-profile-generation
-Patch30:        apparmor-2.5.1-ldapclient-profile
-Patch31:        genprof-whitespace-in-profile-fix
-Patch32:        apparmor-remove-repo
-Patch33:        apparmor-2.5.1-ntpd-sys_nice
-Patch34:        apparmor-2.5.1-ssl-fix
-Patch35:        apparmor-2.5.1-dnsmasq-libvirt-profile-fix
-Patch36:        klog-needs-CAP_SYSLOG
-Patch37:        apparmor-2.5.1-network-fixes
-Patch38:        apparmor-profiles-dhclient
+
+Patch1:         apparmor-scripts
+Patch2:         apparmor-no-caching-test
+Patch3:         apparmor-utils-add-log-types
+Patch4:         apparmor-utils-filenames-in-slash
+Patch5:         apparmor-utils-string-split
+Patch6:         apparmor-profiles-cupsd-fix
+Patch7:         apparmor-profiles-sshd-fix
+Patch8:         apparmor-profiles-syslog-ng-fix
+Patch9:         apparmor-startproc.patch
+Patch10:        apparmor-2.5.1-unified-build
+Patch11:        apparmor-2.5.1-rpmlint-asprintf
+Patch12:        apparmor-2.5.1-edirectory-profile
+Patch13:        apparmor-2.5.1-ldapclient-profile
+Patch14:        genprof-whitespace-in-profile-fix
+Patch15:        apparmor-remove-repo
+Patch16:        apparmor-2.5.1-ntpd-sys_nice
+Patch17:        apparmor-2.5.1-ssl-fix
+Patch18:        apparmor-profiles-usr.sbin.dnsmasq
+Patch19:        klog-needs-CAP_SYSLOG
+Patch20:        apparmor-profiles-dhclient
+Patch21:        apparmor-utils-subdomain-compat
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            https://launchpad.net/apparmor
@@ -463,8 +443,7 @@
 %endif
 
 %prep
-%setup -q -n %{name}-%{srcversion}
-%patch -p1
+%setup -q -n %{name}-%{version}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -486,23 +465,6 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
 
 %build
 export SUSE_ASNEEDED=0
@@ -574,21 +536,18 @@
 ln -s %{_sysconfdir}/init.d/boot.apparmor ${RPM_BUILD_ROOT}/sbin/rcapparmor
 ln -s %{_sysconfdir}/init.d/boot.apparmor ${RPM_BUILD_ROOT}/sbin/rcsubdomain
 
-for script in ${RPM_BUILD_ROOT}/usr/sbin/*; do
-	d=$(dirname $script)
-	f=$(basename $script)
-	if [ "${f#aa-}" = "$f" ]; then
-		ln -s /usr/sbin/$f $d/aa-$f
+# Re-create the links to the old names
+for file in ${RPM_BUILD_ROOT}/usr/{sbin,share/man/man[0-9]}/aa-*; do
+	d=$(dirname $file)
+	f=$(basename $file)
+	if [ "${f#aa-}" != "$f" ]; then
+		ln -s $f $d/${f#aa-}
 	fi
 done
 
-for man in ${RPM_BUILD_ROOT}/usr/share/man/man[18]/*; do
-	d=$(dirname $man)
-	f=$(basename $man)
-	if [ "${f#aa-}" = "$f" ]; then
-		ln -s $f $d/aa-$f
-	fi
-done
+mv -f ${RPM_BUILD_ROOT}/usr/share/man/man8/{status.8,apparmor_status.8}
+mv -f ${RPM_BUILD_ROOT}/usr/share/man/man8/{notify.8,apparmor_notify.8}
+rm -f  ${RPM_BUILD_ROOT}/usr/share/man/man8/decode.8
 
 %if %{with editor}
 %suse_update_desktop_file -i %{name}-profile-editor Utility TextEditor
@@ -687,6 +646,7 @@
 %config(noreplace) %{_sysconfdir}/apparmor/subdomain.conf
 %{_prefix}/sbin/*
 %dir /var/log/apparmor
+%doc %{_mandir}/man2/aa_change_profile.2.gz
 %doc %{_mandir}/man5/logprof.conf.5.gz
 %doc %{_mandir}/man8/apparmor_notify.8.gz
 %doc %{_mandir}/man8/aa-*.gz

++++++ apparmor-2.5.1-edirectory-profile ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:22.000000000 +0100
@@ -17,7 +17,7 @@
 
 --- a/profiles/apparmor.d/abstractions/nameservice
 +++ b/profiles/apparmor.d/abstractions/nameservice
-@@ -71,6 +71,9 @@
+@@ -70,6 +70,9 @@
    # kerberos
    #include <abstractions/kerberosclient>
  

++++++ apparmor-2.5.1-ldapclient-profile ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:22.000000000 +0100
@@ -1,7 +1,10 @@
-Index: apparmor-2.5.1/profiles/apparmor.d/abstractions/ldapclient
-===================================================================
+---
+ profiles/apparmor.d/abstractions/ldapclient  |   21 +++++++++++++++++++++
+ profiles/apparmor.d/abstractions/nameservice |    8 +++-----
+ 2 files changed, 24 insertions(+), 5 deletions(-)
+
 --- /dev/null
-+++ apparmor-2.5.1/profiles/apparmor.d/abstractions/ldapclient
++++ b/profiles/apparmor.d/abstractions/ldapclient
 @@ -0,0 +1,21 @@
 +# ------------------------------------------------------------------
 +#
@@ -24,11 +27,9 @@
 +  /usr/lib{,32,64}/sasl2/*  r,
 +
 +  #include <abstractions/ssl_certs>
-Index: apparmor-2.5.1/profiles/apparmor.d/abstractions/nameservice
-===================================================================
---- apparmor-2.5.1.orig/profiles/apparmor.d/abstractions/nameservice
-+++ apparmor-2.5.1/profiles/apparmor.d/abstractions/nameservice
-@@ -17,8 +17,6 @@
+--- a/profiles/apparmor.d/abstractions/nameservice
++++ b/profiles/apparmor.d/abstractions/nameservice
+@@ -16,8 +16,6 @@
    /etc/group              r,
    /etc/host.conf          r,
    /etc/hosts              r,
@@ -37,7 +38,7 @@
    /etc/nsswitch.conf      r,
    /etc/gai.conf           r,
    /etc/passwd             r,
-@@ -33,9 +31,6 @@
+@@ -32,9 +30,6 @@
  
    /etc/samba/lmhosts      r,
    /etc/services           r,
@@ -47,7 +48,7 @@
    # db backend
    /var/lib/misc/*.db      r,
    # The Name Service Cache Daemon can cache lookups, sometimes leading
-@@ -59,6 +54,9 @@
+@@ -58,6 +53,9 @@
    # nis
    #include <abstractions/nis>
  

++++++ apparmor-2.5.1-ntpd-sys_nice ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:22.000000000 +0100
@@ -14,7 +14,7 @@
 
 --- a/profiles/apparmor.d/usr.sbin.ntpd
 +++ b/profiles/apparmor.d/usr.sbin.ntpd
-@@ -25,6 +25,7 @@
+@@ -24,6 +24,7 @@
    capability sys_chroot,
    capability sys_resource,
    capability sys_time,

++++++ apparmor-2.5.1-rpmlint-asprintf ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:22.000000000 +0100
@@ -39,7 +39,7 @@
  #include <stdio.h>
 --- a/parser/parser_interface.c
 +++ b/parser/parser_interface.c
-@@ -17,6 +17,7 @@
+@@ -15,6 +15,7 @@
   *   along with this program; if not, contact Novell, Inc.
   */
  
@@ -59,11 +59,11 @@
 +
  /* eliminates need to link with libfl */
  %option noyywrap
- 
+ %option nounput
 --- a/parser/parser_main.c
 +++ b/parser/parser_main.c
-@@ -17,6 +17,7 @@
-  *   along with this program; if not, contact Novell, Inc.
+@@ -19,6 +19,7 @@
+  *   Ltd.
   */
  
 +#define _GNU_SOURCE	/* for asprintf in stdio.h */
@@ -72,11 +72,11 @@
  #include <stdlib.h>
 --- a/parser/parser_variable.c
 +++ b/parser/parser_variable.c
-@@ -17,6 +17,7 @@
+@@ -15,6 +15,7 @@
   *   along with this program; if not, contact Novell, Inc.
   */
  
 +#define _GNU_SOURCE	/* for asprintf in stdio.h */
+ #include <ctype.h>
+ #include <stdlib.h>
  #include <stdio.h>
- #include <stdarg.h>
- #include <string.h>

++++++ apparmor-2.5.1-ssl-fix ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:22.000000000 +0100
@@ -29,7 +29,7 @@
 +
 --- a/profiles/apparmor.d/abstractions/ssl_certs
 +++ b/profiles/apparmor.d/abstractions/ssl_certs
-@@ -15,3 +15,7 @@
+@@ -14,3 +14,7 @@
    /etc/ssl/certs/* r,
    /usr/share/ca-certificates/ r,
    /usr/share/ca-certificates/** r,
@@ -39,7 +39,7 @@
 +  /usr/share/ca-certificates/mozilla/* r,
 --- a/profiles/apparmor/profiles/extras/usr.lib.postfix.smtp
 +++ b/profiles/apparmor/profiles/extras/usr.lib.postfix.smtp
-@@ -16,6 +16,7 @@
+@@ -15,6 +15,7 @@
    #include <abstractions/nameservice>
    #include <abstractions/kerberosclient>
    #include <program-chunks/postfix-common>
@@ -47,7 +47,7 @@
  
    capability dac_override,
    capability dac_read_search,
-@@ -39,7 +40,6 @@
+@@ -38,7 +39,6 @@
    /etc/postfix/{ssl/,}*.pem                   r,
    /etc/postfix/prng_exch                      rw,
    /usr/share/ssl/certs/ca-bundle.crt          r,
@@ -57,7 +57,7 @@
    /etc/mtab                                   r,
 --- a/profiles/apparmor/profiles/extras/usr.lib.postfix.smtpd
 +++ b/profiles/apparmor/profiles/extras/usr.lib.postfix.smtpd
-@@ -16,6 +16,7 @@
+@@ -15,6 +15,7 @@
    #include <abstractions/nameservice>
    #include <abstractions/kerberosclient>
    #include <program-chunks/postfix-common>
@@ -65,7 +65,7 @@
  
    capability dac_override,
    capability dac_read_search,
-@@ -44,7 +45,6 @@
+@@ -43,7 +44,6 @@
    /usr/lib/sasl2/*                            mr,
  
    /usr/share/ssl/certs/ca-bundle.crt          r,
@@ -75,7 +75,7 @@
    /{var/spool/postfix/,}private/anvil            w,
 --- a/profiles/apparmor/profiles/extras/usr.sbin.httpd2-prefork
 +++ b/profiles/apparmor/profiles/extras/usr.sbin.httpd2-prefork
-@@ -18,6 +18,7 @@
+@@ -17,6 +17,7 @@
    #include <abstractions/kerberosclient>
    #include <abstractions/nameservice>
    #include <abstractions/perl>
@@ -83,7 +83,7 @@
  
    capability kill,
    capability net_bind_service,
-@@ -84,7 +85,6 @@
+@@ -83,7 +84,6 @@
    /usr/share/snmp/mibs r,
    /usr/share/snmp/mibs/*.{txt,mib} r,
    /usr/share/snmp/mibs/.index wr,
@@ -93,7 +93,7 @@
    /var/log/httpd/ssl_scache.dir r,
 --- a/profiles/apparmor/profiles/extras/usr.sbin.imapd
 +++ b/profiles/apparmor/profiles/extras/usr.sbin.imapd
-@@ -16,10 +16,10 @@
+@@ -15,10 +15,10 @@
    #include <abstractions/nameservice>
    #include <abstractions/authentication>
    #include <abstractions/user-mail>
@@ -107,7 +107,7 @@
  }
 --- a/profiles/apparmor/profiles/extras/usr.sbin.ipop2d
 +++ b/profiles/apparmor/profiles/extras/usr.sbin.ipop2d
-@@ -16,10 +16,10 @@
+@@ -15,10 +15,10 @@
    #include <abstractions/nameservice>
    #include <abstractions/authentication>
    #include <abstractions/user-mail>
@@ -121,7 +121,7 @@
  }
 --- a/profiles/apparmor/profiles/extras/usr.sbin.ipop3d
 +++ b/profiles/apparmor/profiles/extras/usr.sbin.ipop3d
-@@ -16,10 +16,10 @@
+@@ -15,10 +15,10 @@
    #include <abstractions/nameservice>
    #include <abstractions/authentication>
    #include <abstractions/user-mail>

++++++ apparmor-2.5.1-unified-build ++++++
++++ 5239 lines (skipped)
++++ between apparmor/apparmor-2.5.1-unified-build
++++ and /mounts/work_src_done/STABLE/apparmor/apparmor-2.5.1-unified-build

++++++ apparmor-2.5.1.tar.bz2 -> apparmor-2.6.0.tar.bz2 ++++++
++++ 118872 lines of diff (skipped)

++++++ apparmor-no-caching-test ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -12,4 +12,4 @@
 +tests: error_output gen_xtrans parser_sanity
  
  gen_xtrans:
- 	perl ./gen-xtrans.pl
+ 	./gen-xtrans.pl


++++++ apparmor-profiles-dhclient ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -4,13 +4,14 @@
 
 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
 ---
+
  profiles/apparmor/profiles/extras/sbin.dhclient        |   61 +++++++++++------
  profiles/apparmor/profiles/extras/sbin.dhclient-script |   21 +++++
  2 files changed, 61 insertions(+), 21 deletions(-)
 
 --- a/profiles/apparmor/profiles/extras/sbin.dhclient
 +++ b/profiles/apparmor/profiles/extras/sbin.dhclient
-@@ -12,12 +12,12 @@
+@@ -11,12 +11,12 @@
  # raw sockets, and thus cannot be confined with NetDomain
  #
  # Should these programs have their own domains?
@@ -29,7 +30,7 @@
  
  #include <tunables/global>
  
-@@ -25,25 +25,30 @@
+@@ -24,25 +24,30 @@
    #include <abstractions/base>
    #include <abstractions/bash>
    #include <abstractions/nameservice>
@@ -75,7 +76,7 @@
    /var/lib/dhcp/dhclient.leases     rw,
    /var/lib/dhcp/dhclient-*.leases   rw,
    /var/log/lastlog            r,
-@@ -53,4 +58,18 @@
+@@ -52,4 +57,18 @@
    /var/run/dhclient-*.pid     rw,
    /var/spool                  r,
    /var/spool/mail             r,

++++++ apparmor-profiles-sshd-fix ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -13,7 +13,7 @@
 
 --- a/profiles/apparmor/profiles/extras/usr.sbin.sshd
 +++ b/profiles/apparmor/profiles/extras/usr.sbin.sshd
-@@ -30,6 +30,8 @@
+@@ -29,6 +29,8 @@
    capability kill,
    capability setgid,
    capability setuid,
@@ -22,7 +22,7 @@
  
    /dev/ptmx rw,
    /dev/urandom r,
-@@ -44,11 +46,12 @@
+@@ -43,11 +45,12 @@
  
    @{PROC}/[0-9]*/fd/ r,
    @{PROC}/[0-9]*/loginuid w,

++++++ apparmor-profiles-syslog-ng-fix ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -1,5 +1,9 @@
---- a/profiles/apparmor.d/sbin.syslog-ng.old	2008-11-05 15:53:00.000000000 +0100
-+++ b/profiles/apparmor.d/sbin.syslog-ng	2010-11-05 09:11:23.186489224 +0100
+---
+ profiles/apparmor.d/sbin.syslog-ng |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/profiles/apparmor.d/sbin.syslog-ng
++++ b/profiles/apparmor.d/sbin.syslog-ng
 @@ -19,12 +19,14 @@
    #include <abstractions/base>
    #include <abstractions/consoles>
@@ -29,5 +33,5 @@
 +  @{CHROOT_BASE}/var/run/syslog-ng.ctl rw,
 +  /var/run/syslog-ng/additional-log-sockets.conf r,
  
- }
- 
+   # Site-specific additions and overrides. See local/README for details.
+   #include <local/sbin.syslog-ng>

++++++ apparmor-profiles-usr.sbin.dnsmasq ++++++
From: Jeff Mahoney <jeffm@suse.com>
Subject: dnsmasq: Profile fixes
References: bnc#666090 bnc#678749

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
 profiles/apparmor.d/usr.sbin.dnsmasq |    4 ++++
 1 file changed, 4 insertions(+)

--- a/profiles/apparmor.d/usr.sbin.dnsmasq
+++ b/profiles/apparmor.d/usr.sbin.dnsmasq
@@ -25,10 +25,12 @@
   /etc/dnsmasq.conf r,
   /etc/dnsmasq.d/ r,
   /etc/dnsmasq.d/* r,
+  /etc/ethers r,
 
   /usr/sbin/dnsmasq mr,
 
   /var/run/*dnsmasq*.pid w,
+  /var/run/dnsmasq-forwarders r,
   /var/run/dnsmasq/ r,
   /var/run/dnsmasq/* rw,
 
@@ -37,6 +39,8 @@
   # libvirt pid files for dnsmasq
   /var/run/libvirt/network/      r,
   /var/run/libvirt/network/*.pid rw,
+  /var/lib/libvirt/dnsmasq/            r,
+  /var/lib/libvirt/dnsmasq/*.hostsfile r,
 
   # Site-specific additions and overrides. See local/README for details.
   #include <local/usr.sbin.dnsmasq>
++++++ apparmor-remove-repo ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -9,14 +9,14 @@
 
 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
 ---
- utils/SubDomain.pm |    5 +++++
- utils/logprof.conf |    4 ++++
+ utils/Immunix/AppArmor.pm |    5 +++++
+ utils/logprof.conf        |    4 ++++
  2 files changed, 9 insertions(+)
 
---- a/utils/SubDomain.pm
-+++ b/utils/SubDomain.pm
-@@ -3107,6 +3107,8 @@ sub UI_repo_signup {
- sub UI_ask_to_enable_repo {
+--- a/utils/Immunix/AppArmor.pm
++++ b/utils/Immunix/AppArmor.pm
+@@ -3153,6 +3153,8 @@ sub UI_repo_signup() {
+ sub UI_ask_to_enable_repo() {
  
      my $q = { };
 +    return if (defined $cfg->{settings}{allow_repository} &&
@@ -24,7 +24,7 @@
      return if ( not defined $cfg->{repository}{url} );
      $q->{headers} = [
        gettext("Repository"), $cfg->{repository}{url},
-@@ -3231,6 +3233,8 @@ sub get_preferred_user ($) {
+@@ -3277,6 +3279,8 @@ sub get_preferred_user ($) {
  
  sub repo_is_enabled () {
      my $enabled;
@@ -33,8 +33,8 @@
      if ($cfg->{repository}{url} &&
          $repo_cfg &&
          $repo_cfg->{repository}{enabled} &&
-@@ -3244,6 +3248,7 @@ sub repo_is_enabled () {
- sub update_repo_profile {
+@@ -3290,6 +3294,7 @@ sub repo_is_enabled () {
+ sub update_repo_profile($) {
      my $profile = shift;
  
 +    return undef if not repo_is_enabled();
@@ -43,7 +43,7 @@
      my $url    = $profile->{repo}{url};
 --- a/utils/logprof.conf
 +++ b/utils/logprof.conf
-@@ -35,6 +35,10 @@
+@@ -34,6 +34,10 @@
    # files.
    custom_includes =
  

++++++ apparmor-scripts ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -1,13 +1,13 @@
 ---
 
  parser/rc.aaeventd.suse      |    2 +-
- parser/rc.apparmor.functions |   16 ++++++++--------
+ parser/rc.apparmor.functions |   14 +++++++-------
  parser/rc.apparmor.suse      |   23 ++++++++++++++++++++++-
- 3 files changed, 31 insertions(+), 10 deletions(-)
+ 3 files changed, 30 insertions(+), 9 deletions(-)
 
 --- a/parser/rc.aaeventd.suse
 +++ b/parser/rc.aaeventd.suse
-@@ -30,7 +30,7 @@
+@@ -27,7 +27,7 @@
  ### BEGIN INIT INFO
  # Provides: aaeventd
  # Required-Start: apparmor
@@ -18,7 +18,7 @@
  # Short-Description: AppArmor Notification and Reporting
 --- a/parser/rc.apparmor.functions
 +++ b/parser/rc.apparmor.functions
-@@ -111,9 +111,7 @@ is_apparmor_present() {
+@@ -108,9 +108,7 @@ is_apparmor_present() {
  	# check for subdomainfs version of module
  	grep -qE "^($modules)[[:space:]]" /proc/modules
  
@@ -29,7 +29,7 @@
  
  	return $?
  }
-@@ -380,10 +378,11 @@ apparmor_start() {
+@@ -377,10 +375,11 @@ apparmor_start() {
  	configure_owlsm
  
  	# if there is anything in the profiles file don't load
@@ -43,7 +43,7 @@
  	fi
  	aa_log_end_msg 0
  	return 0
-@@ -415,7 +414,8 @@ remove_profiles() {
+@@ -412,7 +411,8 @@ remove_profiles() {
  	#them so stor to tmp first
  	MODULE_PLIST=$(mktemp ${APPARMOR_TMPDIR}/tmp.XXXXXXXX)
  	sed -e "s/ (\(enforce\|complain\))$//" "$SFS_MOUNTPOINT/profiles" | sort >"$MODULE_PLIST"
@@ -53,7 +53,7 @@
  		echo -n "$profile" > "$SFS_MOUNTPOINT/.remove"
  		rc=$?
  		if [ ${rc} -ne 0 ] ; then 
-@@ -430,7 +430,7 @@ apparmor_stop() {
+@@ -427,7 +427,7 @@ apparmor_stop() {
  	aa_log_daemon_msg "Unloading AppArmor profiles "
  	remove_profiles
  	rc=$?
@@ -62,18 +62,9 @@
  	return $rc
  }
  
-@@ -468,7 +468,7 @@ __apparmor_restart() {
- 	profiles_names_list ${PNAMES_LIST}
- 	MODULE_PLIST=$(mktemp ${APPARMOR_TMPDIR}/tmp.XXXXXXXX)
- 	sed  -e "s/ (\(enforce\|complain\))$//" "$SFS_MOUNTPOINT/profiles" | sort >"$MODULE_PLIST"
--	sort "$PNAMES_LIST" | comm -2 -3 "$MODULE_PLIST" - | while read profile ; do
-+	sort "$PNAMES_LIST" | comm -2 -3 "$MODULE_PLIST" - | while IFS= read profile ; do
- 		echo -n "$profile" > "$SFS_MOUNTPOINT/.remove"
- 	done
- 	rm "$MODULE_PLIST"
 --- a/parser/rc.apparmor.suse
 +++ b/parser/rc.apparmor.suse
-@@ -34,6 +34,7 @@
+@@ -31,6 +31,7 @@
  # Required-Start: boot.cleanup
  # Required-Stop: $null
  # Should-Start: $local_fs
@@ -81,7 +72,7 @@
  # Default-Start: B
  # Default-Stop:
  # Short-Description: AppArmor initialization
-@@ -76,7 +77,19 @@ aa_log_warning_msg() {
+@@ -73,7 +74,19 @@ aa_log_warning_msg() {
  }
  
  aa_log_failure_msg() {
@@ -102,7 +93,7 @@
  }
  
  aa_log_skipped_msg() {
-@@ -84,6 +97,14 @@ aa_log_skipped_msg() {
+@@ -81,6 +94,14 @@ aa_log_skipped_msg() {
  	echo -e	"$rc_skipped"
  }
  

++++++ apparmor-startproc.patch ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -4,7 +4,7 @@
 
 --- a/parser/rc.aaeventd.suse
 +++ b/parser/rc.aaeventd.suse
-@@ -81,9 +81,9 @@ usage() {
+@@ -78,9 +78,9 @@ usage() {
  
  start_aa_event() {
  	if [ -x "$AA_EV_BIN" -a "${APPARMOR_ENABLE_AAEVENTD}" = "yes" ] ; then

++++++ apparmor-utils-add-log-types ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -8,12 +8,12 @@
 
 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
 ---
- utils/SubDomain.pm |    4 +++-
+ utils/Immunix/AppArmor.pm |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
---- a/utils/SubDomain.pm
-+++ b/utils/SubDomain.pm
-@@ -2789,7 +2789,9 @@ sub add_event_to_tree ($) {
+--- a/utils/Immunix/AppArmor.pm
++++ b/utils/Immunix/AppArmor.pm
+@@ -2848,7 +2848,9 @@ sub add_event_to_tree ($) {
  			  ""
                          );
          }

++++++ apparmor-utils-filenames-in-slash ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -13,12 +13,12 @@
 
 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
 ---
- utils/SubDomain.pm |    9 +--------
+ utils/Immunix/AppArmor.pm |    9 +--------
  1 file changed, 1 insertion(+), 8 deletions(-)
 
---- a/utils/SubDomain.pm
-+++ b/utils/SubDomain.pm
-@@ -511,14 +511,7 @@ sub get_full_path ($) {
+--- a/utils/Immunix/AppArmor.pm
++++ b/utils/Immunix/AppArmor.pm
+@@ -553,14 +553,7 @@ sub get_full_path ($) {
          }
      }
  

++++++ apparmor-utils-string-split ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -3,12 +3,12 @@
 
  The string split here ends up not displaying well in yast.
 ---
- utils/SubDomain.pm |    7 ++++++-
+ utils/Immunix/AppArmor.pm |    7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
---- a/utils/SubDomain.pm
-+++ b/utils/SubDomain.pm
-@@ -6241,7 +6241,12 @@ sub check_qualifiers {
+--- a/utils/Immunix/AppArmor.pm
++++ b/utils/Immunix/AppArmor.pm
+@@ -6300,7 +6300,12 @@ sub check_qualifiers($) {
  
      if ($cfg->{qualifiers}{$program}) {
          unless($cfg->{qualifiers}{$program} =~ /p/) {

++++++ apparmor-utils-subdomain-compat ++++++
From: Jeff Mahoney <jeffm@suse.com>
Subject: apparmor-utils: Add Immunix::SubDomain alias

 This patch adds an alias so that 'use Immunix::SubDomain;' works with older
 code.

Acked-by: Jeff Mahoney <jeffm@suse.com>
---

 utils/Immunix/SubDomain.pm |    5 +++++
 1 file changed, 5 insertions(+)

--- /dev/null
+++ b/utils/Immunix/SubDomain.pm
@@ -0,0 +1,5 @@
+# Use of Immunix::SubDomain is deprecated.
+# Use Immunix::AppArmor directly instead.
+use Immunix::AppArmor;
+*Immunix::SubDomain:: = *Immunix::AppArmor::;
+1;
++++++ genprof-whitespace-in-profile-fix ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -14,11 +14,11 @@
 
 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
 ---
- utils/SubDomain.pm |    8 ++++----
+ utils/Immunix/AppArmor.pm |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
---- a/utils/SubDomain.pm
-+++ b/utils/SubDomain.pm
+--- a/utils/Immunix/AppArmor.pm
++++ b/utils/Immunix/AppArmor.pm
 @@ -1033,13 +1033,13 @@ sub setprofileflags ($$) {
      if (open(PROFILE, "$filename")) {
          if (open(NEWPROFILE, ">$filename.new")) {

++++++ klog-needs-CAP_SYSLOG ++++++
--- /var/tmp/diff_new_pack.QO1WKu/_old	2011-03-25 09:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.QO1WKu/_new	2011-03-25 09:01:23.000000000 +0100
@@ -5,7 +5,7 @@
 
 --- a/parser/parser_misc.c
 +++ b/parser/parser_misc.c
-@@ -122,6 +122,9 @@ static int get_table_token(const char *n
+@@ -125,6 +125,9 @@ static int get_table_token(const char *n
  static struct keyword_table capability_table[] = {
  	/* capabilities */
  	#include "cap_names.h"
@@ -15,7 +15,7 @@
  	/* terminate */
  	{NULL, 0}
  };
-@@ -820,6 +823,7 @@ static const char *capnames[] = {
+@@ -783,6 +786,7 @@ static const char *capnames[] = {
  	"audit_control",
  	"setfcap",
  	"mac_override"


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



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)