upgpkg: dhcpcd-git 9.3.4.r0.ge04f03ce-1

2 files changed, 24 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20c6aba730f4..4992ea386842 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = dhcpcd-git
 	pkgdesc = A DHCP and DHCPv6 client
-	pkgver = 7.1.1.r31.gf1713f60
+	pkgver = 9.3.4.r0.ge04f03ce
 	pkgrel = 1
-	url = https://roy.marples.name/projects/dhcpcd
+	url = https://roy.marples.name/projects/dhcpcd/
 	arch = i686
 	arch = x86_64
 	license = BSD
@@ -16,9 +16,13 @@ pkgbase = dhcpcd-git
 	conflicts = dhcpcd
 	options = emptydirs
 	backup = etc/dhcpcd.conf
-	source = git+https://roy.marples.name/git/dhcpcd.git
-	source = dhcpcd.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/dhcpcd.service?h=packages/dhcpcd
-	source = dhcpcd_.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/dhcpcd_.service?h=packages/dhcpcd
+	source = git+https://github.com/rsmarples/dhcpcd.git
+	source = dhcpcd.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd.service
+	source = dhcpcd.sysusers::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd.sysusers
+	source = dhcpcd.tmpfiles::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd.tmpfiles
+	source = dhcpcd_.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd_.service
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 292226d9d73a..0a21316e5501 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=dhcpcd-git
-pkgver=7.1.1.r31.gf1713f60
+pkgver=9.3.4.r0.ge04f03ce
 pkgrel=1
 pkgdesc="A DHCP and DHCPv6 client"
 arch=('i686' 'x86_64')
-url="https://roy.marples.name/projects/dhcpcd"
+url="https://roy.marples.name/projects/dhcpcd/"
 license=('BSD')
 depends=('glibc' 'sh' 'systemd-libs')
 makedepends=('git')
@@ -14,11 +14,15 @@ provides=('dhcpcd' 'dhcp-client')
 conflicts=('dhcpcd')
 backup=('etc/dhcpcd.conf')
 options=('emptydirs')
-source=("git+https://roy.marples.name/git/dhcpcd.git"
-        "dhcpcd.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/dhcpcd.service?h=packages/dhcpcd"
-        "dhcpcd_.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/dhcpcd_.service?h=packages/dhcpcd")
+source=("git+https://github.com/rsmarples/dhcpcd.git"
+        "dhcpcd.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd.service"
+        "dhcpcd.sysusers::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd.sysusers"
+        "dhcpcd.tmpfiles::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd.tmpfiles"
+        "dhcpcd_.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dhcpcd/trunk/dhcpcd_.service")
 sha256sums=('SKIP'
             'SKIP'
+            'SKIP'
+            'SKIP'
             'SKIP')
 
 
@@ -37,7 +41,8 @@ build() {
     --sbindir="/usr/bin" \
     --libexecdir="/usr/lib/dhcpcd" \
     --dbdir="/var/lib/dhcpcd" \
-    --rundir="/run"
+    --runstatedir="/run" \
+    --privsepuser="dhcpcd"
   make
 }
 
@@ -51,11 +56,13 @@ package() {
   cd "dhcpcd"
 
   make DESTDIR="$pkgdir" install
-  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/dhcpcd/LICENSE"
+  install -Dm644 "LICENSE" -t "$pkgdir/usr/share/licenses/dhcpcd"
 
   # Disable ip4vall
   echo "noipv4ll" >> "$pkgdir/etc/dhcpcd.conf"
 
-  install -Dm644 "$srcdir/dhcpcd.service" "$pkgdir/usr/lib/systemd/system/dhcpcd.service"
+  install -Dm644 "$srcdir/dhcpcd.service" -t "$pkgdir/usr/lib/systemd/system"
   install -Dm644 "$srcdir/dhcpcd_.service" "$pkgdir/usr/lib/systemd/system/dhcpcd@.service"
+  install -Dm644 "$srcdir/dhcpcd.sysusers" "$pkgdir/usr/lib/sysusers.d/dhcpcd.conf"
+  install -Dm644 "$srcdir/dhcpcd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/dhcpcd.conf"
 }