libre/notsystemd: Don't include resolvconf, depend on notsystemd-common pkgrel, fix build

1. (not)systemd-resolvconf is only symlinks, use plain
   systemd-resolvconf instead.
2. Now that we patch makepkg to treat pkgrel like pkgver in depends, we can
   (re-?)add this specificity.
3. Backport a patch to fix the build on glibc 2.28

1 files changed, 5 insertions, 22 deletions

diff --git a/libre/notsystemd/PKGBUILD b/libre/notsystemd/PKGBUILD
index 09678d1bc..ec220a8d7 100644
--- a/libre/notsystemd/PKGBUILD
+++ b/libre/notsystemd/PKGBUILD
@@ -14,9 +14,9 @@ _pkgver=239.0
 
 pkgbase=notsystemd
 # Include only split packages that link against libsystemd-shared-XXX.so
-pkgname=('notsystemd' 'notsystemd-udev' 'notsystemd-resolvconf' 'notsystemd-common')
+pkgname=('notsystemd' 'notsystemd-udev' 'notsystemd-common')
 pkgver=239.1
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 arch+=('i686' 'armv7h')
 url="https://repo.parabola.nu/other/${pkgname}"
@@ -93,6 +93,7 @@ sha512sums=('SKIP'
             '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')
 
 _backports=(
+  '75720bff62a84896e9a0654afc7cf9408cf89a38' # (for glibc 2.28) build-sys: Detect whether struct statx is defined in sys/stat.h
 )
 
 _reverts=(
@@ -220,7 +221,7 @@ package_notsystemd() {
   depends=('bash' 'dbus' 'kbd' 'kmod'
            'libsystemd' 'pam' 'libelf'
            'util-linux' 'pcre2')
-  depends+=("notsystemd-common=$pkgver" 'udev')
+  depends+=("notsystemd-common=$pkgver-$pkgrel" 'udev')
   provides=("systemd-tools=$_pkgver")
   conflicts=('systemd-tools')
   optdepends=('libmicrohttpd: remote journald capabilities'
@@ -311,7 +312,7 @@ package_notsystemd-common() {
 package_notsystemd-udev() {
   pkgdesc='Userspace device file manager'
   license=('GPL2') # NB: different than the rest
-  depends=("notsystemd-common=$pkgver" 'systemd-libudev'
+  depends=("notsystemd-common=$pkgver-$pkgrel" 'systemd-libudev'
            'hwids' 'kmod' 'util-linux' 'zlib')
   backup=(etc/udev/udev.conf)
 
@@ -331,21 +332,3 @@ package_notsystemd-udev() {
   install -D -m0755 udev-hook "$pkgdir"/usr/share/libalpm/scripts/udev-hook
   install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *{udev,hwdb}*.hook
 }
-
-package_notsystemd-resolvconf() {
-  pkgdesc='systemd resolvconf replacement'
-  license=('LGPL2.1')
-  depends=('notsystemd' "notsystemd-common=$pkgver")
-  provides=('openresolv' 'resolvconf')
-  conflicts=('openresolv')
-
-  pkgdesc="not${pkgdesc}"
-  provides+=("${pkgname#not}=$_pkgver")
-  conflicts+=("${pkgname#not}")
-
-  install -d -m0755 "$pkgdir"/usr/bin
-  ln -s resolvectl "$pkgdir"/usr/bin/resolvconf
-
-  install -d -m0755 "$pkgdir"/usr/share/man/man1
-  ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz
-}