* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2015-09-06 15:37 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2015-09-06 15:37 UTC (permalink / raw
To: gentoo-commits
commit: e30ab92708881e6d28fe30c9dd9b886716750dc1
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 6 15:37:11 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 15:37:36 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e30ab927
net-misc/dhcp: Removed old.
Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/dhcp-4.2.5_p1-r1.ebuild | 247 ----------------------------------
net-misc/dhcp/dhcp-4.2.5_p1.ebuild | 240 ---------------------------------
2 files changed, 487 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.2.5_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.2.5_p1-r1.ebuild
deleted file mode 100644
index 8561aa9..0000000
--- a/net-misc/dhcp/dhcp-4.2.5_p1-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils 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 ~hppa ~ia64 ~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="selinux? ( sec-policy/selinux-dhcp )
- client? (
- kernel_linux? (
- ipv6? ( sys-apps/iproute2 )
- sys-apps/net-tools
- )
- )
- ldap? (
- net-nds/openldap
- ssl? ( dev-libs/openssl )
- )"
-RDEPEND="${DEPEND}
- 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
- # resolvconf support in dhclient-script
- epatch "${FILESDIR}"/${PN}-4.2.2-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
- epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
- # Enable dhclient to get extra configuration from stdin
- epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
- epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
- epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
- epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
- epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
- epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
-
- # 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:\<client\>::' \
- 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
- cp doc/ja_JP.eucJP/dhcp* common
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -rf doc/ja_JP.eucJP
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
- cd bind-*/
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
diff --git a/net-misc/dhcp/dhcp-4.2.5_p1.ebuild b/net-misc/dhcp/dhcp-4.2.5_p1.ebuild
deleted file mode 100644
index 4ef10a9..0000000
--- a/net-misc/dhcp/dhcp-4.2.5_p1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils 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 hppa ia64 ~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="selinux? ( sec-policy/selinux-dhcp )
- client? ( kernel_linux? ( sys-apps/net-tools ) )
- ldap? (
- net-nds/openldap
- ssl? ( dev-libs/openssl )
- )"
-RDEPEND="${DEPEND}
- 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
- # resolvconf support in dhclient-script
- epatch "${FILESDIR}"/${PN}-4.2.2-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
- epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
- # Enable dhclient to get extra configuration from stdin
- epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
- epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
- epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
- epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
-
- # 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:\<client\>::' \
- 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
- cp doc/ja_JP.eucJP/dhcp* common
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -rf doc/ja_JP.eucJP
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
- cd bind-*/
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2015-10-04 21:47 Julian Ospald
0 siblings, 0 replies; 124+ messages in thread
From: Julian Ospald @ 2015-10-04 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 6b532c76877acec05f5a2a51a664550bb482a87f
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 21:41:58 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 21:47:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b532c76
net-misc/dhcp: add libressl support
net-misc/dhcp/dhcp-4.3.3-r1.ebuild | 258 +++++++++++++++++++++++++++++++++++++
1 file changed, 258 insertions(+)
diff --git a/net-misc/dhcp/dhcp-4.3.3-r1.ebuild b/net-misc/dhcp/dhcp-4.3.3-r1.ebuild
new file mode 100644
index 0000000..35851c1
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.3-r1.ebuild
@@ -0,0 +1,258 @@
+# 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 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
+}
+
+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 dhclient to get extra configuration from stdin
+ epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
+ epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
+ epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
+ epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
+ epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
+ epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
+ epatch "${FILESDIR}"/${PN}-4.3.3-ldap-ipv6-client-id.patch #559832
+
+ # 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:\<client\>::' \
+ 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
+ cp doc/ja_JP.eucJP/dhcp* common
+ fi
+ fi
+ # Now remove the non-english docs so there are no errors later
+ rm -rf doc/ja_JP.eucJP
+
+ # make the bind build work
+ binddir=${S}/bind
+ cd "${binddir}" || die
+ cat <<-EOF > bindvar.tmp
+ binddir=${binddir}
+ GMAKE=${MAKE:-gmake}
+ EOF
+ epatch "${FILESDIR}"/${PN}-4.3.3-bind-disable.patch
+ cd bind-*/
+ epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+ epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
+}
+
+src_configure() {
+ # bind defaults to stupid `/usr/bin/ar`
+ tc-export AR BUILD_CC
+ export ac_cv_path_AR=${AR}
+
+ # this is tested for by the bind build system, and can cause trouble
+ # when cross-building; since dhcp itself doesn't make use of libcap,
+ # simply disable it.
+ export ac_cv_lib_cap_cap_set_proc=no
+
+ # Use FHS sane paths ... some of these have configure options,
+ # but not all, so just do it all here.
+ local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+ cat <<-EOF >> includes/site.h
+ #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
+ #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
+ #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
+ #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
+ #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
+ #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
+ #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
+ #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
+ #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
+ #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
+ #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
+ #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
+ EOF
+
+ econf \
+ --enable-paranoia \
+ --enable-early-chroot \
+ --sysconfdir=${e} \
+ $(use_enable ipv6 dhcpv6) \
+ $(use_with ldap) \
+ $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+
+ # configure local bind cruft. symtable option requires
+ # perl and we don't want to require that #383837.
+ cd bind/bind-*/ || die
+ eval econf \
+ $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
+ --disable-symtable \
+ --without-make-clean
+}
+
+src_compile() {
+ # build local bind cruft first
+ emake -C bind/bind-*/lib/export install
+ # then build standard dhcp code
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+ dohtml doc/References.html
+
+ if [[ -e client/dhclient ]] ; then
+ # move the client to /
+ dodir /sbin
+ mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+ exeinto /sbin
+ if use kernel_linux ; then
+ newexe "${S}"/client/scripts/linux dhclient-script
+ else
+ newexe "${S}"/client/scripts/freebsd dhclient-script
+ fi
+ fi
+
+ if [[ -e server/dhcpd ]] ; then
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins contrib/ldap/dhcp.*
+ dosbin contrib/ldap/dhcpd-conf-to-ldap
+ fi
+
+ newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+ newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+ newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+ newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+ systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+ systemd_dounit "${FILESDIR}"/dhcpd4.service
+ systemd_dounit "${FILESDIR}"/dhcpd6.service
+ systemd_dounit "${FILESDIR}"/dhcrelay4.service
+ systemd_dounit "${FILESDIR}"/dhcrelay6.service
+ systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+ systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+ sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+ fi
+
+ # the default config files aren't terribly useful #384087
+ local f
+ for f in "${ED}"/etc/dhcp/*.conf.example ; do
+ mv "${f}" "${f%.example}" || die
+ done
+ sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+ enewgroup dhcp
+ enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+ # Keep the user files over the sample ones. The
+ # hashing is to ignore the crappy defaults #384087.
+ local f h
+ for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+ h=${f#*:}
+ f="/etc/dhcp/${f%:*}.conf"
+ if [ -e "${EROOT}"${f} ] ; then
+ case $(md5sum "${EROOT}"${f}) in
+ ${h}*) ;;
+ *) cp -p "${EROOT}"${f} "${ED}"${f};;
+ esac
+ fi
+ done
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+ ewarn
+ ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+ ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+ ewarn "and dhcp should be removed from the default runlevel"
+ ewarn
+ fi
+}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-01-13 9:45 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2016-01-13 9:45 UTC (permalink / raw
To: gentoo-commits
commit: ae8350b926cd8e1695914433048611a5abb30f5a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 09:41:13 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 09:45:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae8350b9
net-misc/dhcp: Bump to version 4.3.3_p1
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/Manifest | 1 +
net-misc/dhcp/dhcp-4.3.3_p1.ebuild | 258 +++++++++++++++++++++++++++++++++++++
2 files changed, 259 insertions(+)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index d4813d9..7babe8f 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,4 +1,5 @@
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 6246c9b358759f6cdcc45104caaf76e732a211dbbbbf64a21f499c8db1298165 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.3_p1.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
new file mode 100644
index 0000000..535c9ae
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
@@ -0,0 +1,258 @@
+# 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
+}
+
+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 dhclient to get extra configuration from stdin
+ epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
+ epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
+ epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
+ epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
+ epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
+ epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
+ epatch "${FILESDIR}"/${PN}-4.3.3-ldap-ipv6-client-id.patch #559832
+
+ # 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:\<client\>::' \
+ 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
+ cp doc/ja_JP.eucJP/dhcp* common
+ fi
+ fi
+ # Now remove the non-english docs so there are no errors later
+ rm -rf doc/ja_JP.eucJP
+
+ # make the bind build work
+ binddir=${S}/bind
+ cd "${binddir}" || die
+ cat <<-EOF > bindvar.tmp
+ binddir=${binddir}
+ GMAKE=${MAKE:-gmake}
+ EOF
+ epatch "${FILESDIR}"/${PN}-4.3.3-bind-disable.patch
+ cd bind-*/
+ epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+ epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
+}
+
+src_configure() {
+ # bind defaults to stupid `/usr/bin/ar`
+ tc-export AR BUILD_CC
+ export ac_cv_path_AR=${AR}
+
+ # this is tested for by the bind build system, and can cause trouble
+ # when cross-building; since dhcp itself doesn't make use of libcap,
+ # simply disable it.
+ export ac_cv_lib_cap_cap_set_proc=no
+
+ # Use FHS sane paths ... some of these have configure options,
+ # but not all, so just do it all here.
+ local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+ cat <<-EOF >> includes/site.h
+ #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
+ #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
+ #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
+ #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
+ #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
+ #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
+ #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
+ #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
+ #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
+ #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
+ #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
+ #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
+ EOF
+
+ econf \
+ --enable-paranoia \
+ --enable-early-chroot \
+ --sysconfdir=${e} \
+ $(use_enable ipv6 dhcpv6) \
+ $(use_with ldap) \
+ $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+
+ # configure local bind cruft. symtable option requires
+ # perl and we don't want to require that #383837.
+ cd bind/bind-*/ || die
+ eval econf \
+ $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
+ --disable-symtable \
+ --without-make-clean
+}
+
+src_compile() {
+ # build local bind cruft first
+ emake -C bind/bind-*/lib/export install
+ # then build standard dhcp code
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+ dohtml doc/References.html
+
+ if [[ -e client/dhclient ]] ; then
+ # move the client to /
+ dodir /sbin
+ mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+ exeinto /sbin
+ if use kernel_linux ; then
+ newexe "${S}"/client/scripts/linux dhclient-script
+ else
+ newexe "${S}"/client/scripts/freebsd dhclient-script
+ fi
+ fi
+
+ if [[ -e server/dhcpd ]] ; then
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins contrib/ldap/dhcp.*
+ dosbin contrib/ldap/dhcpd-conf-to-ldap
+ fi
+
+ newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+ newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+ newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+ newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+ systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+ systemd_dounit "${FILESDIR}"/dhcpd4.service
+ systemd_dounit "${FILESDIR}"/dhcpd6.service
+ systemd_dounit "${FILESDIR}"/dhcrelay4.service
+ systemd_dounit "${FILESDIR}"/dhcrelay6.service
+ systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+ systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+ sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+ fi
+
+ # the default config files aren't terribly useful #384087
+ local f
+ for f in "${ED}"/etc/dhcp/*.conf.example ; do
+ mv "${f}" "${f%.example}" || die
+ done
+ sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+ enewgroup dhcp
+ enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+ # Keep the user files over the sample ones. The
+ # hashing is to ignore the crappy defaults #384087.
+ local f h
+ for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+ h=${f#*:}
+ f="/etc/dhcp/${f%:*}.conf"
+ if [ -e "${EROOT}"${f} ] ; then
+ case $(md5sum "${EROOT}"${f}) in
+ ${h}*) ;;
+ *) cp -p "${EROOT}"${f} "${ED}"${f};;
+ esac
+ fi
+ done
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+ ewarn
+ ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+ ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+ ewarn "and dhcp should be removed from the default runlevel"
+ ewarn
+ fi
+}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-01-14 11:56 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2016-01-14 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 1825a4d0eafef49de030903a4719e55f20742c32
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 11:55:23 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 11:55:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1825a4d0
net-misc/dhcp: amd64 stable wrt bug #571832
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.3.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
index 535c9ae..6d400bb 100644
--- a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-01-15 13:00 Andreas Schuerch
0 siblings, 0 replies; 124+ messages in thread
From: Andreas Schuerch @ 2016-01-15 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 61684b19e4b5477577a4d005a19f1f0338af801a
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 13:00:02 2016 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 13:00:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61684b19
net-misc/dhcp: 4.3.3_p1 stable on x86, see bug 571832
Package-Manager: portage-2.2.26
net-misc/dhcp/dhcp-4.3.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
index 6d400bb..20be167 100644
--- a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-01-17 11:30 Markus Meier
0 siblings, 0 replies; 124+ messages in thread
From: Markus Meier @ 2016-01-17 11:30 UTC (permalink / raw
To: gentoo-commits
commit: 156ccf7a48604b12f0f14053c8b396a29c6f38bb
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 11:30:34 2016 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 11:30:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=156ccf7a
net-misc/dhcp: arm stable, bug #571832
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="arm"
net-misc/dhcp/dhcp-4.3.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
index 20be167..171137f 100644
--- a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-01-17 16:13 Tobias Klausmann
0 siblings, 0 replies; 124+ messages in thread
From: Tobias Klausmann @ 2016-01-17 16:13 UTC (permalink / raw
To: gentoo-commits
commit: d93b92f8b76e313cd619936f43b09911c52d5ff4
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 16:13:00 2016 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 16:13:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d93b92f8
net-misc/dhcp: add alpha keyword
Gentoo-Bug: 571832
Package-Manager: portage-2.2.26
net-misc/dhcp/dhcp-4.3.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
index 171137f..889b520 100644
--- a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-01-17 17:02 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2016-01-17 17:02 UTC (permalink / raw
To: gentoo-commits
commit: b6786fa15bf6cd5fd86bd06d2b044393113ce74d
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 16:59:43 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 16:59:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6786fa1
net-misc/dhcp: ppc stable wrt bug #571832
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.3.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
index 889b520..f576294 100644
--- a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-01-18 4:52 Jeroen Roovers
0 siblings, 0 replies; 124+ messages in thread
From: Jeroen Roovers @ 2016-01-18 4:52 UTC (permalink / raw
To: gentoo-commits
commit: 9f4ed11026647188ee1582fa95819ae9e83d6fea
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 04:49:00 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 04:49:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4ed110
net-misc/dhcp: Stable for HPPA PPC64 (bug #571832).
Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches
net-misc/dhcp/dhcp-4.3.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
index f576294..34c9b74 100644
--- a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-03-19 11:35 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2016-03-19 11:35 UTC (permalink / raw
To: gentoo-commits
commit: bb5020f501937f4537b50fba5a17d955639d78a9
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 11:34:38 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 11:34:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb5020f5
net-misc/dhcp: sparc stable wrt bug #571832
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.3.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
index 34c9b74..990cd07 100644
--- a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-03-20 11:53 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2016-03-20 11:53 UTC (permalink / raw
To: gentoo-commits
commit: 016223342e23e3caee1142a5d48d9a2f1668ddb2
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 11:51:37 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 11:51:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01622334
net-misc/dhcp: ia64 stable wrt bug #571832
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.3.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
index 990cd07..60860e6 100644
--- a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-03-30 10:23 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2016-03-30 10:23 UTC (permalink / raw
To: gentoo-commits
commit: f6596ff246badfd4d320deb12f0844cde32663de
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 10:22:54 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 10:23:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6596ff2
net-misc/dhcp: Removed old.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/Manifest | 2 -
net-misc/dhcp/dhcp-4.2.5_p1-r2.ebuild | 256 ---------------------------------
net-misc/dhcp/dhcp-4.3.3-r1.ebuild | 258 ----------------------------------
3 files changed, 516 deletions(-)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index c6a6536..9a8c6c8 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,5 +1,3 @@
-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.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.2.5_p1-r2.ebuild b/net-misc/dhcp/dhcp-4.2.5_p1-r2.ebuild
deleted file mode 100644
index 268df67..0000000
--- a/net-misc/dhcp/dhcp-4.2.5_p1-r2.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2014 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
- # resolvconf support in dhclient-script
- epatch "${FILESDIR}"/${PN}-4.2.2-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
- epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
- # Enable dhclient to get extra configuration from stdin
- epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
- epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
- epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
- epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
- epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
- epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
-
- # 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:\<client\>::' \
- 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
- cp doc/ja_JP.eucJP/dhcp* common
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -rf doc/ja_JP.eucJP
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
- cd bind-*/
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
diff --git a/net-misc/dhcp/dhcp-4.3.3-r1.ebuild b/net-misc/dhcp/dhcp-4.3.3-r1.ebuild
deleted file mode 100644
index 35851c1..0000000
--- a/net-misc/dhcp/dhcp-4.3.3-r1.ebuild
+++ /dev/null
@@ -1,258 +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 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
-}
-
-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 dhclient to get extra configuration from stdin
- epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
- epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
- epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
- epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
- epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
- epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
- epatch "${FILESDIR}"/${PN}-4.3.3-ldap-ipv6-client-id.patch #559832
-
- # 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:\<client\>::' \
- 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
- cp doc/ja_JP.eucJP/dhcp* common
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -rf doc/ja_JP.eucJP
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.3.3-bind-disable.patch
- cd bind-*/
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-10-04 18:20 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2016-10-04 18:20 UTC (permalink / raw
To: gentoo-commits
commit: b5a18db02429e19a880e91af2d4b1f5ee9e587ab
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 4 18:19:45 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 4 18:20:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a18db0
net-misc/dhcp: Removed old.
Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/Manifest | 1 -
net-misc/dhcp/dhcp-4.3.1-r2.ebuild | 254 -------------------------------------
2 files changed, 255 deletions(-)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index b1e3213..f3d15ab 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,4 +1,3 @@
-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.4.tar.gz 9302513 SHA256 f5115aee3dd3e6925de4ba47b80ab732ba48b481c8364b6ebade2d43698d607e SHA512 411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706 WHIRLPOOL ea283592268c8efabd7fec430bd21c45306822b9275c91ee1e604d09e92f9eb3c50941ea11ecd9dcb230caec3b8e6ee94958e8eb6375e0ca0e7a64a8aaf63bce
DIST dhcp-4.3.5.tar.gz 10075147 SHA256 eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954 SHA512 aba0e1d361eb9e7ed33fc48c0b0b9288057af9ec51775e40e27feb9ababc182506706fcf39079236ce36b0f7ded391e107474dc29de2e60ed45d37753505e1f0 WHIRLPOOL 85012016d81efb7654ec417e7a0f1a6145e8e143b13d6d9470d0fb7caf37c035441d5b2b8849d332f8ad0a9a6509bb0b931ac8f207f7ba9104e96811c0360124
diff --git a/net-misc/dhcp/dhcp-4.3.1-r2.ebuild b/net-misc/dhcp/dhcp-4.3.1-r2.ebuild
deleted file mode 100644
index f1ddaec..00000000
--- a/net-misc/dhcp/dhcp-4.3.1-r2.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 dhclient to get extra configuration from stdin
- epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
- epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
- epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
- epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
- epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
- epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
-
- # 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:\<client\>::' \
- 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
- cp doc/ja_JP.eucJP/dhcp* common
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -rf doc/ja_JP.eucJP
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
- cd bind-*/
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-10-04 18:20 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2016-10-04 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 6efdb4604ff8e1d7065091203ebccadfafde7ce8
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 4 18:18:32 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 4 18:20:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6efdb460
net-misc/dhcp: Bump to version 4.3.5
Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/Manifest | 1 +
net-misc/dhcp/dhcp-4.3.5.ebuild | 264 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 265 insertions(+)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 9a8c6c8..b1e3213 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,3 +1,4 @@
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.4.tar.gz 9302513 SHA256 f5115aee3dd3e6925de4ba47b80ab732ba48b481c8364b6ebade2d43698d607e SHA512 411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706 WHIRLPOOL ea283592268c8efabd7fec430bd21c45306822b9275c91ee1e604d09e92f9eb3c50941ea11ecd9dcb230caec3b8e6ee94958e8eb6375e0ca0e7a64a8aaf63bce
+DIST dhcp-4.3.5.tar.gz 10075147 SHA256 eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954 SHA512 aba0e1d361eb9e7ed33fc48c0b0b9288057af9ec51775e40e27feb9ababc182506706fcf39079236ce36b0f7ded391e107474dc29de2e60ed45d37753505e1f0 WHIRLPOOL 85012016d81efb7654ec417e7a0f1a6145e8e143b13d6d9470d0fb7caf37c035441d5b2b8849d332f8ad0a9a6509bb0b931ac8f207f7ba9104e96811c0360124
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
new file mode 100644
index 00000000..3d4b30c
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.5.ebuild
@@ -0,0 +1,264 @@
+# 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
+ "${FILESDIR}/${PN}-4.2.5-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() {
+ epatch "${PATCHES[@]}"
+
+ # 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:\<client\>::' \
+ 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 || die
+
+ # make the bind build work
+ binddir=${S}/bind
+ cd "${binddir}" || die
+ cat <<-EOF > bindvar.tmp
+ binddir=${binddir}
+ GMAKE=${MAKE:-gmake}
+ EOF
+ epatch "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
+ cd bind-*/ || die
+ epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+}
+
+src_configure() {
+ # bind defaults to stupid `/usr/bin/ar`
+ tc-export AR BUILD_CC
+ export ac_cv_path_AR=${AR}
+
+ # this is tested for by the bind build system, and can cause trouble
+ # when cross-building; since dhcp itself doesn't make use of libcap,
+ # simply disable it.
+ export ac_cv_lib_cap_cap_set_proc=no
+
+ # Use FHS sane paths ... some of these have configure options,
+ # but not all, so just do it all here.
+ local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+ cat <<-EOF >> includes/site.h
+ #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
+ #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
+ #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
+ #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
+ #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
+ #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
+ #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
+ #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
+ #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
+ #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
+ #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
+ #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
+ EOF
+
+ econf \
+ --enable-paranoia \
+ --enable-early-chroot \
+ --sysconfdir=${e} \
+ $(use_enable ipv6 dhcpv6) \
+ $(use_with ldap) \
+ $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+
+ # configure local bind cruft. symtable option requires
+ # perl and we don't want to require that #383837.
+ cd bind/bind-*/ || die
+ eval econf \
+ $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
+ --disable-symtable \
+ --without-make-clean
+}
+
+src_compile() {
+ # build local bind cruft first
+ emake -C bind/bind-*/lib/export install
+ # then build standard dhcp code
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+ dohtml doc/References.html
+
+ if [[ -e client/dhclient ]] ; then
+ # move the client to /
+ dodir /sbin
+ mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+ exeinto /sbin
+ if use kernel_linux ; then
+ newexe "${S}"/client/scripts/linux dhclient-script
+ else
+ newexe "${S}"/client/scripts/freebsd dhclient-script
+ fi
+ fi
+
+ if [[ -e server/dhcpd ]] ; then
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins contrib/ldap/dhcp.*
+ dosbin contrib/ldap/dhcpd-conf-to-ldap
+ fi
+
+ newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+ newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+ newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+ newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+ systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+ systemd_dounit "${FILESDIR}"/dhcpd4.service
+ systemd_dounit "${FILESDIR}"/dhcpd6.service
+ systemd_dounit "${FILESDIR}"/dhcrelay4.service
+ systemd_dounit "${FILESDIR}"/dhcrelay6.service
+ systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+ systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+ sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+ fi
+
+ # the default config files aren't terribly useful #384087
+ local f
+ for f in "${ED}"/etc/dhcp/*.conf.example ; do
+ mv "${f}" "${f%.example}" || die
+ done
+ sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+ enewgroup dhcp
+ enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+ # Keep the user files over the sample ones. The
+ # hashing is to ignore the crappy defaults #384087.
+ local f h
+ for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+ h=${f#*:}
+ f="/etc/dhcp/${f%:*}.conf"
+ if [ -e "${EROOT}"${f} ] ; then
+ case $(md5sum "${EROOT}"${f}) in
+ ${h}*) ;;
+ *) cp -p "${EROOT}"${f} "${ED}"${f};;
+ esac
+ fi
+ done
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+ ewarn
+ ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+ ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+ ewarn "and dhcp should be removed from the default runlevel"
+ ewarn
+ fi
+}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-11-26 10:36 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2016-11-26 10:36 UTC (permalink / raw
To: gentoo-commits
commit: f1a705bb5958b72372f353ce8cc923d60d0a6e32
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 10:36:07 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 10:36:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1a705bb
net-misc/dhcp: amd64 stable wrt bug #576866
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.4.ebuild b/net-misc/dhcp/dhcp-4.3.4.ebuild
index 9b8f963..90643ea 100644
--- a/net-misc/dhcp/dhcp-4.3.4.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-11-26 10:44 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2016-11-26 10:44 UTC (permalink / raw
To: gentoo-commits
commit: 604a15cfe77889de32ce103ce2b481db13da91de
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 10:43:58 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 10:43:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=604a15cf
net-misc/dhcp: x86 stable wrt bug #576866
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.4.ebuild b/net-misc/dhcp/dhcp-4.3.4.ebuild
index 90643ea..1567e16 100644
--- a/net-misc/dhcp/dhcp-4.3.4.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-11-27 16:43 Tobias Klausmann
0 siblings, 0 replies; 124+ messages in thread
From: Tobias Klausmann @ 2016-11-27 16:43 UTC (permalink / raw
To: gentoo-commits
commit: 91dc172bc81e71d6598a7e39eaa2095068e659ef
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 16:43:11 2016 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 16:43:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91dc172b
net-misc/dhcp-4.3.5-r0: stable on alpha
Gentoo-Bug: 576866
net-misc/dhcp/dhcp-4.3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
index 3d4b30c..f58ee47 100644
--- a/net-misc/dhcp/dhcp-4.3.5.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2016-11-30 19:32 Markus Meier
0 siblings, 0 replies; 124+ messages in thread
From: Markus Meier @ 2016-11-30 19:32 UTC (permalink / raw
To: gentoo-commits
commit: 4c215ee87de49602335d4f36fe8cb1b4d623475e
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 19:31:58 2016 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 19:31:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c215ee8
net-misc/dhcp: arm stable, bug #576866
Package-Manager: portage-2.3.2
RepoMan-Options: --include-arches="arm"
net-misc/dhcp/dhcp-4.3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.4.ebuild b/net-misc/dhcp/dhcp-4.3.4.ebuild
index 1567e16..c95c5c1 100644
--- a/net-misc/dhcp/dhcp-4.3.4.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2017-01-12 16:10 Jeroen Roovers
0 siblings, 0 replies; 124+ messages in thread
From: Jeroen Roovers @ 2017-01-12 16:10 UTC (permalink / raw
To: gentoo-commits
commit: 149c33fdbda288e0cbe2a4d1de0fe0ab05a3b379
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 16:09:58 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 16:10:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=149c33fd
net-misc/dhcp: Stable for HPPA (bug #576866).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches
net-misc/dhcp/dhcp-4.3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.4.ebuild b/net-misc/dhcp/dhcp-4.3.4.ebuild
index 05708b7..6843474 100644
--- a/net-misc/dhcp/dhcp-4.3.4.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2017-08-05 18:07 Sergei Trofimovich
0 siblings, 0 replies; 124+ messages in thread
From: Sergei Trofimovich @ 2017-08-05 18:07 UTC (permalink / raw
To: gentoo-commits
commit: 1bec15015fad27b85873882fb36a5458a4a3d05c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 5 18:06:12 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Aug 5 18:07:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bec1501
net-misc/dhcp: stable 4.3.5 for ia64, bug #626750
Package-Manager: Portage-2.3.6, Repoman-2.3.3
RepoMan-Options: --include-arches="ia64"
net-misc/dhcp/dhcp-4.3.5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
index f47077142c9..3e735401ddc 100644
--- a/net-misc/dhcp/dhcp-4.3.5.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2017-08-10 4:40 Markus Meier
0 siblings, 0 replies; 124+ messages in thread
From: Markus Meier @ 2017-08-10 4:40 UTC (permalink / raw
To: gentoo-commits
commit: 759236a7c6812bf9349a761366d0943451eccbe4
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 04:38:07 2017 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 04:38:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=759236a7
net-misc/dhcp: arm stable, bug #626750
Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
net-misc/dhcp/dhcp-4.3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
index 3e735401ddc..134f99e02e8 100644
--- a/net-misc/dhcp/dhcp-4.3.5.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2017-08-25 13:28 Mikle Kolyada
0 siblings, 0 replies; 124+ messages in thread
From: Mikle Kolyada @ 2017-08-25 13:28 UTC (permalink / raw
To: gentoo-commits
commit: 192d711b6e6dd9ad4238823671167a44da3d8306
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 13:28:32 2017 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 13:28:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192d711b
net-misc/dhcp: amd64 stable wrt bug #626750
Package-Manager: Portage-2.3.6, Repoman-2.3.1
net-misc/dhcp/dhcp-4.3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
index 134f99e02e8..729f703e796 100644
--- a/net-misc/dhcp/dhcp-4.3.5.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2017-08-29 21:39 Thomas Deutschmann
0 siblings, 0 replies; 124+ messages in thread
From: Thomas Deutschmann @ 2017-08-29 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 3c492c371e5898877c19b89f47275e1e09692a2a
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 21:21:16 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 21:38:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c492c37
net-misc/dhcp: x86 stable (bug #626750)
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-misc/dhcp/dhcp-4.3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
index 729f703e796..f0751c5a375 100644
--- a/net-misc/dhcp/dhcp-4.3.5.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2017-10-09 14:29 Sergei Trofimovich
0 siblings, 0 replies; 124+ messages in thread
From: Sergei Trofimovich @ 2017-10-09 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 9b20017c94778815454999339fd8da7e9037bcbb
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 9 14:29:25 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Oct 9 14:29:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b20017c
net-misc/dhcp: stable 4.3.5 for ppc/ppc64, bug #626750 (thanks to ernsteiswuerfel)
Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc ppc64"
net-misc/dhcp/dhcp-4.3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
index f0751c5a375..aff36679d42 100644
--- a/net-misc/dhcp/dhcp-4.3.5.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2017-11-08 22:27 Sergei Trofimovich
0 siblings, 0 replies; 124+ messages in thread
From: Sergei Trofimovich @ 2017-11-08 22:27 UTC (permalink / raw
To: gentoo-commits
commit: 792782c7d8606a87d65e30dfc4aeef639a000962
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 8 22:24:23 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Nov 8 22:27:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792782c7
net-misc/dhcp: stable 4.3.5 for sparc, bug #626750 (thanks to Rolf Eike Beer)
Package-Manager: Portage-2.3.13, Repoman-2.3.4
RepoMan-Options: --include-arches="sparc"
net-misc/dhcp/dhcp-4.3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
index aff36679d42..ece1188d4e1 100644
--- a/net-misc/dhcp/dhcp-4.3.5.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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"
+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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-02-02 11:20 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2018-02-02 11:20 UTC (permalink / raw
To: gentoo-commits
commit: 60a6ee37e9b1bc0320ae551abc7ac23b3de0a7e1
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 2 11:20:06 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 11:20:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60a6ee37
net-misc/dhcp: Removed old.
Package-Manager: Portage-2.3.23, Repoman-2.3.6
net-misc/dhcp/dhcp-4.3.6.ebuild | 262 ----------------------------------------
1 file changed, 262 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.3.6.ebuild b/net-misc/dhcp/dhcp-4.3.6.ebuild
deleted file mode 100644
index 469f240e286..00000000000
--- a/net-misc/dhcp/dhcp-4.3.6.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2018 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 ~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 \
- -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:\<client\>::' \
- 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 || die
-
- # make the bind build work
- binddir="${S}/bind"
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- eapply -p2 "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
- cd bind-*/ || die
- eapply -p2 "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- local myeconfargs=(
- --enable-paranoia
- --enable-early-chroot
- --sysconfdir=${e}
- $(use_enable ipv6 dhcpv6)
- $(use_with ldap)
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
- )
- econf "${myeconfargs[@]}"
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- docinto html
- dodoc doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-02-08 13:40 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2018-02-08 13:40 UTC (permalink / raw
To: gentoo-commits
commit: f75bd3ecb5278b6384e9427006f16a07d40126a7
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 8 13:39:44 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 8 13:40:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75bd3ec
net-misc/dhcp: License changed from ISC to MPL-2.0
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-misc/dhcp/dhcp-4.4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.0.ebuild b/net-misc/dhcp/dhcp-4.4.0.ebuild
index ff83c6a59ab..ca0eefb2fec 100644
--- a/net-misc/dhcp/dhcp-4.4.0.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.0.ebuild
@@ -15,7 +15,7 @@ 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
+LICENSE="MPL-2.0 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 ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-02-28 16:35 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2018-02-28 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 135e7f7665906c5ac144101b35121a05495eefc8
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 16:34:22 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 16:35:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=135e7f76
net-misc/dhcp: Bump to versions 4.3.6_p1 and 4.4.1
Bug: https://bugs.gentoo.org/649010
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-misc/dhcp/Manifest | 3 ++-
.../dhcp/{dhcp-4.4.0.ebuild => dhcp-4.3.6_p1.ebuild} | 17 ++++++++---------
net-misc/dhcp/{dhcp-4.4.0.ebuild => dhcp-4.4.1.ebuild} | 1 +
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index a0c93eb7fa5..e3151d1326c 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,4 +1,5 @@
DIST dhcp-4.3.4.tar.gz 9302513 BLAKE2B eb7fb7d7d46d5a706b4f22b4add98619709f7ac1ecf8244564f043fd56adb6e2f54a0e01b573abcd7e054a82f74279c8134802380ee2d02c1cab1118d48a4965 SHA512 411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706
DIST dhcp-4.3.5.tar.gz 10075147 BLAKE2B ffce896cfafe17a412030d0a1cb4a92323be175ecbb35061fe0538ed13a9f91d604daed89b5f282c92ef161944e9f18557545d95c9fbbd29e1f6a31485ef3b11 SHA512 aba0e1d361eb9e7ed33fc48c0b0b9288057af9ec51775e40e27feb9ababc182506706fcf39079236ce36b0f7ded391e107474dc29de2e60ed45d37753505e1f0
+DIST dhcp-4.3.6-P1.tar.gz 10189202 BLAKE2B 5dfbda82fa76d1011c552c9d9b5f15296834c2f380795e11fc6419010dd533fa45b9544fc10fc9da45095127f54ffe136b5fd7cc584589150b1b0a9a054e800c SHA512 cb04af2fb0fa8c5621e8b3dcb41e81422475218e1569b0eac6e13c876a21279928a3348f799253d7207517720466523b1cc28005c671542e37b1a391342b1e62
DIST dhcp-4.3.6.tar.gz 10182593 BLAKE2B 2b6324c63446a5cbded9a7cdd4455b6c880aabd282dfd19d44fe2fafe684a991b4afa87ec04ee3fc131437c8efdddbe2777d70586c2e8b2b4319e786325dc398 SHA512 de4962dc2aa174df17a3a1456719a777a42d238c3d6ad1771ccc460fa70c9e9cefcce52c7437f7acde61b9c3a2e84e9d49fd2dc33c7e9243053ceed5b247be03
-DIST dhcp-4.4.0.tar.gz 11158069 BLAKE2B c554e15f549bdf6342bfa4337ab54f2a259a1c212700a69b56d795b1c91230759e254b050087ad09cf065d9dcc380e6110a95d63c3d2ba982c567dd381889d3e SHA512 0dcddfe803db0cea49204f71c9fbc3b1a55496acc83e344d9147893410bbb5f96874ff6457037ee9f759d701cea4bab98dc51ad5d7b23926254e25e5e421eabd
+DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
diff --git a/net-misc/dhcp/dhcp-4.4.0.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
similarity index 92%
copy from net-misc/dhcp/dhcp-4.4.0.ebuild
copy to net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index ca0eefb2fec..9e73d36618c 100644
--- a/net-misc/dhcp/dhcp-4.4.0.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -15,7 +15,7 @@ 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="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
+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 ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
@@ -60,10 +60,11 @@ PATCHES=(
"${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.4.0-always-accept-4.patch" #437108
+ "${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() {
@@ -120,11 +121,9 @@ src_prepare() {
binddir=${binddir}
GMAKE=${MAKE:-gmake}
EOF
- eapply -p2 "${FILESDIR}"/${PN}-4.4.0-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@' \
- -i bind-*/lib/Makefile.in || die
+ eapply -p2 "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
+ cd bind-*/ || die
+ eapply -p2 "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
}
src_configure() {
@@ -169,14 +168,14 @@ src_configure() {
# perl and we don't want to require that #383837.
cd bind/bind-*/ || die
eval econf \
- $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el}; fi; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+ $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
--disable-symtable \
--without-make-clean
}
src_compile() {
# build local bind cruft first
- emake -C bind/bind-*/lib install
+ emake -C bind/bind-*/lib/export install
# then build standard dhcp code
emake AR="$(tc-getAR)"
}
diff --git a/net-misc/dhcp/dhcp-4.4.0.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
similarity index 99%
rename from net-misc/dhcp/dhcp-4.4.0.ebuild
rename to net-misc/dhcp/dhcp-4.4.1.ebuild
index ca0eefb2fec..358e3c1f12a 100644
--- a/net-misc/dhcp/dhcp-4.4.0.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -168,6 +168,7 @@ src_configure() {
# configure local bind cruft. symtable option requires
# perl and we don't want to require that #383837.
cd bind/bind-*/ || die
+ local el
eval econf \
$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el}; fi; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
--disable-symtable \
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-03-02 14:15 Jason Zaman
0 siblings, 0 replies; 124+ messages in thread
From: Jason Zaman @ 2018-03-02 14:15 UTC (permalink / raw
To: gentoo-commits
commit: 3a7b8c08c8d049d26190295dff431f5bde50234c
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 2 14:01:12 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 14:14:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7b8c08
net-misc/dhcp: amd64 stable
Gentoo-bug: 649010
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-misc/dhcp/dhcp-4.3.6_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index 9e73d36618c..55cb340ec65 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-03-02 23:21 Sergei Trofimovich
0 siblings, 0 replies; 124+ messages in thread
From: Sergei Trofimovich @ 2018-03-02 23:21 UTC (permalink / raw
To: gentoo-commits
commit: 3906dea4a1c0483c60c401987b374db2de5e6849
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 2 23:20:34 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 23:21:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3906dea4
net-misc/dhcp: stable 4.3.6_p1 for ia64, bug #649010
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"
net-misc/dhcp/dhcp-4.3.6_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index 55cb340ec65..58c062f1fe3 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-03-04 11:13 Sergei Trofimovich
0 siblings, 0 replies; 124+ messages in thread
From: Sergei Trofimovich @ 2018-03-04 11:13 UTC (permalink / raw
To: gentoo-commits
commit: 888bc959077d8b0b2276876ddb1455619683b194
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Mar 4 10:14:46 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Mar 4 11:13:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=888bc959
net-misc/dhcp: stable 4.3.6_p1 for sparc, bug #649010
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"
net-misc/dhcp/dhcp-4.3.6_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index 4df7ace03e3..c5e7456891f 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-03-05 17:13 Tobias Klausmann
0 siblings, 0 replies; 124+ messages in thread
From: Tobias Klausmann @ 2018-03-05 17:13 UTC (permalink / raw
To: gentoo-commits
commit: c6c57900eba1abd754bb8d8df77b05a530f7ddbd
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 5 15:05:49 2018 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 5 17:13:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c57900
net-misc/dhcp-4.3.6_p1-r0: alpha stable
Gentoo-Bug: http://bugs.gentoo.org/649010
net-misc/dhcp/dhcp-4.3.6_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index c5e7456891f..bcadccf48ac 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-03-11 5:20 Matt Turner
0 siblings, 0 replies; 124+ messages in thread
From: Matt Turner @ 2018-03-11 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 2d8544998fa138566fe6438220e16a6eeb17c6ec
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 05:20:00 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 05:20:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d854499
net-misc/dhcp-4.3.6_p1: hppa stable, bug 649010
net-misc/dhcp/dhcp-4.3.6_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index bcadccf48ac..cd7650e8bb8 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-03-12 4:41 Matt Turner
0 siblings, 0 replies; 124+ messages in thread
From: Matt Turner @ 2018-03-12 4:41 UTC (permalink / raw
To: gentoo-commits
commit: a2584b15545aed391f581c45d4d6292b78330592
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 04:40:56 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 04:40:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2584b15
net-misc/dhcp-4.3.6_p1: ppc64 stable, bug 649010
net-misc/dhcp/dhcp-4.3.6_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index 528478089f2..865f6c35067 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-03-12 4:41 Matt Turner
0 siblings, 0 replies; 124+ messages in thread
From: Matt Turner @ 2018-03-12 4:41 UTC (permalink / raw
To: gentoo-commits
commit: 1b5f4eb80f7f3d21d880f75ed502fb30c3ad32ff
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 04:40:53 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 04:40:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b5f4eb8
net-misc/dhcp-4.3.6_p1: ppc stable, bug 649010
net-misc/dhcp/dhcp-4.3.6_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index cd7650e8bb8..528478089f2 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-03-13 18:01 Markus Meier
0 siblings, 0 replies; 124+ messages in thread
From: Markus Meier @ 2018-03-13 18:01 UTC (permalink / raw
To: gentoo-commits
commit: 98f5dae04f5e4186c30d5ed49f453169f0070f0e
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 17:54:12 2018 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 18:00:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98f5dae0
net-misc/dhcp: arm stable, bug #649010
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="arm"
net-misc/dhcp/dhcp-4.3.6_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index 865f6c35067..dfbf259894c 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-03-13 19:51 Mikle Kolyada
0 siblings, 0 replies; 124+ messages in thread
From: Mikle Kolyada @ 2018-03-13 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 23a95e758d7d13deb6222e8635e122d3eb8d8188
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 19:50:46 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 19:51:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a95e75
net-misc/dhcp: Drop insecure versions
Bug https://bugs.gentoo.org/649010
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-misc/dhcp/Manifest | 3 -
net-misc/dhcp/dhcp-4.3.4.ebuild | 264 -------------------------------------
net-misc/dhcp/dhcp-4.3.5.ebuild | 263 ------------------------------------
net-misc/dhcp/dhcp-4.3.6-r1.ebuild | 263 ------------------------------------
4 files changed, 793 deletions(-)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index e3151d1326c..4197edbff03 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,5 +1,2 @@
-DIST dhcp-4.3.4.tar.gz 9302513 BLAKE2B eb7fb7d7d46d5a706b4f22b4add98619709f7ac1ecf8244564f043fd56adb6e2f54a0e01b573abcd7e054a82f74279c8134802380ee2d02c1cab1118d48a4965 SHA512 411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706
-DIST dhcp-4.3.5.tar.gz 10075147 BLAKE2B ffce896cfafe17a412030d0a1cb4a92323be175ecbb35061fe0538ed13a9f91d604daed89b5f282c92ef161944e9f18557545d95c9fbbd29e1f6a31485ef3b11 SHA512 aba0e1d361eb9e7ed33fc48c0b0b9288057af9ec51775e40e27feb9ababc182506706fcf39079236ce36b0f7ded391e107474dc29de2e60ed45d37753505e1f0
DIST dhcp-4.3.6-P1.tar.gz 10189202 BLAKE2B 5dfbda82fa76d1011c552c9d9b5f15296834c2f380795e11fc6419010dd533fa45b9544fc10fc9da45095127f54ffe136b5fd7cc584589150b1b0a9a054e800c SHA512 cb04af2fb0fa8c5621e8b3dcb41e81422475218e1569b0eac6e13c876a21279928a3348f799253d7207517720466523b1cc28005c671542e37b1a391342b1e62
-DIST dhcp-4.3.6.tar.gz 10182593 BLAKE2B 2b6324c63446a5cbded9a7cdd4455b6c880aabd282dfd19d44fe2fafe684a991b4afa87ec04ee3fc131437c8efdddbe2777d70586c2e8b2b4319e786325dc398 SHA512 de4962dc2aa174df17a3a1456719a777a42d238c3d6ad1771ccc460fa70c9e9cefcce52c7437f7acde61b9c3a2e84e9d49fd2dc33c7e9243053ceed5b247be03
DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
diff --git a/net-misc/dhcp/dhcp-4.3.4.ebuild b/net-misc/dhcp/dhcp-4.3.4.ebuild
deleted file mode 100644
index 862b888b144..00000000000
--- a/net-misc/dhcp/dhcp-4.3.4.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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
- "${FILESDIR}/${PN}-4.2.5-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() {
- epatch "${PATCHES[@]}"
-
- # 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:\<client\>::' \
- 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
- cp doc/ja_JP.eucJP/dhcp* common
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -rf doc/ja_JP.eucJP
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
- cd bind-*/
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
deleted file mode 100644
index c496d7f5f16..00000000000
--- a/net-misc/dhcp/dhcp-4.3.5.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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
- "${FILESDIR}/${PN}-4.2.5-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() {
- epatch "${PATCHES[@]}"
-
- # 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:\<client\>::' \
- 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 || die
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
- cd bind-*/ || die
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
diff --git a/net-misc/dhcp/dhcp-4.3.6-r1.ebuild b/net-misc/dhcp/dhcp-4.3.6-r1.ebuild
deleted file mode 100644
index 9e73d36618c..00000000000
--- a/net-misc/dhcp/dhcp-4.3.6-r1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2018 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 ~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:\<client\>::' \
- 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 || die
-
- # make the bind build work
- binddir="${S}/bind"
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- eapply -p2 "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
- cd bind-*/ || die
- eapply -p2 "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- local myeconfargs=(
- --enable-paranoia
- --enable-early-chroot
- --sysconfdir=${e}
- $(use_enable ipv6 dhcpv6)
- $(use_with ldap)
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
- )
- econf "${myeconfargs[@]}"
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- docinto html
- dodoc doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-03-16 22:50 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2018-03-16 22:50 UTC (permalink / raw
To: gentoo-commits
commit: 53ad77348f17dfca79dfa6cf0421f4ee57b8ac5b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 22:44:03 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 22:44:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53ad7734
net-misc/dhcp: Added sub-slot dep operator for dev-libs/openssl.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-misc/dhcp/dhcp-4.3.6_p1.ebuild | 2 +-
net-misc/dhcp/dhcp-4.4.1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index dfbf259894c..b8dc4ed2b86 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -30,7 +30,7 @@ DEPEND="
ldap? (
net-nds/openldap
ssl? (
- !libressl? ( dev-libs/openssl:0 )
+ !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
)
)"
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 358e3c1f12a..b092a122950 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -30,7 +30,7 @@ DEPEND="
ldap? (
net-nds/openldap
ssl? (
- !libressl? ( dev-libs/openssl:0 )
+ !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
)
)"
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2018-09-08 13:57 Mart Raudsepp
0 siblings, 0 replies; 124+ messages in thread
From: Mart Raudsepp @ 2018-09-08 13:57 UTC (permalink / raw
To: gentoo-commits
commit: 63d762132d476b955fa208cf5b519e0c4ad94afe
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 8 13:52:46 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Sep 8 13:52:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d76213
net-misc/dhcp-4.3.6_p1: arm64 stable
Package-Manager: Portage-2.3.49, Repoman-2.3.10
net-misc/dhcp/dhcp-4.3.6_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index b8dc4ed2b86..934d0e56fbb 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2019-01-27 10:08 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2019-01-27 10:08 UTC (permalink / raw
To: gentoo-commits
commit: db6acb30d693068acb6c725400702d1c51e63342
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 10:07:11 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 10:08:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db6acb30
net-misc/dhcp: Minor ebuild improvements.
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.1.ebuild | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index b092a122950..c3848a50d3e 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -170,7 +170,7 @@ src_configure() {
cd bind/bind-*/ || die
local el
eval econf \
- $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el}; fi; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+ $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
--disable-symtable \
--without-make-clean
}
@@ -192,7 +192,7 @@ src_install() {
if [[ -e client/dhclient ]] ; then
# move the client to /
dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+ mv "${ED%/}"/usr/sbin/dhclient "${ED%/}"/sbin/ || die
exeinto /sbin
if use kernel_linux ; then
@@ -224,15 +224,15 @@ src_install() {
systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+ sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED%/}"/etc/init.d/* || die #442560
fi
# the default config files aren't terribly useful #384087
local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
+ for f in "${ED%/}"/etc/dhcp/*.conf.example ; do
mv "${f}" "${f%.example}" || die
done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+ sed -i '/^[^#]/s:^:#:' "${ED%/}"/etc/dhcp/*.conf || die
}
pkg_preinst() {
@@ -245,10 +245,10 @@ pkg_preinst() {
for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
h=${f#*:}
f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
+ if [ -e "${EROOT%/}"${f} ] ; then
case $(md5sum "${EROOT}"${f}) in
${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
+ *) cp -p "${EROOT%/}"${f} "${ED%/}"${f};;
esac
fi
done
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2019-01-27 12:13 Sergei Trofimovich
0 siblings, 0 replies; 124+ messages in thread
From: Sergei Trofimovich @ 2019-01-27 12:13 UTC (permalink / raw
To: gentoo-commits
commit: 9e50ef46ec22ef3b3029eabe6d50d45b6a44f14c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 12:12:25 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 12:12:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e50ef46
net-misc/dhcp: stable 4.4.1 for ia64, bug #666860
Package-Manager: Portage-2.3.58, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index c3848a50d3e..7039c275f14 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -17,7 +17,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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2019-01-30 8:13 Sergei Trofimovich
0 siblings, 0 replies; 124+ messages in thread
From: Sergei Trofimovich @ 2019-01-30 8:13 UTC (permalink / raw
To: gentoo-commits
commit: fa287a5ba1e05ebbe29227cf07f325033692245c
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed Jan 30 06:46:53 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 08:03:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa287a5b
net-misc/dhcp: stable 4.4.1 for sparc, bug #666860
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 7039c275f14..94a13e2cd47 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -17,7 +17,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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2019-01-30 13:20 Tobias Klausmann
0 siblings, 0 replies; 124+ messages in thread
From: Tobias Klausmann @ 2019-01-30 13:20 UTC (permalink / raw
To: gentoo-commits
commit: 18f6f273f19f952438faa9b1aa453c1838b48039
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 13:19:56 2019 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 13:19:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f6f273
net-misc/dhcp-4.4.1-r0: alpha stable
Bug: http://bugs.gentoo.org/666860
Signed-off-by: Tobias Klausmann <klausman <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 94a13e2cd47..140b6f70996 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -17,7 +17,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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2019-02-04 20:16 Markus Meier
0 siblings, 0 replies; 124+ messages in thread
From: Markus Meier @ 2019-02-04 20:16 UTC (permalink / raw
To: gentoo-commits
commit: dd82f4b4409ba93df284fad523b628f4e9955364
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 4 20:13:11 2019 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Mon Feb 4 20:13:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd82f4b4
net-misc/dhcp: arm stable, bug #666860
Signed-off-by: Markus Meier <maekke <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"
net-misc/dhcp/dhcp-4.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index cfb373ea637..30d54f2e199 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -17,7 +17,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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2019-02-07 11:53 Mikle Kolyada
0 siblings, 0 replies; 124+ messages in thread
From: Mikle Kolyada @ 2019-02-07 11:53 UTC (permalink / raw
To: gentoo-commits
commit: 554f02931f9fd929a6b64f247b9b17a6e4775eed
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 7 11:53:34 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 11:53:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554f0293
net-misc/dhcp: amd64 stable wrt bug #666860
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
net-misc/dhcp/dhcp-4.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 30d54f2e199..572693563b6 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -17,7 +17,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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2019-02-16 23:38 Mart Raudsepp
0 siblings, 0 replies; 124+ messages in thread
From: Mart Raudsepp @ 2019-02-16 23:38 UTC (permalink / raw
To: gentoo-commits
commit: 97769ca7756fca0953e754b9b5ef0b3cb83e169e
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 23:36:14 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 23:36:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97769ca7
net-misc/dhcp: arm64 stable (bug #666860)
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 572693563b6..35ed728fa01 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -17,7 +17,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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2019-07-31 22:03 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2019-07-31 22:03 UTC (permalink / raw
To: gentoo-commits
commit: 925ce2e330d5bcdb028e44f38ed908c804d7526d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 22:03:31 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 22:03:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=925ce2e3
net-misc/dhcp: Fixed HOMEPAGE
Thanks-to: Daniel M. Weeks <dan <AT> danweeks.net>
Closes: https://bugs.gentoo.org/691190
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 35ed728fa01..a0bdbf50b4d 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -11,7 +11,7 @@ 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"
+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"
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2020-01-23 9:08 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2020-01-23 9:08 UTC (permalink / raw
To: gentoo-commits
commit: c7f24270f7e1a74f5a52106f3f8df3dc4258adc0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 09:08:34 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 09:08:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f24270
net-misc/dhcp: Bump to version 4.4.2
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/Manifest | 1 +
net-misc/dhcp/dhcp-4.4.2.ebuild | 266 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 267 insertions(+)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 4a8471be145..1a987541130 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1 +1,2 @@
DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
+DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
diff --git a/net-misc/dhcp/dhcp-4.4.2.ebuild b/net-misc/dhcp/dhcp-4.4.2.ebuild
new file mode 100644
index 00000000000..560df3f8af2
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.4.2.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+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.4.0-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 \
+ -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:\<client\>::' \
+ 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 || die
+
+ # make the bind build work - do NOT make "binddir" local!
+ binddir="${S}/bind"
+ cd "${binddir}" || die
+ cat <<-EOF > bindvar.tmp
+ binddir=${binddir}
+ GMAKE=${MAKE:-gmake}
+ EOF
+ eapply -p2 "${FILESDIR}"/${PN}-4.4.0-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@' \
+ -i bind-*/lib/Makefile.in || die
+}
+
+src_configure() {
+ # bind defaults to stupid `/usr/bin/ar`
+ tc-export AR BUILD_CC
+ export ac_cv_path_AR=${AR}
+
+ # this is tested for by the bind build system, and can cause trouble
+ # when cross-building; since dhcp itself doesn't make use of libcap,
+ # simply disable it.
+ export ac_cv_lib_cap_cap_set_proc=no
+
+ # Use FHS sane paths ... some of these have configure options,
+ # but not all, so just do it all here.
+ local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+ cat <<-EOF >> includes/site.h
+ #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
+ #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
+ #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
+ #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
+ #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
+ #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
+ #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
+ #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
+ #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
+ #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
+ #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
+ #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
+ EOF
+
+ local myeconfargs=(
+ --enable-paranoia
+ --enable-early-chroot
+ --sysconfdir=${e}
+ $(use_enable ipv6 dhcpv6)
+ $(use_with ldap)
+ $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+ )
+ econf "${myeconfargs[@]}"
+
+ # configure local bind cruft. symtable option requires
+ # perl and we don't want to require that #383837.
+ cd bind/bind-*/ || die
+ local el
+ eval econf \
+ $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+ --disable-symtable \
+ --without-make-clean
+}
+
+src_compile() {
+ # build local bind cruft first
+ emake -C bind/bind-*/lib install
+ # then build standard dhcp code
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+ docinto html
+ dodoc doc/References.html
+
+ if [[ -e client/dhclient ]] ; then
+ # move the client to /
+ dodir /sbin
+ mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
+
+ exeinto /sbin
+ if use kernel_linux ; then
+ newexe "${S}"/client/scripts/linux dhclient-script
+ else
+ newexe "${S}"/client/scripts/freebsd dhclient-script
+ fi
+ fi
+
+ if [[ -e server/dhcpd ]] ; then
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins contrib/ldap/dhcp.*
+ dosbin contrib/ldap/dhcpd-conf-to-ldap
+ fi
+
+ newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+ newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+ newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+ newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+ systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+ systemd_dounit "${FILESDIR}"/dhcpd4.service
+ systemd_dounit "${FILESDIR}"/dhcpd6.service
+ systemd_dounit "${FILESDIR}"/dhcrelay4.service
+ systemd_dounit "${FILESDIR}"/dhcrelay6.service
+ systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+ systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+ sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+ fi
+
+ # the default config files aren't terribly useful #384087
+ local f
+ for f in "${ED}"/etc/dhcp/*.conf.example ; do
+ mv "${f}" "${f%.example}" || die
+ done
+ sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+ enewgroup dhcp
+ enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+ # Keep the user files over the sample ones. The
+ # hashing is to ignore the crappy defaults #384087.
+ local f h
+ for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+ h=${f#*:}
+ f="/etc/dhcp/${f%:*}.conf"
+ if [ -e "${EROOT}"${f} ] ; then
+ case $(md5sum "${EROOT}"${f}) in
+ ${h}*) ;;
+ *) cp -p "${EROOT}"${f} "${ED}"${f};;
+ esac
+ fi
+ done
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+ ewarn
+ ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+ ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+ ewarn "and dhcp should be removed from the default runlevel"
+ ewarn
+ fi
+}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2020-01-24 21:52 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2020-01-24 21:52 UTC (permalink / raw
To: gentoo-commits
commit: f948564be9474f90fde53747a643a282608390f6
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 21:46:14 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 21:52:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f948564b
net-misc/dhcp: Revbump to use new acct-*/dhcp packages
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r1.ebuild | 268 +++++++++++++++++++++++++++++++++++++
1 file changed, 268 insertions(+)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r1.ebuild b/net-misc/dhcp/dhcp-4.4.2-r1.ebuild
new file mode 100644
index 00000000000..26c97d7eafa
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.4.2-r1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
+
+DEPEND="
+ acct-group/dhcp
+ acct-user/dhcp
+ 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.4.0-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 \
+ -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:\<client\>::' \
+ 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 || die
+
+ # make the bind build work - do NOT make "binddir" local!
+ binddir="${S}/bind"
+ cd "${binddir}" || die
+ cat <<-EOF > bindvar.tmp
+ binddir=${binddir}
+ GMAKE=${MAKE:-gmake}
+ EOF
+ eapply -p2 "${FILESDIR}"/${PN}-4.4.0-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@' \
+ -i bind-*/lib/Makefile.in || die
+}
+
+src_configure() {
+ # bind defaults to stupid `/usr/bin/ar`
+ tc-export AR BUILD_CC
+ export ac_cv_path_AR=${AR}
+
+ # this is tested for by the bind build system, and can cause trouble
+ # when cross-building; since dhcp itself doesn't make use of libcap,
+ # simply disable it.
+ export ac_cv_lib_cap_cap_set_proc=no
+
+ # Use FHS sane paths ... some of these have configure options,
+ # but not all, so just do it all here.
+ local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+ cat <<-EOF >> includes/site.h
+ #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
+ #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
+ #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
+ #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
+ #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
+ #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
+ #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
+ #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
+ #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
+ #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
+ #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
+ #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
+ EOF
+
+ local myeconfargs=(
+ --enable-paranoia
+ --enable-early-chroot
+ --sysconfdir=${e}
+ $(use_enable ipv6 dhcpv6)
+ $(use_with ldap)
+ $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+ )
+ econf "${myeconfargs[@]}"
+
+ # configure local bind cruft. symtable option requires
+ # perl and we don't want to require that #383837.
+ cd bind/bind-*/ || die
+ local el
+ eval econf \
+ $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+ --disable-symtable \
+ --without-make-clean
+}
+
+src_compile() {
+ # build local bind cruft first
+ emake -C bind/bind-*/lib install
+ # then build standard dhcp code
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+ docinto html
+ dodoc doc/References.html
+
+ if [[ -e client/dhclient ]] ; then
+ # move the client to /
+ dodir /sbin
+ mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
+
+ exeinto /sbin
+ if use kernel_linux ; then
+ newexe "${S}"/client/scripts/linux dhclient-script
+ else
+ newexe "${S}"/client/scripts/freebsd dhclient-script
+ fi
+ fi
+
+ if [[ -e server/dhcpd ]] ; then
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins contrib/ldap/dhcp.*
+ dosbin contrib/ldap/dhcpd-conf-to-ldap
+ fi
+
+ newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+ newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+ newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+ newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+ systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+ systemd_dounit "${FILESDIR}"/dhcpd4.service
+ systemd_dounit "${FILESDIR}"/dhcpd6.service
+ systemd_dounit "${FILESDIR}"/dhcrelay4.service
+ systemd_dounit "${FILESDIR}"/dhcrelay6.service
+ systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+ systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+ sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+ fi
+
+ # the default config files aren't terribly useful #384087
+ local f
+ for f in "${ED}"/etc/dhcp/*.conf.example ; do
+ mv "${f}" "${f%.example}" || die
+ done
+ sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+ enewgroup dhcp
+ enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+ # Keep the user files over the sample ones. The
+ # hashing is to ignore the crappy defaults #384087.
+ local f h
+ for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+ h=${f#*:}
+ f="/etc/dhcp/${f%:*}.conf"
+ if [ -e "${EROOT}"${f} ] ; then
+ case $(md5sum "${EROOT}"${f}) in
+ ${h}*) ;;
+ *) cp -p "${EROOT}"${f} "${ED}"${f};;
+ esac
+ fi
+ done
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+ ewarn
+ ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+ ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+ ewarn "and dhcp should be removed from the default runlevel"
+ ewarn
+ fi
+}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2020-02-18 8:23 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2020-02-18 8:23 UTC (permalink / raw
To: gentoo-commits
commit: 557fd8ba795a841069d6c3709fec7f6b57b51568
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Feb 18 08:21:12 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 08:23:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557fd8ba
net-misc/dhcp: Revbump to remove old user eclass remnants
Closes: https://bugs.gentoo.org/710014
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/{dhcp-4.4.2-r1.ebuild => dhcp-4.4.2-r2.ebuild} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r1.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
similarity index 99%
rename from net-misc/dhcp/dhcp-4.4.2-r1.ebuild
rename to net-misc/dhcp/dhcp-4.4.2-r2.ebuild
index 26c97d7eafa..87b562df602 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
@@ -236,12 +236,12 @@ src_install() {
mv "${f}" "${f%.example}" || die
done
sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+
+ diropts -m0750 -o dhcp -g dhcp
+ keepdir /var/lib/dhcp
}
pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
# Keep the user files over the sample ones. The
# hashing is to ignore the crappy defaults #384087.
local f h
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2020-05-03 10:01 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2020-05-03 10:01 UTC (permalink / raw
To: gentoo-commits
commit: d79010de4b44f1af8340f68113b67d03c0619d53
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 10:00:46 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun May 3 10:00:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79010de
net-misc/dhcp: amd64 stable wrt bug #720694
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
index 8adf530720e..59c68895bc6 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2020-05-03 10:12 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2020-05-03 10:12 UTC (permalink / raw
To: gentoo-commits
commit: 0c2eabb9cab015b78b7cc9e9f91cf1b3cdba5d29
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 10:12:35 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun May 3 10:12:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2eabb9
net-misc/dhcp: arm stable wrt bug #720694
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
index 59c68895bc6..fc2511f8bf0 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2020-05-03 10:25 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2020-05-03 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 1338803ecef8187883942d784297947791af85b5
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 10:25:01 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun May 3 10:25:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1338803e
net-misc/dhcp: sparc stable wrt bug #720694
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
index fc2511f8bf0..ca7ab2a9097 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2020-05-03 10:30 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2020-05-03 10:30 UTC (permalink / raw
To: gentoo-commits
commit: be67af5a0828c4c6adc94269ae2445d7a4c30ede
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 10:29:46 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun May 3 10:29:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be67af5a
net-misc/dhcp: x86 stable wrt bug #720694
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
index ca7ab2a9097..16f157fe7ee 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-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 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2020-05-03 12:30 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2020-05-03 12:30 UTC (permalink / raw
To: gentoo-commits
commit: 05129ce05a422aa41f7ef95a14501b9cda7153c8
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 12:30:38 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun May 3 12:30:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05129ce0
net-misc/dhcp: ppc64 stable wrt bug #720694
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
index 16f157fe7ee..7afceef6e12 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-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 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2020-05-04 6:16 Mart Raudsepp
0 siblings, 0 replies; 124+ messages in thread
From: Mart Raudsepp @ 2020-05-04 6:16 UTC (permalink / raw
To: gentoo-commits
commit: 9272a278cfe7fc0dd8cfee5036760f0919c72659
Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Sun May 3 12:15:03 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon May 4 06:15:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9272a278
net-misc/dhcp: arm64 stable (bug #720694)
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
index 7afceef6e12..a275125bb3b 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-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 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2020-05-06 17:34 Sergei Trofimovich
0 siblings, 0 replies; 124+ messages in thread
From: Sergei Trofimovich @ 2020-05-06 17:34 UTC (permalink / raw
To: gentoo-commits
commit: 2db1954dd8cb6591665fb5451d4ddbabce6b865c
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed May 6 17:31:49 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed May 6 17:34:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db1954d
net-misc/dhcp: stable 4.4.2-r2 for hppa, bug #720694
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
index a275125bb3b..0257824a08f 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-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 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-01-21 20:51 Mike Gilbert
0 siblings, 0 replies; 124+ messages in thread
From: Mike Gilbert @ 2021-01-21 20:51 UTC (permalink / raw
To: gentoo-commits
commit: e615386b6a018b9f8e00756578161aae9acc79eb
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Jan 21 20:21:14 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 20:51:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e615386b
net-misc/dhcp: Pass randomdev path to configure
* dhcp fails to detect which random device to use when cross-compiling,
so we have to pass --with-randomdev=/dev/random to configure
Closes: https://bugs.gentoo.org/766426
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/19153
net-misc/dhcp/dhcp-4.4.2-r3.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index c0bbefce10f..b123e346e37 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -166,6 +166,7 @@ src_configure() {
--enable-paranoia
--enable-early-chroot
--sysconfdir=${e}
+ --with-randomdev=/dev/random
$(use_enable ipv6 dhcpv6)
$(use_with ldap)
$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
@@ -178,6 +179,7 @@ src_configure() {
local el
eval econf \
$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+ --with-randomdev=/dev/random \
--disable-symtable \
--without-make-clean
}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-02-25 1:28 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2021-02-25 1:28 UTC (permalink / raw
To: gentoo-commits
commit: af7f9e4e6383822de9d5b9c4f462041927cfc83f
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 01:27:40 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 01:27:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af7f9e4e
net-misc/dhcp: fix 32-bit build with libatomic (ppc, arm, ...)
Bug: https://bugs.gentoo.org/720806
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r3.ebuild | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index b123e346e37..0aef829c93b 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit systemd toolchain-funcs
+inherit systemd toolchain-funcs flag-o-matic
MY_PV="${PV//_alpha/a}"
MY_PV="${MY_PV//_beta/b}"
@@ -162,6 +162,11 @@ src_configure() {
#define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
EOF
+ # https://bugs.gentoo.org/720806
+ if use ppc || use arm || use hppa; then
+ append-libs -latomic
+ fi
+
local myeconfargs=(
--enable-paranoia
--enable-early-chroot
@@ -170,6 +175,7 @@ src_configure() {
$(use_enable ipv6 dhcpv6)
$(use_with ldap)
$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+ LIBS="${LIBS}"
)
econf "${myeconfargs[@]}"
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-02-25 1:29 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2021-02-25 1:29 UTC (permalink / raw
To: gentoo-commits
commit: 2a9fe50ed49109c6834460d2149dde9b0231dfc4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 01:29:06 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 01:29:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a9fe50e
net-misc/dhcp: Stabilize 4.4.2-r3 ppc, #720694
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index 0aef829c93b..2d8a36235b0 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-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 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-02-26 11:38 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2021-02-26 11:38 UTC (permalink / raw
To: gentoo-commits
commit: ff9b6cc19896cf6325e8bf5b9f6649cbdf455652
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 11:33:09 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 11:38:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff9b6cc1
net-misc/dhcp: Removed old
Closes: https://github.com/gentoo/gentoo/pull/19643
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/Manifest | 1 -
net-misc/dhcp/dhcp-4.4.1.ebuild | 265 ---------------------------------------
net-misc/dhcp/dhcp-4.4.2.ebuild | 266 ----------------------------------------
3 files changed, 532 deletions(-)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 1a987541130..8f08b4e4503 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,2 +1 @@
-DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
deleted file mode 100644
index 52e3c8070bd..00000000000
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="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 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-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.4.0-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 \
- -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:\<client\>::' \
- 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 || die
-
- # make the bind build work
- binddir="${S}/bind"
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- eapply -p2 "${FILESDIR}"/${PN}-4.4.0-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@' \
- -i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- local myeconfargs=(
- --enable-paranoia
- --enable-early-chroot
- --sysconfdir=${e}
- $(use_enable ipv6 dhcpv6)
- $(use_with ldap)
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
- )
- econf "${myeconfargs[@]}"
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- local el
- eval econf \
- $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- docinto html
- dodoc doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${ED%/}"/usr/sbin/dhclient "${ED%/}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED%/}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED%/}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED%/}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT%/}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT%/}"${f} "${ED%/}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
diff --git a/net-misc/dhcp/dhcp-4.4.2.ebuild b/net-misc/dhcp/dhcp-4.4.2.ebuild
deleted file mode 100644
index 251ffeb42ec..00000000000
--- a/net-misc/dhcp/dhcp-4.4.2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-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.4.0-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 \
- -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:\<client\>::' \
- 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 || die
-
- # make the bind build work - do NOT make "binddir" local!
- binddir="${S}/bind"
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- eapply -p2 "${FILESDIR}"/${PN}-4.4.0-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@' \
- -i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- local myeconfargs=(
- --enable-paranoia
- --enable-early-chroot
- --sysconfdir=${e}
- $(use_enable ipv6 dhcpv6)
- $(use_with ldap)
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
- )
- econf "${myeconfargs[@]}"
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- local el
- eval econf \
- $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- docinto html
- dodoc doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-03-07 11:58 David Seifert
0 siblings, 0 replies; 124+ messages in thread
From: David Seifert @ 2021-03-07 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 084f2ccc0aedd30d53de76a13577ba7f12134e0e
Author: Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Sun Mar 7 11:57:19 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 11:57:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084f2ccc
net-misc/dhcp: migrate to tmpfiles.eclass
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index 2d8a36235b0..a1d57e2ebbf 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit systemd toolchain-funcs flag-o-matic
+inherit systemd toolchain-funcs flag-o-matic tmpfiles
MY_PV="${PV//_alpha/a}"
MY_PV="${MY_PV//_beta/b}"
@@ -231,7 +231,7 @@ src_install() {
newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+ newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
systemd_dounit "${FILESDIR}"/dhcpd4.service
systemd_dounit "${FILESDIR}"/dhcpd6.service
systemd_dounit "${FILESDIR}"/dhcrelay4.service
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-04-29 18:00 Mikle Kolyada
0 siblings, 0 replies; 124+ messages in thread
From: Mikle Kolyada @ 2021-04-29 18:00 UTC (permalink / raw
To: gentoo-commits
commit: fcf1b32c6f71b6de9dbd28e09cb6f9ae6565bd99
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 17:36:40 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 18:00:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcf1b32c
net-misc/dhcp: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2-r3.ebuild | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index a1d57e2ebbf..0cb341b0cec 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
@@ -19,7 +19,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 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
+IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
DEPEND="
acct-group/dhcp
@@ -32,10 +32,7 @@ DEPEND="
)
ldap? (
net-nds/openldap
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
+ ssl? ( dev-libs/openssl:0= )
)"
RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-dhcp )
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-05-26 21:49 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2021-05-26 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 68fa06b8bd629857ef0dc03a983f6eb299cd6b69
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May 26 21:48:41 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May 26 21:48:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fa06b8
net-misc/dhcp: Security bump to version 4.4.2_p1
Bug: https://bugs.gentoo.org/792324
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/Manifest | 1 +
net-misc/dhcp/dhcp-4.4.2_p1.ebuild | 277 +++++++++++++++++++++++++++++++++++++
2 files changed, 278 insertions(+)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 8f08b4e4503..ccdfdad09e7 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1 +1,2 @@
+DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040
DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
new file mode 100644
index 00000000000..1a0e0a3d7f5
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2021 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
+
+DEPEND="
+ acct-group/dhcp
+ acct-user/dhcp
+ client? (
+ kernel_linux? (
+ ipv6? ( sys-apps/iproute2 )
+ sys-apps/net-tools
+ )
+ )
+ ldap? (
+ net-nds/openldap
+ ssl? ( dev-libs/openssl:0= )
+ )"
+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.4.0-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
+
+ # Possible upstream candidates
+ "${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194
+ "${FILESDIR}/dhcp-4.4.2-variable-name.patch" #752402
+)
+
+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:\<client\>::' \
+ 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 || die
+
+ # make the bind build work - do NOT make "binddir" local!
+ binddir="${S}/bind"
+ cd "${binddir}" || die
+ cat <<-EOF > bindvar.tmp
+ binddir=${binddir}
+ GMAKE=${MAKE:-gmake}
+ EOF
+ eapply -p2 "${FILESDIR}"/${PN}-4.4.0-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@' \
+ -i bind-*/lib/Makefile.in || die
+}
+
+src_configure() {
+ # bind defaults to stupid `/usr/bin/ar`
+ tc-export AR BUILD_CC
+ export ac_cv_path_AR=${AR}
+
+ # this is tested for by the bind build system, and can cause trouble
+ # when cross-building; since dhcp itself doesn't make use of libcap,
+ # simply disable it.
+ export ac_cv_lib_cap_cap_set_proc=no
+
+ # Use FHS sane paths ... some of these have configure options,
+ # but not all, so just do it all here.
+ local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+ cat <<-EOF >> includes/site.h
+ #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
+ #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
+ #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
+ #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
+ #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
+ #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
+ #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
+ #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
+ #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
+ #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
+ #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
+ #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
+ EOF
+
+ # https://bugs.gentoo.org/720806
+ if use ppc || use arm || use hppa; then
+ append-libs -latomic
+ fi
+
+ local myeconfargs=(
+ --enable-paranoia
+ --enable-early-chroot
+ --sysconfdir=${e}
+ --with-randomdev=/dev/random
+ $(use_enable ipv6 dhcpv6)
+ $(use_with ldap)
+ $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+ LIBS="${LIBS}"
+ )
+ econf "${myeconfargs[@]}"
+
+ # configure local bind cruft. symtable option requires
+ # perl and we don't want to require that #383837.
+ cd bind/bind-*/ || die
+ local el
+ eval econf \
+ $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+ --with-randomdev=/dev/random \
+ --disable-symtable \
+ --without-make-clean
+}
+
+src_compile() {
+ # build local bind cruft first
+ emake -C bind/bind-*/lib install
+ # then build standard dhcp code
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+ docinto html
+ dodoc doc/References.html
+
+ if [[ -e client/dhclient ]] ; then
+ # move the client to /
+ dodir /sbin
+ mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
+
+ exeinto /sbin
+ if use kernel_linux ; then
+ newexe "${S}"/client/scripts/linux dhclient-script
+ else
+ newexe "${S}"/client/scripts/freebsd dhclient-script
+ fi
+ fi
+
+ if [[ -e server/dhcpd ]] ; then
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins contrib/ldap/dhcp.*
+ dosbin contrib/ldap/dhcpd-conf-to-ldap
+ fi
+
+ newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+ newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+ newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+ newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+ newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+ systemd_dounit "${FILESDIR}"/dhcpd4.service
+ systemd_dounit "${FILESDIR}"/dhcpd6.service
+ systemd_dounit "${FILESDIR}"/dhcrelay4.service
+ systemd_dounit "${FILESDIR}"/dhcrelay6.service
+ systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+ systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+ sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+ fi
+
+ # the default config files aren't terribly useful #384087
+ local f
+ for f in "${ED}"/etc/dhcp/*.conf.example ; do
+ mv "${f}" "${f%.example}" || die
+ done
+ sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+
+ diropts -m0750 -o dhcp -g dhcp
+ keepdir /var/lib/dhcp
+}
+
+pkg_preinst() {
+ # Keep the user files over the sample ones. The
+ # hashing is to ignore the crappy defaults #384087.
+ local f h
+ for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+ h=${f#*:}
+ f="/etc/dhcp/${f%:*}.conf"
+ if [ -e "${EROOT}"${f} ] ; then
+ case $(md5sum "${EROOT}"${f}) in
+ ${h}*) ;;
+ *) cp -p "${EROOT}"${f} "${ED}"${f};;
+ esac
+ fi
+ done
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+ ewarn
+ ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+ ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+ ewarn "and dhcp should be removed from the default runlevel"
+ ewarn
+ fi
+}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-06-02 19:01 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2021-06-02 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 75c87d8a9ecd36ce4a2a7b10614d2f61bf0bf6ff
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 2 19:00:35 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 2 19:00:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c87d8a
net-misc/dhcp: Stabilize 4.4.2_p1 amd64, #792324
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
index 8d24273b2ac..493158f8ef0 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-06-02 19:01 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2021-06-02 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 9e657c7ab28994f53d1b54da422661b365987feb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 2 19:00:10 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 2 19:00:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e657c7a
net-misc/dhcp: Stabilize 4.4.2_p1 x86, #792324
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
index 1a0e0a3d7f5..8d24273b2ac 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-06-02 22:42 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2021-06-02 22:42 UTC (permalink / raw
To: gentoo-commits
commit: ffad2e5f246c7e84b119f4be16e6e979edfeb3dd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 2 22:41:14 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 2 22:41:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffad2e5f
net-misc/dhcp: Stabilize 4.4.2_p1 arm, #792324
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
index 493158f8ef0..1a88dafeecb 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-06-03 8:23 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2021-06-03 8:23 UTC (permalink / raw
To: gentoo-commits
commit: deada1bb0aa262b159da7412e826bcc32ab0ee0d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 3 08:22:12 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 3 08:22:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deada1bb
net-misc/dhcp: Stabilize 4.4.2_p1 ppc64, #792324
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
index 1a88dafeecb..c1011a8e63e 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86"
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-06-03 15:52 Sergei Trofimovich
0 siblings, 0 replies; 124+ messages in thread
From: Sergei Trofimovich @ 2021-06-03 15:52 UTC (permalink / raw
To: gentoo-commits
commit: 4ac86757e70748b7ce69ccd1d0dd1ea215c3fed1
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Jun 3 11:30:33 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Jun 3 15:52:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac86757
net-misc/dhcp: stable 4.4.2_p1 for sparc, bug #792324
Package-Manager: Portage-3.0.18, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
index c1011a8e63e..2a874ada95d 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.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 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-06-03 23:38 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2021-06-03 23:38 UTC (permalink / raw
To: gentoo-commits
commit: 8c5d9b16425fa14764b5dd3ffa7df93be60748cb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 3 23:38:10 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 3 23:38:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c5d9b16
net-misc/dhcp: Stabilize 4.4.2_p1 arm64, #792324
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
index 2a874ada95d..b073122583b 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.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 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-06-07 6:25 Sergei Trofimovich
0 siblings, 0 replies; 124+ messages in thread
From: Sergei Trofimovich @ 2021-06-07 6:25 UTC (permalink / raw
To: gentoo-commits
commit: 860b360a5bfbb47ccc6559d5068291fa6218185d
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 7 06:22:34 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jun 7 06:25:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860b360a
net-misc/dhcp: stable 4.4.2_p1 for ppc
stable wrt bug #792324
Package-Manager: Portage-3.0.19, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
index b073122583b..0cb341b0cec 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.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 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-06-08 14:10 Lars Wendler
0 siblings, 0 replies; 124+ messages in thread
From: Lars Wendler @ 2021-06-08 14:10 UTC (permalink / raw
To: gentoo-commits
commit: 70d1fc386a3c3e1b3af78c11aa32438ce6e6d624
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 8 14:09:56 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jun 8 14:10:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d1fc38
net-misc/dhcp: Security cleanup
Bug: https://bugs.gentoo.org/792324
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/dhcp/Manifest | 1 -
net-misc/dhcp/dhcp-4.4.2-r3.ebuild | 277 -------------------------------------
2 files changed, 278 deletions(-)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index ccdfdad09e7..bc614fc3a8d 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,2 +1 @@
DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040
-DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
deleted file mode 100644
index 0cb341b0cec..00000000000
--- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2021 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 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
-
-DEPEND="
- acct-group/dhcp
- acct-user/dhcp
- client? (
- kernel_linux? (
- ipv6? ( sys-apps/iproute2 )
- sys-apps/net-tools
- )
- )
- ldap? (
- net-nds/openldap
- ssl? ( dev-libs/openssl:0= )
- )"
-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.4.0-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
-
- # Possible upstream candidates
- "${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194
- "${FILESDIR}/dhcp-4.4.2-variable-name.patch" #752402
-)
-
-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:\<client\>::' \
- 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 || die
-
- # make the bind build work - do NOT make "binddir" local!
- binddir="${S}/bind"
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- eapply -p2 "${FILESDIR}"/${PN}-4.4.0-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@' \
- -i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- # https://bugs.gentoo.org/720806
- if use ppc || use arm || use hppa; then
- append-libs -latomic
- fi
-
- local myeconfargs=(
- --enable-paranoia
- --enable-early-chroot
- --sysconfdir=${e}
- --with-randomdev=/dev/random
- $(use_enable ipv6 dhcpv6)
- $(use_with ldap)
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
- LIBS="${LIBS}"
- )
- econf "${myeconfargs[@]}"
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- local el
- eval econf \
- $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
- --with-randomdev=/dev/random \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- docinto html
- dodoc doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-
- diropts -m0750 -o dhcp -g dhcp
- keepdir /var/lib/dhcp
-}
-
-pkg_preinst() {
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-06-17 9:59 Yixun Lan
0 siblings, 0 replies; 124+ messages in thread
From: Yixun Lan @ 2021-06-17 9:59 UTC (permalink / raw
To: gentoo-commits
commit: d897b7453795b9b354445afe80a7122c0bba0c1d
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 17 09:58:04 2021 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 09:58:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d897b745
net-misc/dhcp: keyword ~riscv
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
index 0cb341b0cec..3f8699608d3 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.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 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-07-28 2:59 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2021-07-28 2:59 UTC (permalink / raw
To: gentoo-commits
commit: 7ea2cf10a9f26e915cada4262066dacd87513a62
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 28 02:58:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 28 02:59:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea2cf10
net-misc/dhcp: avoid undefined/broken runtime behaviour with -O3
-fstrict-aliasing (enabled by -O3) breaks code within dhcp
which violates the no-strict-aliasing rule. So, let's tag on
an option to avoid assuming that rule / avoid the optimisation
which is unsafe here.
Bug: https://bugs.gentoo.org/787935
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/{dhcp-4.4.2_p1.ebuild => dhcp-4.4.2_p1-r1.ebuild} | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
similarity index 98%
rename from net-misc/dhcp/dhcp-4.4.2_p1.ebuild
rename to net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
index 4b86781a388..57fd8dd47f4 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
@@ -159,6 +159,10 @@ src_configure() {
#define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
EOF
+ # Breaks with -O3 because of reliance on undefined behaviour
+ # bug #787935
+ append-flags -fno-strict-aliasing
+
# https://bugs.gentoo.org/720806
if use ppc || use arm || use hppa; then
append-libs -latomic
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2021-07-30 23:31 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2021-07-30 23:31 UTC (permalink / raw
To: gentoo-commits
commit: 8cd2b4c8c0afc62d40af8e0d220ec9408698bd7f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 30 22:57:17 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 30 23:30:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cd2b4c8
net-misc/dhcp: [QA] call tmpfiles_process in pkg_postinst
This is needed to actually apply the tmpfiles configuration
we've installed in the ebuild. See tmpfiles.eclass documentation.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
index 57fd8dd47f4..7ae208514c6 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
@@ -271,6 +271,10 @@ pkg_preinst() {
}
pkg_postinst() {
+ if use server ; then
+ tmpfiles_process dhcpd.conf
+ fi
+
if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
ewarn
ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-01-04 10:30 David Seifert
0 siblings, 0 replies; 124+ messages in thread
From: David Seifert @ 2022-01-04 10:30 UTC (permalink / raw
To: gentoo-commits
commit: 2fcebaa07dddec39f8d670bc994a3ac36722b09f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 4 10:29:44 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 4 10:29:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fcebaa0
net-misc/dhcp: remove implicit kernel_linux
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
index 7ae208514c67..34a3dbeb56d7 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
+IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
acct-group/dhcp
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-03-22 23:32 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2022-03-22 23:32 UTC (permalink / raw
To: gentoo-commits
commit: ab08133e0710c3a7ad07f8f3cb141f2c1dc555ee
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 23:17:55 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 23:27:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab08133e
net-misc/dhcp: add subslot dep on OpenLDAP
New OpenLDAP breaks ABI (changes SONAME)
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/{dhcp-4.4.2_p1-r1.ebuild => dhcp-4.4.2_p1-r2.ebuild} | 4 ++--
net-misc/dhcp/{dhcp-4.4.3.ebuild => dhcp-4.4.3-r1.ebuild} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
similarity index 99%
rename from net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
rename to net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
index 34a3dbeb56d7..df94d6ae017e 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
@@ -31,8 +31,8 @@ DEPEND="
)
)
ldap? (
- net-nds/openldap
- ssl? ( dev-libs/openssl:0= )
+ net-nds/openldap:=
+ ssl? ( dev-libs/openssl:= )
)"
RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-dhcp )
diff --git a/net-misc/dhcp/dhcp-4.4.3.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
similarity index 99%
rename from net-misc/dhcp/dhcp-4.4.3.ebuild
rename to net-misc/dhcp/dhcp-4.4.3-r1.ebuild
index 585884b4fc84..b261be6fe3cc 100644
--- a/net-misc/dhcp/dhcp-4.4.3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
@@ -31,8 +31,8 @@ DEPEND="
)
)
ldap? (
- net-nds/openldap
- ssl? ( dev-libs/openssl:0= )
+ net-nds/openldap:=
+ ssl? ( dev-libs/openssl:= )
)"
RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-dhcp )
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-04-28 17:52 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2022-04-28 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 71b5f23ce2ed0cea82ef576b6db98606831e43da
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 17:51:43 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 17:51:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b5f23c
net-misc/dhcp: add -latomic for x86 too
Closes: https://bugs.gentoo.org/801592
Bug: https://bugs.gentoo.org/841482
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild | 4 ++--
net-misc/dhcp/dhcp-4.4.3-r1.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
index df94d6ae017e..4c213e87fbc3 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
@@ -163,8 +163,8 @@ src_configure() {
# bug #787935
append-flags -fno-strict-aliasing
- # https://bugs.gentoo.org/720806
- if use ppc || use arm || use hppa; then
+ # bug #720806, bug #801592
+ if use ppc || use arm || use hppa || use x86; then
append-libs -latomic
fi
diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
index b261be6fe3cc..518577815642 100644
--- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
@@ -167,8 +167,8 @@ src_configure() {
# bug #787935
append-flags -fno-strict-aliasing
- # https://bugs.gentoo.org/720806
- if use ppc || use arm || use hppa; then
+ # bug #720806, bug #801592
+ if use ppc || use arm || use hppa || use x86; then
append-libs -latomic
fi
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-04-28 18:00 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2022-04-28 18:00 UTC (permalink / raw
To: gentoo-commits
commit: c00b2fd2c2f09a391fd8a95add64db50c6e8e2ec
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 17:57:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 17:57:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c00b2fd2
net-misc/dhcp: change x86 test to check for i486 CHOST
Closes: https://bugs.gentoo.org/801592
Bug: https://bugs.gentoo.org/841482
Suggested-by: Ben Kohler <iamben <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild | 2 +-
net-misc/dhcp/dhcp-4.4.3-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
index 4c213e87fbc3..6b2cf7158832 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
@@ -164,7 +164,7 @@ src_configure() {
append-flags -fno-strict-aliasing
# bug #720806, bug #801592
- if use ppc || use arm || use hppa || use x86; then
+ if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
append-libs -latomic
fi
diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
index 518577815642..0cd58207062a 100644
--- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
@@ -168,7 +168,7 @@ src_configure() {
append-flags -fno-strict-aliasing
# bug #720806, bug #801592
- if use ppc || use arm || use hppa || use x86; then
+ if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
append-libs -latomic
fi
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-09-08 3:31 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2022-09-08 3:31 UTC (permalink / raw
To: gentoo-commits
commit: 748cf94546eed557232b2180d2554b6a7d821906
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 03:31:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 03:31:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=748cf945
net-misc/dhcp: Stabilize 4.4.3-r1 amd64, #869125
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
index 0cd58207062a..2801ce4b720f 100644
--- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3-r1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-09-08 3:31 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2022-09-08 3:31 UTC (permalink / raw
To: gentoo-commits
commit: 5bb4ab11c6996ec5f51871e8893d36a850a04cce
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 03:31:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 03:31:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb4ab11
net-misc/dhcp: Stabilize 4.4.3-r1 x86, #869125
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
index 2801ce4b720f..694fd5c64899 100644
--- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3-r1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-09-08 10:32 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2022-09-08 10:32 UTC (permalink / raw
To: gentoo-commits
commit: 2c39c22203e6fb9c383d249cd4d8d0b4dc3734f1
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 10:32:32 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 10:32:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c39c222
net-misc/dhcp: sparc stable wrt bug #869125
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
index 694fd5c64899..63b41b5435e3 100644
--- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3-r1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-09-08 10:52 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2022-09-08 10:52 UTC (permalink / raw
To: gentoo-commits
commit: f53619e88451fcbd7d683d0d603d6a8867930d5b
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 10:52:05 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 10:52:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f53619e8
net-misc/dhcp: Stabilize 4.4.3-r1 arm, #869125
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
index 63b41b5435e3..78b068a0ec98 100644
--- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3-r1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-09-08 11:35 Agostino Sarubbo
0 siblings, 0 replies; 124+ messages in thread
From: Agostino Sarubbo @ 2022-09-08 11:35 UTC (permalink / raw
To: gentoo-commits
commit: f0fc6fb174e0fddb4276075c1d1f68be97248947
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 11:35:17 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 11:35:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0fc6fb1
net-misc/dhcp: Stabilize 4.4.3-r1 arm64, #869125
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
index 78b068a0ec98..dfb8246e3440 100644
--- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3-r1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-09-15 19:58 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2022-09-15 19:58 UTC (permalink / raw
To: gentoo-commits
commit: 55a367f493a87a041871228bdeef694586f58b7d
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 19:57:10 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 19:57:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55a367f4
net-misc/dhcp: Stabilize 4.4.3-r1 ppc, #869125
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
index dfb8246e3440..bc52f8ad31cf 100644
--- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3-r1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-09-16 17:17 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2022-09-16 17:17 UTC (permalink / raw
To: gentoo-commits
commit: 542da7eebed4dd42bd4534067a4a20f21c251ac0
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 17:17:10 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 17:17:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542da7ee
net-misc/dhcp: Stabilize 4.4.3-r1 ppc64, #869125
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
index bc52f8ad31cf..9db36ddb42da 100644
--- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3-r1.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 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-10-05 19:21 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2022-10-05 19:21 UTC (permalink / raw
To: gentoo-commits
commit: ef7d8760852c160b5e3714fe0118c1db75540dd5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 5 19:20:01 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 5 19:20:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef7d8760
net-misc/dhcp: add 4.4.3_p1
Bug: https://bugs.gentoo.org/875521
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/Manifest | 1 +
net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 294 +++++++++++++++++++++++++++++++++++++
2 files changed, 295 insertions(+)
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 93fbebb2127a..a6b776f66394 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,2 +1,3 @@
DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040
+DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
DIST dhcp-4.4.3.tar.gz 10078953 BLAKE2B d88570760cc00bd72d1e9c2e76c7a7b9f07cadfbe044220a43ee33fc201c217725c3909a386ae11f28346920dacb0313d78193a9e3d7eac9757384b4fe762597 SHA512 4472d6794af80b482560956cee6895889cc1aca39980f851faf56824627e95731f2983cf7c7454bc3decb0a12c874fcbd29bd6c5a9695412def6bc14c6df17e0
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
new file mode 100644
index 000000000000..0cd58207062a
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2022 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
+
+DEPEND="
+ acct-group/dhcp
+ acct-user/dhcp
+ 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
+}
+
+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"
+ # bug #265531
+ "${FILESDIR}/${PN}-4.3.6-nogateway.patch"
+ # bug #296921
+ "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch"
+ # bug #437108
+ "${FILESDIR}/${PN}-4.4.0-always-accept-4.patch"
+ # bug #480636
+ "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch"
+ # bug #471142
+ "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch"
+ # bug #559832
+ "${FILESDIR}/${PN}-4.3.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:\<client\>::' \
+ 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 || die
+
+ # make the bind build work - do NOT make "binddir" local!
+ binddir="${S}/bind"
+ cd "${binddir}" || die
+ cat <<-EOF > bindvar.tmp
+ binddir=${binddir}
+ GMAKE=${MAKE:-gmake}
+ EOF
+ eapply -p2 "${FILESDIR}"/${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@' \
+ -i bind-*/lib/Makefile.in || die
+}
+
+src_configure() {
+ # bind defaults to stupid `/usr/bin/ar`
+ tc-export AR BUILD_CC
+ export ac_cv_path_AR=${AR}
+
+ # this is tested for by the bind build system, and can cause trouble
+ # when cross-building; since dhcp itself doesn't make use of libcap,
+ # simply disable it.
+ export ac_cv_lib_cap_cap_set_proc=no
+
+ # Use FHS sane paths ... some of these have configure options,
+ # but not all, so just do it all here.
+ local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+ cat <<-EOF >> includes/site.h
+ #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
+ #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
+ #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
+ #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
+ #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
+ #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
+ #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
+ #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
+ #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
+ #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
+ #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
+ #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
+ EOF
+
+ # Breaks with -O3 because of reliance on undefined behaviour
+ # bug #787935
+ append-flags -fno-strict-aliasing
+
+ # bug #720806, bug #801592
+ if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
+ append-libs -latomic
+ fi
+
+ local myeconfargs=(
+ --enable-paranoia
+ --enable-early-chroot
+ --sysconfdir=${e}
+ --with-randomdev=/dev/random
+ $(use_enable ipv6 dhcpv6)
+ $(use_with ldap)
+ $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+ LIBS="${LIBS}"
+ )
+ econf "${myeconfargs[@]}"
+
+ # configure local bind cruft. symtable option requires
+ # perl and we don't want to require that. bug #383837.
+ cd bind/bind-*/ || die
+ local el
+ eval econf \
+ $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+ --with-randomdev=/dev/random \
+ --disable-symtable \
+ --without-make-clean
+}
+
+src_compile() {
+ # Build local bind cruft first
+ emake -C bind/bind-*/lib install
+ # then build standard dhcp code
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+ docinto html
+ dodoc doc/References.html
+
+ if [[ -e client/dhclient ]] ; then
+ # Move the client to /
+ dodir /sbin
+ mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
+
+ exeinto /sbin
+ if use kernel_linux ; then
+ newexe "${S}"/client/scripts/linux dhclient-script
+ else
+ newexe "${S}"/client/scripts/freebsd dhclient-script
+ fi
+ fi
+
+ if [[ -e server/dhcpd ]] ; then
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins contrib/ldap/dhcp.*
+ dosbin contrib/ldap/dhcpd-conf-to-ldap
+ fi
+
+ newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+ newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+ newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+ newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+ newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+ systemd_dounit "${FILESDIR}"/dhcpd4.service
+ systemd_dounit "${FILESDIR}"/dhcpd6.service
+ systemd_dounit "${FILESDIR}"/dhcrelay4.service
+ systemd_dounit "${FILESDIR}"/dhcrelay6.service
+ systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+ systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+ sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+ fi
+
+ # the default config files aren't terribly useful #384087
+ local f
+ for f in "${ED}"/etc/dhcp/*.conf.example ; do
+ mv "${f}" "${f%.example}" || die
+ done
+ sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+
+ diropts -m0750 -o dhcp -g dhcp
+ keepdir /var/lib/dhcp
+}
+
+pkg_preinst() {
+ # Keep the user files over the sample ones. The
+ # hashing is to ignore the crappy defaults #384087.
+ local f h
+ for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+ h=${f#*:}
+ f="/etc/dhcp/${f%:*}.conf"
+ if [ -e "${EROOT}"${f} ] ; then
+ case $(md5sum "${EROOT}"${f}) in
+ ${h}*) ;;
+ *) cp -p "${EROOT}"${f} "${ED}"${f};;
+ esac
+ fi
+ done
+}
+
+pkg_postinst() {
+ if use server ; then
+ tmpfiles_process dhcpd.conf
+ fi
+
+ if use client ; then
+ ewarn "The client and relay functionality will be removed in the next release!"
+ ewarn "Upstream have decided to discontinue this functionality."
+ fi
+
+ if [[ -e "${EROOT}"/etc/init.d/dhcp ]] ; then
+ ewarn
+ ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+ ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+ ewarn "and dhcp should be removed from the default runlevel"
+ ewarn
+ fi
+}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-10-13 22:37 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2022-10-13 22:37 UTC (permalink / raw
To: gentoo-commits
commit: 5446fc35614fa8ff17505c11f9d6f33c166b8208
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 22:36:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 22:36:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5446fc35
net-misc/dhcp: Stabilize 4.4.3_p1 amd64, #877043
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index 0cd58207062a..2801ce4b720f 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-10-13 23:01 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2022-10-13 23:01 UTC (permalink / raw
To: gentoo-commits
commit: 162a15ae60603c71b14b60afc135130003b17f42
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 23:00:57 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 23:00:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162a15ae
net-misc/dhcp: Stabilize 4.4.3_p1 arm, #877043
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index 2801ce4b720f..003d48414f36 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-10-13 23:19 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2022-10-13 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 154669fcb5a7934dcf87bba0eea49ecee1966e59
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 23:19:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 23:19:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=154669fc
net-misc/dhcp: Stabilize 4.4.3_p1 arm64, #877043
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index 003d48414f36..dae8a192302e 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-10-13 23:20 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2022-10-13 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 386a8cd5937a3440a8fe11cc3cdc6973198f3ae6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 23:20:10 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 23:20:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=386a8cd5
net-misc/dhcp: Stabilize 4.4.3_p1 x86, #877043
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index dae8a192302e..43cd1fdd00dd 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-10-14 4:14 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2022-10-14 4:14 UTC (permalink / raw
To: gentoo-commits
commit: eb35017b2b64b017a8bf185c53295c50e2a061e8
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 04:13:59 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 04:13:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb35017b
net-misc/dhcp: Stabilize 4.4.3_p1 ppc64, #877043
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index 43cd1fdd00dd..6a9a5ac3b452 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-10-14 4:14 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2022-10-14 4:14 UTC (permalink / raw
To: gentoo-commits
commit: 83fc79190bc8624313711bf1bfc1045a9f920e11
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 04:14:00 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 04:14:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83fc7919
net-misc/dhcp: Stabilize 4.4.3_p1 ppc, #877043
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index 6a9a5ac3b452..33f85b96f9d9 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.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 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-10-14 4:30 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2022-10-14 4:30 UTC (permalink / raw
To: gentoo-commits
commit: 64a18f5c18fe6744e7aa185f973c8de3f224cf0b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 04:30:19 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 04:30:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a18f5c
net-misc/dhcp: Stabilize 4.4.3_p1 sparc, #877043
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index 33f85b96f9d9..9db36ddb42da 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.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 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2022-10-24 15:51 Mike Gilbert
0 siblings, 0 replies; 124+ messages in thread
From: Mike Gilbert @ 2022-10-24 15:51 UTC (permalink / raw
To: gentoo-commits
commit: b0b0bb928264159532d273d46cb7e164e62c3e8c
Author: Wiktor Jaskulski <root <AT> GDN-N-WIKTORJ <DOT> advaoptical <DOT> com>
AuthorDate: Sun Oct 23 20:10:18 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 15:50:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b0bb92
net-misc/dhcp: Adding acct-user/dhcp and acct-group/dhcp to BDPEND
Closes: https://github.com/gentoo/gentoo/pull/27919
Signed-off-by: Wiktor Jaskulski <root <AT> GDN-N-WIKTORJ.advaoptical.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index e425d52ea36c..70e7c8c97bd7 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
@@ -21,9 +21,11 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
-DEPEND="
+BDEPEND="
acct-group/dhcp
- acct-user/dhcp
+ acct-user/dhcp"
+
+DEPEND="
client? (
kernel_linux? (
ipv6? ( sys-apps/iproute2 )
@@ -34,7 +36,9 @@ DEPEND="
net-nds/openldap:=
ssl? ( dev-libs/openssl:= )
)"
-RDEPEND="${DEPEND}
+RDEPEND="
+ ${BDEPEND}
+ ${DEPEND}
selinux? ( sec-policy/selinux-dhcp )
vim-syntax? ( app-vim/dhcpd-syntax )"
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-03-04 5:38 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2023-03-04 5:38 UTC (permalink / raw
To: gentoo-commits
commit: f48d3caab32c7fca2fa3171436a463a5b87819be
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 05:38:06 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 05:38:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48d3caa
net-misc/dhcp: Stabilize 4.4.3_p1-r1 arm64, #899342
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
index f2efd63970a9..46a9bcba5c97 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r1.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-03-04 5:41 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2023-03-04 5:41 UTC (permalink / raw
To: gentoo-commits
commit: ea61238436d09a1c6ec09056a691fbe59c0b32a3
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 05:41:21 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 05:41:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea612384
net-misc/dhcp: Stabilize 4.4.3_p1-r1 arm, #899342
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
index 46a9bcba5c97..b453257f2c38 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r1.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-03-04 5:47 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2023-03-04 5:47 UTC (permalink / raw
To: gentoo-commits
commit: ccfab5d4930d71d11111e428df27106fb1b3b671
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 05:46:28 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 05:46:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccfab5d4
net-misc/dhcp: Stabilize 4.4.3_p1-r1 x86, #899342
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
index b453257f2c38..157afa107559 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r1.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-03-04 7:04 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2023-03-04 7:04 UTC (permalink / raw
To: gentoo-commits
commit: 0a153018390c6a89cce1e4fa2afc085c09d095a7
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 07:02:38 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 07:02:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a153018
net-misc/dhcp: Stabilize 4.4.3_p1-r1 ppc64, #899342
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
index 157afa107559..ce2963e03771 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r1.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-03-04 8:07 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2023-03-04 8:07 UTC (permalink / raw
To: gentoo-commits
commit: ffd36acd9e19b1b99948fc5fc61a89002b954012
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 08:07:18 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 08:07:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd36acd
net-misc/dhcp: Stabilize 4.4.3_p1-r1 sparc, #899342
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
index ce2963e03771..074805972e3f 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r1.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-03-04 9:55 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2023-03-04 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 12d448a4cc3d674e1db12b466e524074b23f9e3b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 09:55:15 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 09:55:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d448a4
net-misc/dhcp: Stabilize 4.4.3_p1-r1 ppc, #899342
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
index 074805972e3f..402c54ea72fa 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r1.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-03-04 10:15 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2023-03-04 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 5653da58afa034585aad33387a40fbb3b7513164
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 10:14:47 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 10:14:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5653da58
net-misc/dhcp: Stabilize 4.4.3_p1-r1 amd64, #899342
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
index 402c54ea72fa..9fa84b982375 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r1.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-04-28 6:27 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2023-04-28 6:27 UTC (permalink / raw
To: gentoo-commits
commit: 26f1caba782e1e9ff0c3eaf8ac9b332a9ff58e7d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 06:26:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 06:26:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f1caba
net-misc/dhcp: destabilize 4.4.3_p1-r2
Fixes: 8c680f270b865d00a05f08ed03e042d27fb76fc0
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 60785dbffa15..aca3e20ed93e 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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-05-21 20:38 Mike Gilbert
0 siblings, 0 replies; 124+ messages in thread
From: Mike Gilbert @ 2023-05-21 20:38 UTC (permalink / raw
To: gentoo-commits
commit: ca5b57e09ab7caa3871bc31a42f5ac07f826cea0
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 20:37:50 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May 21 20:37:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5b57e0
net-misc/dhcp: drop 4.4.3_p1
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 298 -------------------------------------
1 file changed, 298 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
deleted file mode 100644
index 955d356609f4..000000000000
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2022 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:\<client\>::' \
- 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 || die
-
- # make the bind build work - do NOT make "binddir" local!
- binddir="${S}/bind"
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- eapply -p2 "${FILESDIR}"/${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@' \
- -i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- # Breaks with -O3 because of reliance on undefined behaviour
- # bug #787935
- append-flags -fno-strict-aliasing
-
- # bug #720806, bug #801592
- if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
- append-libs -latomic
- fi
-
- local myeconfargs=(
- --enable-paranoia
- --enable-early-chroot
- --sysconfdir=${e}
- --with-randomdev=/dev/random
- $(use_enable ipv6 dhcpv6)
- $(use_with ldap)
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
- LIBS="${LIBS}"
- )
- econf "${myeconfargs[@]}"
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that. bug #383837.
- cd bind/bind-*/ || die
- local el
- eval econf \
- $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
- --with-randomdev=/dev/random \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # Build local bind cruft first
- emake -C bind/bind-*/lib install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- docinto html
- dodoc doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # Move the client to /
- dodir /sbin
- mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-
- diropts -m0750 -o dhcp -g dhcp
- keepdir /var/lib/dhcp
-}
-
-pkg_preinst() {
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if use server ; then
- tmpfiles_process dhcpd.conf
- fi
-
- if use client ; then
- ewarn "The client and relay functionality will be removed in the next release!"
- ewarn "Upstream have decided to discontinue this functionality."
- fi
-
- if [[ -e "${EROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-05-27 15:29 Mike Gilbert
0 siblings, 0 replies; 124+ messages in thread
From: Mike Gilbert @ 2023-05-27 15:29 UTC (permalink / raw
To: gentoo-commits
commit: 4a72293b35a464e9209ec9825b9c30a61d10e9d4
Author: Raul E Rangel <rrangel <AT> chromium <DOT> org>
AuthorDate: Wed Nov 30 20:42:06 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat May 27 15:29:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a72293b
net-misc/dhcp: Add missing dep
checking for zlib library... yes
checking for library containing deflate... no
configure: error: found zlib include but not library.
/build/arm64-generic/tmp/portage/net-misc/dhcp-4.4.1-r1/work/dhcp-4.4.1/bind/bind-9.11.2-P1/config.log:
This shows up when cross compiling into a new sysroot when using the
ROOT= environment variable.
Signed-off-by: Raul E Rangel <rrangel <AT> chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/30467
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild | 4 ++--
net-misc/dhcp/{dhcp-4.4.3_p1-r2.ebuild => dhcp-4.4.3_p1-r4.ebuild} | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild
index aca3e20ed93e..48fb12a0f5d6 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r3.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="
@@ -26,6 +26,7 @@ BDEPEND="
acct-user/dhcp"
DEPEND="
+ sys-libs/zlib:=
client? (
kernel_linux? (
ipv6? ( sys-apps/iproute2 )
@@ -76,7 +77,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-r2.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
similarity index 97%
rename from net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild
rename to net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index 9fa84b982375..4140099005c0 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.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="
@@ -26,6 +26,7 @@ BDEPEND="
acct-user/dhcp"
DEPEND="
+ sys-libs/zlib:=
client? (
kernel_linux? (
ipv6? ( sys-apps/iproute2 )
@@ -76,6 +77,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() {
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-06-17 5:57 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2023-06-17 5:57 UTC (permalink / raw
To: gentoo-commits
commit: 2be015afac1e8ad81349453d2318407e5057eeb9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 05:56:07 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 05:56:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be015af
net-misc/dhcp: Stabilize 4.4.3_p1-r4 arm, #908634
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index 4140099005c0..87bcfdbda2d7 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-06-17 5:57 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2023-06-17 5:57 UTC (permalink / raw
To: gentoo-commits
commit: 35bb7fdf08cbe7545df844b87ebcb3124f7c6274
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 05:56:09 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 05:56:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35bb7fdf
net-misc/dhcp: Stabilize 4.4.3_p1-r4 amd64, #908634
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index 87bcfdbda2d7..70aaa8b57cd9 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-06-17 6:12 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2023-06-17 6:12 UTC (permalink / raw
To: gentoo-commits
commit: 4e438fabc3ed55e12022fe4d6fb6de881277693d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 06:11:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 06:11:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e438fab
net-misc/dhcp: Stabilize 4.4.3_p1-r4 arm64, #908634
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index 70aaa8b57cd9..5d8068b68492 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-06-17 7:43 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2023-06-17 7:43 UTC (permalink / raw
To: gentoo-commits
commit: 4549068dd3409abb0abdc68e1e272308bab6a7ac
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 07:42:40 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 07:42:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4549068d
net-misc/dhcp: Stabilize 4.4.3_p1-r4 sparc, #908634
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index 5d8068b68492..4c0a06af2459 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-06-17 10:42 Arthur Zamarin
0 siblings, 0 replies; 124+ messages in thread
From: Arthur Zamarin @ 2023-06-17 10:42 UTC (permalink / raw
To: gentoo-commits
commit: 9a2c217546f10eec57f2e5220549d5e0c5087068
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 10:41:51 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 10:41:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a2c2175
net-misc/dhcp: Stabilize 4.4.3_p1-r4 ppc64, #908634
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index 4c0a06af2459..c64b9585996c 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-06-17 15:13 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2023-06-17 15:13 UTC (permalink / raw
To: gentoo-commits
commit: 9c71ab786a210f95c9a21049272e8a0fee7a219c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 15:12:41 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 15:12:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c71ab78
net-misc/dhcp: Stabilize 4.4.3_p1-r4 x86, #908634
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index c64b9585996c..9541c917b72e 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-06-17 22:48 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2023-06-17 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 9a148169889bafdb8ee078b92f82e9b46052225d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 22:47:31 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 22:47:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a148169
net-misc/dhcp: Stabilize 4.4.3_p1-r4 ppc, #908634
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index 9541c917b72e..8ed622a74bb9 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.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="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2023-07-14 12:09 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2023-07-14 12:09 UTC (permalink / raw
To: gentoo-commits
commit: 885a699283e2efc97faa78f694f04811d8d1123a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 12:08:28 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 12:08:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885a6992
net-misc/dhcp: switch to append-atomic-flags
Fixes build on mips (report on #gentoo).
Bug: https://bugs.gentoo.org/720806
Bug: https://bugs.gentoo.org/801592
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index 8ed622a74bb9..d8539208aefd 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
@@ -174,9 +174,7 @@ src_configure() {
append-flags -fno-strict-aliasing
# bug #720806, bug #801592
- if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
- append-libs -latomic
- fi
+ append-atomic-flags
local myeconfargs=(
--enable-paranoia
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2024-02-18 11:29 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2024-02-18 11:29 UTC (permalink / raw
To: gentoo-commits
commit: 0762acb5ac0a3f951d4c7d96c1608aa98ef6cae2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 11:02:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 11:24:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0762acb5
net-misc/dhcp: update EAPI 7 -> 8, use HTTPS for SRC_URI
* EAPI 8
* Use HTTPS for SRC_URI
* Add missing || die
* Reorder phases to reflect execution order
I was hoping to wire up verify-sig w/ sec-keys/openpgp-keys-isc just for fun
as we have it now for net-dns/bind, but it was signed with a diff. key. It's
EOL anyway so oh well.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild | 296 ++++++++++++++++++++++++++++++++++
1 file changed, 296 insertions(+)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
new file mode 100644
index 000000000000..57a70adbdc45
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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="
+ https://downloads.isc.org/isc/dhcp/${MY_P}.tar.gz
+ https://downloads.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+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"
+
+DEPEND="
+ sys-libs/zlib:=
+ 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 )
+"
+BDEPEND="
+ acct-group/dhcp
+ acct-user/dhcp
+"
+
+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_unpack() {
+ unpack ${A}
+ # handle local bind hell
+ cd "${S}"/bind || die
+ unpack ./bind.tar.gz
+}
+
+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:\<client\>::' \
+ 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 || die
+
+ # make the bind build work - do NOT make "binddir" local!
+ binddir="${S}/bind"
+ cd "${binddir}" || die
+ cat <<-EOF > bindvar.tmp
+ binddir=${binddir}
+ GMAKE=${MAKE:-gmake}
+ EOF
+ eapply -p2 "${FILESDIR}"/${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@' \
+ -i bind-*/lib/Makefile.in || die
+}
+
+src_configure() {
+ # bind defaults to stupid `/usr/bin/ar`
+ tc-export AR BUILD_CC
+ export ac_cv_path_AR=${AR}
+
+ # this is tested for by the bind build system, and can cause trouble
+ # when cross-building; since dhcp itself doesn't make use of libcap,
+ # simply disable it.
+ export ac_cv_lib_cap_cap_set_proc=no
+
+ # Use FHS sane paths ... some of these have configure options,
+ # but not all, so just do it all here.
+ local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+ cat <<-EOF >> includes/site.h
+ #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
+ #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
+ #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
+ #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
+ #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
+ #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
+ #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
+ #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
+ #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
+ #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
+ #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
+ #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
+ EOF
+
+ # Breaks with -O3 because of reliance on undefined behaviour
+ # bug #787935
+ append-flags -fno-strict-aliasing
+
+ # bug #720806, bug #801592
+ append-atomic-flags
+
+ local myeconfargs=(
+ --enable-paranoia
+ --enable-early-chroot
+ --sysconfdir=${e}
+ --with-randomdev=/dev/random
+ $(use_enable ipv6 dhcpv6)
+ $(use_with ldap)
+ $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+ LIBS="${LIBS}"
+ )
+ econf "${myeconfargs[@]}"
+
+ # configure local bind cruft. symtable option requires
+ # perl and we don't want to require that. bug #383837.
+ cd bind/bind-*/ || die
+ local el
+ eval econf \
+ $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+ --with-randomdev=/dev/random \
+ --disable-symtable \
+ --without-make-clean
+}
+
+src_compile() {
+ # Build local bind cruft first
+ emake -C bind/bind-*/lib install
+ # then build standard dhcp code
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+ docinto html
+ dodoc doc/References.html
+ newtmpfiles "${FILESDIR}"/dhcp.tmpfiles dhcp.conf
+
+ if [[ -e client/dhclient ]] ; then
+ # Move the client to /
+ dodir /sbin
+ mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
+
+ exeinto /sbin
+ if use kernel_linux ; then
+ newexe "${S}"/client/scripts/linux dhclient-script
+ else
+ newexe "${S}"/client/scripts/freebsd dhclient-script
+ fi
+ fi
+
+ if [[ -e server/dhcpd ]] ; then
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins contrib/ldap/dhcp.*
+ dosbin contrib/ldap/dhcpd-conf-to-ldap
+ fi
+
+ newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+ newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+ newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+ newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+ systemd_dounit "${FILESDIR}"/dhcpd4.service
+ systemd_dounit "${FILESDIR}"/dhcpd6.service
+ systemd_dounit "${FILESDIR}"/dhcrelay4.service
+ systemd_dounit "${FILESDIR}"/dhcrelay6.service
+ systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+ systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+ sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+ fi
+
+ # the default config files aren't terribly useful #384087
+ local f
+ for f in "${ED}"/etc/dhcp/*.conf.example ; do
+ mv "${f}" "${f%.example}" || die
+ done
+ sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+ # Keep the user files over the sample ones. The
+ # hashing is to ignore the crappy defaults #384087.
+ local f h
+ for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+ h=${f#*:}
+ f="/etc/dhcp/${f%:*}.conf"
+ if [ -e "${EROOT}"${f} ] ; then
+ case $(md5sum "${EROOT}"${f}) in
+ ${h}*) ;;
+ *) cp -p "${EROOT}"${f} "${ED}"${f};;
+ esac
+ fi
+ done
+}
+
+pkg_postinst() {
+ tmpfiles_process dhcp.conf
+
+ if use client ; then
+ ewarn "The client and relay functionality will be removed in the next release!"
+ ewarn "Upstream have decided to discontinue this functionality."
+ fi
+
+ if [[ -e "${EROOT}"/etc/init.d/dhcp ]] ; then
+ ewarn
+ ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+ ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+ ewarn "and dhcp should be removed from the default runlevel"
+ ewarn
+ fi
+}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2024-02-18 11:29 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2024-02-18 11:29 UTC (permalink / raw
To: gentoo-commits
commit: 9a5eb41fa663ed6805ba79a8ca0310dbe9400359
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 10:54:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 11:24:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a5eb41f
net-misc/dhcp: drop 4.4.3_p1-r3
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild | 294 ----------------------------------
1 file changed, 294 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild
deleted file mode 100644
index 48fb12a0f5d6..000000000000
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild
+++ /dev/null
@@ -1,294 +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="
- sys-libs/zlib:=
- 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:\<client\>::' \
- 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 || die
-
- # make the bind build work - do NOT make "binddir" local!
- binddir="${S}/bind"
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- eapply -p2 "${FILESDIR}"/${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@' \
- -i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- # Breaks with -O3 because of reliance on undefined behaviour
- # bug #787935
- append-flags -fno-strict-aliasing
-
- # bug #720806, bug #801592
- if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
- append-libs -latomic
- fi
-
- local myeconfargs=(
- --enable-paranoia
- --enable-early-chroot
- --sysconfdir=${e}
- --with-randomdev=/dev/random
- $(use_enable ipv6 dhcpv6)
- $(use_with ldap)
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
- LIBS="${LIBS}"
- )
- econf "${myeconfargs[@]}"
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that. bug #383837.
- cd bind/bind-*/ || die
- local el
- eval econf \
- $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
- --with-randomdev=/dev/random \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # Build local bind cruft first
- emake -C bind/bind-*/lib install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- docinto html
- dodoc doc/References.html
- newtmpfiles "${FILESDIR}"/dhcp.tmpfiles dhcp.conf
-
- if [[ -e client/dhclient ]] ; then
- # Move the client to /
- dodir /sbin
- mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- tmpfiles_process dhcp.conf
-
- if use client ; then
- ewarn "The client and relay functionality will be removed in the next release!"
- ewarn "Upstream have decided to discontinue this functionality."
- fi
-
- if [[ -e "${EROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2024-02-18 11:29 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2024-02-18 11:29 UTC (permalink / raw
To: gentoo-commits
commit: 93b0d198c1bb5c574a6f76e3440ec72c252a6623
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Dec 10 13:00:57 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 11:24:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93b0d198
net-misc/dhcp: add kea migration assistant (keama)
keama assist in migrating of dhcpd configuration to net-misc/kea, but
has to be manually compiled.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34210
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 57a70adbdc45..479016e40c64 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -75,7 +75,6 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.3-configure-clang16.patch"
)
-
src_unpack() {
unpack ${A}
# handle local bind hell
@@ -207,11 +206,14 @@ src_compile() {
emake -C bind/bind-*/lib install
# then build standard dhcp code
emake AR="$(tc-getAR)"
+ emake -C keama AR="$(tc-getAR)"
}
src_install() {
default
+ emake -C keama DESTDIR="${D}" install
+
dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
docinto html
dodoc doc/References.html
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2024-03-24 11:29 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2024-03-24 11:29 UTC (permalink / raw
To: gentoo-commits
commit: b930ca5afa3b8fa173aec4a8ed93c44495dfe170
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 11:28:25 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 11:28:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b930ca5a
net-misc/dhcp: Stabilize 4.4.3_p1-r5 ppc, #927704
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 040aa5192a15..aa564290bbc6 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
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"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2024-03-24 11:35 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2024-03-24 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 92a11e85dd4b148a39464cd012f340dd4c7eab60
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 11:34:27 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 11:34:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a11e85
net-misc/dhcp: Stabilize 4.4.3_p1-r5 ppc64, #927704
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 467839150a45..375824b0030c 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
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"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2024-03-24 11:35 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2024-03-24 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 41b893a83e2b3be1b86201dfa339af2db9b4e5a1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 11:34:29 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 11:34:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b893a8
net-misc/dhcp: Stabilize 4.4.3_p1-r5 x86, #927704
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 375824b0030c..38ce4122f3d3 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
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"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2024-03-24 11:35 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2024-03-24 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 0d97c2827c6de853d0f349ae528e0a2608cff158
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 11:34:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 11:34:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d97c282
net-misc/dhcp: Stabilize 4.4.3_p1-r5 arm64, #927704
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 aa564290bbc6..0de3d18d2d67 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
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"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2024-03-24 11:35 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2024-03-24 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 6017c53841cb35978bc08ced4ec3414ae6a8a856
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 11:34:26 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 11:34:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6017c538
net-misc/dhcp: Stabilize 4.4.3_p1-r5 amd64, #927704
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 c1e5d141a2df..467839150a45 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
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"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2024-03-24 11:35 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2024-03-24 11:35 UTC (permalink / raw
To: gentoo-commits
commit: aca5f1ea22066d7c101dc7c08d60f5ca192f9bdb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 11:34:25 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 11:34:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca5f1ea
net-misc/dhcp: Stabilize 4.4.3_p1-r5 sparc, #927704
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 0de3d18d2d67..c1e5d141a2df 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
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"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2024-03-24 11:35 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2024-03-24 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 8192c38203d9673c6efbea8dab57d7f230a0e270
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 11:35:17 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 11:35:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8192c382
net-misc/dhcp: Stabilize 4.4.3_p1-r5 arm, #927704
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 38ce4122f3d3..f7cc414209db 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
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"
DEPEND="
^ permalink raw reply related [flat|nested] 124+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/
@ 2024-05-26 22:43 Sam James
0 siblings, 0 replies; 124+ messages in thread
From: Sam James @ 2024-05-26 22:43 UTC (permalink / raw
To: gentoo-commits
commit: b521d467ff331341162586bc96d5f969d630ad2f
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun May 26 21:36:45 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 26 22:42:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b521d467
net-misc/dhcp: fix variable reordering leading to undefined variable in RDEPEND
BDEPEND is expanded in RDEPEND, so it has to come first. Fixes failure
to depend on acct-*/ packages at runtime, i.e. no guarantee when
installing with binpkgs / depcleaning that accounts will be usable
anymore.
Fixes: 0762acb5ac0a3f951d4c7d96c1608aa98ef6cae2
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../dhcp/{dhcp-4.4.3_p1-r5.ebuild => dhcp-4.4.3_p1-r6.ebuild} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r6.ebuild
similarity index 100%
rename from net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
rename to net-misc/dhcp/dhcp-4.4.3_p1-r6.ebuild
index f7cc414209db..82f6478828a7 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r5.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r6.ebuild
@@ -25,6 +25,10 @@ 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="
sys-libs/zlib:=
client? (
@@ -43,10 +47,6 @@ RDEPEND="
selinux? ( sec-policy/selinux-dhcp )
vim-syntax? ( app-vim/dhcpd-syntax )
"
-BDEPEND="
- acct-group/dhcp
- acct-user/dhcp
-"
PATCHES=(
# Gentoo patches - these will probably never be accepted upstream
^ permalink raw reply related [flat|nested] 124+ messages in thread
end of thread, other threads:[~2024-05-26 22:43 UTC | newest]
Thread overview: 124+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-05 19:21 [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-05-26 22:43 Sam James
2024-03-24 11:35 Sam James
2024-03-24 11:35 Sam James
2024-03-24 11:35 Sam James
2024-03-24 11:35 Sam James
2024-03-24 11:35 Sam James
2024-03-24 11:35 Sam James
2024-03-24 11:29 Sam James
2024-02-18 11:29 Sam James
2024-02-18 11:29 Sam James
2024-02-18 11:29 Sam James
2023-07-14 12:09 Sam James
2023-06-17 22:48 Sam James
2023-06-17 15:13 Sam James
2023-06-17 10:42 Arthur Zamarin
2023-06-17 7:43 Arthur Zamarin
2023-06-17 6:12 Sam James
2023-06-17 5:57 Sam James
2023-06-17 5:57 Sam James
2023-05-27 15:29 Mike Gilbert
2023-05-21 20:38 Mike Gilbert
2023-04-28 6:27 Sam James
2023-03-04 10:15 Arthur Zamarin
2023-03-04 9:55 Arthur Zamarin
2023-03-04 8:07 Arthur Zamarin
2023-03-04 7:04 Arthur Zamarin
2023-03-04 5:47 Arthur Zamarin
2023-03-04 5:41 Arthur Zamarin
2023-03-04 5:38 Arthur Zamarin
2022-10-24 15:51 Mike Gilbert
2022-10-14 4:30 Arthur Zamarin
2022-10-14 4:14 Arthur Zamarin
2022-10-14 4:14 Arthur Zamarin
2022-10-13 23:20 Sam James
2022-10-13 23:19 Sam James
2022-10-13 23:01 Sam James
2022-10-13 22:37 Sam James
2022-09-16 17:17 Arthur Zamarin
2022-09-15 19:58 Arthur Zamarin
2022-09-08 11:35 Agostino Sarubbo
2022-09-08 10:52 Agostino Sarubbo
2022-09-08 10:32 Agostino Sarubbo
2022-09-08 3:31 Sam James
2022-09-08 3:31 Sam James
2022-04-28 18:00 Sam James
2022-04-28 17:52 Sam James
2022-03-22 23:32 Sam James
2022-01-04 10:30 David Seifert
2021-07-30 23:31 Sam James
2021-07-28 2:59 Sam James
2021-06-17 9:59 Yixun Lan
2021-06-08 14:10 Lars Wendler
2021-06-07 6:25 Sergei Trofimovich
2021-06-03 23:38 Sam James
2021-06-03 15:52 Sergei Trofimovich
2021-06-03 8:23 Sam James
2021-06-02 22:42 Sam James
2021-06-02 19:01 Sam James
2021-06-02 19:01 Sam James
2021-05-26 21:49 Lars Wendler
2021-04-29 18:00 Mikle Kolyada
2021-03-07 11:58 David Seifert
2021-02-26 11:38 Lars Wendler
2021-02-25 1:29 Sam James
2021-02-25 1:28 Sam James
2021-01-21 20:51 Mike Gilbert
2020-05-06 17:34 Sergei Trofimovich
2020-05-04 6:16 Mart Raudsepp
2020-05-03 12:30 Agostino Sarubbo
2020-05-03 10:30 Agostino Sarubbo
2020-05-03 10:25 Agostino Sarubbo
2020-05-03 10:12 Agostino Sarubbo
2020-05-03 10:01 Agostino Sarubbo
2020-02-18 8:23 Lars Wendler
2020-01-24 21:52 Lars Wendler
2020-01-23 9:08 Lars Wendler
2019-07-31 22:03 Lars Wendler
2019-02-16 23:38 Mart Raudsepp
2019-02-07 11:53 Mikle Kolyada
2019-02-04 20:16 Markus Meier
2019-01-30 13:20 Tobias Klausmann
2019-01-30 8:13 Sergei Trofimovich
2019-01-27 12:13 Sergei Trofimovich
2019-01-27 10:08 Lars Wendler
2018-09-08 13:57 Mart Raudsepp
2018-03-16 22:50 Lars Wendler
2018-03-13 19:51 Mikle Kolyada
2018-03-13 18:01 Markus Meier
2018-03-12 4:41 Matt Turner
2018-03-12 4:41 Matt Turner
2018-03-11 5:20 Matt Turner
2018-03-05 17:13 Tobias Klausmann
2018-03-04 11:13 Sergei Trofimovich
2018-03-02 23:21 Sergei Trofimovich
2018-03-02 14:15 Jason Zaman
2018-02-28 16:35 Lars Wendler
2018-02-08 13:40 Lars Wendler
2018-02-02 11:20 Lars Wendler
2017-11-08 22:27 Sergei Trofimovich
2017-10-09 14:29 Sergei Trofimovich
2017-08-29 21:39 Thomas Deutschmann
2017-08-25 13:28 Mikle Kolyada
2017-08-10 4:40 Markus Meier
2017-08-05 18:07 Sergei Trofimovich
2017-01-12 16:10 Jeroen Roovers
2016-11-30 19:32 Markus Meier
2016-11-27 16:43 Tobias Klausmann
2016-11-26 10:44 Agostino Sarubbo
2016-11-26 10:36 Agostino Sarubbo
2016-10-04 18:20 Lars Wendler
2016-10-04 18:20 Lars Wendler
2016-03-30 10:23 Lars Wendler
2016-03-20 11:53 Agostino Sarubbo
2016-03-19 11:35 Agostino Sarubbo
2016-01-18 4:52 Jeroen Roovers
2016-01-17 17:02 Agostino Sarubbo
2016-01-17 16:13 Tobias Klausmann
2016-01-17 11:30 Markus Meier
2016-01-15 13:00 Andreas Schuerch
2016-01-14 11:56 Agostino Sarubbo
2016-01-13 9:45 Lars Wendler
2015-10-04 21:47 Julian Ospald
2015-09-06 15:37 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox