From 4d37b8aa4c6b04fa417e8f87f276f7e08a411ee0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 1 Sep 2024 12:01:16 +0100 Subject: gentoo auto-resync : 01:09:2024 - 12:01:15 --- net-misc/dhcpcd/Manifest | 4 +- net-misc/dhcpcd/dhcpcd-10.0.10.ebuild | 172 ++++++++++++++++++++++++++++++++++ net-misc/dhcpcd/dhcpcd-9999.ebuild | 8 +- 3 files changed, 177 insertions(+), 7 deletions(-) create mode 100644 net-misc/dhcpcd/dhcpcd-10.0.10.ebuild (limited to 'net-misc/dhcpcd') diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index e1aec919cebc..e382700d4646 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -3,12 +3,14 @@ AUX dhcpcd-10.0.6-fix-lib-check.patch 340 BLAKE2B 6e9f881e64676477b100bb65d4962a AUX dhcpcd-10.0.6-rebinding.patch 1351 BLAKE2B 5bf20cc11f82082b9aed01279c2071d948cb4308e935289b2ff7022cd146b4e600cd35dfe63d08006311769b1816cbadb0fcfe7cecaecec64d25fc1f0ddc450f SHA512 c657af1001ea7dbfcd3a6c502667cda3eb164ee532e2083976ab5a46cdc4ab0a0812fd828f0bb98dd6bf326ecdaa3ef16f4d545580c59c63f8aad0e893651427 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041 +DIST dhcpcd-10.0.10.tar.xz 272732 BLAKE2B 2ecf52009f3fd4442863e1927a8d9e777ee6f34ff4d50a6f1e67821fb23fd12221df1e3a0a04ea0874df8feac15785772b4aa75af407f74448e442db36410e30 SHA512 87c836731637c134a95ea91d9a3d5c682e6e7f3340961f2995fc84931ff9b2a4c0073aca872a98738dc76005eb1159c42f1044fb0998891386784df299786349 DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7c1ffd53b285842a92d99d88fae44e7e6384134bbe1eb839001f822fa7fb43718c42f9e8e6d11a05ec66fa2fc6 SHA512 403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004 DIST dhcpcd-10.0.8.tar.xz 272116 BLAKE2B 1bf27387c13f192c6216e2f1ecad06bfa82267d5d6e08ddaa123789699fe9154222c33b1aa1f603e65ae8dce510cb24d48e72701494e0793c766e81f024f8bc5 SHA512 8c9bcd49a828dbc1089f49b73decefb6d1c3ef47fecaae242b08e3bdc8c3c49540d1d3551ab879d58df0dca64dcc64d7a29c665d1b1ebbd72d6a52662529eea4 DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee +EBUILD dhcpcd-10.0.10.ebuild 4941 BLAKE2B 1136c63b4807b881a717c9ea0cb69b210f76354056490f6930ce1e52dbb89972d897a8e948f55dceeb7cc7baf08f97e379a60a0deaab6c286d320c6fe8f83679 SHA512 d147d5094274d0716ab406069b12abd31d5e7e3e039cd76b29ac6deecdd9a4ffd9f500d3fe28028bdc7e437f16106bc297ac818895cf149a287790e5b79f0a3c EBUILD dhcpcd-10.0.6-r2.ebuild 4914 BLAKE2B 06d46941ff39863b0741e63a5584762a5ea72fcf8ab8f5bc08899e124777c0bd14133d0b8f3916a64d191836cd1f8aa754d21415845977a4351e8e68ca40152d SHA512 f653bbdeb503a6464bfa7fc1469cb41fdaef83f9a9042158c5401d179dca3c8ce61a545c68821f9b0a172f65037672250885d5171dc63669361465d2e7a318a4 EBUILD dhcpcd-10.0.6-r3.ebuild 5153 BLAKE2B 0bc2764f5a8b21c1475b15f31b493674f8b847e08c615103b8cb5d11ac1ed45666ed119991294fe5c26cd09972c67a3dbb7724c95905f078e6d188c3b38d4ce3 SHA512 23b2bda0bb0ebe0bbd88b82b0f83ca6ecc4a0cafdb4967fad437c6ee976323162fb6b939950ee240a694e9d36cd74f2ccd7bea8176201910ca365d3108f1d76c EBUILD dhcpcd-10.0.8.ebuild 5061 BLAKE2B d67781e5502650c58654beb22d19692d3a05458b207f1ddf7b17bc30b0d0299b7c81495c73563b2c1e1c4e16182245b88119bcda2a007841b262c87753dc74f6 SHA512 679ee5532a20eb8bbeaa87abbc5ff36f4ce79bddb930e25661d0a0404c44bd4ebbb1a235b8eb7262316e699b3896bcfbe132ad1da357d55e27f91fb4172a422b EBUILD dhcpcd-9.5.1.ebuild 4610 BLAKE2B e74ed2bcac66ce60354b6a1d5fe606b91c87057db2e23dd31fd1035aa5ab05042053c62d04b406c5ff9c1b96a2e196a60a8df699c7755319ca50a58f627e684e SHA512 88976827203f49c28d45cb0dfd65b1f71e881e53c617e3cc131f6886197cfcc50dfaa6d0d1a2e6e678e12f9964aa50f70d102475bcbcc9431e6d5f4c98c5120b -EBUILD dhcpcd-9999.ebuild 5069 BLAKE2B efd50fb2ddb281df4168c24cdc61e74192d1c7eec2821fa8f1cd70bf56244d47c7f8c9178b2dab1d2eb0e6fd808bad2938dacb2551f23e6e73728067be6e95c2 SHA512 5b398fc5ddd1ea0f8189e66bb0525c10f2f079991fc9d3011264c7274bada9603e5bbebb78fd5af3d98d7d0bd20e1b7b2375169d3377a61753003479a37e2c12 +EBUILD dhcpcd-9999.ebuild 4941 BLAKE2B 1136c63b4807b881a717c9ea0cb69b210f76354056490f6930ce1e52dbb89972d897a8e948f55dceeb7cc7baf08f97e379a60a0deaab6c286d320c6fe8f83679 SHA512 d147d5094274d0716ab406069b12abd31d5e7e3e039cd76b29ac6deecdd9a4ffd9f500d3fe28028bdc7e437f16106bc297ac818895cf149a287790e5b79f0a3c MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45 diff --git a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild new file mode 100644 index 000000000000..ec115638fa16 --- /dev/null +++ b/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd optfeature 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 BSD ISC MIT" +SLOT="0" +IUSE="debug +embedded ipv6 privsep +udev" + +DEPEND=" + app-crypt/libmd + udev? ( virtual/udev ) +" +RDEPEND=" + ${DEPEND} + privsep? ( + acct-group/dhcpcd + acct-user/dhcpcd + ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + # These don't exist on Linux/glibc (bug #900264) + memset_explicit + memset_s + setproctitle + strtoi + consttime_memequal + SHA256_Init + hmac + # These may exist on some glibc versions, but the checks fail due to + # -Werror / undefined reference no matter what. bug #924825 + arc4random + arc4random_uniform +) + +PATCHES=( + "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch +) + +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 + + optfeature "lookup-hostname hook" net-dns/bind-tools +} diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index 56307d8d8f09..ec115638fa16 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit systemd toolchain-funcs +inherit systemd optfeature toolchain-funcs if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -168,9 +168,5 @@ pkg_postinst() { 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 + optfeature "lookup-hostname hook" net-dns/bind-tools } -- cgit v1.2.3