gentoo auto-resync : 21:04:2023 - 12:02:15

3 files changed, 159 insertions, 3 deletions

diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 55899d5fba0e..b329a6f7eaf2 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,10 +1,12 @@
 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
 DIST dhcpcd-10.0.0.tar.gz 356168 BLAKE2B a471f44f547754af8975af13d0645b90938a1b93a09d5b45b302e82aa9d70dca2bff4e39b6fc67918967526ff25a8bb6cf32140939c60a4fc5d18dec7404bf99 SHA512 3b7096a2b3fac070443b6b08dffd38a5fd388a0f2c2581598452fa20445574d7ab3d1239601d3c9ed03fcfff6c8b740c88c337be94a5397a6b292ab9a474be7f
+DIST dhcpcd-10.0.1.tar.xz 263564 BLAKE2B f1e93285d040b98bede86bb2e87e372afc0d1d124e7a6580c23d8d228a34ee17001fc3c2d9091b16fb082fe2f2ad7ba50c0dd7b0db2b2237ab1cff9ca152100a SHA512 31b0ac780b8592d3d40437837fd759a357b0200dbdc7fd8c62287a4fedc052f324fb8006daff84455906c82d5a4cb6a04916b94a0ad9b17899532f83daf51d3d
 DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45
 DIST dhcpcd-9.5.0.tar.gz 348645 BLAKE2B bb04391b669dd88cab448a0f98a75ecdc2e865549c75afc6732d3c70272898cdf603c97b79b38e276badcc4254703bb6b0a27f35fbb7da83aeaf2d53341c1593 SHA512 02943769ce24c1073f2634a1e2e0db74f5f95322f7690d40df49589b131ce46aeddc9b8505b8d185070b95bbd3d34284c19998bbb89e059b0ad67cd07fe98932
 EBUILD dhcpcd-10.0.0.ebuild 4644 BLAKE2B a4992ef62133d7e8e971c118a3c0ac957d9e57d8d11c9f43a0472a57a074ffc44bc5065bf290451802cefca99445ad18137ce835369104f69b90077ccd4861ae SHA512 7f673a9109286f5b0c64d2c33ea2f618ac9999778970e3e9fc640e0e8fe326f6d9cf5c052fee92f73d242b3a35e506a954cfa7637578e455abccc50f8f8396dd
+EBUILD dhcpcd-10.0.1.ebuild 4645 BLAKE2B d91647c2848635deb660d61d6d37058a35ec2f12fb9914a6f753207d31f3284d86ba9281363b618a5e3bea509f9ac899769591ae738bc94923169b8cdc11a334 SHA512 99a22505227de7210250e7265d3099c2bae62b667a78f8a7f14cd54faaf122f3971afc07cdf0be3977e72e4004a702d7bff59c144b5f962262b18f8d7b857304
 EBUILD dhcpcd-9.4.1.ebuild 4646 BLAKE2B 9f2447bc68012dfd41188f10d62729958b1abb3804e44abb5f65cfd2ee3086fb28cd9530b420e4a0597ec9ab4af4aab7784dcbe935adfc2b017e34b3dfb8025e SHA512 63f8ce073f061a76f8c9e41b3601d4ecd13ab3471443d6cfe73149333c3bc0452f02d6bd96cfbfac664bf6b5f315eb664ec45e673ec71086d23c9e7e4e26ca46
 EBUILD dhcpcd-9.5.0.ebuild 4644 BLAKE2B a4992ef62133d7e8e971c118a3c0ac957d9e57d8d11c9f43a0472a57a074ffc44bc5065bf290451802cefca99445ad18137ce835369104f69b90077ccd4861ae SHA512 7f673a9109286f5b0c64d2c33ea2f618ac9999778970e3e9fc640e0e8fe326f6d9cf5c052fee92f73d242b3a35e506a954cfa7637578e455abccc50f8f8396dd
-EBUILD dhcpcd-9999.ebuild 4644 BLAKE2B a4992ef62133d7e8e971c118a3c0ac957d9e57d8d11c9f43a0472a57a074ffc44bc5065bf290451802cefca99445ad18137ce835369104f69b90077ccd4861ae SHA512 7f673a9109286f5b0c64d2c33ea2f618ac9999778970e3e9fc640e0e8fe326f6d9cf5c052fee92f73d242b3a35e506a954cfa7637578e455abccc50f8f8396dd
+EBUILD dhcpcd-9999.ebuild 4645 BLAKE2B d91647c2848635deb660d61d6d37058a35ec2f12fb9914a6f753207d31f3284d86ba9281363b618a5e3bea509f9ac899769591ae738bc94923169b8cdc11a334 SHA512 99a22505227de7210250e7265d3099c2bae62b667a78f8a7f14cd54faaf122f3971afc07cdf0be3977e72e4004a702d7bff59c144b5f962262b18f8d7b857304
 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.1.ebuild
new file mode 100644
index 000000000000..1ea2577fd47a
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-10.0.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug +embedded ipv6 privsep +udev"
+
+DEPEND="udev? ( virtual/udev )"
+RDEPEND="
+	${DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable debug)
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(use_enable privsep)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
+		$(usex privsep '--privsepuser=dhcpcd' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index a04b080f5bbd..1ea2577fd47a 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -12,8 +12,8 @@ else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/${MY_P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_P}"
+	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi