From 0360d00c5ece87097e158509371dd0a34218439e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 7 Feb 2021 13:08:10 -0800
Subject: [PATCH] dhcp: add basic logging functionality

vlogger should properly set tag and facility identically to logger if
you don't set anything special so it shoud be entirely safe to simply
exec straight into vlogger without explicitly setting those flags.

Fixes #25558
---
 srcpkgs/dhcp/files/dhclient/log/run | 1 +
 srcpkgs/dhcp/files/dhclient/run     | 1 +
 srcpkgs/dhcp/files/dhcpd4/log/run   | 1 +
 srcpkgs/dhcp/files/dhcpd4/run       | 1 +
 srcpkgs/dhcp/files/dhcpd6/log/run   | 1 +
 srcpkgs/dhcp/files/dhcpd6/run       | 1 +
 srcpkgs/dhcp/template               | 2 +-
 7 files changed, 7 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/dhcp/files/dhclient/log/run
 create mode 120000 srcpkgs/dhcp/files/dhcpd4/log/run
 create mode 120000 srcpkgs/dhcp/files/dhcpd6/log/run

diff --git a/srcpkgs/dhcp/files/dhclient/log/run b/srcpkgs/dhcp/files/dhclient/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/dhcp/files/dhclient/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/dhcp/files/dhclient/run b/srcpkgs/dhcp/files/dhclient/run
index 5cb45f19cf5a..19b924ab3c29 100644
--- a/srcpkgs/dhcp/files/dhclient/run
+++ b/srcpkgs/dhcp/files/dhclient/run
@@ -1,3 +1,4 @@
 #!/bin/sh
+exec 2>&1
 [ -r conf ] && . ./conf
 exec dhclient ${OPTS:=-d} 
diff --git a/srcpkgs/dhcp/files/dhcpd4/log/run b/srcpkgs/dhcp/files/dhcpd4/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/dhcp/files/dhcpd4/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/dhcp/files/dhcpd4/run b/srcpkgs/dhcp/files/dhcpd4/run
index 05d9f9b726ed..423d87cc70dd 100644
--- a/srcpkgs/dhcp/files/dhcpd4/run
+++ b/srcpkgs/dhcp/files/dhcpd4/run
@@ -1,4 +1,5 @@
 #!/bin/sh
+exec 2>&1
 [ -r conf ] && . ./conf
 touch /var/lib/dhcp/dhcpd.leases
 exec dhcpd -f ${OPTS:=-4 -q -pf /run/dhcpd4.pid}
diff --git a/srcpkgs/dhcp/files/dhcpd6/log/run b/srcpkgs/dhcp/files/dhcpd6/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/dhcp/files/dhcpd6/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/dhcp/files/dhcpd6/run b/srcpkgs/dhcp/files/dhcpd6/run
index 2dc26f332212..57b86926acb7 100644
--- a/srcpkgs/dhcp/files/dhcpd6/run
+++ b/srcpkgs/dhcp/files/dhcpd6/run
@@ -1,4 +1,5 @@
 #!/bin/sh
+exec 2>&1
 [ -r conf ] && . ./conf
 touch /var/lib/dhcp/dhcpd.leases
 exec dhcpd -f ${OPTS:=-6 -q -pf /run/dhcpd6.pid}
diff --git a/srcpkgs/dhcp/template b/srcpkgs/dhcp/template
index 1b6f7de5b6cc..2db18dcc60b0 100644
--- a/srcpkgs/dhcp/template
+++ b/srcpkgs/dhcp/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcp'
 pkgname=dhcp
 version=4.4.2P1
-revision=1
+revision=2
 wrksrc="dhcp-${version/P/-P}"
 build_style=gnu-configure
 hostmakedepends="perl tar automake libtool"