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

[Christian Hesse]

    Date: Monday, May 10, 2021 @ 13:16:02
  Author: eworm
Revision: 414917

upgpkg: util-linux 2.37rc2-1: new upstream pre-release, testing only!

Upstream replaced its implementation of hardlink (up to version 2.36.x,
which we do not ship) with Debian's. Now we *do* package the hardlink
executable and set provides, conflicts and replaces on the hardlink
package. This will land in official repositories with version 2.37.

Modified:
  util-linux/trunk/PKGBUILD

----------+
 PKGBUILD |   70 +++++++++++++++++++++++++++----------------------------------
 1 file changed, 32 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-10 13:13:40 UTC (rev 414916)
+++ PKGBUILD	2021-05-10 13:16:02 UTC (rev 414917)
@@ -4,23 +4,24 @@
 
 pkgbase=util-linux
 pkgname=(util-linux util-linux-libs)
-_pkgmajor=2.36
-pkgver=${_pkgmajor}.2
+_pkgmajor=2.37
+_realver=${_pkgmajor}-rc2
+pkgver=${_realver/-/}
 pkgrel=1
 pkgdesc='Miscellaneous system utilities for Linux'
 url='https://github.com/karelzak/util-linux'
 arch=('x86_64')
-makedepends=('systemd' 'python' 'libcap-ng' 'libxcrypt')
+makedepends=('asciidoctor' 'libcap-ng' 'libxcrypt' 'python' 'systemd')
 license=('GPL2')
 options=('strip')
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
-source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$pkgver.tar."{xz,sign}
+source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${pkgbase}-${_realver}.tar."{xz,sign}
         pam-{login,common,runuser,su}
         'util-linux.sysusers'
         '60-rfkill.rules'
         'rfkill-unblock_.service'
         'rfkill-block_.service')
-sha256sums=('f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f'
+sha256sums=('253cb944931f57eefea29b8147b7a002b05595da43850e5aceb8045214e667f8'
             'SKIP'
             '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
             'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
@@ -32,14 +33,8 @@
             'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
 
 build() {
-  cd "$pkgbase-$pkgver"
+  cd "${pkgbase}-${_realver}"
 
-  # We ship Debian's hardlink in package 'hardlink', Fedora's hardlink was
-  # merged in util-linux. For now we disable the latter, but let's dicuss
-  # the details:
-  # https://bugs.archlinux.org/task/62896
-  # https://github.com/karelzak/util-linux/issues/808
-
   ./configure \
     --prefix=/usr \
     --libdir=/usr/lib \
@@ -54,7 +49,6 @@
     --enable-chfn-chsh \
     --enable-write \
     --enable-mesg \
-    --disable-hardlink \
     --with-python=3
 
   make
@@ -61,9 +55,9 @@
 }
 
 package_util-linux() {
-  conflicts=('rfkill')
-  provides=('rfkill')
-  replaces=('rfkill')
+  conflicts=('rfkill' 'hardlink')
+  provides=('rfkill' 'hardlink')
+  replaces=('rfkill' 'hardlink')
   depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so'
            'libudev.so' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
            'libmagic.so' 'libncursesw.so' 'libreadline.so')
@@ -77,45 +71,45 @@
           etc/pam.d/su
           etc/pam.d/su-l)
 
-  cd "$pkgbase-$pkgver"
+  cd "${pkgbase}-${_realver}"
 
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 
   # setuid chfn and chsh
-  chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
+  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 "${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"
 
   # TODO(dreisner): offer this upstream?
-  sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket"
+  sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "${pkgdir}/usr/lib/systemd/system/uuidd.socket"
 
   # adjust for usrmove
   # TODO(dreisner): fix configure.ac upstream so that this isn't needed
-  cd "$pkgdir"
+  cd "${pkgdir}"
   mv usr/sbin/* usr/bin
   rmdir usr/sbin
 
   ### runtime libs are shipped as part of util-linux-libs
-  rm "$pkgdir"/usr/lib/lib*.{a,so}*
+  rm "${pkgdir}"/usr/lib/lib*.{a,so}*
 
   ### install systemd-sysusers
-  install -Dm0644 "$srcdir/util-linux.sysusers" \
-    "$pkgdir/usr/lib/sysusers.d/util-linux.conf"
+  install -Dm0644 "${srcdir}/util-linux.sysusers" \
+    "${pkgdir}/usr/lib/sysusers.d/util-linux.conf"
 
-  install -Dm0644 "$srcdir/60-rfkill.rules" \
-    "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules"
+  install -Dm0644 "${srcdir}/60-rfkill.rules" \
+    "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
 
-  install -Dm0644 "$srcdir/rfkill-unblock_.service" \
-    "$pkgdir/usr/lib/systemd/system/rfkill-unblock at .service"
-  install -Dm0644 "$srcdir/rfkill-block_.service" \
-    "$pkgdir/usr/lib/systemd/system/rfkill-block at .service"
+  install -Dm0644 "${srcdir}/rfkill-unblock_.service" \
+    "${pkgdir}/usr/lib/systemd/system/rfkill-unblock at .service"
+  install -Dm0644 "${srcdir}/rfkill-block_.service" \
+    "${pkgdir}/usr/lib/systemd/system/rfkill-block at .service"
 }
 
 package_util-linux-libs() {
@@ -124,5 +118,5 @@
   conflicts=('libutil-linux')
   replaces=('libutil-linux')
 
-  make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
+  make -C "${pkgbase}-${_realver}" DESTDIR="${pkgdir}" install-usrlib_execLTLIBRARIES
 }