rev bump to make sure ~ gets the init script fixes

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index e64fa5981a8843f9b5568a1df625dc0f8bec178d..0b661a9be0ede2970675cc86143423e8422abda7 100644 (file)
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.261 2015/02/07 07:51:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.262 2015/02/07 17:43:26 williamh Exp $
+
+*dhcp-4.3.1-r1 (07 Feb 2015)
+
+  07 Feb 2015; William Hubbs <williamh@gentoo.org> +dhcp-4.3.1-r1.ebuild:
+  rev bump to make sure ~ gets the init script fixes
 
   07 Feb 2015; Lars Wendler <polynomial-c@gentoo.org> files/dhcpd.init5:
   Re-added the possibility to depend on slapd in the init script.

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 7bfd4bc6531652646595f64d53fd92f8e7eddedd..6567832d73f6b151074f1ec40f65040ecb9fe21b 100644 (file)
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -35,23 +35,14 @@ DIST dhcp-4.3.1.tar.gz 8980806 SHA256 266cbca8a7a6bb8f9ccc5765da0d2b04099329314a
 EBUILD dhcp-4.2.5_p1-r1.ebuild 7589 SHA256 9550000131ba6a3e6fc2e0ad3b4c0beb701a99c6bf4dd2349292be4933e8b8d6 SHA512 02351cbf71804929361a6c5f07a57fa0314620d831a0e387d094c39b8dd5996d2476f433f8be8b37b8c9e3b5d956df2310b2917b92f5fb8d6a47ac774735c3e0 WHIRLPOOL 247b0d5a4c5f4f7793661eaffe3c1f3a81cfc338fe5db67229b8b84688588fbdb85485283e791e41f8a5470d4142d5ad920f13aeffb5b38c41acf93a4ebb1a0e
 EBUILD dhcp-4.2.5_p1-r2.ebuild 7980 SHA256 8e5c475970aca58a502b370e0ed289e5d5b3e9c53ea8a4b09c57a2a9a79c6dd5 SHA512 e82494443a763c31edd16f25932d23a3b8963afc9a5185dd94d742356d12d5d20559ac265537128dd02ad7dcbd2197be296a8c24dce88f9f4562669352ec2282 WHIRLPOOL d2df0308ecd5c542fb12cc8ae0399851991c49af03d104d5eec3505aa660196b5fdd2b3240c4da80008d917704033b0964d7e4e8a6182ab66b548ee6791db2fe
 EBUILD dhcp-4.2.5_p1.ebuild 7408 SHA256 40f9449d9a0ac310ffbb9275f4fc62714a63b3dac5c5380250d1509b5ae6c14d SHA512 bf5449ba1c547ce8f62ec5ac0ce425e1c7594394bd243f5d8d495985a0b8754106898940ea1f274686bc4eb4e0d3ed822154f12d532f8a0763ebf30a2e325dc6 WHIRLPOOL a8a5c1ccd66068da876ffdeeb49a9079d3b9362dd9b4984969b399483231eb7a0eb61246c4550d24d320462203a1077cc8d9de5797f81f6f441db7aa1693c045
+EBUILD dhcp-4.3.1-r1.ebuild 7896 SHA256 65877f20c4e930d4231ec620cfca8cbe3528e97cd4e947c0729289401de39236 SHA512 4d1b9d80d20b2e4eab3d9d97232907c92e2d36e2c59c8eea9cf9edee26f165e76f5c8246a99192289dece7308f8a5328ec0eb85b596de6a7855b03465563b37b WHIRLPOOL 4ed3bf26a467d574325edb9b7049f5f07ca3a0fe923730dc1d6670baa4a4316c8c9646f4dcef1f5443d10ca16f9282db7fa9743ec428cf4eb1c47b872b237eca
 EBUILD dhcp-4.3.1.ebuild 7891 SHA256 97d7218efd0d5eef90238ca36be526dd109c5c80dae0b4a40fc545a435d39768 SHA512 717162416bacb9046b67e28663eba39558f01ddcc89c51bd58d3854c2cce7dc7518b60d53d32bf746f54ca56932b638485a3b06bd8383ee284bd89e995144ab1 WHIRLPOOL 210f013967922f836c77c993be116a94be562ed669c82e2cd7d25978b61cfa34609a843a19065fa39074e6ee5d9366829903afe0d4ea77450602efaab8fda65d
-MISC ChangeLog 44122 SHA256 5b5452b8c39ca8a40e4136369ff97a9297d42493f3902e9b9b51872e368ba8fe SHA512 7f0b121aa38d31e0f6317bddb08138ab66fb8f97c702e4e1148b4ba129e8d5e74f009f7e173dd0b4242a7439fc08f7a21f881e62cc46cb586ad624f94837386f WHIRLPOOL 0f4828895f04a4b151c71b408b2d5dfae6c409452f94e4164e4fe1ea4fdf36fd7e692cac90e0d83617e4d78f6a64cd8ea9c9d8254c9d60c7f4fb0e09e51b5f0c
+MISC ChangeLog 44276 SHA256 6f02786adcfd3ca2556d6c250ee94594ef96e2717b461662cb09bde9b1f3ef01 SHA512 7fa97192f88bdd856d56300e978bea5254900d7f544e238b7eed7bbfa823149240ca2f6905be5b5b703912dea181f73982a40bcf48571c1732908ecdb8af2556 WHIRLPOOL 9a983d85539151e6a53a7520252d7ec0bf5ab80c4a32c0e3563204eb1eef92239746324515720d9da379e8440b67030a352cc964c1c028e799a98223fd88a789
 MISC metadata.xml 500 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c SHA512 52b56888b04bd8533e00930fddeccac3f1e6a4e6172b57489f52300dcf60191784fec25e94916dbc9ff007c1493fd8144ec30458b4de3589d31d6f2ddafa78b2 WHIRLPOOL 9631e8fe91b7874d03b4f91ab8ac3064a9c259433a7f27214580ea6643c3784f1988559e9c0336fd3508def32ea0ec7be74be20e8ff7d62f0d47b45b478e8714
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU1cQMAAoJEPiazRVxLXTF8/YQAIE9jrHd83eInMMMGbfDKIVx
-ibsl07NcDM0oGGtGNEgtpbpRhGz5wDWK9O+6TmFQyy93E2KFSaQZxlrbrENW0TY2
-oLYwLBH0CX6pfxe9n+AYFPRNxrGaD8yRWcFH0ufYulqxyvFFc4liVOdaxWqt3NZt
-cbiNB9sj8Wz4GFgV2v9y765yEdDrfggeWCQ9Na6h+FvhyD4c1c0Wfvow13OXk9tc
-gV3f21Id7OXsgfGJHpzUaLo0QnK+uK9WqSKlQDUs+okQ/AKXX51fGBoyDPjiqt8q
-N7x7Wzy4NwQwQVsWPYj6dJq9YSBGQnN4dnrM+/7u/FzvveUFiptpQVNwTtqZDCPG
-K4lsiJUx4lBpVexar2489Yr86A8nb5iLxtuH1RXk1/WZu5kIYabbPb4Bvm8c/Me8
-X3mSecGv8EYTchTpw32bHo2ThpSI1NBh8hk/pzwkjviVR+fMOZCPi15dwWcmW8pW
-DuwdwC6L4kBuWMwvR7II1cvRvHpW4/YGT4aeFEIBmwYlt+1Jj2VaaKaXbcxf4k0E
-sV5Ofp5f6rKwB3HsR1RpnXDo8QsJoiaaETUC5MW7DO1spsj+AoYuomacUdUaYZdk
-XskHrcYizJYKCx8B8CDH2iy6fdPBAvo/7S+L4ja1pt3xaPCobncWhqP/zxiw7E/d
-hM9fJ1dzK1UZ6KlySedF
-=EBEE
+iEYEAREIAAYFAlTWTskACgkQblQW9DDEZTgLRACfUkhS3g0rE/n5HbGHvyo6VBxu
+VHwAniECjQq7ROTzVQGnsP9B2+0V3hLN
+=MnEG
 -----END PGP SIGNATURE-----

diff --git a/net-misc/dhcp/dhcp-4.3.1-r1.ebuild b/net-misc/dhcp/dhcp-4.3.1-r1.ebuild
new file mode 100644 (file)
index 0000000..2ee1dab
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.1-r1.ebuild
@@ -0,0 +1,254 @@
+# 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-r1.ebuild,v 1.1 2015/02/07 17:43:26 williamh 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
+}