diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2023-05-21 16:36:04 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2023-05-21 16:36:04 -0400 |
| commit | c9ffaa149a270cf3da67bceb9eb31541aa668810 (patch) | |
| tree | fb67965175bd362a4e4e9fd01b1d7566bd9ac12d /net-misc/dhcp | |
| parent | gui-libs/wlroots: fix building with seatd, revbump to wlroots-0.16.2-r1 (diff) | |
| download | gentoo-c9ffaa149a270cf3da67bceb9eb31541aa668810.tar.gz gentoo-c9ffaa149a270cf3da67bceb9eb31541aa668810.tar.bz2 gentoo-c9ffaa149a270cf3da67bceb9eb31541aa668810.zip | |
net-misc/dhcp: drop broken LD_PRELOAD setting
Closes: https://bugs.gentoo.org/836405
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-misc/dhcp')
| -rw-r--r-- | net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild | 3 | ||||
| -rw-r--r-- | net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild (renamed from net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild) | 3 | ||||
| -rw-r--r-- | net-misc/dhcp/files/dhcpd.init5 | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild index aca3e20ed93e..9fa84b982375 100644 --- a/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild +++ b/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="+client ipv6 ldap selinux +server ssl vim-syntax" BDEPEND=" @@ -76,7 +76,6 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch" # Possible upstream candidates - "${FILESDIR}/${PN}-4.4.3-configure-clang16.patch" ) src_prepare() { diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild index 9fa84b982375..aca3e20ed93e 100644 --- a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild +++ b/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+client ipv6 ldap selinux +server ssl vim-syntax" BDEPEND=" @@ -76,6 +76,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch" # Possible upstream candidates + "${FILESDIR}/${PN}-4.4.3-configure-clang16.patch" ) src_prepare() { diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5 index f0ea9b0c7904..66b29cd3bb00 100644 --- a/net-misc/dhcp/files/dhcpd.init5 +++ b/net-misc/dhcp/files/dhcpd.init5 @@ -77,11 +77,9 @@ start() { local leasefile="$(get_var lease-file-name /var/lib/dhcp/${SVCNAME}.leases)" checkpath -f -o dhcp:dhcp "${chroot}${leasefile}" - # Setup LD_PRELOAD so name resolution works in our chroot. if [ -n "${chroot}" ] ; then checkpath -d -o root:root -m 755 "${chroot}"/dev "${chroot}"/etc "${chroot}"/proc cp -pP /etc/localtime /etc/resolv.conf "${chroot}"/etc/ - export LD_PRELOAD="${LD_PRELOAD} libresolv.so libnss_dns.so" if ! mountinfo -q "${chroot}/proc" ; then mount --bind /proc "${chroot}/proc" fi |