From b4e0ad0892e897e8e1a7cafeda308ec09a01e791 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 26 Apr 2007 19:32:44 +0000 Subject: [PATCH] Bump, #176137 thanks to Attila Jecs. Package-Manager: portage-2.1.2.4 --- net-misc/dhcp/ChangeLog | 7 +- net-misc/dhcp/Manifest | 16 +- net-misc/dhcp/dhcp-3.1.0_alpha3.ebuild | 237 +++++++++++++++++++ net-misc/dhcp/files/digest-dhcp-3.1.0_alpha3 | 3 + 4 files changed, 258 insertions(+), 5 deletions(-) create mode 100644 net-misc/dhcp/dhcp-3.1.0_alpha3.ebuild create mode 100644 net-misc/dhcp/files/digest-dhcp-3.1.0_alpha3 diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog index 8555290c6055..e7a7b30ebd6b 100644 --- a/net-misc/dhcp/ChangeLog +++ b/net-misc/dhcp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/dhcp # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.126 2007/04/22 17:27:37 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.127 2007/04/26 19:32:44 uberlord Exp $ + +*dhcp-3.1.0_alpha3 (26 Apr 2007) + + 26 Apr 2007; Roy Marples +dhcp-3.1.0_alpha3.ebuild: + Bump, #176137 thanks to Attila Jecs. 22 Apr 2007; Roy Marples dhcp-3.0.3-r9.ebuild, dhcp-3.0.5.ebuild, dhcp-3.0.5-r1.ebuild, dhcp-3.1.0_alpha2.ebuild: diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index 56fcbea8ddbb..c3d70be6a8d4 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -93,6 +93,7 @@ SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c files/dh DIST dhcp-3.0.3.tar.gz 870240 RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 SHA1 1e2e6c3ecdb8046a39aaabe1a36171e1d45d21e4 SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe DIST dhcp-3.0.5.tar.gz 876591 RMD160 b968e7520fd936bd6f888f77734f3db7df23a636 SHA1 6501ba0e3dbd83ff57d3274538c4e4a1848ffc64 SHA256 dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6 DIST dhcp-3.1.0a2.tar.gz 776040 RMD160 21419b31dc75fce67d86222277282ffa2a9c9007 SHA1 cc8eca9477f7d60f74c77ff0c556212835aa6b8f SHA256 81e4e068df774f473c36999236fab16d742e3c74ae162dfb990db7b134e87a85 +DIST dhcp-3.1.0a3.tar.gz 776225 RMD160 29f4259fbe6c8f5e619001513827c97a2ab7d628 SHA1 b731552005b2385d87756208f3e03297b40f80d0 SHA256 06d0ffe09cc1c32b7b27719d372414937818665349cdbe9c13652c1ae63677f2 EBUILD dhcp-3.0.3-r9.ebuild 7075 RMD160 b08f0f974e180699ce172c17691cd481d0822d0d SHA1 b71a3c1b28259eb527d65d931e1ca0776650b7ed SHA256 98380898e5eaaedadb7949fa3bf4d2a04d23b32d5c5b2d3a2c633fc48e4dfed8 MD5 d9c16fc8286037a363a5b09a3fe746d4 dhcp-3.0.3-r9.ebuild 7075 RMD160 b08f0f974e180699ce172c17691cd481d0822d0d dhcp-3.0.3-r9.ebuild 7075 @@ -109,10 +110,14 @@ EBUILD dhcp-3.1.0_alpha2.ebuild 7470 RMD160 db0f05f5c26bf6160bd0d68bdceee8460aeb MD5 1de7a90d12475125e754b46006f575b2 dhcp-3.1.0_alpha2.ebuild 7470 RMD160 db0f05f5c26bf6160bd0d68bdceee8460aeb1766 dhcp-3.1.0_alpha2.ebuild 7470 SHA256 503e84c58f60ce737528b205074e0ee5713d1d2d72bc028cbc9a66db3d2ef999 dhcp-3.1.0_alpha2.ebuild 7470 -MISC ChangeLog 21698 RMD160 6f28781c27ea15edac2298ca95f31b4f3ee1e4ae SHA1 b44f35316f9b72960653793c66a67b8b0048a7e0 SHA256 6fc5b30c73f0835d0bbc0f71b017391f16a13cf45ceb812ea49b61cc9d9de578 -MD5 20f165dd4bf5a463f7a0af515165b6cf ChangeLog 21698 -RMD160 6f28781c27ea15edac2298ca95f31b4f3ee1e4ae ChangeLog 21698 -SHA256 6fc5b30c73f0835d0bbc0f71b017391f16a13cf45ceb812ea49b61cc9d9de578 ChangeLog 21698 +EBUILD dhcp-3.1.0_alpha3.ebuild 7470 RMD160 2dbd200561617977c3a4834b8fdf76575dcf6f7f SHA1 6b6fc9af712b4bfc0155079f36494ae1fbedd636 SHA256 148da65354609598ec0223e81558919aa1f09e650ec34234d00d623162724810 +MD5 0f7965d4331e77b1811b4b5677b003c0 dhcp-3.1.0_alpha3.ebuild 7470 +RMD160 2dbd200561617977c3a4834b8fdf76575dcf6f7f dhcp-3.1.0_alpha3.ebuild 7470 +SHA256 148da65354609598ec0223e81558919aa1f09e650ec34234d00d623162724810 dhcp-3.1.0_alpha3.ebuild 7470 +MISC ChangeLog 21848 RMD160 1f1a43e1b59828fdddc2e896f4c9274d01a255ad SHA1 7a01a24d59325241c2bb232dda25b3fa1386b146 SHA256 f49c70aa29be5db6b90518b05ace18d2a1141db57089b1685810397f2721a5d0 +MD5 398d4a684d4ea2bf69f10061ce9f567c ChangeLog 21848 +RMD160 1f1a43e1b59828fdddc2e896f4c9274d01a255ad ChangeLog 21848 +SHA256 f49c70aa29be5db6b90518b05ace18d2a1141db57089b1685810397f2721a5d0 ChangeLog 21848 MISC metadata.xml 441 RMD160 489c700355a49fda7d249a7b3f72066add57e779 SHA1 f2013226d45685a4bd06c3f7723df78e134486d4 SHA256 16dccfd59e8db49b0c9b9bb34f99188f9773a2ef00757d4fb429fea4293ac44e MD5 3ccab43e194be4b8df2632546cbd028e metadata.xml 441 RMD160 489c700355a49fda7d249a7b3f72066add57e779 metadata.xml 441 @@ -129,3 +134,6 @@ SHA256 3dc56e680549f1bbbce372b339d5bf1d0474bfd8a45d950f5542bec89117606d files/di 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 +MD5 b206b65f86a9414d928a2113216894e4 files/digest-dhcp-3.1.0_alpha3 238 +RMD160 603b185b1f6168de71c846fb502846e54a057a1b files/digest-dhcp-3.1.0_alpha3 238 +SHA256 aebd4e694e3dfba16531ccb8219cdbf79bd02a4c4be5bae323e87f2c61001a30 files/digest-dhcp-3.1.0_alpha3 238 diff --git a/net-misc/dhcp/dhcp-3.1.0_alpha3.ebuild b/net-misc/dhcp/dhcp-3.1.0_alpha3.ebuild new file mode 100644 index 000000000000..1ab0b953e3be --- /dev/null +++ b/net-misc/dhcp/dhcp-3.1.0_alpha3.ebuild @@ -0,0 +1,237 @@ +# Copyright 1999-2007 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_alpha3.ebuild,v 1.1 2007/04/26 19:32:44 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 + + # 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 + + # 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 + newconfd "${FILESDIR}"/dhcpd.conf dhcpd + newconfd "${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_alpha3 b/net-misc/dhcp/files/digest-dhcp-3.1.0_alpha3 new file mode 100644 index 000000000000..2d72313a6c8a --- /dev/null +++ b/net-misc/dhcp/files/digest-dhcp-3.1.0_alpha3 @@ -0,0 +1,3 @@ +MD5 d09be1a80982b78482e8fbd416924468 dhcp-3.1.0a3.tar.gz 776225 +RMD160 29f4259fbe6c8f5e619001513827c97a2ab7d628 dhcp-3.1.0a3.tar.gz 776225 +SHA256 06d0ffe09cc1c32b7b27719d372414937818665349cdbe9c13652c1ae63677f2 dhcp-3.1.0a3.tar.gz 776225 -- 2.26.2