From 9daf5006bb2a1493ac49c11388ceb010c27e1911 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Sat, 4 Jul 2020 11:38:53 +0200
Subject: [PATCH] [notify] dhcpcd: update to 9.1.4

Note
----
as of version 9.x dhcpcd requires a dedicated user to run with
the new privsep option. Run the provided pre-install script to
create the new user/group dhcpcd.
---
 dhcpcd/.footprint  |  3 +--
 dhcpcd/.signature  |  8 ++++----
 dhcpcd/Pkgfile     | 10 +++++++---
 dhcpcd/pre-install |  6 ++++++
 4 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 dhcpcd/pre-install

diff --git a/dhcpcd/.footprint b/dhcpcd/.footprint
index 7c5608d8..39ee81bc 100644
--- a/dhcpcd/.footprint
+++ b/dhcpcd/.footprint
@@ -7,7 +7,6 @@ drwxr-xr-x	root/root	lib/dhcpcd/dev/
 -rwxr-xr-x	root/root	lib/dhcpcd/dev/udev.so
 drwxr-xr-x	root/root	lib/dhcpcd/dhcpcd-hooks/
 -rw-r--r--	root/root	lib/dhcpcd/dhcpcd-hooks/01-test
--rw-r--r--	root/root	lib/dhcpcd/dhcpcd-hooks/02-dump
 -rw-r--r--	root/root	lib/dhcpcd/dhcpcd-hooks/20-resolv.conf
 -rw-r--r--	root/root	lib/dhcpcd/dhcpcd-hooks/30-hostname
 -rwxr-xr-x	root/root	lib/dhcpcd/dhcpcd-run-hooks
@@ -28,4 +27,4 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/dhcpcd.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
-drwxr-xr-x	root/root	var/lib/dhcpcd/
+drwxr-xr-x	dhcpcd/dhcpcd	var/lib/dhcpcd/
diff --git a/dhcpcd/.signature b/dhcpcd/.signature
index 9a7b331b..e3437293 100644
--- a/dhcpcd/.signature
+++ b/dhcpcd/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqvvBMzwckF/aoWM2diNiyrr9GAo6W3/HtQrvSpiZJ/vvqZz8HYKywx+c1ncunWPO2ecg0BV6Rq+apCFviq/osA8=
-SHA256 (Pkgfile) = b855f8deb92a054a581d708ab46d685417a94f9a3b9f47c5b369b12c2a66410c
-SHA256 (.footprint) = d9a7aee62c42089e2d24224ba37e4d88502f402e0f94ea92d0a19492ff7afd76
-SHA256 (dhcpcd-8.1.9.tar.xz) = 8e2a505eb2bd8007d7c6fd855fcb4dd28cced8fc28886c7ce41fb4fc5630fbcf
+RWRJc1FUaeVeqvNlpzZaMVUtKc2Vk+q5RPf9U3AkIYfWt33fhXA7FaDU1NVwgSzsok9ZIgCCLmLsVkUVUprlS6WrXIx8ydgO6ww=
+SHA256 (Pkgfile) = 5cb189485f1f02efa48aedbf7b8270d388bfedd59c37876e1af0609ca29ae53f
+SHA256 (.footprint) = 36408a5de30857e3c77ae409c68ff83d874a30ee33a8d70d75a4280de32743f9
+SHA256 (dhcpcd-9.1.4.tar.xz) = 5fe133e5497d8af6d26bd6e6b8dd48ab12d124d6cc4cefe6de6536ff97f76820
diff --git a/dhcpcd/Pkgfile b/dhcpcd/Pkgfile
index dd8b43f7..30b890e2 100644
--- a/dhcpcd/Pkgfile
+++ b/dhcpcd/Pkgfile
@@ -1,10 +1,10 @@
 # Description: An RFC2131-compliant DHCP client daemon
-# URL:         https://roy.marples.name/projects/dhcpcd/
+# URL:         http://roy.marples.name/projects/dhcpcd/
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 # Depends on:  eudev
 
 name=dhcpcd
-version=8.1.9
+version=9.1.4
 release=1
 source=(https://roy.marples.name/downloads/dhcpcd/$name-$version.tar.xz)
 
@@ -15,9 +15,13 @@ build () {
                 --libexecdir=/lib/dhcpcd \
                 --dbdir=/var/lib/dhcpcd \
                 --sysconfdir=/etc/dhcpcd \
-                --with-hooks=
+                --enable-privsep \
+                --privsepuser=dhcpcd
 
     make
     make DESTDIR=$PKG install
+
+    install -d -o dhcpcd -g dhcpcd $PKG/var/lib/dhcpcd
+
     chmod -R u+w $PKG
 }
diff --git a/dhcpcd/pre-install b/dhcpcd/pre-install
new file mode 100644
index 00000000..ee653178
--- /dev/null
+++ b/dhcpcd/pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+getent group dhcpcd || /usr/sbin/groupadd -r dhcpcd
+getent passwd dhcpcd || /usr/sbin/useradd -r -d /var/lib/dhcpcd -s /bin/false dhcpcd
+/usr/bin/passwd -l dhcpcd
+