Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2019-11-13 13:12:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Wed Nov 13 13:12:49 2019 rev:132 rq:746670 version:2.13.3 Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2019-10-10 12:21:37.562979858 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor.new.2990/apparmor.changes 2019-11-13 13:12:50.654730546 +0100 @@ -1,0 +2,6 @@ +Sat Nov 2 23:01:05 UTC 2019 - Christian Boltz <[email protected]> + +- add libapparmor-python3.8.diff to fix building the libapparmor python + bindings (deb#943657) + +------------------------------------------------------------------- New: ---- libapparmor-python3.8.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.Gqh2wx/_old 2019-11-13 13:12:51.838731778 +0100 +++ /var/tmp/diff_new_pack.Gqh2wx/_new 2019-11-13 13:12:51.842731783 +0100 @@ -74,6 +74,9 @@ # allow reading /usr/etc/pam.d/* and some other authentification-related files (submitted upstream 2019-10-07 https://gitlab.com/apparmor/apparmor/merge_requests/426) Patch8: usr-etc-abstractions-authentification.diff +# fix building libapparmor python bindings with python 3.8. Based on https://gitlab.com/apparmor/apparmor/merge_requests/430 but patching configure directly to avoid needing BuildRequires: aclocal +Patch9: libapparmor-python3.8.diff + PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apparmor_bin_prefix /lib/apparmor @@ -365,6 +368,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build %define _lto_cflags %{nil} ++++++ libapparmor-python3.8.diff ++++++ >From ccbf1e0bf1bf5c3bbab47029fbbc5415ef73bac1 Mon Sep 17 00:00:00 2001 From: intrigeri <[email protected]> Date: Tue, 29 Oct 2019 17:53:11 +0000 Subject: [PATCH] Fix a Python 3.8 autoconf check Bug-Debian: https://bugs.debian.org/943657 Author: Matthias Klose <[email protected]> --- libraries/libapparmor/m4/ac_python_devel.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) #Index: libraries/libapparmor/m4/ac_python_devel.m4 #=================================================================== #--- a/libraries/libapparmor/m4/ac_python_devel.m4.orig 2019-06-18 01:55:38.000000000 +0200 #+++ b/libraries/libapparmor/m4/ac_python_devel.m4 2019-11-02 23:18:39.461818181 +0100 #@@ -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> Index: libraries/libapparmor/configure =================================================================== --- a/libraries/libapparmor/configure.orig 2019-06-18 01:57:46.000000000 +0200 +++ b/libraries/libapparmor/configure 2019-11-02 23:19:48.225634333 +0100 @@ -4756,7 +4756,7 @@ $as_echo_n "checking python extra librar 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 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5 $as_echo "$PYTHON_EXTRA_LIBS" >&6; } @@ -4790,7 +4790,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # 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" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */
