[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/
commit: becd6aebc7e4c3e78e2497c4315ad2a1df5b3bd1
Author: Sam James gentoo org>
AuthorDate: Sun Feb 18 11:23:52 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 18 11:24:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=becd6aeb
net-misc/dhcp: move patches to devspace for 4.4.3_p1-r5
Signed-off-by: Sam James gentoo.org>
net-misc/dhcp/Manifest | 1 +
net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild | 27 +-
net-misc/dhcp/files/dhcp-4.4.3-infiniband.patch | 957
3 files changed, 16 insertions(+), 969 deletions(-)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 565f763ef590..47b71db74f8f 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1 +1,2 @@
DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B
6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4
SHA512
d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
+DIST dhcp-4.4.3-patches.tar.xz 15276 BLAKE2B
4750833f986eccdc60b63de55f0b0633039806d75e1bbb79ea6974990399f2ec33836fd22ec3a0981aaeffc3fcfd914deff96d139f4ea3c2ad1b9010ec737d06
SHA512
c8071f48e4074a7a83e74706868a782c7dc4bcb6df4b9035411e419a95bf90de66ece2b2aacc8f8f3ca517287599cb178704402ff276a4620c941733ce03c57b
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
index 479016e40c64..040aa5192a15 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -16,6 +16,7 @@ HOMEPAGE="https://www.isc.org/dhcp;
SRC_URI="
https://downloads.isc.org/isc/dhcp/${MY_P}.tar.gz
https://downloads.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz
+
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/dhcp-4.4.3-patches.tar.xz
"
S="${WORKDIR}/${MY_P}"
@@ -50,29 +51,31 @@ BDEPEND="
PATCHES=(
# Gentoo patches - these will probably never be accepted upstream
# Fix some permission issues
- "${FILESDIR}/${PN}-4.4.3-fix-perms.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-fix-perms.patch"
# Enable dhclient to equery NTP servers
- "${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch"
- "${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-ntp.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-resolvconf.patch"
# Enable dhclient to get extra configuration from stdin
- "${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-stdin-conf.patch"
# bug #265531
- "${FILESDIR}/${PN}-4.4.3-nogateway.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-nogateway.patch"
# bug #296921
- "${FILESDIR}/${PN}-4.4.3-quieter-ping.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-quieter-ping.patch"
# bug #437108
- "${FILESDIR}/${PN}-4.4.3-always-accept-4.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-always-accept-4.patch"
# bug #480636
- "${FILESDIR}/${PN}-4.4.3-iproute2-path.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-iproute2-path.patch"
# bug #471142
- "${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-bindtodevice-inet6.patch"
# bug #559832
- "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-ldap-ipv6-client-id.patch"
+ # bug #908986
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-infiniband.patch"
# Possible upstream candidates
- "${FILESDIR}/${PN}-4.4.3-configure-clang16.patch"
+ "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-configure-clang16.patch"
)
src_unpack() {
@@ -136,7 +139,7 @@ src_prepare() {
binddir=${binddir}
GMAKE=${MAKE:-gmake}
EOF
- eapply -p2 "${FILESDIR}"/${PN}-4.4.3-bind-disable.patch
+ eapply -p2
"${WORKDIR}"/dhcp-4.4.3-patches/${PN}-4.4.3-bind-disable.patch
# Only use the relevant subdirs now that ISC
#removed the lib/export structure in bind.
sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
diff --git a/net-misc/dhcp/files/dhcp-4.4.3-infiniband.patch
b/net-misc/dhcp/files/dhcp-4.4.3-infiniband.patch
deleted file mode 100644
index 6c1489e2a788..
--- a/net-misc/dhcp/files/dhcp-4.4.3-infiniband.patch
+++ /dev/null
@@ -1,957 +0,0 @@
-diff -urP a/client/clparse.c b/client/clparse.c
a/client/clparse.c 2023-06-21 23:44:22.471212250 -0600
-+++ b/client/clparse.c 2023-06-22 00:07:48.650031050 -0600
-@@ -197,6 +197,7 @@
- /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
-*/
- top_level_config.requested_lease = 7200;
-+ top_level_config.bootp_broadcast_always = 0;
-
[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/
commit: c9ffaa149a270cf3da67bceb9eb31541aa668810
Author: Mike Gilbert gentoo org>
AuthorDate: Sun May 21 20:36:04 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun May 21 20:36:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ffaa14
net-misc/dhcp: drop broken LD_PRELOAD setting
Closes: https://bugs.gentoo.org/836405
Signed-off-by: Mike Gilbert gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild | 293 -
net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild | 3 +-
...-4.4.3_p1-r2.ebuild => dhcp-4.4.3_p1-r3.ebuild} | 0
net-misc/dhcp/files/dhcpd.init5| 2 -
4 files changed, 1 insertion(+), 297 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
deleted file mode 100644
index 9fa84b982375..
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs flag-o-matic tmpfiles
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="https://www.isc.org/dhcp;
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
- ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${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"
-IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
-
-BDEPEND="
- acct-group/dhcp
- acct-user/dhcp"
-
-DEPEND="
- client? (
- kernel_linux? (
- ipv6? ( sys-apps/iproute2 )
- sys-apps/net-tools
- )
- )
- ldap? (
- net-nds/openldap:=
- ssl? ( dev-libs/openssl:= )
- )"
-RDEPEND="
- ${BDEPEND}
- ${DEPEND}
- selinux? ( sec-policy/selinux-dhcp )
- vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- # handle local bind hell
- cd "${S}"/bind
- unpack ./bind.tar.gz
-}
-
-PATCHES=(
- # Gentoo patches - these will probably never be accepted upstream
- # Fix some permission issues
- "${FILESDIR}/${PN}-4.4.3-fix-perms.patch"
-
- # Enable dhclient to equery NTP servers
- "${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch"
- "${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch"
-
- # Enable dhclient to get extra configuration from stdin
- "${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch"
- # bug #265531
- "${FILESDIR}/${PN}-4.4.3-nogateway.patch"
- # bug #296921
- "${FILESDIR}/${PN}-4.4.3-quieter-ping.patch"
- # bug #437108
- "${FILESDIR}/${PN}-4.4.3-always-accept-4.patch"
- # bug #480636
- "${FILESDIR}/${PN}-4.4.3-iproute2-path.patch"
- # bug #471142
- "${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch"
- # bug #559832
- "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
-
- # Possible upstream candidates
-)
-
-src_prepare() {
- default
-
- # Brand the version with Gentoo
- sed -i \
- -e "/VERSION=/s:'$: Gentoo-${PR}':" \
- configure || die
-
- # Change the hook script locations of the scripts
- sed -i \
- -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g'
\
- -e
's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
- client/scripts/* || die
-
- # No need for the linux script to force bash #158540
- sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
- # Quiet the freebsd logger a little
- sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd ||
die
-
- # Remove these options from the sample config
- sed -i -r \
- -e "/(script|host-name|domain-name) /d" \
- client/dhclient.conf.example || die
-
- if use client && ! use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
- Makefile.in || die
- elif ! use client && use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\::' \
- Makefile.in || die
- fi
-
- # Only install different man pages if we don't have en
- if [[ " ${LINGUAS} " != *" en "* ]]; then
- # Install Japanese man pages
- if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
- einfo "Installing Japanese documention"
- cp doc/ja_JP.eucJP/dhclient* client || die
-
[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/
commit: 8c680f270b865d00a05f08ed03e042d27fb76fc0
Author: Sam James gentoo org>
AuthorDate: Fri Apr 28 06:25:28 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 28 06:25:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c680f27
net-misc/dhcp: fix configure w/ clang 16
Signed-off-by: Sam James gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild | 294 +
.../dhcp/files/dhcp-4.4.3-configure-clang16.patch | 143 ++
2 files changed, 437 insertions(+)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild
b/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild
new file mode 100644
index ..60785dbffa15
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs flag-o-matic tmpfiles
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="https://www.isc.org/dhcp;
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+ ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${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"
+IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
+
+BDEPEND="
+ acct-group/dhcp
+ acct-user/dhcp"
+
+DEPEND="
+ client? (
+ kernel_linux? (
+ ipv6? ( sys-apps/iproute2 )
+ sys-apps/net-tools
+ )
+ )
+ ldap? (
+ net-nds/openldap:=
+ ssl? ( dev-libs/openssl:= )
+ )"
+RDEPEND="
+ ${BDEPEND}
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-dhcp )
+ vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ # handle local bind hell
+ cd "${S}"/bind
+ unpack ./bind.tar.gz
+}
+
+PATCHES=(
+ # Gentoo patches - these will probably never be accepted upstream
+ # Fix some permission issues
+ "${FILESDIR}/${PN}-4.4.3-fix-perms.patch"
+
+ # Enable dhclient to equery NTP servers
+ "${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch"
+ "${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch"
+
+ # Enable dhclient to get extra configuration from stdin
+ "${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch"
+ # bug #265531
+ "${FILESDIR}/${PN}-4.4.3-nogateway.patch"
+ # bug #296921
+ "${FILESDIR}/${PN}-4.4.3-quieter-ping.patch"
+ # bug #437108
+ "${FILESDIR}/${PN}-4.4.3-always-accept-4.patch"
+ # bug #480636
+ "${FILESDIR}/${PN}-4.4.3-iproute2-path.patch"
+ # bug #471142
+ "${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch"
+ # bug #559832
+ "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
+
+ # Possible upstream candidates
+ "${FILESDIR}/${PN}-4.4.3-configure-clang16.patch"
+)
+
+src_prepare() {
+ default
+
+ # Brand the version with Gentoo
+ sed -i \
+ -e "/VERSION=/s:'$: Gentoo-${PR}':" \
+ configure || die
+
+ # Change the hook script locations of the scripts
+ sed -i \
+ -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g'
\
+ -e
's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+ client/scripts/* || die
+
+ # No need for the linux script to force bash #158540
+ sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+ # Quiet the freebsd logger a little
+ sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd ||
die
+
+ # Remove these options from the sample config
+ sed -i -r \
+ -e "/(script|host-name|domain-name) /d" \
+ client/dhclient.conf.example || die
+
+ if use client && ! use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+ Makefile.in || die
+ elif ! use client && use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\::' \
+ Makefile.in || die
+ fi
+
+ # Only install different man pages if we don't have en
+ if [[ " ${LINGUAS} " != *" en "* ]]; then
+ # Install Japanese man pages
+ if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+ einfo "Installing Japanese documention"
+ cp doc/ja_JP.eucJP/dhclient* client || die
+ cp doc/ja_JP.eucJP/dhcp* common || die
+ fi
+ fi
+ # Now remove the non-english
[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/
commit: d71420bcf88260155b49c4ff294003189e5cba60
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Jan 20 03:44:24 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Jan 20 03:44:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71420bc
net-misc/dhcp: tweak /var/lib/dhcp creation
Drop the keepdir from src_install.
Update the modes in the tmpfiles.d file, and install it unconditionally.
Closes: https://bugs.gentoo.org/891347
Signed-off-by: Mike Gilbert gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild | 293 ++
net-misc/dhcp/files/dhcp.tmpfiles | 2 +
2 files changed, 295 insertions(+)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
new file mode 100644
index ..f2efd63970a9
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs flag-o-matic tmpfiles
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="https://www.isc.org/dhcp;
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+ ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${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"
+IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
+
+BDEPEND="
+ acct-group/dhcp
+ acct-user/dhcp"
+
+DEPEND="
+ client? (
+ kernel_linux? (
+ ipv6? ( sys-apps/iproute2 )
+ sys-apps/net-tools
+ )
+ )
+ ldap? (
+ net-nds/openldap:=
+ ssl? ( dev-libs/openssl:= )
+ )"
+RDEPEND="
+ ${BDEPEND}
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-dhcp )
+ vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ # handle local bind hell
+ cd "${S}"/bind
+ unpack ./bind.tar.gz
+}
+
+PATCHES=(
+ # Gentoo patches - these will probably never be accepted upstream
+ # Fix some permission issues
+ "${FILESDIR}/${PN}-4.4.3-fix-perms.patch"
+
+ # Enable dhclient to equery NTP servers
+ "${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch"
+ "${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch"
+
+ # Enable dhclient to get extra configuration from stdin
+ "${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch"
+ # bug #265531
+ "${FILESDIR}/${PN}-4.4.3-nogateway.patch"
+ # bug #296921
+ "${FILESDIR}/${PN}-4.4.3-quieter-ping.patch"
+ # bug #437108
+ "${FILESDIR}/${PN}-4.4.3-always-accept-4.patch"
+ # bug #480636
+ "${FILESDIR}/${PN}-4.4.3-iproute2-path.patch"
+ # bug #471142
+ "${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch"
+ # bug #559832
+ "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
+
+ # Possible upstream candidates
+)
+
+src_prepare() {
+ default
+
+ # Brand the version with Gentoo
+ sed -i \
+ -e "/VERSION=/s:'$: Gentoo-${PR}':" \
+ configure || die
+
+ # Change the hook script locations of the scripts
+ sed -i \
+ -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g'
\
+ -e
's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+ client/scripts/* || die
+
+ # No need for the linux script to force bash #158540
+ sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+ # Quiet the freebsd logger a little
+ sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd ||
die
+
+ # Remove these options from the sample config
+ sed -i -r \
+ -e "/(script|host-name|domain-name) /d" \
+ client/dhclient.conf.example || die
+
+ if use client && ! use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+ Makefile.in || die
+ elif ! use client && use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\::' \
+ Makefile.in || die
+ fi
+
+ # Only install different man pages if we don't have en
+ if [[ " ${LINGUAS} " != *" en "* ]]; then
+ # Install Japanese man pages
+ if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+ einfo "Installing Japanese documention"
+ cp doc/ja_JP.eucJP/dhclient* client || die
+ cp
[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/
commit: 5516475e7648dc3c46a680475f1f3c9124ce88a7
Author: David Seifert gentoo org>
AuthorDate: Fri Oct 14 18:25:26 2022 +
Commit: David Seifert gentoo org>
CommitDate: Fri Oct 14 18:25:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5516475e
net-misc/dhcp: rebase patches
Signed-off-by: David Seifert gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 20 +-
...pt-4.patch => dhcp-4.4.3-always-accept-4.patch} | 0
...6.patch => dhcp-4.4.3-bindtodevice-inet6.patch} | 11 +++---
...ent-ntp.patch => dhcp-4.4.3-dhclient-ntp.patch} | 0
patch => dhcp-4.4.3-dhclient-resolvconf.patch} | 44 +++---
patch => dhcp-4.4.3-dhclient-stdin-conf.patch} | 0
...-fix-perms.patch => dhcp-4.4.3-fix-perms.patch} | 6 +--
...2-path.patch => dhcp-4.4.3-iproute2-path.patch} | 0
patch => dhcp-4.4.3-ldap-ipv6-client-id.patch} | 0
...-nogateway.patch => dhcp-4.4.3-nogateway.patch} | 0
...er-ping.patch => dhcp-4.4.3-quieter-ping.patch} | 0
11 files changed, 40 insertions(+), 41 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index 9db36ddb42da..e425d52ea36c 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
@@ -50,26 +50,26 @@ src_unpack() {
PATCHES=(
# Gentoo patches - these will probably never be accepted upstream
# Fix some permission issues
- "${FILESDIR}/${PN}-3.0-fix-perms.patch"
+ "${FILESDIR}/${PN}-4.4.3-fix-perms.patch"
# Enable dhclient to equery NTP servers
- "${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
- "${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
+ "${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch"
+ "${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch"
# Enable dhclient to get extra configuration from stdin
- "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+ "${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch"
# bug #265531
- "${FILESDIR}/${PN}-4.3.6-nogateway.patch"
+ "${FILESDIR}/${PN}-4.4.3-nogateway.patch"
# bug #296921
- "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch"
+ "${FILESDIR}/${PN}-4.4.3-quieter-ping.patch"
# bug #437108
- "${FILESDIR}/${PN}-4.4.0-always-accept-4.patch"
+ "${FILESDIR}/${PN}-4.4.3-always-accept-4.patch"
# bug #480636
- "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch"
+ "${FILESDIR}/${PN}-4.4.3-iproute2-path.patch"
# bug #471142
- "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch"
+ "${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch"
# bug #559832
- "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch"
+ "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
# Possible upstream candidates
)
diff --git a/net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch
b/net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch
similarity index 100%
rename from net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch
rename to net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch
diff --git a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch
b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch
similarity index 51%
rename from net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch
rename to net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch
index 77254c32e2b0..f6ea0f858c6d 100644
--- a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch
@@ -5,15 +5,14 @@ snipped from fedora
# dhclient -6: bind socket to interface (#1001742)
# (Submitted to dhcp-b...@isc.org - [ISC-Bugs #34784])
-diff -up dhcp-4.2.5/common/socket.c.bindtodevice_inet6
dhcp-4.2.5/common/socket.c
dhcp-4.2.5/common/socket.c.bindtodevice_inet6 2013-09-17
16:47:05.0 +0200
-+++ dhcp-4.2.5/common/socket.c 2013-09-17 16:48:18.975997842 +0200
-@@ -245,7 +245,7 @@ if_register_socket(struct interface_info
+--- a/common/socket.c
b/common/socket.c
+@@ -266,7 +266,7 @@
#if defined(SO_BINDTODEVICE)
/* Bind this socket to this interface. */
- if ((local_family != AF_INET6) && (info->ifp != NULL) &&
+ if (((do_multicast == 0)||(*do_multicast == 0)) && (info->ifp != NULL)
&&
setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE,
- (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
- log_fatal("setsockopt: SO_BINDTODEVICE: %m");
+ (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
+ log_fatal("Can't set SO_BINDTODEVICE on dhcp socket for"
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch
b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch
similarity index 100%
rename from net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch
rename to net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch
diff --git
[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/
commit: 65f86cdce2f35d916c5f3c41fd41900f3bf6bedb
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Nov 20 19:29:17 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Nov 20 19:29:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f86cdc
net-misc/dhcp: backport build fix
Closes: https://bugs.gentoo.org/752402
Signed-off-by: Mike Gilbert gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r3.ebuild | 1 +
net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch | 25 ++
2 files changed, 26 insertions(+)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index 0257824a08f..6cad24e7519 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
# Possible upstream candidates
"${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194
+ "${FILESDIR}/dhcp-4.4.2-variable-name.patch" #752402
)
src_prepare() {
diff --git a/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch
b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch
new file mode 100644
index 000..9f5085dd5e2
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch
@@ -0,0 +1,25 @@
+From 261c84d91d1b4581df9f7f0ec031908299de7726 Mon Sep 17 00:00:00 2001
+From: Mark Andrews
+Date: Thu, 19 Dec 2019 09:27:44 +1100
+Subject: [PATCH] fix variable name in conditional block
+
+---
+ lib/isc/stats.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/isc/stats.c b/lib/isc/stats.c
+index 5bce3c1100..a7ab97ce53 100644
+--- a/bind/bind-9.11.14/lib/isc/stats.c
b/bind/bind-9.11.14/lib/isc/stats.c
+@@ -297,7 +297,7 @@ setcounter(isc_stats_t *stats,
+ isc_atomic_store((int32_t *)>counters[counter].lo,
+(uint32_t)(value & 0x));
+ # else
+- stats->counters[counter] = val;
++ stats->counters[counter] = value;
+ # endif
+ #endif
+ }
+--
+GitLab
+
[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/
commit: 9b7959a9776a912bdef36f4db14c3c7bb23ddf34
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Nov 18 17:08:22 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Nov 18 17:08:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b7959a9
net-misc/dhcp: pull in network-online.target in service units
dhcpd refuses to start if there are no configured broadcast interfaces.
Closes: https://bugs.gentoo.org/628920
Signed-off-by: Mike Gilbert gentoo.org>
net-misc/dhcp/{dhcp-4.4.2-r2.ebuild => dhcp-4.4.2-r3.ebuild} | 0
net-misc/dhcp/files/dhcpd4.service | 2 ++
net-misc/dhcp/files/dhcpd6.service | 2 ++
3 files changed, 4 insertions(+)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
similarity index 100%
rename from net-misc/dhcp/dhcp-4.4.2-r2.ebuild
rename to net-misc/dhcp/dhcp-4.4.2-r3.ebuild
diff --git a/net-misc/dhcp/files/dhcpd4.service
b/net-misc/dhcp/files/dhcpd4.service
index b064bd9b57d..8197ace1210 100644
--- a/net-misc/dhcp/files/dhcpd4.service
+++ b/net-misc/dhcp/files/dhcpd4.service
@@ -3,6 +3,8 @@ Description=DHCPv4 Server Daemon
Documentation=man:dhcpd(8) man:dhcpd.conf(5)
After=network.target
After=time-sync.target
+After=network-online.target
+Wants=network-online.target
[Service]
ExecStart=/usr/sbin/dhcpd -f -cf /etc/dhcp/dhcpd.conf -user dhcp -group dhcp
--no-pid
diff --git a/net-misc/dhcp/files/dhcpd6.service
b/net-misc/dhcp/files/dhcpd6.service
index 603cacd8eb8..7f41db0a72b 100644
--- a/net-misc/dhcp/files/dhcpd6.service
+++ b/net-misc/dhcp/files/dhcpd6.service
@@ -3,6 +3,8 @@ Description=DHCPv6 Server Daemon
Documentation=man:dhcpd(8) man:dhcpd.conf(5)
After=network.target
After=time-sync.target
+After=network-online.target
+Wants=network-online.target
[Service]
ExecStart=/usr/sbin/dhcpd -f -s -6 -cf /etc/dhcp/dhcpd.conf -user dhcp -group
dhcp --no-pid
[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/
commit: 34e2a1385458f4d62dcc5fb01cd62700704141be
Author: Tony Vroon gentoo org>
AuthorDate: Tue Sep 19 22:43:56 2017 +
Commit: Tony Vroon gentoo org>
CommitDate: Tue Sep 19 22:44:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34e2a138
net-misc/dhcp: --without-lmdb not valid in embedded BIND.
Package-Manager: portage-2.3.8
net-misc/dhcp/dhcp-4.3.6-r1.ebuild| 263 ++
net-misc/dhcp/files/dhcp-4.3.6-lmdb-removal.patch | 12 +
2 files changed, 275 insertions(+)
diff --git a/net-misc/dhcp/dhcp-4.3.6-r1.ebuild
b/net-misc/dhcp/dhcp-4.3.6-r1.ebuild
new file mode 100644
index 000..32b0629c937
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.6-r1.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP;
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+ ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz;
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
+
+DEPEND="
+ client? (
+ kernel_linux? (
+ ipv6? ( sys-apps/iproute2 )
+ sys-apps/net-tools
+ )
+ )
+ ldap? (
+ net-nds/openldap
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-dhcp )
+ vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ # handle local bind hell
+ cd "${S}"/bind
+ unpack ./bind.tar.gz
+}
+
+PATCHES=(
+ # Gentoo patches - these will probably never be accepted upstream
+ # Fix some permission issues
+ "${FILESDIR}/${PN}-3.0-fix-perms.patch"
+
+ # Enable dhclient to equery NTP servers
+ "${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
+ "${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
+
+ # Enable dhclient to get extra configuration from stdin
+ "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+ "${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
+ "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
+ "${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
+ "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
+ "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
+ "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
+ "${FILESDIR}/${PN}-4.3.6-lmdb-removal.patch" #628598
+)
+
+src_prepare() {
+ default
+
+ # Brand the version with Gentoo
+ sed -i \
+ -e "/VERSION=/s:'$: Gentoo-${PR}':" \
+ configure || die
+
+ # Change the hook script locations of the scripts
+ sed -i \
+ -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g'
\
+ -e
's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+ client/scripts/* || die
+
+ # No need for the linux script to force bash #158540
+ sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+ # Quiet the freebsd logger a little
+ sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd ||
die
+
+ # Remove these options from the sample config
+ sed -i -r \
+ -e "/(script|host-name|domain-name) /d" \
+ client/dhclient.conf.example || die
+
+ if use client && ! use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+ Makefile.in || die
+ elif ! use client && use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\::' \
+ Makefile.in || die
+ fi
+
+ # Only install different man pages if we don't have en
+ if [[ " ${LINGUAS} " != *" en "* ]]; then
+ # Install Japanese man pages
+ if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+ einfo "Installing Japanese documention"
+ cp doc/ja_JP.eucJP/dhclient* client || die
+ cp doc/ja_JP.eucJP/dhcp* common || die
+ fi
+ fi
+ # Now remove the non-english docs so there are no errors later
+ rm -r doc/ja_JP.eucJP
[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/
commit: ba88569985ba83cd2fd5035028ee599fca26f622
Author: Lars Wendler gentoo org>
AuthorDate: Tue Aug 1 07:45:50 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Aug 1 07:46:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba885699
net-misc/dhcp: Bump to version 4.3.6
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Signed-off-by: Lars Wendler gentoo.org>
net-misc/dhcp/Manifest | 1 +
net-misc/dhcp/dhcp-4.3.6.ebuild| 262 +
net-misc/dhcp/files/dhcp-3.0-fix-perms.patch | 4 +-
.../dhcp/files/dhcp-3.0.3-dhclient-no-down.patch | 4 +-
net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch | 210 ++
.../files/dhcp-4.3.6-dhclient-resolvconf.patch | 422 +
net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch | 11 +
net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch | 66
net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch | 66
9 files changed, 1042 insertions(+), 4 deletions(-)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 3341a295d95..075efb60c20 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,2 +1,3 @@
DIST dhcp-4.3.4.tar.gz 9302513 SHA256
f5115aee3dd3e6925de4ba47b80ab732ba48b481c8364b6ebade2d43698d607e SHA512
411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706
WHIRLPOOL
ea283592268c8efabd7fec430bd21c45306822b9275c91ee1e604d09e92f9eb3c50941ea11ecd9dcb230caec3b8e6ee94958e8eb6375e0ca0e7a64a8aaf63bce
DIST dhcp-4.3.5.tar.gz 10075147 SHA256
eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954 SHA512
aba0e1d361eb9e7ed33fc48c0b0b9288057af9ec51775e40e27feb9ababc182506706fcf39079236ce36b0f7ded391e107474dc29de2e60ed45d37753505e1f0
WHIRLPOOL
85012016d81efb7654ec417e7a0f1a6145e8e143b13d6d9470d0fb7caf37c035441d5b2b8849d332f8ad0a9a6509bb0b931ac8f207f7ba9104e96811c0360124
+DIST dhcp-4.3.6.tar.gz 10182593 SHA256
a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b SHA512
de4962dc2aa174df17a3a1456719a777a42d238c3d6ad1771ccc460fa70c9e9cefcce52c7437f7acde61b9c3a2e84e9d49fd2dc33c7e9243053ceed5b247be03
WHIRLPOOL
1617687cd2144a09e2fe32b6e9bf49fcdb32f96c2979051f4c0826860eb59572c64c821d8de119f40e5546bc6132773a01702ba76c11be28a28c2926d9ed5c98
diff --git a/net-misc/dhcp/dhcp-4.3.6.ebuild b/net-misc/dhcp/dhcp-4.3.6.ebuild
new file mode 100644
index 000..2404129b81e
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.6.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP;
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+ ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz;
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
+
+DEPEND="
+ client? (
+ kernel_linux? (
+ ipv6? ( sys-apps/iproute2 )
+ sys-apps/net-tools
+ )
+ )
+ ldap? (
+ net-nds/openldap
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-dhcp )
+ vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ # handle local bind hell
+ cd "${S}"/bind
+ unpack ./bind.tar.gz
+}
+
+PATCHES=(
+ # Gentoo patches - these will probably never be accepted upstream
+ # Fix some permission issues
+ "${FILESDIR}/${PN}-3.0-fix-perms.patch"
+
+ # Enable dhclient to equery NTP servers
+ "${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
+ "${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
+
+ # Enable dhclient to get extra configuration from stdin
+ "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+ "${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
+ "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
+ "${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
+ "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
+ "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
+ "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
+)
+
+src_prepare() {
+ default
+
+ # Brand the version with Gentoo
+ sed -i \
+
[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/
commit: 8e7ee61b36033f35517f0a4287efb6973e02d979
Author: Lars Wendler gentoo org>
AuthorDate: Wed Mar 30 10:21:10 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Mar 30 10:23:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7ee61b
net-misc/dhcp: Bump to version 4.3.4
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler gentoo.org>
net-misc/dhcp/Manifest| 1 +
net-misc/dhcp/dhcp-4.3.4.ebuild | 265 ++
net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch | 38
net-misc/dhcp/files/dhcp-4.3.4-dhclient-ntp.patch | 209 +
4 files changed, 513 insertions(+)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 783e943..c6a6536 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -2,3 +2,4 @@ DIST dhcp-4.2.5-P1.tar.gz 8255960 SHA256
59b06c9f5d775e46999b422c45b9229402c462b
DIST dhcp-4.3.1.tar.gz 8980806 SHA256
266cbca8a7a6bb8f9ccc5765da0d2b04099329314a54a4fc1022d510ad3e9af0 SHA512
84ca525fda825bf367a98754f1fb1b8eba5b095c92c25ddaec6e30b31008c7d5c43062ae43cecaa43731a8e78ae406a3123906fd402d2ba4b46b7adbae65aa6a
WHIRLPOOL
3fd3720f6883b43856d2169264ee2adfb541b793604728c4e5cc3b647d4a88d6245fb6e53062de4118301cc15f0b4388363eba304bf3623dfb88c91bde94b2b6
DIST dhcp-4.3.3-P1.tar.gz 9204043 SHA256
c11e896dffa1bfbc49462965d3f6dec45534e34068603546d9a236f2aa669921 SHA512
7e14268b4acaa82c807af9d956f76f4327a9a75d36273a244fef74dbd54e7506e8b38ce6035e56f61ab09a19bfc0a40599f76c89dc342514f1048b5ac3b2a0eb
WHIRLPOOL
a0a6873e2f1625cfa208c328ed2d6ec507e239456d6eba24f5731a83ba16f5fbb36f0d6d99fd33fb9045cbf051116196a57c6c2ded2b36e93964475ad29d2b0e
DIST dhcp-4.3.3.tar.gz 9205539 SHA256
553c4945b09b1c1b904c4780f34f72aaefa2fc8c6556715de0bc9d4e3d255ede SHA512
33671816e21456ffec57e2c9ab2d129377096b4e2e5b4ca8194dcd9495c6a9e18a2a5e79d4f05694f3dc841895aa0adb63afd7bd6fe4641eb5a80d3fd7e715d9
WHIRLPOOL
27e7f2fdd1f1f7b3309b444a67e21d139468317538345cc3599e6a47f20489fa5d07018eabe8e32c429f2f16f03c28b22b29bff2ab08972f541c63603bd3df9a
+DIST dhcp-4.3.4.tar.gz 9302513 SHA256
f5115aee3dd3e6925de4ba47b80ab732ba48b481c8364b6ebade2d43698d607e SHA512
411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706
WHIRLPOOL
ea283592268c8efabd7fec430bd21c45306822b9275c91ee1e604d09e92f9eb3c50941ea11ecd9dcb230caec3b8e6ee94958e8eb6375e0ca0e7a64a8aaf63bce
diff --git a/net-misc/dhcp/dhcp-4.3.4.ebuild b/net-misc/dhcp/dhcp-4.3.4.ebuild
new file mode 100644
index 000..9b8f963
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.4.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP;
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+ ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz;
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
+
+DEPEND="
+ client? (
+ kernel_linux? (
+ ipv6? ( sys-apps/iproute2 )
+ sys-apps/net-tools
+ )
+ )
+ ldap? (
+ net-nds/openldap
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-dhcp )
+ vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ # handle local bind hell
+ cd "${S}"/bind
+ unpack ./bind.tar.gz
+}
+
+PATCHES=(
+ # Gentoo patches - these will probably never be accepted upstream
+ # Fix some permission issues
+ "${FILESDIR}/${PN}-3.0-fix-perms.patch"
+
+ # Enable dhclient to equery NTP servers
+ "${FILESDIR}/${PN}-4.3.4-dhclient-ntp.patch"
+ "${FILESDIR}/${PN}-4.3.1-dhclient-resolvconf.patch"
+
+ # Stop downing the interface on Linux as that breaks link daemons
+ # such as wpa_supplicant and netplug
+ "${FILESDIR}/${PN}-3.0.3-dhclient-no-down.patch"
+
+ # Enable dhclient to get extra configuration from stdin
+ "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+ "${FILESDIR}/${PN}-4.2.2-nogateway.patch" #265531
+ "${FILESDIR}/${PN}-4.2.4-quieter-ping.patch" #296921
+ "${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
+
[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/
commit: 2db723bf3f4e187785d20741fa5e745242cec04f
Author: Lars Wendler gentoo org>
AuthorDate: Wed Jan 13 09:44:53 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Jan 13 09:45:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db723bf
net-misc/dhcp: Removed old.
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler gentoo.org>
net-misc/dhcp/Manifest | 1 -
net-misc/dhcp/dhcp-4.3.2.ebuild| 254
net-misc/dhcp/dhcp-4.3.3.ebuild| 255 -
net-misc/dhcp/files/dhcp-3.0-paranoia.patch| 207 -
.../dhcp/files/dhcp-3.1.3-dhclient-no-down.patch | 77 ---
5 files changed, 794 deletions(-)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 7babe8f..783e943 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,5 +1,4 @@
DIST dhcp-4.2.5-P1.tar.gz 8255960 SHA256
59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250 SHA512
02a811b6e88ce013f7ecff6abf81d4b2aff82fff584521ae03fc3242b6036d0d0ad3afc6283fe8b97d18b8fffd4b6d2253386897ae2297c165240017f5f219ec
WHIRLPOOL
b8cf91c69ae0e1b234089ce3fae4b9daf5bde7f415d8cbc274ab4d006c8aa25f55807c70ba4c6771e0c9803ec5a99f8cc2088e561cac7d16479f5f022ee5459f
DIST dhcp-4.3.1.tar.gz 8980806 SHA256
266cbca8a7a6bb8f9ccc5765da0d2b04099329314a54a4fc1022d510ad3e9af0 SHA512
84ca525fda825bf367a98754f1fb1b8eba5b095c92c25ddaec6e30b31008c7d5c43062ae43cecaa43731a8e78ae406a3123906fd402d2ba4b46b7adbae65aa6a
WHIRLPOOL
3fd3720f6883b43856d2169264ee2adfb541b793604728c4e5cc3b647d4a88d6245fb6e53062de4118301cc15f0b4388363eba304bf3623dfb88c91bde94b2b6
-DIST dhcp-4.3.2.tar.gz 9230340 SHA256
6246c9b358759f6cdcc45104caaf76e732a211df64a21f499c8db1298165 SHA512
b91a0a90736c6e8bd66a74af8c67949c81db3148eba23ee647f0987bbd98543f0dfd1605c94e152b28a606bbbecd94cd8a8112db5f5fe4c3d041101bda1b95da
WHIRLPOOL
a201cea52e96517ff1dae2b6c05b05da11feb4c2eed6dca539ea5ab3185711377cd7f7ed9ecc5e5f2bc30bc84d73a85d4140154c43b4f0f27a7e0a4a51f56787
DIST dhcp-4.3.3-P1.tar.gz 9204043 SHA256
c11e896dffa1bfbc49462965d3f6dec45534e34068603546d9a236f2aa669921 SHA512
7e14268b4acaa82c807af9d956f76f4327a9a75d36273a244fef74dbd54e7506e8b38ce6035e56f61ab09a19bfc0a40599f76c89dc342514f1048b5ac3b2a0eb
WHIRLPOOL
a0a6873e2f1625cfa208c328ed2d6ec507e239456d6eba24f5731a83ba16f5fbb36f0d6d99fd33fb9045cbf051116196a57c6c2ded2b36e93964475ad29d2b0e
DIST dhcp-4.3.3.tar.gz 9205539 SHA256
553c4945b09b1c1b904c4780f34f72aaefa2fc8c6556715de0bc9d4e3d255ede SHA512
33671816e21456ffec57e2c9ab2d129377096b4e2e5b4ca8194dcd9495c6a9e18a2a5e79d4f05694f3dc841895aa0adb63afd7bd6fe4641eb5a80d3fd7e715d9
WHIRLPOOL
27e7f2fdd1f1f7b3309b444a67e21d139468317538345cc3599e6a47f20489fa5d07018eabe8e32c429f2f16f03c28b22b29bff2ab08972f541c63603bd3df9a
diff --git a/net-misc/dhcp/dhcp-4.3.2.ebuild b/net-misc/dhcp/dhcp-4.3.2.ebuild
deleted file mode 100644
index 447f44c..000
--- a/net-misc/dhcp/dhcp-4.3.2.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils systemd toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP;
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
- ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz;
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
-
-DEPEND="
- client? (
- kernel_linux? (
- ipv6? ( sys-apps/iproute2 )
- sys-apps/net-tools
- )
- )
- ldap? (
- net-nds/openldap
- ssl? ( dev-libs/openssl )
- )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-dhcp )
- vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- # handle local bind hell
- cd "${S}"/bind
- unpack ./bind.tar.gz
-}
-
-src_prepare() {
- # Gentoo patches - these will probably never be accepted upstream
- # Fix some permission issues
- epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
- # Enable dhclient to equery NTP servers
- epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
- epatch "${FILESDIR}"/${PN}-4.3.1-dhclient-resolvconf.patch
- # Stop downing the interface on Linux as that breaks link daemons
- # such as wpa_supplicant and netplug
- epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
- # Enable
