Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2016-08-31 00:01:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2016-05-25 21:22:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor.new/apparmor.changes 2016-08-31 00:01:23.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Aug 26 20:21:37 UTC 2016 - [email protected] + +- add changes-since-2.10.1--r3326..3346.diff with upstream changes and + fixes since the 2.10.1 release, including + - allow dac_override in winbindd profile (boo#990006#c5) + - allow mr for /usr/lib*/ldb/*.so in samba abstractions (needed since + Samba 4.4.x, boo#990006) + - abstractions/nameservice: also support ConnMan-managed resolv.conf + - let aa-genprof ask about profiles in extra dir (again) + - fix aa-logprof "add hat" endless loop (lp#1538306) + - honor 'chown' file events in logparser.py + - ignore log file events with a request mask of 'send' or 'receive' + because they are actually network events (lp#1577051, lp#1582374) + - accept hostname with dots when parsing logs (lp#1453300 comments #1 and #2) +- fix python LibAppArmor import failures with swig > 3.0.8 (boo#987607) + (libapparmor-fix-import-path.diff) +- refresh apparmor-abstractions-no-multiline.diff +- drop upstreamed profiles-ping-inet6-r3449.diff +- add %check section - runs libapparmor (including swig bindings), + parser and profiles tests +- add BuildRequires: perl(Locale::gettext) - needed for parser tests + +------------------------------------------------------------------- Old: ---- profiles-ping-inet6-r3449.diff New: ---- changes-since-2.10.1--r3326..3346.diff libapparmor-fix-import-path.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.RsgGjE/_old 2016-08-31 00:01:24.000000000 +0200 +++ /var/tmp/diff_new_pack.RsgGjE/_new 2016-08-31 00:01:24.000000000 +0200 @@ -82,6 +82,9 @@ # split a long string in AppArmor.pm. Not accepted upstream because they want a solution without hardcoded width. Patch3: apparmor-utils-string-split +# upstream changes/fixes from 2.10 branch r3326..3346 +Patch4: changes-since-2.10.1--r3326..3346.diff + # Ruby 2.0 mkmf prefixes everything with $(DESTDIR), bnc#822277, [email protected] Patch5: ruby-2_0-mkmf-destdir.patch @@ -92,8 +95,8 @@ # bug 906858 - confine lessopen.sh (submitted upstream 2014-12-21) Patch7: apparmor-lessopen-profile.patch -# boo#980596 - latest ping includes IPv6 (commited upstream trunk r3449 / 2.10 branch r3331 / 2.9 branch r3009) -Patch8: profiles-ping-inet6-r3449.diff +# fix import path for LibAppArmor for newer swig versions (boo#987607, not upstreamed yet) +Patch8: libapparmor-fix-import-path.diff Url: https://launchpad.net/apparmor PreReq: sed @@ -110,6 +113,7 @@ BuildRequires: pcre-devel BuildRequires: pkg-config BuildRequires: python +BuildRequires: perl(Locale::gettext) %if 0%{?suse_version} > 1220 BuildRequires: texlive-amsfonts BuildRequires: texlive-cm-super @@ -434,6 +438,7 @@ %patch1 -p1 %patch2 %patch3 -p1 +%patch4 # Ruby 2.0 mkmf prefixes every path with $(DESTDIR) %if 0%{?suse_version} > 1230 @@ -479,12 +484,10 @@ %endif make - #make check ) # Utilities: make -C utils -# make -C utils check # deprecated/utils (perl modules still needed by YaST) %if %{with perl} @@ -495,7 +498,6 @@ make -C parser V=1 # techdoc.txt depends on techdoc.pdf and techdoc/index.html, so make techdoc.txt should be enough make -C parser V=1 techdoc.txt -# make -C parser check # Apache mod_apparmor: %if %{with apache} @@ -509,7 +511,6 @@ # Profiles: make -C profiles -# make -C profiles check ##configure --disable-static --with-pic \ #--with-perl \ @@ -517,6 +518,20 @@ make -C changehat/tomcat_apparmor/tomcat_5_5 CATALINA_HOME=%{CATALINA_HOME} %endif +%check +%if %{with python3} +export PYTHON=/usr/bin/python3 +export PYTHON_VERSIONS=python3 +%endif + +make check -C libraries/libapparmor +make check -C parser +# profiles make check fails for the utils (libapparmor PYTHONPATH issues), therefore only do parser-based checks +# also, check-parser breaks if using 'make -C' (but works if cd'ing into the directory) +(cd profiles && make check-parser) +# utils make check fails if profiles don't exist in /etc/apparmor.d/ +# make check -C utils + %install %if %{with python3} @@ -772,7 +787,9 @@ %dir %{python3_sitearch}/LibAppArmor/__pycache__ %{python3_sitearch}/LibAppArmor/_LibAppArmor.cpython-*.so %{python3_sitearch}/LibAppArmor/__pycache__/__init__.cpython-*.pyc +%{python3_sitearch}/LibAppArmor/__pycache__/LibAppArmor.cpython-*.pyc %{python3_sitearch}/LibAppArmor/__init__.py +%{python3_sitearch}/LibAppArmor/LibAppArmor.py %{python3_sitelib}/apparmor/ %{python3_sitelib}/apparmor-%{version}-py*.egg-info %endif ++++++ apparmor-abstractions-no-multiline.diff ++++++ --- /var/tmp/diff_new_pack.RsgGjE/_old 2016-08-31 00:01:24.000000000 +0200 +++ /var/tmp/diff_new_pack.RsgGjE/_new 2016-08-31 00:01:24.000000000 +0200 @@ -37,7 +37,7 @@ =================================================================== --- profiles/apparmor.d/abstractions/dbus-session-strict.orig 2014-10-18 13:11:18.498652324 +0200 +++ profiles/apparmor.d/abstractions/dbus-session-strict 2014-10-18 13:11:31.098494805 +0200 -@@ -13,13 +13,6 @@ +@@ -13,16 +13,9 @@ /etc/machine-id r, /var/lib/dbus/machine-id r, @@ -46,6 +46,9 @@ - peer=(addr="@/tmp/dbus-*"), + unix (connect, receive, send) type=stream peer=(addr="@/tmp/dbus-*"), + # dbus with systemd and --enable-user-session + owner /run/user/[0-9]*/bus rw, + - dbus send - bus=session - path=/org/freedesktop/DBus ++++++ changes-since-2.10.1--r3326..3346.diff ++++++ ++++ 875 lines (skipped) ++++++ libapparmor-fix-import-path.diff ++++++ Index: libraries/libapparmor/swig/python/Makefile.am =================================================================== --- libraries/libapparmor/swig/python/Makefile.am.orig 2014-01-06 23:08:55.000000000 +0100 +++ libraries/libapparmor/swig/python/Makefile.am 2016-08-26 18:03:52.526582753 +0200 @@ -6,9 +6,8 @@ SUBDIRS = test libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i $(SWIG) -python -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i - mv LibAppArmor.py __init__.py -MOSTLYCLEANFILES=libapparmor_wrap.c __init__.py +MOSTLYCLEANFILES=libapparmor_wrap.c LibAppArmor.py all-local: libapparmor_wrap.c setup.py if test ! -f libapparmor_wrap.c; then cp $(srcdir)/libapparmor_wrap.c . ; fi Index: libraries/libapparmor/swig/python/__init__.py =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ libraries/libapparmor/swig/python/__init__.py 2016-08-26 18:03:16.790763701 +0200 @@ -0,0 +1 @@ +from LibAppArmor.LibAppArmor import * Index: libraries/libapparmor/swig/python/Makefile.in =================================================================== --- libraries/libapparmor/swig/python/Makefile.in.orig 2016-04-20 11:09:04.000000000 +0200 +++ libraries/libapparmor/swig/python/Makefile.in 2016-08-26 18:04:51.770288833 +0200 @@ -326,7 +326,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @HAVE_PYTHON_TRUE@EXTRA_DIST = libapparmor_wrap.c @HAVE_PYTHON_TRUE@SUBDIRS = test -@HAVE_PYTHON_TRUE@MOSTLYCLEANFILES = libapparmor_wrap.c __init__.py +@HAVE_PYTHON_TRUE@MOSTLYCLEANFILES = libapparmor_wrap.c LibAppArmor.py all: all-recursive .SUFFIXES: @@ -648,7 +648,6 @@ uninstall-am: @HAVE_PYTHON_TRUE@libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i @HAVE_PYTHON_TRUE@ $(SWIG) -python -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i -@HAVE_PYTHON_TRUE@ mv LibAppArmor.py __init__.py @HAVE_PYTHON_TRUE@all-local: libapparmor_wrap.c setup.py @HAVE_PYTHON_TRUE@ if test ! -f libapparmor_wrap.c; then cp $(srcdir)/libapparmor_wrap.c . ; fi
