util-linux-selinux 2.38.1-3 update

2 files changed, 33 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61a8cbabf59d..e5b8b12c8e60 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 = 1
+	pkgrel = 3
 	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-1
-	provides = selinux-util-linux=2.38.1-1
+	provides = util-linux=2.38.1-3
+	provides = selinux-util-linux=2.38.1-3
 	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-1
+	provides = util-linux-libs=2.38.1-3
 	provides = libutil-linux-selinux
 	conflicts = util-linux-libs
 	conflicts = libutil-linux-selinux
diff --git a/PKGBUILD b/PKGBUILD
index 441764713694..96026941a501 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=1
+pkgrel=3
 pkgdesc='SELinux aware miscellaneous system utilities for Linux'
 url='https://github.com/karelzak/util-linux'
 arch=('x86_64' 'aarch64')
@@ -86,43 +86,50 @@ package_util-linux-selinux() {
           etc/pam.d/su
           etc/pam.d/su-l)
 
-  cd "${pkgbase/-selinux}-${_realver}"
+  make -C "${pkgbase/-selinux}-${_realver}" DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
 
-  make DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
+  # remove static libraries
+  rm "${pkgdir}"/usr/lib/lib*.a*
 
   # setuid chfn and chsh
   chmod 4755 "${pkgdir}"/usr/bin/{newgrp,ch{sh,fn}}
 
   # install PAM files for login-utils
-  install -Dm0644 "${srcdir}/pam-common" "${pkgdir}/etc/pam.d/chfn"
-  install -m0644 "${srcdir}/pam-common" "${pkgdir}/etc/pam.d/chsh"
-  install -m0644 "${srcdir}/pam-login" "${pkgdir}/etc/pam.d/login"
-  install -m0644 "${srcdir}/pam-runuser" "${pkgdir}/etc/pam.d/runuser"
-  install -m0644 "${srcdir}/pam-runuser" "${pkgdir}/etc/pam.d/runuser-l"
-  install -m0644 "${srcdir}/pam-su" "${pkgdir}/etc/pam.d/su"
-  install -m0644 "${srcdir}/pam-su" "${pkgdir}/etc/pam.d/su-l"
+  install -Dm0644 pam-common "${pkgdir}/etc/pam.d/chfn"
+  install -m0644 pam-common "${pkgdir}/etc/pam.d/chsh"
+  install -m0644 pam-login "${pkgdir}/etc/pam.d/login"
+  install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser"
+  install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser-l"
+  install -m0644 pam-su "${pkgdir}/etc/pam.d/su"
+  install -m0644 pam-su "${pkgdir}/etc/pam.d/su-l"
 
   # TODO(dreisner): offer this upstream?
   sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "${pkgdir}/usr/lib/systemd/system/uuidd.socket"
 
-  ### runtime libs are shipped as part of util-linux-libs
-  rm "${pkgdir}"/usr/lib/lib*.{a,so}*
+  # runtime libs are shipped as part of util-linux-libs
+  install -d -m0755 util-linux-libs/lib/
+  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"/usr/share/man/man3 util-linux-libs/man3
 
-  ### install systemd-sysusers
-  install -Dm0644 "${srcdir}/util-linux.sysusers" \
+  # install systemd-sysusers
+  install -Dm0644 util-linux.sysusers \
     "${pkgdir}/usr/lib/sysusers.d/util-linux.conf"
 
-  install -Dm0644 "${srcdir}/60-rfkill.rules" \
+  install -Dm0644 60-rfkill.rules \
     "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
 
-  install -Dm0644 "${srcdir}/rfkill-unblock_.service" \
+  install -Dm0644 rfkill-unblock_.service \
     "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
-  install -Dm0644 "${srcdir}/rfkill-block_.service" \
+  install -Dm0644 rfkill-block_.service \
     "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
 }
 
 package_util-linux-libs-selinux() {
   pkgdesc="util-linux-selinux runtime libraries"
+  depends=('glibc')
   provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so'
             "${pkgname/-selinux}=${pkgver}-${pkgrel}"
             'libutil-linux-selinux')
@@ -130,5 +137,9 @@ package_util-linux-libs-selinux() {
   conflicts=("${pkgname/-selinux}" 'libutil-linux-selinux')
   replaces=('libutil-linux-selinux')
 
-  make -C "${pkgbase/-selinux}-${_realver}" DESTDIR="${pkgdir}" install-usrlib_execLTLIBRARIES
+  install -d -m0755 "$pkgdir"/usr/{lib/python3.10/,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/man3 "$pkgdir"/usr/share/man/man3
 }