Accepting request 98697 from security:apparmor:factory

- Update to AppArmor 2.7.0 (= r1858)
  - make traceroute6 work (bnc#733312)
  - allow access to pyconfig.h in abstractions/python (lp#840734)
  - fix logprof/genprof for hex-encoded program filenames (= filenames
    containing space etc.)
- add apparmor-2.7-branch.diff with some upstreamed fixes:
  - usr.sbin.smbd needs read access for /etc/netgroup (bnc#738041)
  - create /etc/apparmor.d/tunables/multiarch.d as directory, not as file
  - fix syntax error in abstractons/python

- changed a $ -> % (typo)

OBS-URL: https://build.opensuse.org/request/show/98697
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=31
This commit is contained in:
Stephan Kulow 2012-01-05 12:51:05 +00:00 committed by Git OBS Bridge
parent 76a45f653d
commit b2f1c70e39
6 changed files with 66 additions and 8 deletions

36
apparmor-2.7-branch.diff Normal file
View File

@ -0,0 +1,36 @@
svn diff -r1858..1861 > 2.7-branch.diff
=== modified file 'profiles/Makefile'
--- profiles/Makefile 2011-10-19 22:23:19 +0000
+++ profiles/Makefile 2012-01-03 22:45:00 +0000
@@ -56,6 +56,7 @@
${PROFILES_DEST}/program-chunks \
${PROFILES_DEST}/tunables \
${PROFILES_DEST}/tunables/home.d \
+ ${PROFILES_DEST}/tunables/multiarch.d \
${PROFILES_DEST}/local
install -m 644 ${PROFILES_TO_COPY} ${PROFILES_DEST}
install -m 644 ${ABSTRACTIONS_TO_COPY} ${PROFILES_DEST}/abstractions
=== modified file 'profiles/apparmor.d/abstractions/python'
--- profiles/apparmor.d/abstractions/python 2011-11-30 16:56:45 +0000
+++ profiles/apparmor.d/abstractions/python 2012-01-03 20:23:30 +0000
@@ -31,4 +31,4 @@
/usr/lib/wx/python/*.pth r,
# python build configuration and headers
- /usr/include/python{2,3}.[0-7]*/pyconfig.h
+ /usr/include/python{2,3}.[0-7]*/pyconfig.h r,
=== modified file 'profiles/apparmor.d/usr.sbin.smbd'
--- profiles/apparmor.d/usr.sbin.smbd 2011-11-01 17:28:49 +0000
+++ profiles/apparmor.d/usr.sbin.smbd 2011-12-30 20:55:58 +0000
@@ -21,6 +21,7 @@
capability sys_tty_config,
/etc/mtab r,
+ /etc/netgroup r,
/etc/printcap r,
/proc/*/mounts r,
/proc/sys/kernel/core_pattern r,

3
apparmor-2.7.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff8a2f49f902faa78e502590c65d3850fb9a2a3453bef0dc1f99e947c52fc60f
size 1399442

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c360763503c6e68b46ae0a563efad878c7ab4c28a0f8084035aa3f04bc914437
size 1427203

View File

@ -20,7 +20,7 @@ Signed-off-by: Christian Boltz <apparmor@cboltz.de>
=== modified file 'profiles/apparmor.d/usr.sbin.smbd'
--- profiles/apparmor.d/usr.sbin.smbd 2011-08-27 18:50:42 +0000
+++ profiles/apparmor.d/usr.sbin.smbd 2011-10-19 09:37:04 +0000
@@ -41,6 +41,10 @@
@@ -42,6 +42,10 @@
@{HOMEDIRS}/** lrwk,

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Jan 3 23:52:38 UTC 2012 - opensuse@cboltz.de
- Update to AppArmor 2.7.0 (= r1858)
- make traceroute6 work (bnc#733312)
- allow access to pyconfig.h in abstractions/python (lp#840734)
- fix logprof/genprof for hex-encoded program filenames (= filenames
containing space etc.)
- add apparmor-2.7-branch.diff with some upstreamed fixes:
- usr.sbin.smbd needs read access for /etc/netgroup (bnc#738041)
- create /etc/apparmor.d/tunables/multiarch.d as directory, not as file
- fix syntax error in abstractons/python
-------------------------------------------------------------------
Tue Nov 29 18:34:54 CET 2011 - meissner@suse.de
- changed a $ -> % (typo)
-------------------------------------------------------------------
Sat Nov 26 21:52:31 UTC 2011 - opensuse@cboltz.de

View File

@ -1,7 +1,7 @@
#
# spec file for package apparmor
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -43,9 +43,9 @@ Name: apparmor
%if ! %{?distro:1}0
%define distro suse
%endif
Version: 2.7.rc2
Version: 2.7.0
Release: 1
%define versiondir 2.7.0~rc2
%define versiondir 2.7.0
Summary: AppArmor userlevel parser utility
Group: Productivity/Networking/Security
Source0: apparmor-%{version}.tar.gz
@ -53,6 +53,9 @@ Source1: %{name}-profile-editor.png
Source2: %{name}-profile-editor.desktop
Source3: update-trans.sh
# upstream changes since the 2.7 release
Patch0: apparmor-2.7-branch.diff
# enable caching of profiles (= massive performance speedup when loading profiles)
Patch1: apparmor-enable-profile-cache.diff
@ -200,7 +203,7 @@ Summary: Utility library for AppArmor
Group: Development/Libraries/C and C++
%ifarch ppc64
Obsoletes: libapparmor-64bit < %{version}
Provides: libapparmor-64bit = ${version}
Provides: libapparmor-64bit = %{version}
%endif
Provides: libapparmor = %{version}
Provides: libimmunix = %{version}
@ -401,6 +404,7 @@ SubDomain.
%prep
%setup -q -n %{name}-%{versiondir}
%patch0 -p0
%patch1 -p1
%patch2 -p0
%patch5 -p1