[arch-commits] Commit in apparmor/trunk (PKGBUILD apparmor-3.0.6-python.patch)

[David Runge]

    Date: Wednesday, August 10, 2022 @ 07:44:58
  Author: dvzrv
Revision: 452507

upgpkg: apparmor 3.0.7-1: Upgrade to 3.0.7.

Remove (upstreamed) patch for python-setuptools version detection.

Modified:
  apparmor/trunk/PKGBUILD
Deleted:
  apparmor/trunk/apparmor-3.0.6-python.patch

-----------------------------+
 PKGBUILD                    |   21 ++++++---------------
 apparmor-3.0.6-python.patch |   26 --------------------------
 2 files changed, 6 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-10 07:39:19 UTC (rev 452506)
+++ PKGBUILD	2022-08-10 07:44:58 UTC (rev 452507)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
 
 pkgname=apparmor
-pkgver=3.0.6
+pkgver=3.0.7
 pkgrel=1
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=(x86_64)
@@ -25,24 +25,15 @@
   etc/apparmor/severity.db
 )
 options=(debug)
-source=(
-  https://launchpad.net/$pkgname/${pkgver%.[0-9]}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc}
-  $pkgname-3.0.6-python.patch
-)
-sha512sums=('e200b4d7f2214ac8d3c7fff57ccbaf2c4f5e3831c75287add974c7c3cd5cb70d632cda16043396b11b77ab661b097a3904c7851da79920b0caee13abc885dbef'
-            'SKIP'
-            'afea70b4406e948bce5cdd8b8d62d0dc9d30bca3861545a5a463ba2909c08f1110cb0c638d9f871c8e4451a22015ce037ca829c789a916175d32c7d9cfbf2232')
-b2sums=('6809f77d75283033971009d460476d0357344241f209d3d1eb9322d819182dc4196e12a070735196ef0e56a84dc3cf8c1786f9cf4615ed1b69b2d72a041ffbc4'
-        'SKIP'
-        '689038f910155d23a196a612e992d5e841de352305fab1e2b22d3efebaa31978d2bfdd999bfbd58db46e6dd68dcfd4e86a256fa87fe55ebd0f53067e004811f4')
+source=(https://launchpad.net/$pkgname/${pkgver%.[0-9]}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc})
+sha512sums=('6a3ba96dddcab623b91488eac21eba9441be437c3cd4e2c265fa6fa6711eb121340aec17710756809ded9b734e89d0ee2919ef1bff27343fb31c5cfaa33a77ed'
+            'SKIP')
+b2sums=('340e8fc40f33b45f4e5d253bbaa3d48573da86a2d75220440d3ba5f80e8eacf47bfffdd3a305d3a99cd78a9fb2f6ee9cd2181e66c8e43549491c9fe07e609b42'
+        'SKIP')
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB') # AppArmor Development Team (AppArmor signing key) <apparmor at lists.ubuntu.com>
 _core_perl="/usr/bin/core_perl"
 
 prepare() {
-  # fix issues with python-setuptools version detection: https://gitlab.com/apparmor/apparmor/-/issues/259
-  # and hardcoded LDPATH/ PYTHONPATH https://gitlab.com/apparmor/apparmor/-/issues/39
-  patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-3.0.6-python.patch
-
   cd $pkgname-$pkgver/libraries/libapparmor/
   autoreconf -fiv
 }

Deleted: apparmor-3.0.6-python.patch
===================================================================
--- apparmor-3.0.6-python.patch	2022-08-10 07:39:19 UTC (rev 452506)
+++ apparmor-3.0.6-python.patch	2022-08-10 07:44:58 UTC (rev 452507)
@@ -1,26 +0,0 @@
-diff --git c/libraries/libapparmor/swig/python/test/buildpath.py w/libraries/libapparmor/swig/python/test/buildpath.py
-index 6b805c1b..13596975 100644
---- c/libraries/libapparmor/swig/python/test/buildpath.py
-+++ w/libraries/libapparmor/swig/python/test/buildpath.py
-@@ -3,7 +3,7 @@
- import sys
- import sysconfig
- import setuptools
--if tuple(map(int,setuptools.__version__.split("."))) >= (61, 2):
-+if tuple(map(int,setuptools.__version__.split("."))) >= (62, 0):
-     identifier = sys.implementation.cache_tag
- else:
-     identifier = "%d.%d" % sys.version_info[:2]
-diff --git c/profiles/Makefile w/profiles/Makefile
-index 0b7f2655..19d39a79 100644
---- c/profiles/Makefile
-+++ w/profiles/Makefile
-@@ -41,7 +41,7 @@ ifdef USE_SYSTEM
-     LOGPROF?=aa-logprof
- else
-     # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am
--    PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")
-+    PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) ../libraries/libapparmor/swig/python/test/buildpath.py)
-     LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/
-     LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH)
-     PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH)