Accepting request 199886 from home:cboltz

- add apparmor-fix-url-in-manpages-r2093.diff: fix URL in manpages 
- add apparmor-unconfined-lang-r2094.diff: fix aa-unconfined to work
  in all languages

Please also forward those fixes to 13.1

OBS-URL: https://build.opensuse.org/request/show/199886
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=49

apparmor-fix-url-in-manpages-r2093.diff

@@ -0,0 +1,247 @@
+=== modified file 'changehat/mod_apparmor/mod_apparmor.pod'
+--- changehat/mod_apparmor/mod_apparmor.pod	2010-12-20 20:29:10 +0000
++++ changehat/mod_apparmor/mod_apparmor.pod	2013-09-19 19:14:41 +0000
+@@ -115,7 +115,7 @@
+ may not work correctly.
+ 
+ There are likely other bugs lurking about; if you find any, please report
+-them at L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++them at L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'libraries/libapparmor/doc/aa_change_hat.pod'
+--- libraries/libapparmor/doc/aa_change_hat.pod	2012-11-21 00:52:43 +0000
++++ libraries/libapparmor/doc/aa_change_hat.pod	2013-09-19 19:14:41 +0000
+@@ -248,7 +248,7 @@
+ =head1 BUGS
+ 
+ None known. If you find any, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>. Note that
++L<https://bugs.launchpad.net/apparmor/+filebug>. Note that
+ aa_change_hat(2) provides no memory barriers between different areas of a
+ program; if address space separation is required, then separate processes
+ should be used.
+
+=== modified file 'libraries/libapparmor/doc/aa_change_profile.pod'
+--- libraries/libapparmor/doc/aa_change_profile.pod	2012-11-21 00:52:43 +0000
++++ libraries/libapparmor/doc/aa_change_profile.pod	2013-09-19 19:14:41 +0000
+@@ -197,7 +197,7 @@
+ =head1 BUGS
+ 
+ None known. If you find any, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>. Note that using
++L<https://bugs.launchpad.net/apparmor/+filebug>. Note that using
+ aa_change_profile(2) without execve(2) provides no memory barriers between
+ different areas of a program; if address space separation is required, then
+ separate processes should be used.
+
+=== modified file 'libraries/libapparmor/doc/aa_find_mountpoint.pod'
+--- libraries/libapparmor/doc/aa_find_mountpoint.pod	2012-02-16 00:34:03 +0000
++++ libraries/libapparmor/doc/aa_find_mountpoint.pod	2013-09-19 19:14:41 +0000
+@@ -110,7 +110,7 @@
+ =head1 BUGS
+ 
+ None known. If you find any, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'libraries/libapparmor/doc/aa_getcon.pod'
+--- libraries/libapparmor/doc/aa_getcon.pod	2012-03-22 14:58:18 +0000
++++ libraries/libapparmor/doc/aa_getcon.pod	2013-09-19 19:14:41 +0000
+@@ -103,7 +103,7 @@
+ =head1 BUGS
+ 
+ None known. If you find any, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'parser/apparmor.vim.pod'
+--- parser/apparmor.vim.pod	2012-03-22 20:15:20 +0000
++++ parser/apparmor.vim.pod	2013-09-19 19:14:41 +0000
+@@ -48,7 +48,7 @@
+ 
+ B<apparmor.vim> does not properly detect dark versus light backgrounds.
+ Patches accepted. If you find any bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'parser/apparmor_parser.pod'
+--- parser/apparmor_parser.pod	2013-01-03 23:58:28 +0000
++++ parser/apparmor_parser.pod	2013-09-19 19:14:41 +0000
+@@ -308,7 +308,7 @@
+ =head1 BUGS
+ 
+ If you find any bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'parser/subdomain.conf.pod'
+--- parser/subdomain.conf.pod	2012-02-24 12:21:59 +0000
++++ parser/subdomain.conf.pod	2013-09-19 19:14:41 +0000
+@@ -96,7 +96,7 @@
+ been included with the SUSE kernel, so no rebuilding should be necessary.
+ 
+ If you find any additional bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'utils/aa-audit.pod'
+--- utils/aa-audit.pod	2011-02-07 23:39:54 +0000
++++ utils/aa-audit.pod	2013-09-19 18:48:14 +0000
+@@ -16,7 +16,7 @@
+ =head1 BUGS
+ 
+ If you find any bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'utils/aa-autodep.pod'
+--- utils/aa-autodep.pod	2011-02-07 23:39:54 +0000
++++ utils/aa-autodep.pod	2013-09-19 18:48:14 +0000
+@@ -42,7 +42,7 @@
+ This program does not perform full static analysis of executables, so
+ the profiles generated are necessarily incomplete. If you find any bugs,
+ please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'utils/aa-complain.pod'
+--- utils/aa-complain.pod	2011-02-07 23:39:54 +0000
++++ utils/aa-complain.pod	2013-09-19 18:48:14 +0000
+@@ -37,7 +37,7 @@
+ =head1 BUGS
+ 
+ If you find any bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'utils/aa-disable.pod'
+--- utils/aa-disable.pod	2011-02-07 23:39:36 +0000
++++ utils/aa-disable.pod	2013-09-19 18:48:14 +0000
+@@ -39,7 +39,7 @@
+ =head1 BUGS
+ 
+ If you find any bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'utils/aa-enforce.pod'
+--- utils/aa-enforce.pod	2011-05-02 20:33:31 +0000
++++ utils/aa-enforce.pod	2013-09-19 18:48:14 +0000
+@@ -41,7 +41,7 @@
+ =head1 BUGS
+ 
+ If you find any bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'utils/aa-exec.pod'
+--- utils/aa-exec.pod	2012-04-11 16:16:47 +0000
++++ utils/aa-exec.pod	2013-09-19 18:48:14 +0000
+@@ -87,7 +87,7 @@
+ =head1 BUGS
+ 
+ If you find any bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'utils/aa-genprof.pod'
+--- utils/aa-genprof.pod	2011-02-07 23:39:54 +0000
++++ utils/aa-genprof.pod	2013-09-19 18:48:14 +0000
+@@ -73,7 +73,7 @@
+ =head1 BUGS
+ 
+ If you find any bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'utils/aa-logprof.pod'
+--- utils/aa-logprof.pod	2011-02-07 23:39:54 +0000
++++ utils/aa-logprof.pod	2013-09-19 18:48:14 +0000
+@@ -155,7 +155,7 @@
+ =head1 BUGS
+ 
+ If you find any bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'utils/aa-status.pod'
+--- utils/aa-status.pod	2010-12-20 20:29:10 +0000
++++ utils/aa-status.pod	2013-09-19 18:48:14 +0000
+@@ -116,7 +116,7 @@
+ =back
+ 
+ If you find any additional bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'utils/aa-unconfined.pod'
+--- utils/aa-unconfined.pod	2010-12-20 20:29:10 +0000
++++ utils/aa-unconfined.pod	2013-09-19 18:48:14 +0000
+@@ -47,7 +47,7 @@
+ to profiling all network-accessible processes in the lab.
+ 
+ If you find any bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+
+=== modified file 'utils/logprof.conf.pod'
+--- utils/logprof.conf.pod	2011-02-07 23:39:54 +0000
++++ utils/logprof.conf.pod	2013-09-19 18:48:14 +0000
+@@ -103,7 +103,7 @@
+ =head1 BUGS
+ 
+ If you find any bugs, please report them at
+-L<http://https://bugs.launchpad.net/apparmor/+filebug>.
++L<https://bugs.launchpad.net/apparmor/+filebug>.
+ 
+ =head1 SEE ALSO
+ 
+

apparmor-unconfined-lang-r2094.diff

@@ -0,0 +1,13 @@
+=== modified file 'utils/aa-unconfined'
+--- utils/aa-unconfined	2011-01-13 21:58:26 +0000
++++ utils/aa-unconfined	2013-09-19 21:31:28 +0000
+@@ -60,7 +60,7 @@
+     @pids = grep { /^\d+$/ } readdir(PROC);
+     closedir(PROC);
+ } else {
+-    if (open(NETSTAT, "/bin/netstat -nlp |")) {
++    if (open(NETSTAT, "LANG=C /bin/netstat -nlp |")) {
+         while (<NETSTAT>) {
+             chomp;
+             push @pids, $5
+

apparmor.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep 20 11:28:20 UTC 2013 - opensuse@cboltz.de
+
+- add apparmor-fix-url-in-manpages-r2093.diff: fix URL in manpages 
+- add apparmor-unconfined-lang-r2094.diff: fix aa-unconfined to work
+  in all languages
+
 -------------------------------------------------------------------
 Mon Sep 16 18:23:46 UTC 2013 - seife+obs@b1-systems.com
 

apparmor.spec

@@ -100,9 +100,15 @@ Patch6:         apparmor-init.py-gsoc.diff
 # fix some (mis)translations in utils/po/de.po (upstream trunk r2186, 2.8 r2091)
 Patch7:         apparmor-utils-po-de-r2091.diff	
 
-# fix ntpd after configuration change (submitted upstream 2013-09-16)
+# fix ntpd after configuration change (commited upstream trunk r2188, 2.8 r2092)
 Patch8:         apparmor-2.8.2-fix-ntpd-profile.diff
 
+# fix URL in manpages (commited upstream trunk r2189, 2.8 r2093)
+Patch9:         apparmor-fix-url-in-manpages-r2093.diff
+
+# fix aa-unconfined to work with all languages (commited upstream trunk r2190, 2.8 r2094)
+Patch10:        apparmor-unconfined-lang-r2094.diff
+
 # Add support for eDirectory calls in abstractions/nameservice. Not accepted upstream (yet) because of open questions
 Patch12:        apparmor-2.5.1-edirectory-profile
 
@@ -475,6 +481,8 @@ SubDomain.
 %patch6
 %patch7
 %patch8
+%patch9
+%patch10
 %patch12 -p1
 
 # only create Immunix::SubDomain perl module for openSUSE <= 12.1