Accepting request 123313 from home:cboltz

- update to AppArmor 2.8.0 (= r2047)
  - new utility aa-easyprof - templated profile generation tool (the resulting
    profile may be less strict than profiles generated with genprof/logprof)
  - various small bugfixes
- removed upstreamed patches

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

apparmor-2.7.103.tar.gz

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

apparmor-2.8.0.tar.gz

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

apparmor-dnsmasq-profile-fix.patch

@@ -1,17 +0,0 @@
----
- profiles/apparmor.d/usr.sbin.dnsmasq |    3 +++
- 1 file changed, 3 insertions(+)
-
-=== modified file 'profiles/apparmor.d/usr.sbin.dnsmasq'
---- apparmor-2.7.2.orig/profiles/apparmor.d/usr.sbin.dnsmasq	2012-01-09 20:08:19 +0000
-+++ apparmor-2.7.2/profiles/apparmor.d/usr.sbin.dnsmasq	2012-04-16 21:10:18 +0000
-@@ -9,7 +9,7 @@
- #
- # ------------------------------------------------------------------
- 
--@{TFTP_DIR}=/var/tftp
-+@{TFTP_DIR}=/var/tftp /srv/tftpboot
- 
- #include <tunables/global>
- /usr/sbin/dnsmasq {
-

apparmor-techdoc.patch

@@ -1,80 +0,0 @@
-Various changes in building techdoc.tex:
-- make table of contents, footnotes etc. clickable hyperlinks
-- use timestamp of techdoc.tex (instead of build time) as creationdate
-  in the PDF metadata
-- don't include build date on first page of the PDF
-- make clean:
-  - delete techdoc.out (created by pdftex)
-  - fix deletion of techdoc.txt (was techdo_r_.txt)
-
-The initial target was to get reproduceable PDF builds (therefore the 
-timestamp-related changes), the other things came up during discussing
-this patch with David Haller.
-
-The only remaining difference in the PDF from build to build is the /ID
-line.  This line can't be controlled in pdflatex and is now filtered 
-out by build-compare in the openSUSE build service (bnc#760867).
-
-Credits go to David Haller for writing large parts of this patch
-(but he didn't notice the techdo_r_.txt ;-)
-
-
-Signed-Off-By: Christian Boltz <apparmor@cboltz.de>
-
-
-
-=== modified file 'parser/Makefile'
---- parser/Makefile	2012-03-22 20:19:27 +0000
-+++ parser/Makefile	2012-05-08 18:40:10 +0000
-@@ -118,7 +118,8 @@
- 	$(MAKE) -C po ${NAME}.pot NAME=${NAME} SOURCES="${SRCS} ${HDRS}"
- 
- techdoc.pdf: techdoc.tex
--	while pdflatex $< ${BUILD_OUTPUT} || exit 1 ; \
-+	timestamp=$(shell date "+%Y%m%d%H%M%S+02'00'" -r $< );\
-+	while pdflatex "\def\fixedpdfdate{$$timestamp}\input $<" ${BUILD_OUTPUT} || exit 1 ; \
- 		grep -q "Label(s) may have changed" techdoc.log; \
- 	do :; done
- 
-@@ -302,7 +303,7 @@
- 	rm -f $(NAME)*.tar.gz $(NAME)*.tgz
- 	rm -f af_names.h
- 	rm -f cap_names.h
--	rm -rf techdoc.aux techdoc.log techdoc.pdf techdoc.toc techdor.txt techdoc/
-+	rm -rf techdoc.aux techdoc.out techdoc.log techdoc.pdf techdoc.toc techdoc.txt techdoc/
- 	$(MAKE) -s -C $(AAREDIR) clean
- 	$(MAKE) -s -C po clean
- 	$(MAKE) -s -C tst clean
-
-=== modified file 'parser/techdoc.tex'
---- parser/techdoc.tex	2011-02-09 22:29:05 +0000
-+++ parser/techdoc.tex	2012-05-08 18:55:56 +0000
-@@ -5,6 +5,17 @@
- \usepackage{url}
- %\usepackage{times}
- 
-+\usepackage[pdftex,
-+  pdfauthor={Andreas Gruenbacher and Seth Arnold},
-+  pdftitle={AppArmor Technical Documentation},%
-+\ifx\fixedpdfdate\@empty\else
-+  pdfcreationdate={\fixedpdfdate},
-+  pdfmoddate={\fixedpdfdate},
-+\fi
-+  pdfsubject={AppArmor},
-+  pdfkeywords={AppArmor}
-+]{hyperref}
-+
- \hyphenation{App-Armor}
- \hyphenation{name-space}
- 
-@@ -14,7 +25,8 @@
- \author{Andreas Gruenbacher and Seth Arnold \\
- \url{{agruen,seth.arnold}@suse.de} \\
- SUSE Labs / Novell}
--%\date{}
-+% don't include the (build!) date
-+\date{}
- 
- \begin{document}
- 
-

apparmor-utils-subdomain-compat

@@ -33,6 +33,6 @@ Signed-off-by: Christian Boltz <apparmor@cboltz.de>
  MODULES = ${MODDIR}/AppArmor.pm ${MODDIR}/Repository.pm \
 -	${MODDIR}/Config.pm ${MODDIR}/Severity.pm
 +	${MODDIR}/Config.pm ${MODDIR}/Severity.pm ${MODDIR}/SubDomain.pm
- 
+ PYTOOLS = aa-easyprof
- MANPAGES = ${TOOLS:=.8} logprof.conf.5
+ PYSETUP = python-tools-setup.py
  

apparmor.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Jun  2 19:55:14 UTC 2012 - opensuse@cboltz.de
+
+- update to AppArmor 2.8.0 (= r2047)
+  - new utility aa-easyprof - templated profile generation tool (the resulting
+    profile may be less strict than profiles generated with genprof/logprof)
+  - various small bugfixes
+- removed upstreamed patches
+
 -------------------------------------------------------------------
 Tue May  8 19:30:23 UTC 2012 - opensuse@cboltz.de
 

apparmor.spec

@@ -43,7 +43,7 @@ Name:           apparmor
 %if ! %{?distro:1}0
   %define distro suse
 %endif
-Version:        2.7.103
+Version:        2.8.0
 Release:        0
 Summary:        AppArmor userlevel parser utility
 License:        GPL-2.0+
@@ -71,12 +71,6 @@ Patch12:        apparmor-2.5.1-edirectory-profile
 # create Immunix::SubDomain perl module - only included for openSUSE <= 12.1 - bnc#720617 #c7
 Patch21:        apparmor-utils-subdomain-compat
 
-# bnc#738905 - commited upstream (after 2.7.2 / 2.8 beta5)
-Patch22:        apparmor-dnsmasq-profile-fix.patch
-
-# use hyperref and use techdoc.tex's file date for the pdf's creation and mod date (avoids useless rebuilds) - patch sent upstream after 2.8 beta5
-Patch30:        apparmor-techdoc.patch
-
 Url:            https://launchpad.net/apparmor
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -413,13 +407,6 @@ SubDomain.
 %patch21 -p1
 %endif
 %endif
-%patch22 -p1
-
-# preserve timestamp of techdoc.tex
-touch -r parser/techdoc.tex parser/techdoc.timestamp 
-%patch30 -p0
-# preserve timestamp of techdoc.tex
-touch -r parser/techdoc.timestamp parser/techdoc.tex
 
 # profile for winbindd (bnc#748499, not upstreamed yet)
 test ! -e profiles/apparmor.d/usr.sbin.winbindd
@@ -568,8 +555,8 @@ echo -------------------------------------------------------------------
 %doc common/apparmor.css
 %doc parser/techdoc.pdf parser/techdoc/techdoc.html parser/techdoc/techdoc.css parser/techdoc.txt
 # apparmor.vim is included in the vim package. Ideally it should be in a -devel package, but that's overmuch for one file
-%dir /usr/share/apparmor
+%dir %{_datadir}/apparmor
-/usr/share/apparmor/apparmor.vim
+%{_datadir}/apparmor/apparmor.vim
 
 %files parser
 %defattr(-,root,root)
@@ -640,10 +627,16 @@ fi
 %files utils
 %defattr(-,root,root)
 %dir %{_sysconfdir}/apparmor
+%config(noreplace) %{_sysconfdir}/apparmor/easyprof.conf
 %config(noreplace) %{_sysconfdir}/apparmor/logprof.conf
 %config(noreplace) %{_sysconfdir}/apparmor/notify.conf
 %config(noreplace) %{_sysconfdir}/apparmor/severity.db
 %{_sbindir}/*
+%{_bindir}/aa-easyprof
+%{python_sitelib}/apparmor-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/apparmor/
+%dir %{_datadir}/apparmor
+%{_datadir}/apparmor/easyprof/
 %dir %{_localstatedir}/log/apparmor
 %doc %{_mandir}/man2/aa_change_profile.2.gz
 %doc %{_mandir}/man5/logprof.conf.5.gz
@@ -654,6 +647,7 @@ fi
 %doc %{_mandir}/man8/autodep.8.gz
 %doc %{_mandir}/man8/complain.8.gz
 %doc %{_mandir}/man8/disable.8.gz
+%doc %{_mandir}/man8/easyprof.8.gz
 %doc %{_mandir}/man8/enforce.8.gz
 %doc %{_mandir}/man8/exec.8.gz
 %doc %{_mandir}/man8/genprof.8.gz