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

[David Runge]

    Date: Thursday, April 23, 2020 @ 17:30:10
  Author: dvzrv
Revision: 381213

upgpkg: apparmor 2.13.4-3: Adding upstream fix for make >= 4.3 (instead of local). Adding upstream fixes for systemd userdb (FS#65777).

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

--------------------------------+
 PKGBUILD                       |   18 +++++++++++++-----
 apparmor-2.13.4-fix_make.patch |   22 ----------------------
 2 files changed, 13 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-23 17:09:33 UTC (rev 381212)
+++ PKGBUILD	2020-04-23 17:30:10 UTC (rev 381213)
@@ -2,7 +2,7 @@
 
 pkgname=apparmor
 pkgver=2.13.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor"
@@ -20,10 +20,14 @@
         'etc/apparmor/subdomain.conf'
         'etc/apparmor/severity.db')
 source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}
-        "${pkgname}-2.13.4-fix_make.patch")
+        "${pkgname}-2.13.4-make4.3.patch::https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch"
+        "${pkgname}-2.13.4-run_variable.patch::https://gitlab.com/apparmor/apparmor/-/commit/454fca7483eae7b7ee613343c2c02abaa20e37e3.patch"
+        "${pkgname}-2.13.4-fix_systemd_userdb.patch::https://gitlab.com/apparmor/apparmor/-/commit/d4296d217c888e08e10bec300fe35351c2ef2f81.patch")
 sha512sums=('d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651'
             'SKIP'
-            '2591da638aabe37d5e32f0002e9b8a4304affe20174c23baab32802025b832a25fd688d58b58d26877dee40f1953c897cda6d4023e5013b4ca3b100ddd3aedd0')
+            '8d0eb65624a7dcc7f019974a7ad10ec0b3e2d61e51a3f9771564b4e0ddaaece17e90f78388933e8f9451ad413a51dd16d479b99733ceef73b86eb8308122a335'
+            '0abe606ad510cc97947152b28750354bd43046b38abcd6b28bbc04916fad39308f78b3626ca8b4a3ec59612fea908bdef2e309376f617595b5fc1aaec2bc6343'
+            '0fde84730115b2854b85d1b72fbbd5c54730e887af333bfff917da529a08a429d3494efdae9d1baa1d05891d925b04d69f079d11d4afb0907cbfefbd0f280583')
 # AppArmor Development Team (AppArmor signing key) <apparmor at lists.ubuntu.com>
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -32,8 +36,12 @@
   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"
-
+  patch -Np1 -i "../${pkgname}-2.13.4-make4.3.patch"
+  # fix problems with /run/systemd/userdb access
+  # https://bugs.archlinux.org/task/65777
+  # https://gitlab.com/apparmor/apparmor/-/issues/82
+  patch -Np1 -i "../${pkgname}-2.13.4-run_variable.patch"
+  patch -Np1 -i "../${pkgname}-2.13.4-fix_systemd_userdb.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)

Deleted: apparmor-2.13.4-fix_make.patch
===================================================================
--- apparmor-2.13.4-fix_make.patch	2020-04-23 17:09:33 UTC (rev 381212)
+++ apparmor-2.13.4-fix_make.patch	2020-04-23 17:30:10 UTC (rev 381213)
@@ -1,22 +0,0 @@
-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: