diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-02-13 00:12:52 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-02-13 00:12:52 +0000 |
commit | 965058196f44550f3bc491dd85064071e085b776 (patch) | |
tree | 8485c648f0ac19b27204c8b331c3619c93463cce /net-misc/dhcpcd | |
parent | 0ec1e1dd7867c3dedcbea76c9b6e847d6b388c03 (diff) |
gentoo auto-resync : 13:02:2025 - 00:12:52
Diffstat (limited to 'net-misc/dhcpcd')
-rw-r--r-- | net-misc/dhcpcd/Manifest | 13 | ||||
-rw-r--r-- | net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild | 170 | ||||
-rw-r--r-- | net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild | 178 | ||||
-rw-r--r-- | net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild (renamed from net-misc/dhcpcd/dhcpcd-10.0.8.ebuild) | 13 | ||||
-rw-r--r-- | net-misc/dhcpcd/dhcpcd-10.2.0.ebuild (renamed from net-misc/dhcpcd/dhcpcd-10.0.10.ebuild) | 4 | ||||
-rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch | 46 | ||||
-rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch | 46 | ||||
-rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch | 28 |
8 files changed, 39 insertions, 459 deletions
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 9d75ade232ea..b6e32d13b4ca 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,16 +1,11 @@ -AUX dhcpcd-10.0.6-crash.patch 1598 BLAKE2B 149cd9ab0372ba507505d1d30707e18ef69b7db583211e86bd48c2fabcde62003356735813789d4f021bdc1636291b0469601fbd2be33f79f84ba17147968f84 SHA512 dfe49bb7d872ffc27ece3d59635cc5a81975181065ae0c54576195637266b24653832c05146bf2e6c0e9f772faf1920c09f234d40b0bf57c8eabf50d0a9818ae AUX dhcpcd-10.0.6-fix-lib-check.patch 340 BLAKE2B 6e9f881e64676477b100bb65d4962ac4de360a21e938e79c294cd8f8cb837bbe30cdcfa8ca84b3d9558fcf3d5109ba04704c2e4bb269ba2526deed51fec0bf11 SHA512 66ac97580ae066afb4e46b15161a8331140c010764f7932218ce03112bed4bf52e316f58fbb7919c38052ce6ef2a4c36768103aa01f146161cf94169cb8ccacd -AUX dhcpcd-10.0.6-rebinding.patch 1351 BLAKE2B 5bf20cc11f82082b9aed01279c2071d948cb4308e935289b2ff7022cd146b4e600cd35dfe63d08006311769b1816cbadb0fcfe7cecaecec64d25fc1f0ddc450f SHA512 c657af1001ea7dbfcd3a6c502667cda3eb164ee532e2083976ab5a46cdc4ab0a0812fd828f0bb98dd6bf326ecdaa3ef16f4d545580c59c63f8aad0e893651427 +AUX dhcpcd-10.1.0-seccomp-glibc-2.41.patch 870 BLAKE2B 1ea71a1a5b9d3483139617bea790ad70a989e28256afd2c2a73b0048bbfdefd1f164b548b59caf47269fba5ef6deb379c9ee6d790149a02559b6ea2334992e3b SHA512 acfce6d1966347b1b7797c96d499fe28e3a7e97c1961ab10f3fc7023826af18bcfcef7731e42444b78c5404870b75b9790eac529f346a1a68ae03f3366e91171 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-10.1.0.tar.xz 271660 BLAKE2B 9d47ae8b97ba082f980966a2c3f688c6a8addb10989c166dafebdb6491793815c4caddc3016334f6549923632fd01fc8ce0987eca31af01948b0f4a643f88b38 SHA512 25b3304471c85975e004f101fdd8dc6155065009e9d94719aadc6181717839c501d66740f002aa00acda73cce3c0d924f4241eed177688c4e794be301b059e04 -EBUILD dhcpcd-10.0.10.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c -EBUILD dhcpcd-10.0.6-r2.ebuild 4908 BLAKE2B bc0e0e9861b2be679817a74bd7ff749038dd04f8653d7ca13732602c3184ff9728b1b6efcfb411972e77e425f444cc01b084dc95cc4310e82da32667151e1d36 SHA512 480c9c9c4d74bd0ff52e3efb339d73abb2ba2b2fc8373e6f6f2aa2075d628d6e230b0d707f5bbaf6581b86759bc561c708bf962f1e6a6cfe07f53cf267e5269a -EBUILD dhcpcd-10.0.6-r3.ebuild 5147 BLAKE2B 9fefbb6c238edf8124d7a015954f6e3aab60870fe91664c705d2df6ee5a8e9694b542cee7fece90927ebbdb50ff249d5cbc6c928eac9938475b36fbc07280ea7 SHA512 8a3b7fb39663b07481239d2de7d4b8d6449e38b7f8024c280c97cdbbf1da59a031c1d23ee24fbc9af37565efe67eb8c3bf56e64568f761e26ddada8a76bcf388 -EBUILD dhcpcd-10.0.8.ebuild 5055 BLAKE2B 84dd290736fd5df2b1eee34233f906938928d2346e84e83893153db86a6bb66827913ff1e48eac5f47ff4d122a3c32e3782a977e7129c3e751d4466cb34d6ce3 SHA512 2905b9d6f5a8c12a801423972da34f6a0edf568ab48814b8d4cdfea9bc1e660d67444cd52162efc8cccabd3962d6be915c7bfb0dd69a4d1c501166d6f77a068c +DIST dhcpcd-10.2.0.tar.xz 274896 BLAKE2B 0b209f253e6462cc176ffef749228fc3b82474ee4baa2c468277b58abea9541282a2a96633e88641c46e3e9a612049f574009dd42f00f86334e655b10c234e81 SHA512 d2414ae8ff292e04a9d7060d523b5975e996fb921c481d198c5b6804fd73c6fc6edd806faf24788eacd8a2125e80528db8844865178b65a3acf29d3d264a3bff +EBUILD dhcpcd-10.1.0-r1.ebuild 4976 BLAKE2B 1f6d2267d9f45879b23321b23e61bf94d45ebee8636d2f3e7d2c0952205f00f136b234f59858f7d342b53977b7702a452f0bb64e46ab97978123c714e07b6abf SHA512 f986c753abd83ebacb0083d85dc747d5266807b73db634498279ac88e0316b807bee99a9ecaf1bfef5217d207160a6a4c6e710cb2cb6c93db915e1b1f658e0d6 EBUILD dhcpcd-10.1.0.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c +EBUILD dhcpcd-10.2.0.ebuild 4935 BLAKE2B 2a5789402ae1b1f4b6a049ca45f98ebddb10a45c4d8753d60346e6ee69287b2d99bc566fa1573d6d97c281b9e1912f85d84e395a7f5d011198e20af417313951 SHA512 902a31842e545c59ff3955706306066cd34b0d8b46a8e588370c4943df64415845a080672458c4233c9188474342c6965a8b1c3da64c9954c2f608687a743cef EBUILD dhcpcd-9999.ebuild 4935 BLAKE2B c5c7a630572305a52a7edb2f9c329c3314393a94896f7b538c6e613d05eeb35eff0059186ad402c05a29130af09f231f3d8d712df413c6d6088ceb9376b52780 SHA512 d0edccb3d0047d4adf3f694f0c7625914de2e552e7aa8ef189ced54399469622cdb3a340549eb4017b391eb765d93095fd21312d78e7b7ab537c290ec07fa251 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45 diff --git a/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild deleted file mode 100644 index da71fc81b647..000000000000 --- a/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2024 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 ~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="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 -) - -PATCHES=( - "${FILESDIR}"/${PN}-10.0.6-rebinding.patch - "${FILESDIR}"/${PN}-10.0.6-crash.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 - - 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-10.0.6-r3.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild deleted file mode 100644 index 06b17e02b53a..000000000000 --- a/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2024 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 ~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-rebinding.patch - "${FILESDIR}"/${PN}-10.0.6-crash.patch - "${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 - - 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-10.0.8.ebuild b/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild index ba52c3873ac8..008dcac7a8fa 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.8.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit systemd toolchain-funcs +inherit systemd optfeature toolchain-funcs if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -15,7 +15,7 @@ else 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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" @@ -54,6 +54,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch + "${FILESDIR}"/${P}-seccomp-glibc-2.41.patch ) src_configure() { @@ -168,9 +169,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 } diff --git a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild b/net-misc/dhcpcd/dhcpcd-10.2.0.ebuild index 4a63060cb6be..fcfca62700dc 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ else 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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" diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch deleted file mode 100644 index 5b61e3ca37ef..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/issues/179 -https://github.com/NetworkConfiguration/dhcpcd/issues/283 -https://bugzilla.redhat.com/2262996 -https://github.com/NetworkConfiguration/dhcpcd/commit/727c78f503d456875e2a3cee7609288b537d9d25 - -From 727c78f503d456875e2a3cee7609288b537d9d25 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com> -Date: Fri, 16 Feb 2024 17:15:35 +0100 -Subject: [PATCH] Move dhcp(v4) packet size check earlier (#295) - -dhcp_handlebootp handled zero sized packets correctly, but -dhcp_redirect_dhcp did not have such protection. Move size check before -both of them. Size when called from dhcp_packet is checked by -is_packet_udp_bootp call. Only dhcp_recvmsg needs earlier checking to be -added. - -Fixes #283 ---- a/src/dhcp.c -+++ b/src/dhcp.c -@@ -3532,12 +3532,6 @@ dhcp_handlebootp(struct interface *ifp, struct bootp *bootp, size_t len, - { - size_t v; - -- if (len < offsetof(struct bootp, vend)) { -- logerrx("%s: truncated packet (%zu) from %s", -- ifp->name, len, inet_ntoa(*from)); -- return; -- } -- - /* Unlikely, but appeases sanitizers. */ - if (len > FRAMELEN_MAX) { - logerrx("%s: packet exceeded frame length (%zu) from %s", -@@ -3670,6 +3664,13 @@ dhcp_recvmsg(struct dhcpcd_ctx *ctx, struct msghdr *msg) - logerr(__func__); - return; - } -+ -+ if (iov->iov_len < offsetof(struct bootp, vend)) { -+ logerrx("%s: truncated packet (%zu) from %s", -+ ifp->name, iov->iov_len, inet_ntoa(from->sin_addr)); -+ return; -+ } -+ - state = D_CSTATE(ifp); - if (state == NULL) { - /* Try re-directing it to another interface. */ diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch deleted file mode 100644 index 6457368f1150..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/920652#c2 -https://github.com/NetworkConfiguration/dhcpcd/commit/8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663 - -From 8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Sun, 24 Dec 2023 12:07:25 +0000 -Subject: [PATCH] DHCP: DECLINE address on ARP defend failure - -Also, drop the lease. -This should get us a new address from the DHCP server when we -re-enter DISCOVER to avoid looping on the same address and fail -again. ---- - src/dhcp.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/dhcp.c b/src/dhcp.c -index 014ce6cf..a58e1db2 100644 ---- a/src/dhcp.c -+++ b/src/dhcp.c -@@ -1944,7 +1944,11 @@ dhcp_expire(void *arg) - static void - dhcp_decline(struct interface *ifp) - { -+ struct dhcp_state *state = D_STATE(ifp); - -+ // Set the expired state so we send over BPF as this could be -+ // an address defence failure. -+ state->added |= STATE_EXPIRED; - send_message(ifp, DHCP_DECLINE, NULL); - } - #endif -@@ -2098,8 +2102,12 @@ static void - dhcp_arp_defend_failed(struct arp_state *astate) - { - struct interface *ifp = astate->iface; -+ struct dhcp_state *state = D_STATE(ifp); - -+ if (!(ifp->options->options & (DHCPCD_INFORM | DHCPCD_STATIC))) -+ dhcp_decline(ifp); - dhcp_drop(ifp, "EXPIRED"); -+ dhcp_unlink(ifp->ctx, state->leasefile); - dhcp_start1(ifp); - } - #endif - diff --git a/net-misc/dhcpcd/files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch b/net-misc/dhcpcd/files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch new file mode 100644 index 000000000000..6b69b47176d2 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch @@ -0,0 +1,28 @@ +https://github.com/NetworkConfiguration/dhcpcd/commit/e9e40400003db2e4f12dba85acabbaf2212a520f + +From e9e40400003db2e4f12dba85acabbaf2212a520f Mon Sep 17 00:00:00 2001 +From: Scott Shambarger <devel@shambarger.net> +Date: Sat, 7 Dec 2024 16:37:28 +0000 +Subject: [PATCH] linux: Allow the __NR_rt_sigprocmask syscall + +Fixes recent glibc changes to getrandom() used by arc4random(). +Fixes #421. +--- + src/privsep-linux.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 8357904c..e3485a2e 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -409,6 +409,9 @@ static struct sock_filter ps_seccomp_filter[] = { + #ifdef __NR_recvmsg + SECCOMP_ALLOW(__NR_recvmsg), + #endif ++#ifdef __NR_rt_sigprocmask ++ SECCOMP_ALLOW(__NR_rt_sigprocmask), ++#endif + #ifdef __NR_rt_sigreturn + SECCOMP_ALLOW(__NR_rt_sigreturn), + #endif + |