From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch | 25 ++++++++++++++++++++++ net-misc/dhcp/files/dhcpd4.service | 2 ++ net-misc/dhcp/files/dhcpd6.service | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch (limited to 'net-misc/dhcp/files') diff --git a/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch new file mode 100644 index 000000000000..9f5085dd5e23 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch @@ -0,0 +1,25 @@ +From 261c84d91d1b4581df9f7f0ec031908299de7726 Mon Sep 17 00:00:00 2001 +From: Mark Andrews +Date: Thu, 19 Dec 2019 09:27:44 +1100 +Subject: [PATCH] fix variable name in conditional block + +--- + lib/isc/stats.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/isc/stats.c b/lib/isc/stats.c +index 5bce3c1100..a7ab97ce53 100644 +--- a/bind/bind-9.11.14/lib/isc/stats.c ++++ b/bind/bind-9.11.14/lib/isc/stats.c +@@ -297,7 +297,7 @@ setcounter(isc_stats_t *stats, + isc_atomic_store((int32_t *)&stats->counters[counter].lo, + (uint32_t)(value & 0xffffffff)); + # else +- stats->counters[counter] = val; ++ stats->counters[counter] = value; + # endif + #endif + } +-- +GitLab + diff --git a/net-misc/dhcp/files/dhcpd4.service b/net-misc/dhcp/files/dhcpd4.service index b064bd9b57df..8197ace12103 100644 --- a/net-misc/dhcp/files/dhcpd4.service +++ b/net-misc/dhcp/files/dhcpd4.service @@ -3,6 +3,8 @@ Description=DHCPv4 Server Daemon Documentation=man:dhcpd(8) man:dhcpd.conf(5) After=network.target After=time-sync.target +After=network-online.target +Wants=network-online.target [Service] ExecStart=/usr/sbin/dhcpd -f -cf /etc/dhcp/dhcpd.conf -user dhcp -group dhcp --no-pid diff --git a/net-misc/dhcp/files/dhcpd6.service b/net-misc/dhcp/files/dhcpd6.service index 603cacd8eb89..7f41db0a72b1 100644 --- a/net-misc/dhcp/files/dhcpd6.service +++ b/net-misc/dhcp/files/dhcpd6.service @@ -3,6 +3,8 @@ Description=DHCPv6 Server Daemon Documentation=man:dhcpd(8) man:dhcpd.conf(5) After=network.target After=time-sync.target +After=network-online.target +Wants=network-online.target [Service] ExecStart=/usr/sbin/dhcpd -f -s -6 -cf /etc/dhcp/dhcpd.conf -user dhcp -group dhcp --no-pid -- cgit v1.2.3