summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChocobo12023-05-20 21:26:30 +0800
committerChocobo12023-05-20 21:26:52 +0800
commit05b2f1af7221a85652b56bfa8a7284e23f6d42c7 (patch)
tree40ec522b7bafc6fdb20c47dc4185aa9e7d6bd41f
parenta407b51bc57faeb8f824150480711bbab86c00c0 (diff)
downloadaur-dhcpcd8-git.tar.gz
upgpkg: dhcpcd8-git 8.1.9.r7.g9095f26a-2
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
2 files changed, 10 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 85592e8f9e59..fa01ba0cbbe7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dhcpcd8-git
pkgdesc = A DHCP and DHCPv6 client (8.x releases)
pkgver = 8.1.9.r7.g9095f26a
- pkgrel = 1
+ pkgrel = 2
url = https://roy.marples.name/projects/dhcpcd/
arch = i686
arch = x86_64
@@ -18,8 +18,8 @@ pkgbase = dhcpcd8-git
options = emptydirs
backup = etc/dhcpcd.conf
source = git+https://github.com/NetworkConfiguration/dhcpcd.git#branch=dhcpcd-8
- source = dhcpcd.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd.service
- source = dhcpcd_.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd_.service
+ source = dhcpcd.service::https://gitlab.archlinux.org/archlinux/packaging/packages/dhcpcd/-/raw/main/dhcpcd.service
+ source = dhcpcd_.service::https://gitlab.archlinux.org/archlinux/packaging/packages/dhcpcd/-/raw/main/dhcpcd_.service
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index afae060b4e88..c83bcea57b52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=dhcpcd8-git
pkgver=8.1.9.r7.g9095f26a
-pkgrel=1
+pkgrel=2
pkgdesc="A DHCP and DHCPv6 client (8.x releases)"
arch=('i686' 'x86_64')
url="https://roy.marples.name/projects/dhcpcd/"
@@ -15,8 +15,8 @@ conflicts=('dhcpcd')
backup=('etc/dhcpcd.conf')
options=('emptydirs')
source=("git+https://github.com/NetworkConfiguration/dhcpcd.git#branch=dhcpcd-8"
- "dhcpcd.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd.service"
- "dhcpcd_.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd_.service")
+ "dhcpcd.service::https://gitlab.archlinux.org/archlinux/packaging/packages/dhcpcd/-/raw/main/dhcpcd.service"
+ "dhcpcd_.service::https://gitlab.archlinux.org/archlinux/packaging/packages/dhcpcd/-/raw/main/dhcpcd_.service")
sha256sums=('SKIP'
'SKIP'
'SKIP')
@@ -25,7 +25,10 @@ sha256sums=('SKIP'
pkgver() {
cd "dhcpcd"
- git describe --long --tags | sed 's/^dhcpcd-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+ _tag=$(git tag -l --sort -v:refname | grep -E '^v8[0-9\.]+$' | head -n1)
+ _rev=$(git rev-list --count $_tag..HEAD)
+ _hash=$(git rev-parse --short HEAD)
+ printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//'
}
build() {