commit: 6eb9def2b3c4ab5289d489f8ddc0168d277393a7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri May 17 12:46:14 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri May 17 12:46:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb9def2
net-misc/dhcpcd: add missing app-crypt/libmd dep While at it, fix the configure check to not care about /usr vs / when checking for libraries, as we only support separate /usr with an initramfs these days. Closes: https://bugs.gentoo.org/932086 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{dhcpcd-9999.ebuild => dhcpcd-10.0.6-r3.ebuild} | 13 +++++++++++-- net-misc/dhcpcd/dhcpcd-9999.ebuild | 11 +++++++++-- net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch | 16 ++++++++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild similarity index 95% copy from net-misc/dhcpcd/dhcpcd-9999.ebuild copy to net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild index 914373137e7d..3fcb61425cc4 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,10 @@ LICENSE="BSD-2 BSD ISC MIT" SLOT="0" IUSE="debug +embedded ipv6 privsep +udev" -DEPEND="udev? ( virtual/udev )" +DEPEND=" + app-crypt/libmd + udev? ( virtual/udev ) +" RDEPEND=" ${DEPEND} privsep? ( @@ -45,6 +48,12 @@ QA_CONFIG_IMPL_DECL_SKIP=( hmac ) +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" diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index 914373137e7d..1c3bbc87d456 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,10 @@ LICENSE="BSD-2 BSD ISC MIT" SLOT="0" IUSE="debug +embedded ipv6 privsep +udev" -DEPEND="udev? ( virtual/udev )" +DEPEND=" + app-crypt/libmd + udev? ( virtual/udev ) +" RDEPEND=" ${DEPEND} privsep? ( @@ -45,6 +48,10 @@ QA_CONFIG_IMPL_DECL_SKIP=( hmac ) +PATCHES=( + "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch +) + src_configure() { local myeconfargs=( --dbdir="${EPREFIX}/var/lib/dhcpcd" diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch new file mode 100644 index 000000000000..0d609822aad1 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch @@ -0,0 +1,16 @@ +--- a/configure ++++ b/configure +@@ -361,11 +361,8 @@ if [ -e "$LDELF" ]; then + echo "LDFLAGS+= -Wl,-rpath=${LIBDIR}" >>$CONFIG_MK + fi + +-if [ -z "$PREFIX" ] || [ "$PREFIX" = / ]; then +- ALLOW_USR_LIBS=false +-else +- ALLOW_USR_LIBS=true +-fi ++ALLOW_USR_LIBS=true ++ + case "$OS" in + linux*|solaris*|sunos*|kfreebsd*|dragonfly*|freebsd*) ;; + *)
