Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2012-05-09 07:24:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2012-04-17 07:43:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor.new/apparmor.changes 2012-05-09 07:24:57.000000000 +0200 @@ -1,0 +2,19 @@ +Tue May 8 19:30:23 UTC 2012 - [email protected] + +- add apparmor-techdoc.patch to remove traces of the build time in PDF files + +------------------------------------------------------------------- +Sat May 5 20:25:49 UTC 2012 - [email protected] + +- update to AppArmor 2.8 beta5 (= 2.7.103 / r2031) + - new utility aa-exec to confine a program with the specified AppArmor profile + - add support for mount rules + - see http://wiki.apparmor.net/index.php/ReleaseNotes_2_8 for full upstream + changelog +- removed upstreamed and backported patches +- remove outdated autobuild and "disable repo" patches that were disabled since + the AppArmor 2.7 package +- create the Immunix::SubDomain compat perl module only for openSUSE <= 12.1 + (bnc#720617 #c7) + +------------------------------------------------------------------- Old: ---- 0001-fix-for-lp929531.patch apparmor-2.5.1-rpmlint-asprintf apparmor-2.5.1-unified-build apparmor-2.7.2.tar.gz apparmor-r2022-log-parser-network-bnc755923.patch apparmor-remove-repo New: ---- apparmor-2.7.103.tar.gz apparmor-techdoc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.Q4TldS/_old 2012-05-09 07:25:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Q4TldS/_new 2012-05-09 07:25:00.000000000 +0200 @@ -43,9 +43,8 @@ %if ! %{?distro:1}0 %define distro suse %endif -Version: 2.7.2 +Version: 2.7.103 Release: 0 -%define versiondir 2.7.2 Summary: AppArmor userlevel parser utility License: GPL-2.0+ Group: Productivity/Networking/Security @@ -57,9 +56,6 @@ # profile for winbindd (bnc#748499, not upstreamed yet) Source4: usr.sbin.winbindd -# add "/sys/devices/system/cpu/online r" to abstractions/base. Will be included in upstream > 2.7.2 -Patch: 0001-fix-for-lp929531.patch - # enable caching of profiles (= massive performance speedup when loading profiles) Patch1: apparmor-enable-profile-cache.diff @@ -69,25 +65,17 @@ # split a long string in AppArmor.pm. Not accepted upstream because they want a solution without hardcoded width. Patch5: apparmor-utils-string-split -# use autobuild everywhere. Patch applies to 2.6.1 only and probably won't be accepted upstream. -Patch10: apparmor-2.5.1-unified-build -# requires Patch10 -Patch11: apparmor-2.5.1-rpmlint-asprintf - # Add support for eDirectory calls in abstractions/nameservice. Not accepted upstream (yet) because of open questions Patch12: apparmor-2.5.1-edirectory-profile -# obsolete, upstream implemented this in another way -Patch15: apparmor-remove-repo - -# remove after 12.1 release - bnc#720617 #c7 +# 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) +# bnc#738905 - commited upstream (after 2.7.2 / 2.8 beta5) Patch22: apparmor-dnsmasq-profile-fix.patch -# bnc#755923 / lp#800826 - logprof etc. ignores network log entries because of changed log format. from upstream r2022 (2.8 beta5 will have it) -Patch23: apparmor-r2022-log-parser-network-bnc755923.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 @@ -104,6 +92,7 @@ BuildRequires: libtool BuildRequires: pcre-devel BuildRequires: pkg-config +BuildRequires: python BuildRequires: texlive-latex BuildRequires: w3m @@ -412,18 +401,25 @@ %endif %prep -%setup -q -n %{name}-%{versiondir} -%patch -p1 +%setup -q %patch1 -p1 %patch2 -p0 %patch5 -p1 -#%patch10 -p1 # disabled, see above -#%patch11 -p1 # disabled, see above %patch12 -p1 -#%patch15 -p1 # obsolete, see above + +# only create Immunix::SubDomain perl module for openSUSE <= 12.1 +%if 0%{?suse_version} +%if 0%{?suse_version} <= 1210 %patch21 -p1 +%endif +%endif %patch22 -p1 -%patch23 -p0 + +# 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 @@ -571,6 +567,9 @@ %doc parser/*.[1-9].html %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 +/usr/share/apparmor/apparmor.vim %files parser %defattr(-,root,root) @@ -656,6 +655,7 @@ %doc %{_mandir}/man8/complain.8.gz %doc %{_mandir}/man8/disable.8.gz %doc %{_mandir}/man8/enforce.8.gz +%doc %{_mandir}/man8/exec.8.gz %doc %{_mandir}/man8/genprof.8.gz %doc %{_mandir}/man8/logprof.8.gz %doc %{_mandir}/man8/unconfined.8.gz ++++++ apparmor-2.7.2.tar.gz -> apparmor-2.7.103.tar.gz ++++++ ++++ 14288 lines of diff (skipped) ++++++ apparmor-techdoc.patch ++++++ 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 <[email protected]> === 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 ++++++ --- /var/tmp/diff_new_pack.Q4TldS/_old 2012-05-09 07:25:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Q4TldS/_new 2012-05-09 07:25:01.000000000 +0200 @@ -28,7 +28,7 @@ --- a/utils/Makefile 2011-05-27 21:08:50.000000000 +0200 +++ b/utils/Makefile 2011-09-10 17:57:55.000000000 +0200 @@ -31,7 +31,7 @@ PERLTOOLS = aa-genprof aa-logprof aa-aut - aa-unconfined aa-notify aa-disable + aa-unconfined aa-notify aa-disable aa-exec TOOLS = ${PERLTOOLS} aa-decode aa-status MODULES = ${MODDIR}/AppArmor.pm ${MODDIR}/Repository.pm \ - ${MODDIR}/Config.pm ${MODDIR}/Severity.pm -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
