polynomial-c 15/02/10 00:27:08 Modified: ChangeLog Added: dhcp-4.3.1-r2.ebuild Removed: dhcp-4.3.1-r1.ebuild dhcp-4.3.1.ebuild Log: Revbump to fix a typo which slipped in with the latest init script fix. Removed old (Portage version: 2.2.16/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Revision Changes Path 1.263 net-misc/dhcp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.263&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.263&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?r1=1.262&r2=1.263 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- ChangeLog 7 Feb 2015 17:43:26 -0000 1.262 +++ ChangeLog 10 Feb 2015 00:27:08 -0000 1.263 @@ -1,6 +1,13 @@ # ChangeLog for net-misc/dhcp # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.262 2015/02/07 17:43:26 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.263 2015/02/10 00:27:08 polynomial-c Exp $ + +*dhcp-4.3.1-r2 (10 Feb 2015) + + 10 Feb 2015; Lars Wendler <[email protected]> -dhcp-4.3.1.ebuild, + -dhcp-4.3.1-r1.ebuild, +dhcp-4.3.1-r2.ebuild, files/dhcpd.init5: + Revbump to fix a typo which slipped in with the latest init script fix. + Removed old. *dhcp-4.3.1-r1 (07 Feb 2015) 1.1 net-misc/dhcp/dhcp-4.3.1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.3.1-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.3.1-r2.ebuild?rev=1.1&content-type=text/plain Index: dhcp-4.3.1-r2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.3.1-r2.ebuild,v 1.1 2015/02/10 00:27:08 polynomial-c Exp $ 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 }
