From 182806ffa0a72b5ccd34b16e19638b84c7758470 Mon Sep 17 00:00:00 2001
From: Joe Bo Run <joborun@disroot.org>
Date: Mon, 29 May 2023 15:48:01 +0300
Subject: [PATCH] upg openresolv

---
 openresolv/PKGBUILD      | 39 +++++++++++++++++++++++++-----------
 openresolv/PKGBUILD-arch | 43 +++++++++++++++++++++++++++-------------
 openresolv/clean         |  2 +-
 openresolv/deps          |  3 +++
 4 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/openresolv/PKGBUILD b/openresolv/PKGBUILD
index 37f3805..2f18833 100644
--- a/openresolv/PKGBUILD
+++ b/openresolv/PKGBUILD
@@ -5,36 +5,51 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=openresolv
-pkgver=3.12.0
+pkgver=3.13.1
 pkgrel=01
 pkgdesc="resolv.conf management framework (resolvconf) w/o systemd"
-arch=(any)
 url="https://roy.marples.name/projects/openresolv"
 backup=(etc/resolvconf.conf)
 provides=(resolvconf)
 depends=(bash)
 makedepends=()
-source=("https://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz"
-        fs33801.patch)
+#source=("https://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz"
+_commit=1afa8e2c1c7bdd5362afb2cc482e85fb01cf5f6d  # tags/v3.13.1^0
+source=("git+https://github.com/NetworkConfiguration/openresolv#commit=$_commit")
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
+}
 
 prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../fs33801.patch
+  cd $pkgname
+#  patch -Np1 -i ../fs33801.patch
 }
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/resolvconf --sbindir=/usr/bin
+  cd $pkgname
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/resolvconf \
+    --sbindir=/usr/bin
+
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
 }
 
-#---- license gpg-key sha256sums ----
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
+
 license=('custom:BSD')
-sha256sums=('42b30508e857a228535c631eaac936862d86eca68c14b5c0bf387ba176b91b97'
-            '466678996689463af748bcdce7ea6f9f24f59004fa4db61fdc04da9f5fff2a6a')
+
+sha256sums=(SKIP)
+
+##  a3821b82b1f497a244e09baaca59f004f12f7a12b3114c2e64fba7851f234a24  openresolv-3.13.1-01-x86_64.pkg.tar.lz
diff --git a/openresolv/PKGBUILD-arch b/openresolv/PKGBUILD-arch
index 92e9c97..4f1523e 100644
--- a/openresolv/PKGBUILD-arch
+++ b/openresolv/PKGBUILD-arch
@@ -2,34 +2,49 @@
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
 
 pkgname=openresolv
-pkgver=3.12.0
+pkgver=3.13.1
 pkgrel=1
 pkgdesc="resolv.conf management framework (resolvconf)"
-arch=(any)
 url="https://roy.marples.name/projects/openresolv"
-license=('custom:BSD')
-backup=(etc/resolvconf.conf)
+arch=(any)
+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=1afa8e2c1c7bdd5362afb2cc482e85fb01cf5f6d  # tags/v3.13.1^0
+source=("git+https://github.com/NetworkConfiguration/openresolv#commit=$_commit")
+b2sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;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:
diff --git a/openresolv/clean b/openresolv/clean
index a90cc57..d8e9d0f 100644
--- a/openresolv/clean
+++ b/openresolv/clean
@@ -1 +1 @@
-rm -rf {src,pkg,*0.tar.xz}
+rm -rf {src,pkg,openresolv}
diff --git a/openresolv/deps b/openresolv/deps
index e69de29..f4099d9 100644
--- a/openresolv/deps
+++ b/openresolv/deps
@@ -0,0 +1,3 @@
+git
+
+