[arch-commits] Commit in apparmor/trunk (PKGBUILD)

[David Runge]

    Date: Sunday, February 13, 2022 @ 15:40:56
  Author: dvzrv
Revision: 437084

upgpkg: apparmor 3.0.4-1: Upgrade to 3.0.4.

Disable LTO as it is broken:
https://gitlab.com/apparmor/apparmor/-/issues/214
Do not create a debug package, as it contains invalid directories.
Remove patches that are now included.
Minor fixes.

Modified:
  apparmor/trunk/PKGBUILD

----------+
 PKGBUILD |   40 ++++++++++++++--------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-13 11:51:15 UTC (rev 437083)
+++ PKGBUILD	2022-02-13 15:40:56 UTC (rev 437084)
@@ -1,8 +1,8 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
 
 pkgname=apparmor
-pkgver=3.0.3
-pkgrel=3
+pkgver=3.0.4
+pkgrel=1
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=(x86_64)
 url="https://gitlab.com/apparmor/apparmor"
@@ -20,21 +20,16 @@
         'etc/apparmor/notify.conf'
         'etc/apparmor/parser.conf'
         'etc/apparmor/severity.db')
-# broken with LTO: https://gitlab.com/apparmor/apparmor/-/issues/214
-options=(debug !lto)
+# NOTE: debug package currently contains invalid /build dir
+# LTO is currently still broken: https://gitlab.com/apparmor/apparmor/-/issues/214
+options=(!lto)
 source=(
   "https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}
-  "$pkgname-3.0.3-remove_distutils.patch::https://gitlab.com/apparmor/apparmor/-/commit/ab4cfb5e84a95decd06487dc4e59827ddb8ce79d.patch"
-  "$pkgname-3.0.3-python3.10.patch::https://gitlab.com/apparmor/apparmor/-/commit/6cfc6eeec22d3c9ffae413819654359b76680150.patch"
 )
-sha512sums=('bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5'
-            'SKIP'
-            'de4cae1b06fb4f56a8aade9ccb3f223a9930f7c37a865e04aef3446038c016a3880e91546d734ac7102d0df20e3edc5ec9a7909a850a936c94399c431fe5d853'
-            'ecfb29c60b0f1824817035c524f0265e1f5c977f2774f342c84fc783242acdca2835ff0ac099f852c07de5e6a42a323fd51b8c96c5d7695f46fd6cf135155fda')
-b2sums=('aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c'
-        'SKIP'
-        '52c1d4a76f97e72765476e76277482771df18827d143d0ac04e1658e414224272a65a5dc11ac5308c30862b474c912f4642417176a44815723b49bb69ae9c356'
-        'cf545f9548c724f3b1c9c214755dda277bdd6b5b79065c32675c788ab6fc145dd798d0366a360e0f6a3a35f572c71906b0760c0a268c0ffde265e28414dc3326')
+sha512sums=('1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca'
+            'SKIP')
+b2sums=('831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0'
+        'SKIP')
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB') # AppArmor Development Team (AppArmor signing key) <apparmor at lists.ubuntu.com>
 _core_perl="/usr/bin/core_perl"
 
@@ -41,13 +36,8 @@
 prepare() {
   cd "${pkgname}-${pkgver}"
 
-  # replace use of distutils with setuptools
-  # https://gitlab.com/apparmor/apparmor/-/issues/202
-  patch -Np1 -i ../$pkgname-3.0.3-remove_distutils.patch
-  # ensure python3.10 compatibility:
-  #  https://gitlab.com/apparmor/apparmor/-/issues/187
-  patch -Np1 -i ../$pkgname-3.0.3-python3.10.patch
-  # remove test for help text that is broken by the above patches
+  # remove test for help output that hardcodes expected output:
+  # https://gitlab.com/apparmor/apparmor/-/issues/220
   sed '147,179d' -i utils/test/test-aa-notify.py
 
   # fix PYTHONPATH and add LD_LIBRARY_PATH for aa-logprof based check:
@@ -60,7 +50,7 @@
       -i profiles/Makefile
   (
     cd libraries/libapparmor/
-    autoreconf -vfi
+    autoreconf -fiv
   )
 }
 
@@ -143,11 +133,9 @@
 
   # set file mode to allow the perl library to be stripped:
   # https://gitlab.com/apparmor/apparmor/issues/34
-  find "${pkgdir}/usr/lib/perl5/" \
-    -type f -iname "*.so" \
-    -exec chmod 755 {} \;
+  find "${pkgdir}/usr/lib/perl5/" -type f -iname "*.so" -exec chmod 755 {} \;
 
-  # removing empty core_perl directory:
+  # remove empty core_perl directory:
   # https://gitlab.com/apparmor/apparmor/issues/40
   rm -rv "${pkgdir}"/usr/lib/perl5/*/core_perl
   # move ruby bindings to vendor_ruby: