[arch-commits] Commit in apparmor/trunk (PKGBUILD apparmor-2.13.4-fix_make.patch)

[David Runge]

    Date: Monday, March 16, 2020 @ 09:37:10
  Author: dvzrv
Revision: 377772

upgpkg: apparmor 2.13.4-2: Adding fix for FS#65847, which also allows most of the tests to pass again.

Added:
  apparmor/trunk/apparmor-2.13.4-fix_make.patch
Modified:
  apparmor/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   34 +++++++++++++++-------------------
 apparmor-2.13.4-fix_make.patch |   22 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-16 09:23:20 UTC (rev 377771)
+++ PKGBUILD	2020-03-16 09:37:10 UTC (rev 377772)
@@ -2,7 +2,7 @@
 
 pkgname=apparmor
 pkgver=2.13.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor"
@@ -19,9 +19,11 @@
         'etc/apparmor/parser.conf'
         'etc/apparmor/subdomain.conf'
         'etc/apparmor/severity.db')
-source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc})
+source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        "${pkgname}-2.13.4-fix_make.patch")
 sha512sums=('d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651'
-            'SKIP')
+            'SKIP'
+            '2591da638aabe37d5e32f0002e9b8a4304affe20174c23baab32802025b832a25fd688d58b58d26877dee40f1953c897cda6d4023e5013b4ca3b100ddd3aedd0')
 # AppArmor Development Team (AppArmor signing key) <apparmor at lists.ubuntu.com>
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -28,6 +30,10 @@
 
 prepare() {
   cd "${pkgname}-${pkgver}"
+  # fix problems in Makefile (header inclusion):
+  # https://gitlab.com/apparmor/apparmor/-/issues/74
+  patch -Np1 -i "../${pkgname}-2.13.4-fix_make.patch"
+
   # fix PYTHONPATH and add LD_LIBRARY_PATH for aa-logprof based check:
   # https://gitlab.com/apparmor/apparmor/issues/39
   local _py3_ver=$(python --version | cut -d " " -f2)
@@ -72,28 +78,18 @@
   make -C libraries/libapparmor check
   echo "INFO: Running check binutils"
   make -C binutils check
+  echo "INFO: Running check parser"
+  make -C parser check
 
-  # disabling parser check as it's broken:
-  # https://gitlab.com/apparmor/apparmor/-/issues/84
-  #  echo "INFO: Running check parser"
-  #  make -C parser check
-
   # check-logprof (included in check) fails:
   # https://gitlab.com/apparmor/apparmor/issues/36
   # echo "INFO: Running check-logprof profiles"
   # make -C profiles check-logprof
 
-  # disabling profiles check-parser as it's broken:
-  # https://gitlab.com/apparmor/apparmor/-/issues/85
-  # echo "INFO: Running check-parser profiles"
-  # make -C profiles check-parser
-
-  # shutil.copytree has a regression
-  # https://gitlab.com/apparmor/apparmor/issues/62
-  # more breakage with apparmor > 2.13.4
-  # https://gitlab.com/apparmor/apparmor/-/issues/86
-  # echo "INFO: Running check utils"
-  # make -C utils check
+  echo "INFO: Running check-parser profiles"
+  make -C profiles check-parser
+  echo "INFO: Running check utils"
+  make -C utils check
 }
 
 package() {

Added: apparmor-2.13.4-fix_make.patch
===================================================================
--- apparmor-2.13.4-fix_make.patch	                        (rev 0)
+++ apparmor-2.13.4-fix_make.patch	2020-03-16 09:37:10 UTC (rev 377772)
@@ -0,0 +1,22 @@
+diff --git a/common/Make.rules b/common/Make.rules
+index d2149fc..efb1f38 100644
+--- a/common/Make.rules
++++ b/common/Make.rules
+@@ -81,7 +81,7 @@ pod_clean:
+ # =====================
+ 
+ # emits defined capabilities in a simple list, e.g. "CAP_NAME CAP_NAME2"
+-CAPABILITIES=$(shell echo "\#include <linux/capability.h>" | cpp -dM | LC_ALL=C sed -n -e '/CAP_EMPTY_SET/d' -e 's/^\#define[ \t]\+CAP_\([A-Z0-9_]\+\)[ \t]\+\([0-9xa-f]\+\)\(.*\)$$/CAP_\1/p' | LC_ALL=C sort)
++CAPABILITIES=$(shell echo "#include <linux/capability.h>" | cpp -dM | LC_ALL=C sed -n -e '/CAP_EMPTY_SET/d' -e 's/^#define[ \t]\+CAP_\([A-Z0-9_]\+\)[ \t]\+\([0-9xa-f]\+\)\(.*\)$$/CAP_\1/p' | LC_ALL=C sort)
+ 
+ .PHONY: list_capabilities
+ list_capabilities: /usr/include/linux/capability.h
+@@ -102,7 +102,7 @@ FILTER_FAMILIES=PF_UNIX
+ __FILTER=$(shell echo $(strip $(FILTER_FAMILIES)) | sed -e 's/ /\\\|/g')
+ 
+ # emits the AF names in a "AF_NAME NUMBER," pattern
+-AF_NAMES=$(shell echo "\#include <sys/socket.h>" | cpp -dM | LC_ALL=C sed -n -e '/$(__FILTER)/d' -e 's/PF_LOCAL/PF_UNIX/' -e 's/^\#define[ \t]\+PF_\([A-Z0-9_]\+\)[ \t]\+\([0-9]\+\).*$$/AF_\1 \2,/p' | sort -n -k2)
++AF_NAMES=$(shell echo "#include <sys/socket.h>" | cpp -dM | LC_ALL=C sed -n -e '/$(__FILTER)/d' -e 's/PF_LOCAL/PF_UNIX/' -e 's/^#define[ \t]\+PF_\([A-Z0-9_]\+\)[ \t]\+\([0-9]\+\).*$$/AF_\1 \2,/p' | sort -n -k2)
+ 
+ .PHONY: list_af_names
+ list_af_names: