New upstream alpha.

Package-Manager: portage-2.1.2_rc3-r4

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 8e2576802a723a39940819d72eb3f47d9910fe72..2bdfb89dee74075727e3a630e3b208951e9c47d1 100644 (file)
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.121 2006/11/06 09:35:52 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.122 2006/12/13 20:21:00 uberlord Exp $
+
+*dhcp-3.1.0_alpha2 (13 Dec 2006)
+
+  13 Dec 2006; Roy Marples <uberlord@gentoo.org> +dhcp-3.1.0_alpha2.ebuild:
+  New upstream alpha.
 
 *dhcp-3.0.5 (06 Nov 2006)
 

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index ffc939b547d3277c9664c4e8c115690423a5d155..08c2681d6760cc9000709dc5dbd0d12d6c7e6083 100644 (file)
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -99,6 +99,7 @@ DIST dhcp-3.0.4.tar.gz 883245 RMD160 f5636d87e1e2138bd239157f54d8f73c73af73ac SH
 DIST dhcp-3.0.5.tar.gz 876591 RMD160 b968e7520fd936bd6f888f77734f3db7df23a636 SHA1 6501ba0e3dbd83ff57d3274538c4e4a1848ffc64 SHA256 dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6
 DIST dhcp-3.0.5rc2.tar.gz 876507 RMD160 6f0f776c550d00528ab77f8585a3bc93408a2372 SHA1 c0b014c0458dc60c11fc073de054cf36030ef780 SHA256 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4
 DIST dhcp-3.1.0a1.tar.gz 773828 RMD160 4ededc197e668219d404a054816cd48e71ac8a39 SHA1 d9f0e71d049f79fbfd99ca4de6e6d12e9ff86548 SHA256 80f610a6bdfe2ac2d2dd50886d903217141c2983c1a22af23fb223998769651b
+DIST dhcp-3.1.0a2.tar.gz 776040 RMD160 21419b31dc75fce67d86222277282ffa2a9c9007 SHA1 cc8eca9477f7d60f74c77ff0c556212835aa6b8f SHA256 81e4e068df774f473c36999236fab16d742e3c74ae162dfb990db7b134e87a85
 EBUILD dhcp-3.0.3-r9.ebuild 7090 RMD160 39faccca29004357a6982530b476a58ef0724eac SHA1 627289ef0d63eb7acaf5c7855b39c2ecac5286ff SHA256 a98505b8c62a03cb7e712b2f5fc1b7190f64314eb4a9bacdf5b45f373dc53aca
 MD5 91749ab205c46ac726bcc8b75279e6de dhcp-3.0.3-r9.ebuild 7090
 RMD160 39faccca29004357a6982530b476a58ef0724eac dhcp-3.0.3-r9.ebuild 7090
@@ -119,10 +120,14 @@ EBUILD dhcp-3.1.0_alpha1.ebuild 7365 RMD160 e69f025fd9402f0da5ab5399d9ca55506eac
 MD5 405d52e1ff6cace078291948ea31bd66 dhcp-3.1.0_alpha1.ebuild 7365
 RMD160 e69f025fd9402f0da5ab5399d9ca55506eacb0d0 dhcp-3.1.0_alpha1.ebuild 7365
 SHA256 e32c80bc37b8ebce7c08b0edf3a31f3160dc7cc2f99487df24195f30d7c38d20 dhcp-3.1.0_alpha1.ebuild 7365
-MISC ChangeLog 20882 RMD160 bee3aca6c47aa487bc834c84fd7fe5416f6715d4 SHA1 454bc777dc6b52162cf0b516a5a8965c1a2a98ad SHA256 c8e317341b0b61a9e14bbd0f0a8549cafcf83b56f66a96f5609b930b1829cf04
-MD5 be1ffd2d7fcc0976fcd5a207796b8a33 ChangeLog 20882
-RMD160 bee3aca6c47aa487bc834c84fd7fe5416f6715d4 ChangeLog 20882
-SHA256 c8e317341b0b61a9e14bbd0f0a8549cafcf83b56f66a96f5609b930b1829cf04 ChangeLog 20882
+EBUILD dhcp-3.1.0_alpha2.ebuild 7365 RMD160 6ff4c8a27483a9d1ba7726e61e8fb5fd8b2a4e8c SHA1 b9870df36088ffac3e0148201d6280c67adde11f SHA256 1d1fac9804aa7a93bc3c91559687c2896eb3b3a062c4affd7af36274ddffe1e1
+MD5 3a350e42276b7b8863a0423d4f9dde10 dhcp-3.1.0_alpha2.ebuild 7365
+RMD160 6ff4c8a27483a9d1ba7726e61e8fb5fd8b2a4e8c dhcp-3.1.0_alpha2.ebuild 7365
+SHA256 1d1fac9804aa7a93bc3c91559687c2896eb3b3a062c4affd7af36274ddffe1e1 dhcp-3.1.0_alpha2.ebuild 7365
+MISC ChangeLog 21015 RMD160 3f63255a5e2692bcb39b165308fac2df9105daed SHA1 bc9b91999b2ec32416116da60b43fe99c7385317 SHA256 0b9c305b3f519a51b09b0144138bb9926decf242ad9c1951843c2354359bafe8
+MD5 4ccf2773a8145f4fe03eb41f62b92a58 ChangeLog 21015
+RMD160 3f63255a5e2692bcb39b165308fac2df9105daed ChangeLog 21015
+SHA256 0b9c305b3f519a51b09b0144138bb9926decf242ad9c1951843c2354359bafe8 ChangeLog 21015
 MISC metadata.xml 441 RMD160 489c700355a49fda7d249a7b3f72066add57e779 SHA1 f2013226d45685a4bd06c3f7723df78e134486d4 SHA256 16dccfd59e8db49b0c9b9bb34f99188f9773a2ef00757d4fb429fea4293ac44e
 MD5 3ccab43e194be4b8df2632546cbd028e metadata.xml 441
 RMD160 489c700355a49fda7d249a7b3f72066add57e779 metadata.xml 441
@@ -142,3 +147,6 @@ SHA256 9394bc332009daadfd256fe921d30a1d4021d421d3840a02fb93f46e8c0b2cae files/di
 MD5 9eadfd8d6702b780408ee4e8013097d4 files/digest-dhcp-3.1.0_alpha1 238
 RMD160 872cf1cb4babcb908f4753d69dd7705ffd488c5c files/digest-dhcp-3.1.0_alpha1 238
 SHA256 69241c8b8610ce8aa684cc62eb072b3db23c43fc5bca173c77e57cfa64d25005 files/digest-dhcp-3.1.0_alpha1 238
+MD5 633acdd0f53ac5b689ccf0d9876382d5 files/digest-dhcp-3.1.0_alpha2 238
+RMD160 6f829c6a9788269b89e5909a83c8e806cd7b955a files/digest-dhcp-3.1.0_alpha2 238
+SHA256 7d2825096cbc840a2559d57c682abc42d901d689a9f2333c46c6dcc180d4e59b files/digest-dhcp-3.1.0_alpha2 238

diff --git a/net-misc/dhcp/dhcp-3.1.0_alpha2.ebuild b/net-misc/dhcp/dhcp-3.1.0_alpha2.ebuild
new file mode 100644 (file)
index 0000000..0ce156b
--- /dev/null
+++ b/net-misc/dhcp/dhcp-3.1.0_alpha2.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.0_alpha2.ebuild,v 1.1 2006/12/13 20:21:00 uberlord Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
+
+LICENSE="isc-dhcp"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="doc minimal static selinux kernel_linux"
+
+DEPEND="selinux? ( sec-policy/selinux-dhcp )
+       kernel_linux? ( sys-apps/net-tools )"
+
+PROVIDE="virtual/dhcpc"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # Gentoo patches - these will probably never be accepted upstream
+       # Enable chroot support
+       epatch "${FILESDIR}/${PN}"-3.0-paranoia.patch
+       # Fix some permission issues
+       epatch "${FILESDIR}/${PN}"-3.0-fix-perms.patch
+       # Enable dhclient to equery NTP servers
+       epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-ntp.patch
+       # resolvconf support in dhclient-script
+       epatch "${FILESDIR}/${PN}"-3.1.0a1-dhclient-resolvconf.patch
+       # Fix setting hostnames on Linux
+       epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-hostname.patch
+       # Allow mtu settings
+       epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-mtu.patch
+       # Allow dhclient to use IF_METRIC to set route metrics
+       epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-metric.patch
+       # Stop downing the interface on Linux as that breaks link dameons
+       # such as wpa_supplicant and netplug
+       epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-no-down.patch
+       # Quiet the isc blurb
+       epatch "${FILESDIR}/${PN}"-3.0.3-no_isc_blurb.patch
+       # Enable dhclient to get extra configuration from stdin
+       epatch "${FILESDIR}/${PN}"-3.0.4-dhclient-stdin-conf.patch
+       # Disable fallback interfaces when using BPF
+       # This allows more than one dhclient instance on the BSD's
+       epatch "${FILESDIR}/${PN}"-3.0.5-bpf-nofallback.patch
+
+       # General fixes which will probably be accepted upstream eventually
+       # Install libdst, #75544
+       epatch "${FILESDIR}/${PN}"-3.0.3-libdst.patch
+       # Fix building on Gentoo/FreeBSD
+       epatch "${FILESDIR}/${PN}"-3.0.2-gmake.patch
+
+       # NetworkManager support patches
+       # If they fail to apply to future versions they will be dropped
+       # Enable eXtended options
+       epatch "${FILESDIR}/${PN}"-3.1.0a1-x-option.patch
+       # Add dbus support to dhclient
+       epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
+
+       # Brand the version with Gentoo
+       # include revision if >0
+       local newver="${MY_PV}-Gentoo"
+       [[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
+       sed -i '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
+               includes/version.h || 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
+
+       # 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
+
+       # Build sed man pages as we don't ever support BSD 4.4 and older, #130251.
+       local x=
+       for x in Makefile.dist $(ls */Makefile.dist) ; do
+               sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}" || die
+       done
+
+       # 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
+       [[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
+}
+
+src_compile() {
+       use static && append-ldflags -static
+
+       cat <<-END >> includes/site.h
+       #define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
+       #define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
+       #define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
+       #define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
+       #define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
+       #define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid"
+       #define DHCPD_LOG_FACILITY LOG_LOCAL1
+       END
+
+       cat <<-END > site.conf
+       CC = $(tc-getCC)
+       LFLAGS = ${LDFLAGS}
+       LIBDIR = /usr/$(get_libdir)
+       INCDIR = /usr/include
+       ETC = /etc/dhcp
+       VARDB = /var/lib/dhcp
+       VARRUN = /var/run/dhcp
+       ADMMANDIR = /usr/share/man/man8
+       ADMMANEXT = .8
+       FFMANDIR = /usr/share/man/man5
+       FFMANEXT = .5
+       LIBMANDIR = /usr/share/man/man3
+       LIBMANEXT = .3
+       USRMANDIR = /usr/share/man/man1
+       USRMANEXT = .1
+       MANCAT = man
+       END
+
+       ./configure --copts "-DPARANOIA -DEARLY_CHROOT -DEXTENDED_NEW_OPTION_INFO \
+               ${CFLAGS}" || die "configure failed"
+
+       # Remove server support from the Makefile
+       # We still install some extra crud though
+       if use minimal ; then
+               sed -i -e 's/\(server\|relay\|dhcpctl\)/ /g' work.*/Makefile || die
+       fi
+       emake || die "compile problem"
+}
+
+src_install() {
+       make install DESTDIR="${D}" || die
+       use doc && dodoc README RELNOTES doc/*
+
+       insinto /etc/dhcp
+       newins client/dhclient.conf dhclient.conf.sample
+       keepdir /var/{lib,run}/dhcp
+
+       # Install our server files
+       if ! use minimal ; then
+               insinto /etc/dhcp
+               newins server/dhcpd.conf dhcpd.conf.sample
+               newinitd "${FILESDIR}"/dhcpd.init dhcpd
+               newinitd "${FILESDIR}"/dhcrelay.init dhcrelay
+               insinto /etc/conf.d
+               newins "${FILESDIR}"/dhcpd.conf dhcpd
+               newins "${FILESDIR}"/dhcrelay.conf dhcrelay
+       fi
+}
+
+pkg_preinst() {
+       if ! use minimal ; then
+               enewgroup dhcp
+               enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+       fi
+}
+
+pkg_postinst() {
+       use minimal && return
+
+       chown 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() {
+       if use minimal ; then
+               eerror "${PN} has not been compiled for server support"
+               eerror "emerge ${PN} without the minimal USE flag to use dhcp sever"
+               return 1
+       fi
+
+       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/files/digest-dhcp-3.1.0_alpha2 b/net-misc/dhcp/files/digest-dhcp-3.1.0_alpha2
new file mode 100644 (file)
index 0000000..b167cec
--- /dev/null
+++ b/net-misc/dhcp/files/digest-dhcp-3.1.0_alpha2
@@ -0,0 +1,3 @@
+MD5 4842c6fe6371d699b45cc977b32097de dhcp-3.1.0a2.tar.gz 776040
+RMD160 21419b31dc75fce67d86222277282ffa2a9c9007 dhcp-3.1.0a2.tar.gz 776040
+SHA256 81e4e068df774f473c36999236fab16d742e3c74ae162dfb990db7b134e87a85 dhcp-3.1.0a2.tar.gz 776040