diff options
Diffstat (limited to 'net-misc/dhcp')
| -rw-r--r-- | net-misc/dhcp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/dhcp/Manifest | 20 | ||||
| -rw-r--r-- | net-misc/dhcp/dhcp-4.3.2.ebuild | 254 |
3 files changed, 276 insertions, 5 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog index 9e852b319f6b..67d8c60d6348 100644 --- 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.265 2015/03/08 08:25:48 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.266 2015/03/10 02:17:25 vapier Exp $ + +*dhcp-4.3.2 (10 Mar 2015) + + 10 Mar 2015; Mike Frysinger <vapier@gentoo.org> +dhcp-4.3.2.ebuild: + Version bump #542766 by Sebastian Pipping. 08 Mar 2015; Jeroen Roovers <jer@gentoo.org> dhcp-4.3.1-r2.ebuild: Stable for HPPA (bug #539258). diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index ec212894319b..007db28415fb 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -32,16 +32,28 @@ AUX dhcrelay6.service 237 SHA256 5406caf5355a71396895a3ef49c3a0af29aa9b982cb1054 AUX dhcrelay6.service.conf 220 SHA256 c8ef2c5d930ad0addd1a4a10576db271f50cc3e81ac8f87b8b56fb759ab65bdd SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9 WHIRLPOOL 70bba913342e6a1b492eda9799146e48c612175f227b1337874b904bcf22251389d10a4b79c90519b248cdd594288f8d31396e2e8475bb8e28d019c9e9382a88 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 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-r2.ebuild 7889 SHA256 f93cf15d9d4b5c46af9a87882f8ef900c80927df8d814a2ce61f05151071ce7b SHA512 2adb139bbfa9162c406d256b745b6c0f533e40ab9729be05497af18a062ac8a47035bc1056503060aa344d35a02d3a91430c9648df16672db6e66d316de47593 WHIRLPOOL 31a5938166c0b5b533f8d46a87acae280488e2482bdbc226ea5c8ca36e944b4108c114d4f3cf09903f4f686212100b77b7d743774bafa674e70b1dabbd54d6e2 -MISC ChangeLog 44741 SHA256 a5c1446a683ff0c464c2417d02e10f5520a7c0991d839a15dcdca530190e9d8b SHA512 a26a8efd7345ab46905953ea9f0901808738437102cf2a2dcadfe0b297cab8fbfa447588a7fb4c773a5bcc40e765da2fbd0cb6d4c415ea57823058d996c2e8a0 WHIRLPOOL ba7f0d52218e2ad3858ed9244985c4e8f5001c29c4d7e9beeece91968a9d836c728b8ee58345240dc633133123a99621a225e8ec749a294e9245b5eb53681aa2 +EBUILD dhcp-4.3.2.ebuild 7891 SHA256 271a2291c875226fb843466a8a4514bb24bc85e2e6bd7f2b8b719f6409f2d57f SHA512 ed31d9039993859f916ecf7563f15c4ee7174ac781f69864baf9f4009bd5cace2807082b4669f7ba3268250e1b07cd6b82dd1e9c5c615de8e206ffe7b7fd7d58 WHIRLPOOL 387697c9ca70dd944671e51901f350d7867e61831e497feffe4429e68dc802fbb9c19b730a63e343846a5bdc68f02c9e7bcd80a6fc91b7485e81bf1cee3b6cf5 +MISC ChangeLog 44887 SHA256 9f9844304808e39b189cc1184b2dc6d90efc768f8fe4cf9bdfd0c0a7ae1bb0b2 SHA512 b5521b08cbf6dbafa350e240a3bbfbcf13e2317a9b722785e7367bac37c84ea47961a6938f6be77bebea5a32c2f5786a26184a06f125894350380f443c83ab5b WHIRLPOOL 2743ea354b22d5dc0bde5e71d9fffda0e770eec692ec4f2d7f6e2a17668c573418ec155fb71f3d79d0e06c8edd6e119b91200a28e064c087349706abc69af857 MISC metadata.xml 500 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c SHA512 52b56888b04bd8533e00930fddeccac3f1e6a4e6172b57489f52300dcf60191784fec25e94916dbc9ff007c1493fd8144ec30458b4de3589d31d6f2ddafa78b2 WHIRLPOOL 9631e8fe91b7874d03b4f91ab8ac3064a9c259433a7f27214580ea6643c3784f1988559e9c0336fd3508def32ea0ec7be74be20e8ff7d62f0d47b45b478e8714 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlT8B44ACgkQVWmRsqeSphOEYgCeMIviPQNkawtE14nCGc/0Izou -KrMAnj1j41PaT+4Q+ijfDXSGXzEID8ga -=cSYf +iQIcBAEBCAAGBQJU/lQ3AAoJEPGu1DbS6WIAqP0P/2JAR1bfVnM0L0bAv+XOU5HB +qCFvG1A+hlVgHy2S9mzVX1EW7Zmpwqf7GxxgqMXviVO6+oBVd+wadptTqNZd9Rb/ +bmNU7BroV3ttB60N0RayJmgdfOmpFRmeq00dIrO8jZ5GHzOfP/QqxuxusQtFF5/4 +grvGgMdjRtKJT4+/bDTUUYng6H2Z+WJcLBDkcc0xHDieWj6ZwFOHB/ebY0Fe0FMu +xXznGI89HibfJ2YT7RiOpP2DTsy5kAP6HNUoXlMxi5EVgs4kbnNyyDg0OUmnWgAp +itCYaUpPtKYovkn2zj/EzsHRjKS/9Pf9zkx1xmt83ntsO5GUrCTSwW5T6aAIht2T +M4dZzvPuf541UgYnRaHBUaUnTEEFy+T7i7dYsE9FA4+Zq5LZa10C5AnXYjck/zNh +4s9xuwQYP1JmwNeTd/KmkLP9RBAKtiJahLn8w5ndi7QUjiZ2kX6KdU0gXgySTkxc +OHAmvoD5H8SKIaTLm4CrxqH7ud8dX611g59oAlQpv7MASYBWfU9spGRASeGbVx/1 +YhDK4GpRmmA2A7vb0ypC4QAJ1cm6YOq0vR/L03pOPaaI55vx0LjN4uOC6woQRNHF +PQjUMP99XZYAnaYvJsRkncZG6I/d20LmOxXcoO5F6Rv/XaRm9N/sBlfFikfmc+Ff +C2r6Qw7u4NV0eyiJqRYF +=EBXx -----END PGP SIGNATURE----- diff --git a/net-misc/dhcp/dhcp-4.3.2.ebuild b/net-misc/dhcp/dhcp-4.3.2.ebuild new file mode 100644 index 000000000000..1f2032c9e549 --- /dev/null +++ b/net-misc/dhcp/dhcp-4.3.2.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.2.ebuild,v 1.1 2015/03/10 02:17:25 vapier 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 +} |