From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- net-misc/dhcpcd/Manifest | 7 +- net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild | 160 --------------------- net-misc/dhcpcd/dhcpcd-9.4.1.ebuild | 2 +- .../dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch | 36 ----- .../dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch | 40 ------ .../dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch | 55 ------- 6 files changed, 2 insertions(+), 298 deletions(-) delete mode 100644 net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild delete mode 100644 net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch delete mode 100644 net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch delete mode 100644 net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch (limited to 'net-misc/dhcpcd') diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 23f64095dd85..3f25be85b9b7 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,11 +1,6 @@ -AUX dhcpcd-9.4.0-memleak_fix.patch 730 BLAKE2B 705d0d6a203560315702af8ccd491cd3529cc7abe5038cb3a8881acb88e5c14d3bb75af267e2ba338e4ef4a6a9b85c0b47ca004f30b2018d978214f260e46fb3 SHA512 3a2111468bb8def0353b153c6d234ee70e7de9606ec4463ecf3276afe82dcbd772138ac7b429c6723112d61f0b22e27760deaf43a2838b7406d8886a29f6393a -AUX dhcpcd-9.4.0-sparc_privsep.patch 1657 BLAKE2B 58564b77f97fa469ae64747915ac27f733e03d833d73edaac64293f1552c3be9128091683b061a05095244a3c59729f3aacd69ca3220bfb3f66bcf09112dedbc SHA512 d9dff010beb3eccd8f6f3adfa9ab2162d16b504f17f6f66363930be693760b16e1f226591e7486e893e99511480cba29d5baaeac1d23e5387e6e5d0e8f4dd1a0 -AUX dhcpcd-9.4.0-unlink_socket.patch 1657 BLAKE2B 6c66e78fb0be1ed60176bee31240b9185b9bf71e80d9b0d6a03d77c1cd5ca7b7a4dab468d5299887443e8e1ef17556d89d569eebdb8eecfbe0e0bf91b381d116 SHA512 17325af7fd51dd9a6eb7edf8e952eb096c054414a7ad7fdf242d19500222832e994815ed9eb3aafb7a68a62dbaa7c9b9e77dc7b632919127662c805e4117f11e AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041 -DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45 -EBUILD dhcpcd-9.4.0-r1.ebuild 4778 BLAKE2B 509b52d1d4334116b1c5d3fdd41e53ee52b206c1f92e58402384b8d9b8c85370a9f008aa2028293c0a450542dea53bbc44f4d26b4999dd298ea3e478295991a8 SHA512 2605a40bc99c35f1acaf8beeedc37d2ee4e82b2693bb0b40b004d785718b54ee0c8bda11f621e5d2a9e62c465380ca061b8e61384eb5f5dd8a183ef018e10bc0 -EBUILD dhcpcd-9.4.1.ebuild 4639 BLAKE2B 7fba6ef68f78a85ba37f82f67371d05ff49d7b0c1e40ce66773a490523ae7364a9fd2eb4a432bab11d806ac752fe9343cd23bb1d85be6fc8fe23cee913d4c2c9 SHA512 bc6b360259c18262fbb9fdcac56324ee56d2726157222fdf021fa8bcdaee6932bac285554faa186b31c6eee221031f9e6b4b4bb85a8fe13e851662c3290e26a7 +EBUILD dhcpcd-9.4.1.ebuild 4646 BLAKE2B 9f2447bc68012dfd41188f10d62729958b1abb3804e44abb5f65cfd2ee3086fb28cd9530b420e4a0597ec9ab4af4aab7784dcbe935adfc2b017e34b3dfb8025e SHA512 63f8ce073f061a76f8c9e41b3601d4ecd13ab3471443d6cfe73149333c3bc0452f02d6bd96cfbfac664bf6b5f315eb664ec45e673ec71086d23c9e7e4e26ca46 EBUILD dhcpcd-9999.ebuild 4647 BLAKE2B a722a65460483c3eb185c6ab5a11e09a68f706b50ec1e2d73f0e32e88e33000d04290e98d88fea1f439a9f0d86f09a2d6573441ec4501a353630b8d1f86c9d2c SHA512 448bbe2b5d26c1ab2ba0d35e2e6d87ea936771342f825aa330de01f0cfa11ba14321d474111f17726c79c5bb6395dc5212a191ab3a1eda15f063876b80d935e2 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45 diff --git a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild deleted file mode 100644 index a4794b63f7ea..000000000000 --- a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" -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" - -COMMON_DEPEND="udev? ( virtual/udev )" -DEPEND="${COMMON_DEPEND}" -RDEPEND=" - ${COMMON_DEPEND} - privsep? ( - acct-group/dhcpcd - acct-user/dhcpcd - ) -" - -PATCHES=( - "${FILESDIR}/${P}-memleak_fix.patch" - "${FILESDIR}/${P}-unlink_socket.patch" - "${FILESDIR}/${P}-sparc_privsep.patch" #776178 -) - -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-9.4.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild index 1aa27d0a3b4e..b7d172155d9c 100644 --- a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild @@ -13,7 +13,7 @@ else MY_P="${MY_P/_beta/-beta}" MY_P="${MY_P/_rc/-rc}" SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch deleted file mode 100644 index 61aed69656d3..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ba9f3823ae825c341ea30f45b46d942b4ce5b8d9 Mon Sep 17 00:00:00 2001 -From: Roy Marples -Date: Sun, 24 Jan 2021 22:53:20 +0000 -Subject: [PATCH] Linux: fix a memory leak when dhcpcd exits or the log is - reopened - ---- - src/logerr.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/logerr.c b/src/logerr.c -index 21e933b8..35268870 100644 ---- a/src/logerr.c -+++ b/src/logerr.c -@@ -484,13 +484,14 @@ logclose(void) - #endif - - closelog(); -+#if defined(__linux__) -+ free(_logprog); -+ _logprog = NULL; -+#endif - #ifndef SMALL - if (ctx->log_file == NULL) - return; - fclose(ctx->log_file); - ctx->log_file = NULL; - #endif --#if defined(__linux__) -- free(_logprog); --#endif - } --- -2.30.0 - - diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch deleted file mode 100644 index a91db28d08c7..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch +++ /dev/null @@ -1,40 +0,0 @@ -From dcfd7a23f002793a855156255e81662ef84064d3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 5 Feb 2021 09:25:12 +0100 -Subject: [PATCH] src/privsep-linux: fix build on sparc (#26) - -Fix the following build failure: - -privsep-linux.c:203: warning: "AUDIT_ARCH_SPARC64" redefined - 203 | # define AUDIT_ARCH_SPARC64 - | -In file included from privsep-linux.c:35: -/srv/storage/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/linux/audit.h:392: note: this is the location of the previous definition - 392 | #define AUDIT_ARCH_SPARC64 (EM_SPARCV9|__AUDIT_ARCH_64BIT) - | -In file included from privsep-linux.c:36: -privsep-linux.c:215:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? - 215 | BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), - | ^~~~~~~~~~~~~~~~~~ - -Signed-off-by: Fabrice Fontaine ---- - src/privsep-linux.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index d00894ab..5c80c1b3 100644 ---- a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -222,9 +222,9 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) - # endif - #elif defined(__sparc__) - # if defined(__arch64__) --# define AUDIT_ARCH_SPARC64 -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC64 - # else --# define AUDIT_ARCH_SPARC -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC - # endif - #elif defined(__xtensa__) - # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch deleted file mode 100644 index 493e9c342f51..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d55f8e440389fbf333e14fe9f1a7d7f4da2b5197 Mon Sep 17 00:00:00 2001 -From: Roy Marples -Date: Tue, 26 Jan 2021 17:37:29 +0000 -Subject: [PATCH] control: unlink privileged socket when shutting down - without privsep - -Otherwise we have a connection refused when dhcpcd starts again -as it sees the stale socket file. ---- - src/control.c | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/src/control.c b/src/control.c -index 71405ed1..a601ad0a 100644 ---- a/src/control.c -+++ b/src/control.c -@@ -50,7 +50,7 @@ - - #ifndef SUN_LEN - #define SUN_LEN(su) \ -- (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) -+ (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) - #endif - - static void -@@ -350,12 +350,12 @@ control_start1(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family, - } - #endif - -- if ((fmode & S_PRIV) == S_PRIV) -- strlcpy(ctx->control_sock, sa.sun_path, -- sizeof(ctx->control_sock)); -- else -+ if ((fmode & S_UNPRIV) == S_UNPRIV) - strlcpy(ctx->control_sock_unpriv, sa.sun_path, - sizeof(ctx->control_sock_unpriv)); -+ else -+ strlcpy(ctx->control_sock, sa.sun_path, -+ sizeof(ctx->control_sock)); - return fd; - } - -@@ -368,7 +368,8 @@ control_start(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family) - if (IN_PRIVSEP_SE(ctx)) { - make_path(ctx->control_sock, sizeof(ctx->control_sock), - ifname, family, false); -- make_path(ctx->control_sock_unpriv, sizeof(ctx->control_sock), -+ make_path(ctx->control_sock_unpriv, -+ sizeof(ctx->control_sock_unpriv), - ifname, family, true); - return 0; - } --- -2.30.0 - -- cgit v1.2.3