From 32cfeb3aee7641b12a0660112ce9e191a428ce8a Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 6 Nov 2006 09:35:52 +0000 Subject: [PATCH] New upstream version. Package-Manager: portage-2.1.2_rc1-r2 --- net-misc/dhcp/ChangeLog | 7 +- net-misc/dhcp/Manifest | 16 +- net-misc/dhcp/dhcp-3.0.5.ebuild | 234 ++++++++++++++++++++++++++ net-misc/dhcp/files/digest-dhcp-3.0.5 | 3 + 4 files changed, 255 insertions(+), 5 deletions(-) create mode 100644 net-misc/dhcp/dhcp-3.0.5.ebuild create mode 100644 net-misc/dhcp/files/digest-dhcp-3.0.5 diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog index 76f5e905bce1..8e2576802a72 100644 --- 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.120 2006/10/17 13:30:01 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.121 2006/11/06 09:35:52 uberlord Exp $ + +*dhcp-3.0.5 (06 Nov 2006) + + 06 Nov 2006; Roy Marples +dhcp-3.0.5.ebuild: + New upstream version. 17 Oct 2006; Roy Marples dhcp-3.0.5_rc2.ebuild, dhcp-3.1.0_alpha1.ebuild: diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index 8fe1fac9e142..ffc939b547d3 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -96,6 +96,7 @@ RMD160 da83794f49e52f072924386b2fd4511d07d985e6 files/dhcrelay.init 748 SHA256 0d16910b1197946165da7812acffecef8ee3b31cdf8f9a596ca6ecb19756fcee files/dhcrelay.init 748 DIST dhcp-3.0.3.tar.gz 870240 RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 SHA1 1e2e6c3ecdb8046a39aaabe1a36171e1d45d21e4 SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe DIST dhcp-3.0.4.tar.gz 883245 RMD160 f5636d87e1e2138bd239157f54d8f73c73af73ac SHA1 2efe316d69563bf2440cbb4efc2bc06ef9445db3 SHA256 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7 +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 EBUILD dhcp-3.0.3-r9.ebuild 7090 RMD160 39faccca29004357a6982530b476a58ef0724eac SHA1 627289ef0d63eb7acaf5c7855b39c2ecac5286ff SHA256 a98505b8c62a03cb7e712b2f5fc1b7190f64314eb4a9bacdf5b45f373dc53aca @@ -106,6 +107,10 @@ EBUILD dhcp-3.0.4-r2.ebuild 7221 RMD160 d13d26bbd33d0fe85808590469895c388d08345e MD5 53484e87af57cfd9d4a08ab643a2ef89 dhcp-3.0.4-r2.ebuild 7221 RMD160 d13d26bbd33d0fe85808590469895c388d08345e dhcp-3.0.4-r2.ebuild 7221 SHA256 29b1d5c0b563826395dc30d10c5f4c077b16115d531f4231e218dc42fa855391 dhcp-3.0.4-r2.ebuild 7221 +EBUILD dhcp-3.0.5.ebuild 7327 RMD160 67a8073856cf20171a58bb379e78ef00c0639702 SHA1 6a9c2e2f9a736365e6dd77810d838690d7c722df SHA256 121da4e6de2ea1f09798616c4209ea0cbd0bbf9c89d1085091488957eb6a8748 +MD5 1b7c5d90f4175a525c7ef9e834b3a07e dhcp-3.0.5.ebuild 7327 +RMD160 67a8073856cf20171a58bb379e78ef00c0639702 dhcp-3.0.5.ebuild 7327 +SHA256 121da4e6de2ea1f09798616c4209ea0cbd0bbf9c89d1085091488957eb6a8748 dhcp-3.0.5.ebuild 7327 EBUILD dhcp-3.0.5_rc2.ebuild 7331 RMD160 158495da0a5220b5369b0c5920628835cd54ae91 SHA1 2457c28ccaff0af2360abe4f484cf1cd83ac4e2f SHA256 a49d758a96a7516c97dcf5c475a7e9fb1417985c0020ef46d6b354b5948bb497 MD5 f566c157f51b7c82b936d572cb233e79 dhcp-3.0.5_rc2.ebuild 7331 RMD160 158495da0a5220b5369b0c5920628835cd54ae91 dhcp-3.0.5_rc2.ebuild 7331 @@ -114,10 +119,10 @@ 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 20761 RMD160 e880ade209d0862a050f0e1e4271b66b53213dd3 SHA1 8a018ccd5b83b0ddd3f2c75510eed918564f5b4e SHA256 ed0c76a23e75ddee2f88779b5d5ff5fb69fffcde17ac24eed510810637dbe4b2 -MD5 01912642e60c3c560da74d97fe635adf ChangeLog 20761 -RMD160 e880ade209d0862a050f0e1e4271b66b53213dd3 ChangeLog 20761 -SHA256 ed0c76a23e75ddee2f88779b5d5ff5fb69fffcde17ac24eed510810637dbe4b2 ChangeLog 20761 +MISC ChangeLog 20882 RMD160 bee3aca6c47aa487bc834c84fd7fe5416f6715d4 SHA1 454bc777dc6b52162cf0b516a5a8965c1a2a98ad SHA256 c8e317341b0b61a9e14bbd0f0a8549cafcf83b56f66a96f5609b930b1829cf04 +MD5 be1ffd2d7fcc0976fcd5a207796b8a33 ChangeLog 20882 +RMD160 bee3aca6c47aa487bc834c84fd7fe5416f6715d4 ChangeLog 20882 +SHA256 c8e317341b0b61a9e14bbd0f0a8549cafcf83b56f66a96f5609b930b1829cf04 ChangeLog 20882 MISC metadata.xml 441 RMD160 489c700355a49fda7d249a7b3f72066add57e779 SHA1 f2013226d45685a4bd06c3f7723df78e134486d4 SHA256 16dccfd59e8db49b0c9b9bb34f99188f9773a2ef00757d4fb429fea4293ac44e MD5 3ccab43e194be4b8df2632546cbd028e metadata.xml 441 RMD160 489c700355a49fda7d249a7b3f72066add57e779 metadata.xml 441 @@ -128,6 +133,9 @@ SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/di MD5 3ac42f4c7431bc78613c2e61b0a79075 files/digest-dhcp-3.0.4-r2 232 RMD160 d5e0c33365d8dc2d37caf86a277a0dbfe0b98565 files/digest-dhcp-3.0.4-r2 232 SHA256 fbea6a9170dda5da61af6c7c6f629d33b642ca3fbfa7f64537bd783e283be420 files/digest-dhcp-3.0.4-r2 232 +MD5 baa5fba0594aaaf320323529af67db24 files/digest-dhcp-3.0.5 232 +RMD160 412ca9be8de7ae69927b5914b742d8a3e367d7b2 files/digest-dhcp-3.0.5 232 +SHA256 3dc56e680549f1bbbce372b339d5bf1d0474bfd8a45d950f5542bec89117606d files/digest-dhcp-3.0.5 232 MD5 9bcfd0200ea79ae1610d34029cf2e864 files/digest-dhcp-3.0.5_rc2 241 RMD160 921c145bf03455eb145900a3e8177fcaaadf43d8 files/digest-dhcp-3.0.5_rc2 241 SHA256 9394bc332009daadfd256fe921d30a1d4021d421d3840a02fb93f46e8c0b2cae files/digest-dhcp-3.0.5_rc2 241 diff --git a/net-misc/dhcp/dhcp-3.0.5.ebuild b/net-misc/dhcp/dhcp-3.0.5.ebuild new file mode 100644 index 000000000000..e13bb57a63ca --- /dev/null +++ b/net-misc/dhcp/dhcp-3.0.5.ebuild @@ -0,0 +1,234 @@ +# 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.0.5.ebuild,v 1.1 2006/11/06 09:35:52 uberlord Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +MY_PV="${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.0.3-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.0.3-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.0.5 b/net-misc/dhcp/files/digest-dhcp-3.0.5 new file mode 100644 index 000000000000..ea5a3e7a3a55 --- /dev/null +++ b/net-misc/dhcp/files/digest-dhcp-3.0.5 @@ -0,0 +1,3 @@ +MD5 ce5d30d4645e4eab1f54561b487d1ec7 dhcp-3.0.5.tar.gz 876591 +RMD160 b968e7520fd936bd6f888f77734f3db7df23a636 dhcp-3.0.5.tar.gz 876591 +SHA256 dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6 dhcp-3.0.5.tar.gz 876591 -- 2.26.2