diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-03-23 04:36:04 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-03-23 04:36:04 +0000 |
commit | 8a8659951cdbd23d8fb4841bc61cb1c3e9e7072e (patch) | |
tree | 176fc3e8e97555a1cdfc8361c002e84694431f4c /net-misc | |
parent | old (diff) | |
download | historical-8a8659951cdbd23d8fb4841bc61cb1c3e9e7072e.tar.gz historical-8a8659951cdbd23d8fb4841bc61cb1c3e9e7072e.tar.bz2 historical-8a8659951cdbd23d8fb4841bc61cb1c3e9e7072e.zip |
Add USE=client/server flags.
Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/dhcp/ChangeLog | 8 | ||||
-rw-r--r-- | net-misc/dhcp/Manifest | 12 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.1-r1.ebuild | 224 | ||||
-rw-r--r-- | net-misc/dhcp/metadata.xml | 4 |
4 files changed, 241 insertions, 7 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog index d8c8ffba29e8..c09bd3f2d703 100644 --- a/net-misc/dhcp/ChangeLog +++ b/net-misc/dhcp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/dhcp # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.169 2011/03/08 20:13:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.170 2011/03/23 04:36:04 vapier Exp $ + +*dhcp-4.2.1-r1 (23 Mar 2011) + + 23 Mar 2011; Mike Frysinger <vapier@gentoo.org> +dhcp-4.2.1-r1.ebuild, + metadata.xml: + Add USE=client/server flags. 08 Mar 2011; Mike Frysinger <vapier@gentoo.org> files/dhcrelay.init2: Fix typo in dhcrelay init script #357935 by Milan Dadok. diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index edeccbc82883..74d2d6acdff7 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -33,13 +33,13 @@ DIST dhcp-3.1.2p1.tar.gz 792355 RMD160 53434f8404c69e8e113cad030ec975cf13b467cc DIST dhcp-4.2.1.tar.gz 8795980 RMD160 8ecb0608f2cdb660d27ce48b9ba09c64bb7af995 SHA1 dc9be6d2d458a5a7a921eb08281a431506fcca17 SHA256 5f10bb28740c3bd2c632f6dbd9de53fb7e9db07cd274c60c7c1884ae6d5870a1 EBUILD dhcp-3.1.2_p1.ebuild 7606 RMD160 4a092fb0f8337065432ad475193633dca2b381e1 SHA1 e883fef011969302fad6ede0977cb6e1a8387dc7 SHA256 765bcec429ccff09c85b0e466da0673813ed4440cdf31c316698e798892dc37d EBUILD dhcp-3.1.3_p1.ebuild 7772 RMD160 745ce5aa7dee055263c9518585c3c0b1bdfd54a8 SHA1 e19623ad15676759b79b50d103e72dd9ea3f6312 SHA256 9f82707e790928beef947dc872a10698d6ed60838a63d616c8cb0d97d2ade5cd -EBUILD dhcp-4.2.1.ebuild 6194 RMD160 1035b980b6839f750fcc3c98228dba698fa66321 SHA1 713afe99bd4eea6c8a40d680bb92d1a76513ccf4 SHA256 d2d5d50958f1b24f98d04d46b865f0bc620e15bef17b255e4e6c61f7281317bb -MISC ChangeLog 29517 RMD160 7176446b7ef322c3fcd9419d85eac998c408fa60 SHA1 aeb1ff3a2f627fbb40d391646fcf847f29be8fb5 SHA256 acdccc487bb886ca92f4727d9a77488adf76ff14d90571444a1ba55dae1a2f62 -MISC metadata.xml 358 RMD160 97ecd4b6ee0a24352a71a66d5ad4fd82481156b4 SHA1 d80da2cf7c6892cdad6b681fda29e46472d68871 SHA256 8665f24cdfcc09576b595f8bd257333ff5f9ea7ee0ca2925ba6fb74d90e12415 +EBUILD dhcp-4.2.1-r1.ebuild 6638 RMD160 863a621ba516e76a00ed5320ca16815551cd62c2 SHA1 3b9339ea43f628f00b6cb173a09fa157c570c284 SHA256 3f427ec4bf60de3d5a1b2e6a5c18e0a7ee4f39e9f47508501e1c960020d9b553 +MISC ChangeLog 29668 RMD160 19a49dccbede60fd89fb075847b7e4e9e3a49f35 SHA1 c20d0140b84bc906c481a3b92084628c75428923 SHA256 bb2793987932a27b9a5188fe8d685f373d4bcc0009b21d8db59b070cdfab61df +MISC metadata.xml 500 RMD160 b5ad909ab2b12acd20e78039e33fda0a27383c9e SHA1 2fc5cee8e105e75a251195254c96085a0f3fa9a3 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk12jesACgkQaC/OocHi7JbKpAD+MxkGMHnHq5D+wnmMW4Di7bUe -BrNi/FZyPQiekypdCe8A/RLlT8SOkkj1M6J5zauLgn4lBiObbEdvGXRr/CvNGBMd -=/GVT +iF4EAREIAAYFAk2JeLEACgkQaC/OocHi7JbsoAD/dogaPSXW0Q8iRojCbWSUPvZx +gBKS2PFe9yCQJiPAAEcA/1XZVZn6cWnY7nqKOpNsxqlF/Czc0Yh4/JoSCBkCzj1/ +=Rdae -----END PGP SIGNATURE----- diff --git a/net-misc/dhcp/dhcp-4.2.1-r1.ebuild b/net-misc/dhcp/dhcp-4.2.1-r1.ebuild new file mode 100644 index 000000000000..c4a9728dbd25 --- /dev/null +++ b/net-misc/dhcp/dhcp-4.2.1-r1.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.1-r1.ebuild,v 1.1 2011/03/23 04:36:04 vapier Exp $ + +EAPI="2" + +inherit eutils + +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" + +LICENSE="as-is BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" + +DEPEND="selinux? ( sec-policy/selinux-dhcp ) + kernel_linux? ( sys-apps/net-tools ) + vim-syntax? ( app-vim/dhcpd-syntax ) + ldap? ( + net-nds/openldap + ssl? ( dev-libs/openssl ) + )" + +PROVIDE="virtual/dhcpc" + +S="${WORKDIR}/${MY_P}" + +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.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 + epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch + # Enable dhclient to get extra configuration from stdin + epatch "${FILESDIR}"/${PN}-4.0.1-dhclient-stdin-conf.patch + epatch "${FILESDIR}"/${PN}-4.2.1-nogateway.patch #265531 + + # NetworkManager support patches + # If they fail to apply to future versions they will be dropped + # Add dbus support to dhclient + epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-dbus.patch + + # 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 \ + -e "/\(script\|host-name\|domain-name\) / d" \ + client/dhclient.conf || 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 +} + +src_configure() { + econf \ + --enable-paranoia \ + --sysconfdir=/etc/dhcp \ + --with-cli-pid-file=/var/run/dhcp/dhclient.pid \ + --with-cli-lease-file=/var/lib/dhcp/dhclient.leases \ + --with-cli6-pid-file=/var/run/dhcp/dhclient6.pid \ + --with-cli6-lease-file=/var/lib/dhcp/dhclient6.leases \ + --with-srv-pid-file=/var/run/dhcp/dhcpd.pid \ + --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ + --with-srv6-pid-file=/var/run/dhcp/dhcpd6.pid \ + --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ + --with-relay-pid-file=/var/run/dhcp/dhcrelay.pid \ + $(use_enable ipv6 dhcpv6) \ + $(use_with ldap) \ + $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto) +} + +src_install() { + emake install DESTDIR="${D}" || die + + 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 || die + else + newexe "${S}"/client/scripts/freebsd dhclient-script || die + fi + + insinto /etc/dhcp + doins client/dhclient.conf || die + + keepdir /var/lib/dhclient + fi + + if [[ -e server/dhcpd ]] ; then + if use ldap ; then + insinto /etc/openldap/schema + doins contrib/ldap/dhcp.* || die + dosbin contrib/ldap/dhcpd-conf-to-ldap || die + fi + + newinitd "${FILESDIR}"/dhcpd.init3 dhcpd + newinitd "${FILESDIR}"/dhcrelay.init2 dhcrelay + newconfd "${FILESDIR}"/dhcpd.conf dhcpd + newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay + + insinto /etc/dhcp + doins server/dhcpd.conf || die + + keepdir /var/{lib,run}/dhcp + fi +} + +pkg_preinst() { + enewgroup dhcp + enewuser dhcp -1 -1 /var/lib/dhcp dhcp + + # Keep the user files over the sample ones + local f + for f in dhclient dhcpd ; do + f="/etc/dhcp/${f}.conf" + if [ -e "${ROOT}"${f} ] ; then + cp -p "${ROOT}"${f} "${D}"${f} + fi + done +} + +pkg_postinst() { + chown -R dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp + + 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 + + einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings." + einfo + einfo "If you would like to run dhcpd in a chroot, simply configure the" + einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:" + einfo " emerge --config =${PF}" +} + +pkg_config() { + local CHROOT="$( + sed -n -e 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \ + "${ROOT}"/etc/conf.d/dhcpd + )" + + if [[ -z ${CHROOT} ]]; then + eerror "CHROOT not defined in /etc/conf.d/dhcpd" + return 1 + fi + + CHROOT="${ROOT}/${CHROOT}" + + if [[ -d ${CHROOT} ]] ; then + ewarn "${CHROOT} already exists - aborting" + return 0 + fi + + ebegin "Setting up the chroot directory" + mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp} + cp /etc/{localtime,resolv.conf} "${CHROOT}"/etc + cp -R /etc/dhcp "${CHROOT}"/etc + cp -R /var/lib/dhcp "${CHROOT}"/var/lib + ln -s ../../var/lib/dhcp "${CHROOT}"/etc/dhcp/lib + chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp + eend 0 + + local logger="$(best_version virtual/logger)" + einfo "To enable logging from the dhcpd server, configure your" + einfo "logger (${logger}) to listen on ${CHROOT}/dev/log" +} diff --git a/net-misc/dhcp/metadata.xml b/net-misc/dhcp/metadata.xml index a0ffd5aeddba..667e06d65e04 100644 --- a/net-misc/dhcp/metadata.xml +++ b/net-misc/dhcp/metadata.xml @@ -4,4 +4,8 @@ <herd>base-system</herd> <longdescription lang="en">The ISC DHCP client/server package.</longdescription> <longdescription lang="ja">ISC DHCP クライアント/サーバ・パッケージです。</longdescription> + <use> + <flag name='client'>Install the dhclient program</flag> + <flag name='server'>Install the dhcpd and dhcrelay programs</flag> + </use> </pkgmetadata> |