Date: Saturday, April 15, 2023 @ 22:55:29 Author: heftig Revision: 474083
3.13.0-1 Modified: openresolv/trunk/PKGBUILD Deleted: openresolv/trunk/fs33801.patch ---------------+ PKGBUILD | 43 +++++++++++++++++++++++++++++-------------- fs33801.patch | 32 -------------------------------- 2 files changed, 29 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-04-15 22:43:33 UTC (rev 474082) +++ PKGBUILD 2023-04-15 22:55:29 UTC (rev 474083) @@ -2,34 +2,49 @@ # Contributor: Ignacio Galmarino <[email protected]> pkgname=openresolv -pkgver=3.12.0 +pkgver=3.13.0 pkgrel=1 pkgdesc="resolv.conf management framework (resolvconf)" +url="https://roy.marples.name/projects/openresolv"; arch=(any) -url="https://roy.marples.name/projects/openresolv"; -license=('custom:BSD') -backup=(etc/resolvconf.conf) +license=(custom:BSD) provides=(resolvconf) depends=(bash) -makedepends=(systemd) -source=("https://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz"; - fs33801.patch) -sha256sums=('42b30508e857a228535c631eaac936862d86eca68c14b5c0bf387ba176b91b97' - '466678996689463af748bcdce7ea6f9f24f59004fa4db61fdc04da9f5fff2a6a') +makedepends=( + git + systemd +) +backup=(etc/resolvconf.conf) +_commit=1036bdbbbe3a773214f5b9bad2ff5dab3655f21f # tags/openresolv-3.13.0^0 +source=("git+https://github.com/NetworkConfiguration/openresolv#commit=$_commit";) +b2sums=('SKIP') +pkgver() { + cd $pkgname + git describe --tags | sed 's/^openresolv-//;s/[^-]*-g/r&/;s/-/+/g' +} + prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../fs33801.patch + cd $pkgname } build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/resolvconf --sbindir=/usr/bin + local configure_options=( + --prefix=/usr + --sysconfdir=/etc + --libexecdir=/usr/lib/resolvconf + --sbindir=/usr/bin + ) + + cd $pkgname + ./configure "${configure_options[@]}" make } package() { - cd $pkgname-$pkgver + cd $pkgname make DESTDIR="$pkgdir" install install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE } + +# vim:set sw=2 sts=-1 et: Deleted: fs33801.patch =================================================================== --- fs33801.patch 2023-04-15 22:43:33 UTC (rev 474082) +++ fs33801.patch 2023-04-15 22:55:29 UTC (rev 474083) @@ -1,32 +0,0 @@ -diff -u -r openresolv-3.8.1/dnsmasq.in openresolv-3.8.1-arch/dnsmasq.in ---- openresolv-3.8.1/dnsmasq.in 2016-05-19 12:36:35.000000000 +0200 -+++ openresolv-3.8.1-arch/dnsmasq.in 2016-05-19 20:05:19.659940747 +0200 -@@ -190,8 +190,8 @@ - fi - fi - if $dbus; then -- if [ -s "$dnsmasq_pid" ]; then -- $changed || kill -HUP $(cat "$dnsmasq_pid") -+ if $changed && systemctl --quiet is-active dnsmasq; then -+ systemctl reload dnsmasq - fi - # Send even if empty so old servers are cleared - if $dbus_ex; then -diff -u -r openresolv-3.8.1/unbound.in openresolv-3.8.1-arch/unbound.in ---- openresolv-3.8.1/unbound.in 2016-05-19 12:36:35.000000000 +0200 -+++ openresolv-3.8.1-arch/unbound.in 2016-05-19 20:04:20.207722679 +0200 -@@ -86,12 +86,7 @@ - [ "$(cat "$unbound_conf")" != "$(printf %s "$newconf")" ] - then - printf %s "$newconf" >"$unbound_conf" -- # If we can't sent a HUP then force a restart -- if [ -s "$unbound_pid" ]; then -- if ! kill -HUP $(cat "$unbound_pid") 2>/dev/null; then -- restart_unbound -- fi -- else -- restart_unbound -+ if systemctl --quiet is-active unbound; then -+ systemctl reload unbound - fi - fi
