diff options
author | 2006-06-09 19:12:32 +0000 | |
---|---|---|
committer | 2006-06-09 19:12:32 +0000 | |
commit | 845c3150a761e7adaefe647af2b36c8dc00ac562 (patch) | |
tree | 8899f31aa7dc060597c38d6b4f1d9bb7ef0d51ae /net-misc | |
parent | Run env-update after updating /etc/env.d file. (diff) | |
download | historical-845c3150a761e7adaefe647af2b36c8dc00ac562.tar.gz historical-845c3150a761e7adaefe647af2b36c8dc00ac562.tar.bz2 historical-845c3150a761e7adaefe647af2b36c8dc00ac562.zip |
Push minimal and doc USE flags to 3.0.3-r9
Package-Manager: portage-2.1
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/dhcp/ChangeLog | 5 | ||||
-rw-r--r-- | net-misc/dhcp/Manifest | 16 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-3.0.3-r9.ebuild | 113 |
3 files changed, 73 insertions, 61 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog index 566a92078053..7ecf012bb18a 100644 --- a/net-misc/dhcp/ChangeLog +++ b/net-misc/dhcp/ChangeLog @@ -1,8 +1,9 @@ # 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.100 2006/06/09 16:00:39 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.101 2006/06/09 19:12:32 uberlord Exp $ - 09 Jun 2006; <roy@gentoo.org> -dhcp-3.0.4.ebuild, dhcp-3.0.4-r1.ebuild: + 09 Jun 2006; <roy@gentoo.org> -dhcp-3.0.4.ebuild, dhcp-3.0.3-r9.ebuild, + dhcp-3.0.4-r1.ebuild: minimal USE flag stops the building of the DHCP server doc USE flag installs the documentation diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index b14f4c2caaea..26d8a7d3cfba 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -92,18 +92,18 @@ EBUILD dhcp-3.0.3-r4.ebuild 4062 RMD160 310de76cfa0feff02e9620ed113e5c2647b3b8c8 MD5 b268712b328548de32d5db06619787a8 dhcp-3.0.3-r4.ebuild 4062 RMD160 310de76cfa0feff02e9620ed113e5c2647b3b8c8 dhcp-3.0.3-r4.ebuild 4062 SHA256 a2083988469dbf8795387c94da9cff44b8f2dadf89048b32f261954dae3a434a dhcp-3.0.3-r4.ebuild 4062 -EBUILD dhcp-3.0.3-r9.ebuild 6804 RMD160 4d6861c1051ab2de04ffb28034500d1e9c665200 SHA1 415f778b1cfaa17876b801daeaa97101462908f5 SHA256 e8b73b1a0efba6790e391ee7abf26092ab828ced610c4686bed5101372d10bfd -MD5 508bffdc4bd6251094f6de3ca28b13cd dhcp-3.0.3-r9.ebuild 6804 -RMD160 4d6861c1051ab2de04ffb28034500d1e9c665200 dhcp-3.0.3-r9.ebuild 6804 -SHA256 e8b73b1a0efba6790e391ee7abf26092ab828ced610c4686bed5101372d10bfd dhcp-3.0.3-r9.ebuild 6804 +EBUILD dhcp-3.0.3-r9.ebuild 7029 RMD160 bfda189a024d27b804f8258907244070a300c6e5 SHA1 d0b798423d58f64638460c56e478dd3e6681f574 SHA256 c5ea89da028a16349bdf8c75e59530c01d1c35687ba8a713102967c1ddb03ad6 +MD5 3890289f5812986f9c18da06cde46abf dhcp-3.0.3-r9.ebuild 7029 +RMD160 bfda189a024d27b804f8258907244070a300c6e5 dhcp-3.0.3-r9.ebuild 7029 +SHA256 c5ea89da028a16349bdf8c75e59530c01d1c35687ba8a713102967c1ddb03ad6 dhcp-3.0.3-r9.ebuild 7029 EBUILD dhcp-3.0.4-r1.ebuild 7029 RMD160 ff3995d0d03e1e63505b47921bb7c216908f16bd SHA1 d44a2227a5a46818cbc3e64c72be98f4c5516b4b SHA256 02f2bb7056168e1c10c33eb35c501cc167b532ac3526afa9171890e613355974 MD5 6fd5e5109bfa4d1d944d726207f13f4f dhcp-3.0.4-r1.ebuild 7029 RMD160 ff3995d0d03e1e63505b47921bb7c216908f16bd dhcp-3.0.4-r1.ebuild 7029 SHA256 02f2bb7056168e1c10c33eb35c501cc167b532ac3526afa9171890e613355974 dhcp-3.0.4-r1.ebuild 7029 -MISC ChangeLog 17990 RMD160 1adbd56c5de59254b42d2e3325e0ae5f07563929 SHA1 299bee4f1f059a6bd9183a4052a46a4a08be880a SHA256 76dbc4cd61022c7bccc3bc7db5b9c8b859e96a5f53c0047fc856e4e15332fbc2 -MD5 9b598c03e3c0722beabd0e6af2cd8cb4 ChangeLog 17990 -RMD160 1adbd56c5de59254b42d2e3325e0ae5f07563929 ChangeLog 17990 -SHA256 76dbc4cd61022c7bccc3bc7db5b9c8b859e96a5f53c0047fc856e4e15332fbc2 ChangeLog 17990 +MISC ChangeLog 18014 RMD160 866220a6a7988ea7b5624862028ea5b2dcf3ca5d SHA1 26e1b7e27e2bddd1fdb1e22d7f1a47f56f788e29 SHA256 0f33dda080ace60801d52ef728777e009eefcb81dbd5b9e1095b590469a8470d +MD5 eda48415d124c4ba8f754fd409a8727a ChangeLog 18014 +RMD160 866220a6a7988ea7b5624862028ea5b2dcf3ca5d ChangeLog 18014 +SHA256 0f33dda080ace60801d52ef728777e009eefcb81dbd5b9e1095b590469a8470d ChangeLog 18014 MISC metadata.xml 330 RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe SHA1 d00a77cf9fff7ed1570a77ff306fdb03081e9e48 SHA256 456ab9c26235fa4c1eda6b53b163e901869d5f64ba442b30db1fe86c57fe56af MD5 436163172942ee1a0bcfb47534a71cce metadata.xml 330 RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe metadata.xml 330 diff --git a/net-misc/dhcp/dhcp-3.0.3-r9.ebuild b/net-misc/dhcp/dhcp-3.0.3-r9.ebuild index 43c383aeaf61..335e74df3072 100644 --- a/net-misc/dhcp/dhcp-3.0.3-r9.ebuild +++ b/net-misc/dhcp/dhcp-3.0.3-r9.ebuild @@ -1,6 +1,6 @@ # 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.3-r9.ebuild,v 1.1 2006/05/23 13:03:28 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.3-r9.ebuild,v 1.2 2006/06/09 19:12:32 uberlord Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -14,12 +14,10 @@ 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 ~x86 ~x86-fbsd" -IUSE="static selinux" +IUSE="doc minimal static selinux" -RDEPEND="selinux? ( sec-policy/selinux-dhcp ) - kernel_linux? ( sys-apps/net-tools )" DEPEND="selinux? ( sec-policy/selinux-dhcp ) - >=sys-apps/sed-4" + kernel_linux? ( sys-apps/net-tools )" PROVIDE="virtual/dhcpc" @@ -31,61 +29,60 @@ src_unpack() { # Gentoo patches - these will probably never be accepted upstream # Enable chroot support - epatch "${FILESDIR}/${PN}-3.0-paranoia.patch" + epatch "${FILESDIR}/${PN}"-3.0-paranoia.patch # Fix some permission issues - epatch "${FILESDIR}/${PN}-3.0-fix-perms.patch" + epatch "${FILESDIR}/${PN}"-3.0-fix-perms.patch # Enable dhclient to equery NTP servers - epatch "${FILESDIR}/${PN}-3.0.3-dhclient-ntp.patch" + epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-ntp.patch # resolvconf support in dhclient-script - epatch "${FILESDIR}/${PN}-3.0.3-dhclient-resolvconf.patch" + epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-resolvconf.patch # Fix setting hostnames on Linux - epatch "${FILESDIR}/${PN}-3.0.3-dhclient-hostname.patch" + epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-hostname.patch # Allow mtu settings - epatch "${FILESDIR}/${PN}-3.0.3-dhclient-mtu.patch" + 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" + 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" + epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-no-down.patch # Quiet the isc blurb - epatch "${FILESDIR}/${PN}-3.0.3-no_isc_blurb.patch" + epatch "${FILESDIR}/${PN}"-3.0.3-no_isc_blurb.patch # Enable dhclient to get extra configuration from stdin - epatch "${FILESDIR}/${PN}-3.0.3-dhclient-stdin-conf.patch" + epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-stdin-conf.patch # General fixes which will probably be accepted upstream eventually - # Fix token ring compiling, #102473 - epatch "${FILESDIR}/${P}-tr.patch" # Install libdst, #75544 - epatch "${FILESDIR}/${PN}-3.0.3-libdst.patch" + epatch "${FILESDIR}/${PN}"-3.0.3-libdst.patch # Fix building on Gentoo/FreeBSD - epatch "${FILESDIR}/${PN}-3.0.2-gmake.patch" + 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" + epatch "${FILESDIR}/${PN}"-3.0.3-x-option.patch # Add dbus support to dhclient - epatch "${FILESDIR}/${PN}-3.0.3-dhclient-dbus.patch" + 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 -e '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \ - includes/version.h + 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/* + client/scripts/* || die # Remove these options from the sample config - sed -i -e "/\(script\|host-name\|domain-name\) / d" client/dhclient.conf + 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}" + sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}" || die done # Only install different man pages if we don't have en @@ -103,9 +100,6 @@ src_unpack() { } src_compile() { - # 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org> - [[ ${ARCH} == "sparc" ]] && filter-flags -O3 -O2 -O - use static && append-ldflags -static cat <<-END >> includes/site.h @@ -140,39 +134,47 @@ src_compile() { ./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 server/dhcpd.conf dhcpd.conf.sample newins client/dhclient.conf dhclient.conf.sample - - dodoc README RELNOTES doc/* - newdoc client/dhclient.conf dhclient.conf.sample - newdoc client/scripts/linux dhclient-script.sample - newdoc 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 - 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() { - enewgroup dhcp - enewuser dhcp -1 -1 /var/lib/dhcp dhcp + 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 + 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" @@ -188,9 +190,15 @@ pkg_postinst() { } 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 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \ - /etc/conf.d/dhcpd + sed -n -e 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \ + "${ROOT}"/etc/conf.d/dhcpd )" if [[ -z ${CHROOT} ]]; then @@ -198,6 +206,8 @@ pkg_config() { return 1 fi + CHROOT="${ROOT}/${CHROOT}" + if [[ -d ${CHROOT} ]] ; then ewarn "${CHROOT} already exists - aborting" return 0 @@ -205,11 +215,12 @@ pkg_config() { 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" + 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 + eend 0 local logger="$(best_version virtual/logger)" einfo "To enable logging from the dhcpd server, configure your" |