diff options
| -rw-r--r-- | net-misc/dhcp/Manifest | 12 | ||||
| -rw-r--r-- | net-misc/dhcp/dhcp-3.0.4_rc1.ebuild | 213 | ||||
| -rw-r--r-- | net-misc/dhcp/files/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch | 83 | ||||
| -rw-r--r-- | net-misc/dhcp/files/digest-dhcp-3.0.4_rc1 | 3 |
4 files changed, 0 insertions, 311 deletions
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index cbc0b172e403..2df194c3a7d6 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -62,10 +62,6 @@ AUX dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e2 MD5 f47ef574359340021a78f5c2f67e4954 files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176 -AUX dhcp-3.0.4_beta2-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae SHA1 c10c35dcf4a94f45f4bc98147a70e9dcf3f01dd5 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f size 2176 -MD5 f47ef574359340021a78f5c2f67e4954 files/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch 2176 -RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae files/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch 2176 -SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f files/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch 2176 AUX dhcp.conf 792 RMD160 7c4ffbe4f47f4fad210c48eb4f92ee15cf651f72 SHA1 b1730b8bc57800e7201bb304be7b5af7d91374b4 SHA256 dad532fc00d98edce2da5c1fcce16db42a0084eefc6da00599a7fcfb8faac0f0 size 792 MD5 0ab9c8e1c34a43a23d47d9649cd3ddcf files/dhcp.conf 792 RMD160 7c4ffbe4f47f4fad210c48eb4f92ee15cf651f72 files/dhcp.conf 792 @@ -92,7 +88,6 @@ RMD160 da83794f49e52f072924386b2fd4511d07d985e6 files/dhcrelay.init 748 SHA256 0d16910b1197946165da7812acffecef8ee3b31cdf8f9a596ca6ecb19756fcee files/dhcrelay.init 748 DIST dhcp-3.0.3.tar.gz 870240 RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe size 870240 DIST dhcp-3.0.4.tar.gz 883245 RMD160 f5636d87e1e2138bd239157f54d8f73c73af73ac SHA256 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7 size 883245 -DIST dhcp-3.0.4rc1.tar.gz 882072 RMD160 1d8c4ee31aa74c84201e009aab2bfe2851c8f785 SHA256 e2fbdefa2dc15e398cc33e96ffaae4eafebd6596d2cda36fea6fcaed190df070 size 882072 EBUILD dhcp-3.0.3-r4.ebuild 4062 RMD160 310de76cfa0feff02e9620ed113e5c2647b3b8c8 SHA1 ac1c0205c709db260c22e6ee9782583b18749e83 SHA256 a2083988469dbf8795387c94da9cff44b8f2dadf89048b32f261954dae3a434a size 4062 MD5 b268712b328548de32d5db06619787a8 dhcp-3.0.3-r4.ebuild 4062 RMD160 310de76cfa0feff02e9620ed113e5c2647b3b8c8 dhcp-3.0.3-r4.ebuild 4062 @@ -105,10 +100,6 @@ EBUILD dhcp-3.0.4.ebuild 6616 RMD160 63a899b2dd7192cb0e83fe3cd52bee72b1924b54 SH MD5 33727e2d1130e15c2e32eb16470c5021 dhcp-3.0.4.ebuild 6616 RMD160 63a899b2dd7192cb0e83fe3cd52bee72b1924b54 dhcp-3.0.4.ebuild 6616 SHA256 0d2fca6cfe43bdea26714b14ee2d401292a669dbe11a45ea5f4c37e05248b717 dhcp-3.0.4.ebuild 6616 -EBUILD dhcp-3.0.4_rc1.ebuild 6626 RMD160 0a1700c273ff17b1312bae3412c8fb3697fa6412 SHA1 fb9e8bb24bbc9747610728060d1bdc382d0efd05 SHA256 258c1e5a481be70d2a93cac859c7831469928bc3163783d682d712763bc1ae1f size 6626 -MD5 c393d3630e94f87764e4658dcc56ae06 dhcp-3.0.4_rc1.ebuild 6626 -RMD160 0a1700c273ff17b1312bae3412c8fb3697fa6412 dhcp-3.0.4_rc1.ebuild 6626 -SHA256 258c1e5a481be70d2a93cac859c7831469928bc3163783d682d712763bc1ae1f dhcp-3.0.4_rc1.ebuild 6626 MISC ChangeLog 16801 RMD160 8e351e91bd3707830db6a53e5a227c82b6b2f08a SHA1 c36f1db3b4e84b1521447cfd3d0b273901c97e76 SHA256 d9071c0dbb52825451e4ed17add63efd202dee30cd4d71a5508ae2fe78fa90cd size 16801 MD5 a66f0fa5e4f28a9537a03dd144eda497 ChangeLog 16801 RMD160 8e351e91bd3707830db6a53e5a227c82b6b2f08a ChangeLog 16801 @@ -126,6 +117,3 @@ SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/di MD5 3ac42f4c7431bc78613c2e61b0a79075 files/digest-dhcp-3.0.4 232 RMD160 d5e0c33365d8dc2d37caf86a277a0dbfe0b98565 files/digest-dhcp-3.0.4 232 SHA256 fbea6a9170dda5da61af6c7c6f629d33b642ca3fbfa7f64537bd783e283be420 files/digest-dhcp-3.0.4 232 -MD5 d679d04bf6d53febbb1c4d9ed7bc9edb files/digest-dhcp-3.0.4_rc1 241 -RMD160 1420b88537a970e4343be00b49880c5cb1d6c580 files/digest-dhcp-3.0.4_rc1 241 -SHA256 3f94a39e2c49b5dd1c530fa50bbc5c010eec072332562c0df47b856bec2cc251 files/digest-dhcp-3.0.4_rc1 241 diff --git a/net-misc/dhcp/dhcp-3.0.4_rc1.ebuild b/net-misc/dhcp/dhcp-3.0.4_rc1.ebuild deleted file mode 100644 index 7d959cc797f0..000000000000 --- a/net-misc/dhcp/dhcp-3.0.4_rc1.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# 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.4_rc1.ebuild,v 1.1 2006/04/21 15:17:07 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 ~x86 ~x86-fbsd" -IUSE="static selinux" - -RDEPEND="selinux? ( sec-policy/selinux-dhcp ) - kernel_linux? ( sys-apps/net-tools )" -DEPEND="selinux? ( sec-policy/selinux-dhcp ) - >=sys-apps/sed-4" - -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_beta2-dhclient-stdin-conf.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 -e '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \ - includes/version.h - - # 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/* - - # Remove these options from the sample config - sed -i -e "/\(script\|host-name\|domain-name\) / d" client/dhclient.conf - - # 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}" - 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() { - # 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 - #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_DB "/var/lib/dhcp/dhclient.leases" - #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" - - emake || die "compile problem" -} - -src_install() { - make install DESTDIR="${D}" || die - - 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 -} - -pkg_preinst() { - enewgroup dhcp - enewuser dhcp -1 -1 /var/lib/dhcp dhcp -} - -pkg_postinst() { - 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() { - local CHROOT="$( - sed -n 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \ - /etc/conf.d/dhcpd - )" - - if [[ -z ${CHROOT} ]]; then - eerror "CHROOT not defined in /etc/conf.d/dhcpd" - return 1 - fi - - 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" - chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp - eend - - 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/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch deleted file mode 100644 index 3fedc7c0e80b..000000000000 --- a/net-misc/dhcp/files/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- common/conflex.c.orig 2006-02-21 16:21:45.000000000 +0000 -+++ common/conflex.c 2006-02-21 16:23:06.000000000 +0000 -@@ -90,7 +90,7 @@ - struct parse **cfile; - { - /* "Memory" config files have no file. */ -- if ((*cfile)->file != -1) -+ if ((*cfile)->file != -1 && (*cfile)->file != fileno(stdin)) - close((*cfile)->file); - - if ((*cfile)->bufsiz) ---- client/clparse.c.orig 2006-02-22 09:37:12.000000000 +0000 -+++ client/clparse.c 2006-02-22 09:38:26.000000000 +0000 -@@ -97,6 +97,11 @@ - status = read_client_conf_file (path_dhclient_conf, - (struct interface_info *)0, - &top_level_config); -+ -+ /* Read any extra configuration from stdin */ -+ read_client_conf_stdin ((struct interface_info *)0, -+ &top_level_config); -+ - if (status != ISC_R_SUCCESS) { - ; - #ifdef LATER -@@ -148,20 +153,17 @@ - return status; - } - --int read_client_conf_file (const char *name, struct interface_info *ip, -- struct client_config *client) -+int read_client_conf_actual (int file, const char *name, -+ struct interface_info *ip, -+ struct client_config *client) - { -- int file; - struct parse *cfile; - const char *val; - int token; - isc_result_t status; - -- if ((file = open (name, O_RDONLY)) < 0) -- return uerr2isc (errno); -- - cfile = (struct parse *)0; -- new_parse (&cfile, file, (char *)0, 0, path_dhclient_conf, 0); -+ new_parse (&cfile, file, (char *)0, 0, name , 0); - - do { - token = peek_token (&val, (unsigned *)0, cfile); -@@ -177,6 +179,32 @@ - return status; - } - -+int read_client_conf_file (const char *name, struct interface_info *ip, -+ struct client_config *client) -+{ -+ int file; -+ isc_result_t status; -+ -+ if ((file = open (name, O_RDONLY)) < 0) -+ return uerr2isc (errno); -+ -+ status = read_client_conf_actual(file, name, ip, client); -+ -+ return status; -+} -+ -+ -+int read_client_conf_stdin (struct interface_info *ip, -+ struct client_config *client) -+{ -+ int file = fileno(stdin); -+ isc_result_t status; -+ -+ if (isatty(file)) return ISC_R_NOTFOUND; -+ status = read_client_conf_actual(file, "stdin", ip, client); -+ -+ return status; -+} - - /* lease-file :== client-lease-statements END_OF_FILE - client-lease-statements :== <nil> diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.4_rc1 b/net-misc/dhcp/files/digest-dhcp-3.0.4_rc1 deleted file mode 100644 index adfc694531b1..000000000000 --- a/net-misc/dhcp/files/digest-dhcp-3.0.4_rc1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c9fc24218f3d16d59c4e1bc5f42ea3b7 dhcp-3.0.4rc1.tar.gz 882072 -RMD160 1d8c4ee31aa74c84201e009aab2bfe2851c8f785 dhcp-3.0.4rc1.tar.gz 882072 -SHA256 e2fbdefa2dc15e398cc33e96ffaae4eafebd6596d2cda36fea6fcaed190df070 dhcp-3.0.4rc1.tar.gz 882072 |