* Don't ignore exit status in debian/rules.
* Fix a Python 3.8 autoconf check.
diff -Nru apparmor-2.13.3/debian/patches/python3.8-ac.diff apparmor-2.13.3/debian/patches/python3.8-ac.diff
--- apparmor-2.13.3/debian/patches/python3.8-ac.diff 1970-01-01 01:00:00.000000000 +0100
+++ apparmor-2.13.3/debian/patches/python3.8-ac.diff 2019-10-27 15:38:00.000000000 +0100
@@ -0,0 +1,20 @@
+--- a/libraries/libapparmor/m4/ac_python_devel.m4
++++ b/libraries/libapparmor/m4/ac_python_devel.m4
+@@ -139,7 +139,7 @@ sys.stdout.write('%s\n' % distutils.sysc
+ if test -z "$PYTHON_EXTRA_LIBS"; then
+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \
+ conf = distutils.sysconfig.get_config_var; \
+-sys.stdout.write('%s %s\n' % (conf('LOCALMODLIBS'), conf('LIBS')))"`
++sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"`
+ fi
+ AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
+ AC_SUBST(PYTHON_EXTRA_LIBS)
+@@ -164,7 +164,7 @@ sys.stdout.write('%s\n' % conf('LINKFORS
+ # save current global flags
+ ac_save_LIBS="$LIBS"
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
++ LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS"
+ CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+ AC_TRY_LINK([
+ #include <Python.h>
diff -Nru apparmor-2.13.3/debian/patches/series apparmor-2.13.3/debian/patches/series
--- apparmor-2.13.3/debian/patches/series 2019-09-09 21:13:22.000000000 +0200
+++ apparmor-2.13.3/debian/patches/series 2019-10-27 15:30:47.000000000 +0100
@@ -26,3 +26,4 @@
ubuntu/parser-conf-no-expr-simplify.patch
upstream-dont-allow-fontconfig-cache-write.patch
upstream-tests-mult-mount-bump-size-of-created-disk.patch
+python3.8-ac.diff
diff -Nru apparmor-2.13.3/debian/rules apparmor-2.13.3/debian/rules
--- apparmor-2.13.3/debian/rules 2019-09-08 10:00:56.000000000 +0200
+++ apparmor-2.13.3/debian/rules 2019-10-27 15:17:48.000000000 +0100
@@ -28,7 +28,7 @@
# Build perl
dh_auto_build -D libraries/libapparmor
# Build pythons
- set -e && for py in $(shell py3versions -s) ; do \
+ set -e; for py in $(shell py3versions -s) ; do \
cp -a $(CURDIR)/libraries/libapparmor $(CURDIR)/libraries/libapparmor.$$py && \
PYTHON=/usr/bin/$$py dh_auto_configure \
-D libraries/libapparmor.$$py -- --with-python && \
@@ -61,7 +61,7 @@
dh_auto_test -Dparser -- V=1
endif
dh_auto_test -Dlibraries/libapparmor -- V=1
- set -e && for py in $(shell py3versions -s) ; do \
+ set -e; for py in $(shell py3versions -s) ; do \
PYTHON=/usr/bin/$$py dh_auto_test \
-D libraries/libapparmor.$$py -- PYTHON=/usr/bin/$$py; \
done
@@ -77,7 +77,7 @@
cd $(CURDIR)/libraries/libapparmor && \
[ ! -f Makefile ] || $(MAKE) distclean
# Clean up rest of build.
- set -e && for i in binutils utils parser profiles changehat/mod_apparmor \
+ set -e; for i in binutils utils parser profiles changehat/mod_apparmor \
changehat/pam_apparmor ; do \
[ ! -f $$i/Makefile ] || $(MAKE) -C $$i clean; \
rm -f $$i/common; \
@@ -98,7 +98,7 @@
DESTDIR=$(CURDIR)/debian/tmp \
install
- set -e && for py in $(shell py3versions -s) ; do \
+ set -e; for py in $(shell py3versions -s) ; do \
(cd utils.$$py && PYTHON=/usr/bin/$$py $(MAKE) \
DESTDIR=$(CURDIR)/debian/tmp \
install) ; \
@@ -140,7 +140,7 @@
-c "chmod +w SO && chrpath --delete SO && chmod -w SO"
# Install python swig modules
- set -e && for py in $(shell py3versions -s); do \
+ set -e; for py in $(shell py3versions -s); do \
PYTHON=/usr/bin/$$py \
$(MAKE) -C libraries/libapparmor.$$py \
DESTDIR=$(CURDIR)/debian/tmp install; \
@@ -189,7 +189,7 @@
dh_apache2 --noenable
override_dh_install-indep:
- set -e && for profile in $(shell grep ^etc/apparmor.d/ $(CURDIR)/debian/apparmor-profiles.install | \
+ set -e; for profile in $(shell grep ^etc/apparmor.d/ $(CURDIR)/debian/apparmor-profiles.install | \
cut -d/ -f3- | grep -v /); do \
DH_AUTOSCRIPTDIR=debian/debhelper/ perl debian/debhelper/dh_apparmor --profile-name=$$profile -papparmor-profiles; \
done
@@ -199,7 +199,7 @@
dh_install
override_dh_install-arch:
- set -e && for profile in lsb_release nvidia_modprobe; do \
+ set -e; for profile in lsb_release nvidia_modprobe; do \
DH_AUTOSCRIPTDIR=debian/debhelper/ perl debian/debhelper/dh_apparmor --profile-name=$$profile -papparmor; \
done
dh_install
