gentoo auto-resync : 18:02:2024 - 17:39:04

4 files changed, 51 insertions, 38 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index ab27aaf50cb7..9302d642f712 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -11,8 +11,8 @@ AUX dhcp-4.4.3-ldap-ipv6-client-id.patch 2095 BLAKE2B 6f35bfb4ee123d6c0c5ecc56d8
 AUX dhcp-4.4.3-nogateway.patch 1904 BLAKE2B 9cb4c4a491e590958ed0654f0b1d7006e310ff5e40b3872bdcb17de45f7fb023d3d08b2433b25a362f13da89c0b818d88bb5f2d9737b3a00528c581a297f65f5 SHA512 571320f652ba5b24813ce9707f333f1d44d09c046c6371c86d011bd9d1c3c1288918851df336a881a62c6c095b6ac3bd9699f022e6f30dbb2542157b10ec20f7
 AUX dhcp-4.4.3-quieter-ping.patch 2622 BLAKE2B fc9c49f60419d39f81d097c70ee61db879578225c4d6c90eb9828852bd1c3fb5daf8de5651b0d75a020767bb7e8b7917355d7e68cc7f8fc3052e010e96115be1 SHA512 4338ca0fd733676ed6ecc790cd5305b9eca468a9be206f0a1d195d024974aabdb7def81d2181261d3b6033fd4e9b5461c07adfb3b16d1df1dc2e5f819c90ba47
 AUX dhcp.tmpfiles 75 BLAKE2B 5985efbb3c21c86cef4bc8796b54274df5db96a62e2cb7a50891a381ae63750d007b7fc730cfbc33c455776d565eda1b7cac7dc648e652c7659c1f36271ecbdf SHA512 c47c3bc0e17a7fc645d72fc7500459fa742e579b9fb1cdeac2e553146845bc26abfbdb80c63a2a1d1c56c2cfccc4a5790706a4e739265f63a7b4604a089100f4
-AUX dhcpd.conf2 1068 BLAKE2B abbe4f73517fba252398da00b9aa801d0ea411ac639b219cad4a64700b74cc14322af131e0053af948f1f1b35c5a3556af75092ea5565e01d7c0d1a602ea7c40 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d
-AUX dhcpd.init5 2759 BLAKE2B 9a4fef8409ca24d535a1ac001000f58ec14e8962eee2bf10f691075eeab3d0e3c92f3fc7ed673f3693a3dc10e7555841ed325ac8d5cde1039851b787d0e8c592 SHA512 a09fa2246ea4ce72625f78fd006d7ba77c690e09984d65cd8c1de855909c2f26e43c12acf80db80a4469158f1d1c26b915a4e139e64b20ab9414592a92a83525
+AUX dhcpd.conf2 1167 BLAKE2B 9f47051535bc8c52d72ad4320810d67931f0e128ee8ee299ded9226b414593df603a22064845d24b804dfadd9c701d528efb349180520d65dc6e8a0964530737 SHA512 14c6f59965b02b2f22da95eb5f903241e067bb85b4fab11eb57ae54c1d24184d9c57d30743f12a25236dda40faf5f66c340773859e332f56b0e7d4aab84ab9c9
+AUX dhcpd.init5 2854 BLAKE2B ca3dacf6ec73fb0365dac765606241524efe2878d28bbf38a35aa45fed19ee1cc8d90690d4bc218ab954935748715363861abaa89036caeb832a439add36bb8a SHA512 98d4ddfc4c884a22bb9aa62013207e14b4c7769290e22cc7f2a626820b670b935d1a9e8ee468b1c021f2ae00fc5dfaf4ceae3615fce483314c303e3a8d5c98f0
 AUX dhcpd4.service 320 BLAKE2B db6ae11706e4201d1f5896ad7594551dae759be1625652a698833cc29e9121b479b7d0a5f7127eada6c8774d8e6d3ff55485f8487e8f5fc120a1b722d70a1a27 SHA512 58ba2c3cb0ac1265d501ceb13cf2bb13eace39929f4f31edb62d6998e1d850490d6b634fff60dabbe8e6940d69958398dc2f6e78fe5158d8021dc8b805c2639e
 AUX dhcpd6.service 326 BLAKE2B d25b992eb7c4eb50984aff7c4c8a247ab55cd201d9002b65a64ac05d311811b876383a1672f8b9e5d297a8e0986a2b6e21eabb7c680ce0ee8faac5693e7da0dc SHA512 8ae33e59f595f86c9f085e60e86ba97dfc991aaa52f922e5c32f46fbba303ae5368d030e42af3cc26fbe986050d8c6275099d5e34f9f46f6d2da9fb4c3eb5ed7
 AUX dhcrelay.conf 547 BLAKE2B 62a2a4da94dd8c31176de43d8c7c7bb0f467216152bd40330eea8f70848b5c7b2937eebcc9763a737efca0357bb5327a382de8e62cc2e7a53de0b0d850027238 SHA512 af94d679c5b7652a770d4acb96f5f12fd9dc99f4e8e26b10fab67514693f63392bc8033a6e5e6c1967d7004decc72b810462e1fe92c1d4808606e48086dea00b
@@ -23,6 +23,7 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
-EBUILD dhcp-4.4.3_p1-r3.ebuild 8492 BLAKE2B 46592e05bbd2fd7607efa50e671b3794c385608043b1d0e941e96bb501694a97ef1b345333cc592f743b2a7023ac04d7e8a061c722683e80adedb471e8f8dc6d SHA512 6a6011d0a0a7c54f8dde3122b74b77dfd0540cbdd54265702d04126b19313aa455cc9526bcb7598ab8d6d5c8450738a6d126b9d95de9a34bd5b264ef7e6ba994
+DIST dhcp-4.4.3-patches.tar.xz 15276 BLAKE2B 4750833f986eccdc60b63de55f0b0633039806d75e1bbb79ea6974990399f2ec33836fd22ec3a0981aaeffc3fcfd914deff96d139f4ea3c2ad1b9010ec737d06 SHA512 c8071f48e4074a7a83e74706868a782c7dc4bcb6df4b9035411e419a95bf90de66ece2b2aacc8f8f3ca517287599cb178704402ff276a4620c941733ce03c57b
 EBUILD dhcp-4.4.3_p1-r4.ebuild 8468 BLAKE2B b5c3cfc77273db73729f8feb3e3fa87f09eca5e3aebc8970d0bcc941fbf749ee05088f1de4aaa0153eb0e0669652f746a9eb6188a9f2a9f375df08cff10c701b SHA512 47fe0b6ed3ac0ed398fbd146952cc141b7202038d819dca706177c948e7cab79ef59e20c12f5ba29f5b0da2b3c828b9156991ae993ccc01ffa2c30d446183b6d
+EBUILD dhcp-4.4.3_p1-r5.ebuild 8950 BLAKE2B 7b66c06eec937cfecd8357c5dcf54c91ff6f4b4a0026abef6b7c419738fcc8d347d20f72c39f10b6d6b92018b67918503070b63765ef3e314aef19483893c618 SHA512 c5fd30cf27efd7464fa93645232349b7c8fc42ede33aa8d314f535174dcb5332361019176b669a547b44a4b7fcaf73fad71bd714ac400f25c5fe86100ded1143
 MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
index 48fb12a0f5d6..040aa5192a15 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd toolchain-funcs flag-o-matic tmpfiles
 
@@ -13,18 +13,18 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
 HOMEPAGE="https://www.isc.org/dhcp"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="
+	https://downloads.isc.org/isc/dhcp/${MY_P}.tar.gz
+	https://downloads.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/dhcp-4.4.3-patches.tar.xz
+"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
 
-BDEPEND="
-	acct-group/dhcp
-	acct-user/dhcp"
-
 DEPEND="
 	sys-libs/zlib:=
 	client? (
@@ -41,44 +41,50 @@ RDEPEND="
 	${BDEPEND}
 	${DEPEND}
 	selinux? ( sec-policy/selinux-dhcp )
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
+	vim-syntax? ( app-vim/dhcpd-syntax )
+"
+BDEPEND="
+	acct-group/dhcp
+	acct-user/dhcp
+"
 
 PATCHES=(
 	# Gentoo patches - these will probably never be accepted upstream
 	# Fix some permission issues
-	"${FILESDIR}/${PN}-4.4.3-fix-perms.patch"
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-fix-perms.patch"
 
 	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch"
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-ntp.patch"
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-resolvconf.patch"
 
 	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch"
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-stdin-conf.patch"
 	# bug #265531
-	"${FILESDIR}/${PN}-4.4.3-nogateway.patch"
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-nogateway.patch"
 	# bug #296921
-	"${FILESDIR}/${PN}-4.4.3-quieter-ping.patch"
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-quieter-ping.patch"
 	# bug #437108
-	"${FILESDIR}/${PN}-4.4.3-always-accept-4.patch"
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-always-accept-4.patch"
 	# bug #480636
-	"${FILESDIR}/${PN}-4.4.3-iproute2-path.patch"
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-iproute2-path.patch"
 	# bug #471142
-	"${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch"
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-bindtodevice-inet6.patch"
 	# bug #559832
-	"${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-ldap-ipv6-client-id.patch"
+	# bug #908986
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-infiniband.patch"
 
 	# Possible upstream candidates
+	"${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-configure-clang16.patch"
 )
 
+src_unpack() {
+	unpack ${A}
+	# handle local bind hell
+	cd "${S}"/bind || die
+	unpack ./bind.tar.gz
+}
+
 src_prepare() {
 	default
 
@@ -133,7 +139,7 @@ src_prepare() {
 	binddir=${binddir}
 	GMAKE=${MAKE:-gmake}
 	EOF
-	eapply -p2 "${FILESDIR}"/${PN}-4.4.3-bind-disable.patch
+	eapply -p2 "${WORKDIR}"/dhcp-4.4.3-patches/${PN}-4.4.3-bind-disable.patch
 	# Only use the relevant subdirs now that ISC
 	#removed the lib/export structure in bind.
 	sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
@@ -173,9 +179,7 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# bug #720806, bug #801592
-	if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
-		append-libs -latomic
-	fi
+	append-atomic-flags
 
 	local myeconfargs=(
 		--enable-paranoia
@@ -205,11 +209,14 @@ src_compile() {
 	emake -C bind/bind-*/lib install
 	# then build standard dhcp code
 	emake AR="$(tc-getAR)"
+	emake -C keama AR="$(tc-getAR)"
 }
 
 src_install() {
 	default
 
+	emake -C keama DESTDIR="${D}" install
+
 	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
 	docinto html
 	dodoc doc/References.html
diff --git a/net-misc/dhcp/files/dhcpd.conf2 b/net-misc/dhcp/files/dhcpd.conf2
index 5cd2eeca3f71..ac173f8a3576 100644
--- a/net-misc/dhcp/files/dhcpd.conf2
+++ b/net-misc/dhcp/files/dhcpd.conf2
@@ -16,7 +16,9 @@
 # All file paths below are relative to the chroot.
 # You can specify a different chroot directory but MAKE SURE it's empty.
 
-# Specify a configuration file - the default is /etc/dhcp/dhcpd.conf
+# Specify a configuration file - the default is based on the service name,
+# so dhcpd would use /etc/dhcp/dhcpd.conf and dhcpd.foo would use
+# /etc/dhcp/dhcpd.foo.conf
 # DHCPD_CONF="/etc/dhcp/dhcpd.conf"
 
 # Configure which interface or interfaces to for dhcpd to listen on.
diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5
index 66b29cd3bb00..8e05625e6345 100644
--- a/net-misc/dhcp/files/dhcpd.init5
+++ b/net-misc/dhcp/files/dhcpd.init5
@@ -1,8 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+description="ISC DHCP server"
+
 extra_commands="configtest"
+description_configtest="Test the syntax of the configuration file"
 
 : ${DHCPD_CONF:=/etc/dhcp/${SVCNAME}.conf}