gentoo resync : 25.11.2020

5 files changed, 34 insertions, 3 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index ffb94de365dc..3330cb7582e3 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -10,11 +10,12 @@ AUX dhcp-4.3.6-quieter-ping.patch 2622 BLAKE2B fc9c49f60419d39f81d097c70ee61db87
 AUX dhcp-4.4.0-always-accept-4.patch 889 BLAKE2B ce7ddd45c924f31c37294eb091476ec1aae4a658beadfd1481e2b0a2044f2d1a5be6798eac3c8f677c223eadf9be043ff3e38bfaec14305a0ad823ec3b2930b8 SHA512 2801de50402443196c412d2c578c74cc040869b7dd59f6e7ae9e66e69edb1fd567de7acbc2b2612b46b5cddca08f984401fefc4f81c26ea630b193f0e0f1884e
 AUX dhcp-4.4.0-bind-disable.patch 774 BLAKE2B 32f09258aeaa3aa299de1f53008cfb4d4e6d994ee2034904bd7ab80d85189a2179e05acdcf43746349b9906df67c1a967c6371f49a07f1f01c892706c0db5160 SHA512 dee1b6dd62528c8c761fea4a61ddf0057a2f594746bf698b2cc31c5de211614c5b8cb5bab69190f0bdad4d1ec781946e91889fb5fa85ca7370d4357cb9d92dd5
 AUX dhcp-4.4.2-fno-common.patch 876 BLAKE2B 004abacf9f6167440b762fd69bcd821df6531cc1d74514841cbc88abdef5f21a51d1907cbb1424eb787fc37d8d869344f9f43dbe908e3fa28d8836d898b6efff SHA512 1a0e0c57bc08e9746e372733fff3a726d99064cde800fc921cbaab0eb19d32bf8cd813d197fd0d64b6d8f4e18c4557d0ef2e81334077d363b995012301bbe176
+AUX dhcp-4.4.2-variable-name.patch 699 BLAKE2B fd0ba7636ccd09e171bfbd6efd061335f56ea6f670c1ac3b87bd73d81938862ca065358777c05f3e5a23a8fff3d0257709fce113904afb12009da43e2908f6e2 SHA512 fccc8ab1f48756dfebec0a90ac414731cdb7f2c08e6356c5ad8b7d04f2459d94dc80692d49b304efba17beb6e2585d4250d53b3a3aee6826a934a111ee391c0a
 AUX dhcpd.conf2 1068 BLAKE2B abbe4f73517fba252398da00b9aa801d0ea411ac639b219cad4a64700b74cc14322af131e0053af948f1f1b35c5a3556af75092ea5565e01d7c0d1a602ea7c40 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d
 AUX dhcpd.init5 2882 BLAKE2B 9ce56c4aef62641508b8f4d366672725dd277c18846f9a001de8d244ca03720aba2c52ca7bd34ac63b08db082489d915c23bd1c685c37699034373bde1a7c37f SHA512 0cf238f3e79ee5d1ba059331664fd092d025ecb8fdb3f1d428713d7cd81ad4efe10ad7ad4ef48146aa6c9763293c1641057a257480e58a639fc6cc20e623f4c1
 AUX dhcpd.tmpfiles 75 BLAKE2B 8e4ddbccb162c620df175dbb39621659f9905c54ba2dc46d3863438e030dee3a04bb4b528bb7ee91a1cb47564081e48ac6937a6aee4ea026adcdb1887e643152 SHA512 0c34ab0ef8618e6792ba8bda797877ce2e6c4fa433b4944dbc03cc4fc69efe26ce4b5e4dec661fbb2b7ae4173d908de02f4e86f8539364789a23f36cfd8edacb
-AUX dhcpd4.service 264 BLAKE2B 457cd044d41413ed0dd19e904489da8db1bf586124e9d89e45511c03485f55d0d06fdda3d6f40e22a9062f258c239979e7b40d0ead1e3b61e060f287b8715897 SHA512 e340311fb890c5fc2f5836cc8d10ea3e4bb34bb5e96e7231798e7d960f05886478bf28305828fbd851080baadafe7d3fd2c7f30a81dcbc68d6368e8b4bd0de71
-AUX dhcpd6.service 270 BLAKE2B ceea24b0a5ee307fe32ca285d805672337c2e86c1c30cef694be193349218890b6231f67267d041f8b004210880ece4b8db1663499545adddf2557d64fde4994 SHA512 2898f0dfa56ecb590c25a1f0e44446a83d1d9118e691c9a7680250a9e47f4dec2b36195dbda8259292d93a31bf0e1230b9f39ad93f2b0a9280e8cc4d77b50bae
+AUX dhcpd4.service 320 BLAKE2B db6ae11706e4201d1f5896ad7594551dae759be1625652a698833cc29e9121b479b7d0a5f7127eada6c8774d8e6d3ff55485f8487e8f5fc120a1b722d70a1a27 SHA512 58ba2c3cb0ac1265d501ceb13cf2bb13eace39929f4f31edb62d6998e1d850490d6b634fff60dabbe8e6940d69958398dc2f6e78fe5158d8021dc8b805c2639e
+AUX dhcpd6.service 326 BLAKE2B d25b992eb7c4eb50984aff7c4c8a247ab55cd201d9002b65a64ac05d311811b876383a1672f8b9e5d297a8e0986a2b6e21eabb7c680ce0ee8faac5693e7da0dc SHA512 8ae33e59f595f86c9f085e60e86ba97dfc991aaa52f922e5c32f46fbba303ae5368d030e42af3cc26fbe986050d8c6275099d5e34f9f46f6d2da9fb4c3eb5ed7
 AUX dhcrelay.conf 547 BLAKE2B 62a2a4da94dd8c31176de43d8c7c7bb0f467216152bd40330eea8f70848b5c7b2937eebcc9763a737efca0357bb5327a382de8e62cc2e7a53de0b0d850027238 SHA512 af94d679c5b7652a770d4acb96f5f12fd9dc99f4e8e26b10fab67514693f63392bc8033a6e5e6c1967d7004decc72b810462e1fe92c1d4808606e48086dea00b
 AUX dhcrelay.init3 701 BLAKE2B b77247ff4bd11d0d61e99b2c759e85889cb50bcc479de2b4e73764809f395168e6d614cba451bddfc614bb6d10a6ed2f9a23f9baeb27b32ff7b55304265e7358 SHA512 ab4c38c53bf21dccee252358f0ecece81829048a546f380cb1e3552804e412c38dac09805fb7f9520531d48d3d79b3dd228ffdba7203b89ac30a778a579ddbda
 AUX dhcrelay4.service 202 BLAKE2B 2adb2a349e63e449cce4c20c6ea1217f2321f3e78e3555fead92f0c7497c90bd9c85e9ce6a1236500aaca446211b733f17c8a8316dd38df71edbd117355b2022 SHA512 fcc41f7bc055a3f32f288536d93447c1d0b9f112196a3864e12668a9c844d60f99f01f991846196ec53034d65da076276fa633069308b8f674e9a2af20e107e4
@@ -25,6 +26,6 @@ AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9
 DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
 DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
 EBUILD dhcp-4.4.1.ebuild 7902 BLAKE2B 06574b801312668a19d8a8f55611c816c29507c3ad0dc187a1e35aa2bf6aeda7d1eda3bdda6e66943c627b7a7fc473c2772aee55ec3e33912ea8dde3bce2495d SHA512 b44efc8e344f8c08728fb92bd0550a4194e23c3277b46f8ecbb28c56cd62bc38eb908764eb3fb85b3f7ba84f21507710a81e6eff1c759a00765ef9bdea824cb7
-EBUILD dhcp-4.4.2-r2.ebuild 8035 BLAKE2B 9ee23fa63735e0e20de2901fb3b21a7e5669e2f8c314e1dbdc31f0e8e10ee024baeefb7f44c1c2ffa9a0dfd4d64b1f19dfff745d076d953c55fa64b1a4227045 SHA512 eab39eeac589a57a52bc7220fe79a9b84fd9c7ce8e489eeda4a1c7a9f8b3f685c8fa15856dfd1c1b70e502589c98b3bcfd820cd4727800e6898a6bfe56c3b5a0
+EBUILD dhcp-4.4.2-r3.ebuild 8089 BLAKE2B e186ca46c3785a5046f7598289a7fbf16a4a6fe659c73ae9fc1f1b2b7a73a119421da5d211766d107aa5a3ba74437b82d5941a208d6eb2e293d559404a2124f1 SHA512 338c64b3baa5d4c244064cf1dad7bae7de87578b3e0adf173ffffae0e8542e123476ba8fe979fbdad6d9867137e8961fb72a4438038c04961a1c44584ed39fd6
 EBUILD dhcp-4.4.2.ebuild 7930 BLAKE2B e4a9d780010707cf9f16816f29ccd1a9c0ebbf961bd89e6c05a1516a5a97c6900a3a04e6435ed4bd00bc8874dd126d6e87d95e1147933f72b1ae8deac2acc6dc SHA512 40b769fce9749bace22ebdabeabfaf44251b03a07bb8dd186c8af5238d1cbdd89a40e59205fac287f576b2fe5d2152371e7f1244c5d22daa2cf158d0814bc9df
 MISC metadata.xml 476 BLAKE2B e77eff7eca45c59f3f7ead1b4065db2696400ed0814fddcd6b8cd377d156795e7d7a6864da8c869b870d1705bbdd6f403a3a0358e149b5a4b4ad098589ba90a9 SHA512 8e9599bcb9c15749514d5fada7ebb4e4bf0752541ff8b54a3c6b557d5debc6356ce593b8f9640abf534aae123d3e65d978cfdf091635246c8afe2a170a61de26
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index 0257824a08f6..6cad24e75195 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
 
 	# Possible upstream candidates
 	"${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194
+	"${FILESDIR}/dhcp-4.4.2-variable-name.patch" #752402
 )
 
 src_prepare() {
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 <marka@isc.org>
+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