summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2023-05-22 10:14:54 +0200
committerNicolas Iooss2023-05-22 10:14:54 +0200
commit856c4f47d28b6afdc939219a5f6b2e31b01e934b (patch)
tree18c52dab206606ca5c62442e1a89ba31cc9b4623
parentb7c423239cd7ba76eac06692c521bcf6bdd982d5 (diff)
downloadaur-856c4f47d28b6afdc939219a5f6b2e31b01e934b.tar.gz
util-linux-selinux 2.38.1-4 update
Backport https://gitlab.archlinux.org/archlinux/packaging/packages/util-linux/-/commit/02b569b97a29af47240ddfc2022b454224fb4266 to fix build with Python 3.11.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD13
2 files changed, 13 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5b8b12c8e60..52773e61f1f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = util-linux-selinux
pkgdesc = SELinux aware miscellaneous system utilities for Linux
pkgver = 2.38.1
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/karelzak/util-linux
arch = x86_64
arch = aarch64
@@ -53,8 +53,8 @@ pkgname = util-linux-selinux
optdepends = words: default dictionary for look
provides = rfkill
provides = hardlink
- provides = util-linux=2.38.1-3
- provides = selinux-util-linux=2.38.1-3
+ provides = util-linux=2.38.1-4
+ provides = selinux-util-linux=2.38.1-4
conflicts = rfkill
conflicts = hardlink
conflicts = util-linux
@@ -76,7 +76,7 @@ pkgname = util-linux-libs-selinux
provides = libmount.so
provides = libsmartcols.so
provides = libuuid.so
- provides = util-linux-libs=2.38.1-3
+ provides = util-linux-libs=2.38.1-4
provides = libutil-linux-selinux
conflicts = util-linux-libs
conflicts = libutil-linux-selinux
diff --git a/PKGBUILD b/PKGBUILD
index 96026941a501..97b1e5cd39c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=(util-linux-selinux util-linux-libs-selinux)
_pkgmajor=2.38
_realver=${_pkgmajor}.1
pkgver=${_realver/-/}
-pkgrel=3
+pkgrel=4
pkgdesc='SELinux aware miscellaneous system utilities for Linux'
url='https://github.com/karelzak/util-linux'
arch=('x86_64' 'aarch64')
@@ -86,6 +86,8 @@ package_util-linux-selinux() {
etc/pam.d/su
etc/pam.d/su-l)
+ _python_stdlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')"
+
make -C "${pkgbase/-selinux}-${_realver}" DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
# remove static libraries
@@ -111,7 +113,8 @@ package_util-linux-selinux() {
mv "$pkgdir"/usr/lib/lib*.so* util-linux-libs/lib/
mv "$pkgdir"/usr/lib/pkgconfig util-linux-libs/lib/pkgconfig
mv "$pkgdir"/usr/include util-linux-libs/include
- mv "$pkgdir"/usr/lib/python3.10/site-packages util-linux-libs/site-packages
+ mv "$pkgdir"/"${_python_stdlib}"/site-packages util-linux-libs/site-packages
+ rmdir "$pkgdir"/"${_python_stdlib}"
mv "$pkgdir"/usr/share/man/man3 util-linux-libs/man3
# install systemd-sysusers
@@ -137,9 +140,11 @@ package_util-linux-libs-selinux() {
conflicts=("${pkgname/-selinux}" 'libutil-linux-selinux')
replaces=('libutil-linux-selinux')
- install -d -m0755 "$pkgdir"/usr/{lib/python3.10/,share/man/}
+ _python_stdlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')"
+
+ install -d -m0755 "$pkgdir"/{"${_python_stdlib}",usr/share/man/}
mv util-linux-libs/lib/* "$pkgdir"/usr/lib/
mv util-linux-libs/include "$pkgdir"/usr/include
- mv util-linux-libs/site-packages "$pkgdir"/usr/lib/python3.10/site-packages
+ mv util-linux-libs/site-packages "$pkgdir"/"${_python_stdlib}"/site-packages
mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3
}