diff options
author | Andrew Savchenko <bircoph@gmail.com> | 2011-04-08 03:18:24 +0400 |
---|---|---|
committer | Andrew Savchenko <bircoph@gmail.com> | 2011-04-08 03:18:24 +0400 |
commit | 2a8245a67f5c460e57d6a00563d5b6dee85e1f09 (patch) | |
tree | aca6e81d75d24068a4bebd6259eb15b747d92120 /net-misc | |
parent | lvm2: fix build with USE=static (diff) | |
download | bircoph-2a8245a67f5c460e57d6a00563d5b6dee85e1f09.tar.gz bircoph-2a8245a67f5c460e57d6a00563d5b6dee85e1f09.tar.bz2 bircoph-2a8245a67f5c460e57d6a00563d5b6dee85e1f09.zip |
dhcp: fix chrooted version
This fix init script and chroot generation functions.
See bug #362535 for details.
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/dhcp/ChangeLog | 800 | ||||
-rw-r--r-- | net-misc/dhcp/Manifest | 16 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.1-r1.ebuild | 225 | ||||
-rw-r--r-- | net-misc/dhcp/files/dhcp-3.0-fix-perms.patch | 15 | ||||
-rw-r--r-- | net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch | 84 | ||||
-rw-r--r-- | net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch | 70 | ||||
-rw-r--r-- | net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch | 216 | ||||
-rw-r--r-- | net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch | 114 | ||||
-rw-r--r-- | net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch | 31 | ||||
-rw-r--r-- | net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch | 384 | ||||
-rw-r--r-- | net-misc/dhcp/files/dhcp-4.2.1-nogateway.patch | 46 | ||||
-rw-r--r-- | net-misc/dhcp/files/dhcpd.conf | 29 | ||||
-rwxr-xr-x | net-misc/dhcp/files/dhcpd.itit4 | 100 | ||||
-rw-r--r-- | net-misc/dhcp/files/dhcrelay.conf | 13 | ||||
-rwxr-xr-x | net-misc/dhcp/files/dhcrelay.init2 | 29 | ||||
-rw-r--r-- | net-misc/dhcp/metadata.xml | 11 |
16 files changed, 2183 insertions, 0 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog new file mode 100644 index 0000000..f6cb3de --- /dev/null +++ b/net-misc/dhcp/ChangeLog @@ -0,0 +1,800 @@ +# ChangeLog for net-misc/dhcp +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.174 2011/04/01 16:56:52 jer Exp $ + + 01 Apr 2011; Jeroen Roovers <jer@gentoo.org> dhcp-3.1.3_p1.ebuild: + Stable for HPPA (bug #360047). + + 27 Mar 2011; Tobias Klausmann <klausman@gentoo.org> dhcp-3.1.3_p1.ebuild: + Stable on alpha, bug #360047 + + 25 Mar 2011; Brent Baude <ranger@gentoo.org> dhcp-3.1.3_p1.ebuild: + Marking dhcp-3.1.3_p1 ppc for bug 360047 + + 23 Mar 2011; Christoph Mende <angelos@gentoo.org> dhcp-3.1.3_p1.ebuild: + Stable on amd64 wrt bug #360047 + +*dhcp-4.2.1-r1 (23 Mar 2011) + + 23 Mar 2011; Mike Frysinger <vapier@gentoo.org> +dhcp-4.2.1-r1.ebuild, + metadata.xml: + Add USE=client/server flags. + + 08 Mar 2011; Mike Frysinger <vapier@gentoo.org> files/dhcrelay.init2: + Fix typo in dhcrelay init script #357935 by Milan Dadok. + +*dhcp-4.2.1 (05 Mar 2011) + + 05 Mar 2011; Mike Frysinger <vapier@gentoo.org> + +files/dhcp-4.2.0-errwarn-message.patch, +dhcp-4.2.1.ebuild, + +files/dhcp-4.2.1-dhclient-resolvconf.patch, + +files/dhcp-4.2.1-nogateway.patch, +files/dhcpd.init3, + +files/dhcrelay.init2: + Version bump #309133 by Milan Dadok, #325605 by Stefan Behte, and #352897 + by Paweł Hajdan, Jr. Add ldap support #160979 by Nico. Allow dhcp init.d + script to be multiplexed #238277 by Roy Marples. Respect nogateway option + by Laszlo Valko #265531 by Dmitry. Fix up chroot config checking by Lance + Albertson #278335 by Arthur Hagen. Include full DHCPD_OPTS when checking + the config #283352 by Marc. Update path to dhcrelay.pid #309129 by Milan + Dadok. + +*dhcp-3.1.3_p1 (15 Oct 2010) + + 15 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> +dhcp-3.1.3_p1.ebuild: + Upstream final 3.1 release: 3.1-ESV. In Gentoo as 3.1.3_p1 since we need + it to come after 3.1.3. + +*dhcp-3.1.3 (15 Oct 2010) + + 15 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> +dhcp-3.1.3.ebuild, + +files/dhcp-3.1.3-dhclient-no-down.patch: + Bug #324671: Add dhcpd-3.1.3 + + 15 Jan 2010; Ulrich Mueller <ulm@gentoo.org> dhcp-3.1.1.ebuild, + dhcp-3.1.1-r1.ebuild, dhcp-3.1.2.ebuild, dhcp-3.1.2_p1.ebuild, + dhcp-4.0.1.ebuild, dhcp-4.1.0.ebuild: + Fix LICENSE, bug 301123. + + 26 Jul 2009; Brent Baude <ranger@gentoo.org> dhcp-3.1.2_p1.ebuild: + Marking dhcp-3.1.2_p1 ppc64 for bug 275231 + + 22 Jul 2009; Raúl Porcel <armin76@gentoo.org> dhcp-3.1.2_p1.ebuild: + arm/s390/sh/sparc stable wrt #275231 + + 19 Jul 2009; nixnut <nixnut@gentoo.org> dhcp-3.1.2_p1.ebuild: + ppc stable #275231 + + 19 Jul 2009; Tobias Klausmann <klausman@gentoo.org> dhcp-3.1.2_p1.ebuild: + Stable on alpha, bug #275231 + + 17 Jul 2009; Jeroen Roovers <jer@gentoo.org> dhcp-3.1.2_p1.ebuild: + Stable for HPPA (bug #275231). + + 16 Jul 2009; Christian Faulhammer <fauli@gentoo.org> dhcp-3.1.2_p1.ebuild: + stable x86, security bug 275231 + + 16 Jul 2009; <chainsaw@gentoo.org> dhcp-3.1.2_p1.ebuild: + Marked stable on AMD64 for security bug #275231; tested on a dual + dual-core Opteron 2220 system with ~15 clients spread over two subnets. + +*dhcp-3.1.2_p1 (14 Jul 2009) + + 14 Jul 2009; Robert Buchholz <rbu@gentoo.org> + +files/dhcp-3.1.2_p1-CVE-2009-1892.patch, +dhcp-3.1.2_p1.ebuild: + Add new upstream version with the official fix for CVE-2009-0692, fix + DoS issue in dhcpd (CVE-2009-1892), bug #275231. + +*dhcp-3.1.1-r1 (14 Jul 2009) + + 14 Jul 2009; <chainsaw@gentoo.org> +dhcp-3.1.1-r1.ebuild, + +files/dhcp-3.1.1-CVE-2009-0692.patch: + Version bump for CVE-2009-0692 (dhclient stack-based buffer overflow); + security bug #277729. Stable keywords approved by arch liaisons. + +*dhcp-4.1.0 (09 Jul 2009) +*dhcp-3.1.2 (09 Jul 2009) + + 09 Jul 2009; <chainsaw@gentoo.org> +dhcp-3.1.2.ebuild, +dhcp-4.1.0.ebuild, + +files/dhcp-4.1-dhclient-metric.patch, +files/dhcp-4.1-no_isc_blurb.patch, + +files/dhcpd.init2: + Version bump to 3.1.2 & 4.1.0 upstream releases, as requested in bug + #264809. Create /var/lib/dhclient as per bug #222261. Recursive chown to + dhcp:dhcp closes bug #236671. Test config in init-script, apache-style by + Arturas from Lithuania in bug #259364. Paranoia/chroot support now + upstream in 4.1, dropped patch. + + 29 May 2009; Mike Frysinger <vapier@gentoo.org> -dhcp-3.0.3-r9.ebuild, + -dhcp-3.0.6.ebuild, -dhcp-3.1.0.ebuild: + Punt old packages vuln to GLSA 200808-05 #271748. + +*dhcp-4.0.1 (30 Mar 2009) + + 30 Mar 2009; <chainsaw@gentoo.org> + +files/dhcp-4.0.1-dhclient-stdin-conf.patch, -dhcp-4.0.0.ebuild, + +dhcp-4.0.1.ebuild: + Version bump to 4.0.1, stdin config support for dhclient has been rediffed + due to upstream changes. Still masked, deleting old ebuild. + + 26 Oct 2008; Mike Frysinger <vapier@gentoo.org> dhcp-4.0.0.ebuild: + Pull in app-vim/dhcpd-syntax with USE=vim-syntax #240192 by Dan Wallis. + +*dhcp-4.0.0 (04 Sep 2008) + + 04 Sep 2008; <chainsaw@gentoo.org> +files/dhcp-4.0-dhclient-metric.patch, + +files/dhcp-4.0-dhclient-ntp.patch, + +files/dhcp-4.0-dhclient-resolvconf.patch, + +files/dhcp-4.0-dhclient-script-correct-operators.patch, + +files/dhcp-4.0-dhclient-stdin-conf.patch, + +files/dhcp-4.0-linux-ipv6-header.patch, + +files/dhcp-4.0-no_isc_blurb.patch, +files/dhcp-4.0-paranoia.patch, + +dhcp-4.0.0.ebuild: + Version bump, closes bug #205214. Thanks to Roy "UberLord" Marples + <roy@marples.name> for patching and patch porting. + + 29 Jun 2008; Tobias Klausmann <klausman@gentoo.org> dhcp-3.1.1.ebuild: + Stable on alpha, bug #227135 + + 29 Jun 2008; Friedrich Oslage <bluebird@gentoo.org> dhcp-3.1.1.ebuild: + Stable on sparc, bug #227135 + + 28 Jun 2008; Jeroen Roovers <jer@gentoo.org> dhcp-3.1.1.ebuild: + Stable for HPPA (bug #227135). + + 28 Jun 2008; Markus Meier <maekke@gentoo.org> dhcp-3.1.1.ebuild: + x86 stable, bug #227135 + + 27 Jun 2008; Brent Baude <ranger@gentoo.org> dhcp-3.1.1.ebuild: + Marking dhcp-3.1.1 ppc for bug 227135 + + 27 Jun 2008; Brent Baude <ranger@gentoo.org> dhcp-3.1.1.ebuild: + Marking dhcp-3.1.1 ppc64 for bug 227135 + + 27 Jun 2008; <chainsaw@gentoo.org> dhcp-3.1.1.ebuild: + Mark stable on AMD64 for security bug #227135. Tested on Core2 Duo & + Opteron 2218. + +*dhcp-3.1.1 (27 Jun 2008) + + 27 Jun 2008; <chainsaw@gentoo.org> +dhcp-3.1.1.ebuild: + Version bump for bug #227135. + + 29 Mar 2008; Mike Frysinger <vapier@gentoo.org> + files/dhcp-3.0.3-dhclient-ntp.patch, + files/dhcp-3.0.3-dhclient-resolvconf.patch, + files/dhcp-3.1.0a1-dhclient-resolvconf.patch: + Convert `echo -e` to `printf` #208558 by Davide Pesavento. + + 25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml: + Removing uberlord from metadata.xml as per #199318. + + 01 Oct 2007; Raúl Porcel <armin76@gentoo.org> dhcp-3.0.6.ebuild, + dhcp-3.1.0.ebuild: + sparc stable wrt #190775 + + 09 Sep 2007; Roy Marples <uberlord@gentoo.org> dhcp-3.1.0.ebuild: + Stop installing a blank dhcpd.leases file, #191748 thanks to Kevin Pyle. + + 08 Sep 2007; Joseph Jezak <josejx@gentoo.org> dhcp-3.0.6.ebuild, + dhcp-3.1.0.ebuild: + Marked ppc/ppc64 stable for bug #190775. + + 06 Sep 2007; Roy Marples <uberlord@gentoo.org> + -files/dhcp-3.1.0a1-x-option.patch, dhcp-3.1.0.ebuild: + Drop the extended option patch for 3.1.0 as we stopped using it. + + 02 Sep 2007; Joshua Kinard <kumba@gentoo.org> dhcp-3.0.6.ebuild, + dhcp-3.1.0.ebuild: + Stable on mips, per 190775. + + 02 Sep 2007; Christoph Mende <angelos@gentoo.org> dhcp-3.0.6.ebuild, + dhcp-3.1.0.ebuild: + Stable on amd64 wrt bug #190775 + + 02 Sep 2007; Raúl Porcel <armin76@gentoo.org> dhcp-3.0.6.ebuild, + dhcp-3.1.0.ebuild: + alpha stable wrt #190775, thanks to Tobias Klausmann for testing + + 30 Aug 2007; Jurek Bartuszek <jurek@gentoo.org> dhcp-3.0.6.ebuild, + dhcp-3.1.0.ebuild: + x86 stable (bug #190775) + + 30 Aug 2007; Jeroen Roovers <jer@gentoo.org> dhcp-3.0.6.ebuild, + dhcp-3.1.0.ebuild: + Stable for HPPA (bug #190775). + +*dhcp-3.1.0 (20 Jul 2007) + + 20 Jul 2007; Roy Marples <uberlord@gentoo.org> +dhcp-3.1.0.ebuild: + Bumpage. + +*dhcp-3.1.0_rc2 (19 Jul 2007) + + 19 Jul 2007; Roy Marples <uberlord@gentoo.org> +dhcp-3.1.0_rc2.ebuild: + New upstream rc. May not work with NetworkManager as dhclient now has it's + own -x option which conflicts with one of the patches. + + 19 Jul 2007; Roy Marples <uberlord@gentoo.org> + +files/dhcp-3.0-ddns-example.patch, dhcp-3.0.3-r9.ebuild, + dhcp-3.0.6.ebuild: + Add 'ddns-update-style ad-hoc;' to the example dhcpd.conf file, #170311 + thanks to Whit Blauvelt. + +*dhcp-3.0.6 (05 Jul 2007) + + 05 Jul 2007; Roy Marples <uberlord@gentoo.org> +dhcp-3.0.6.ebuild: + Bump + +*dhcp-3.1.0_alpha3 (26 Apr 2007) + + 26 Apr 2007; Roy Marples <uberlord@gentoo.org> +dhcp-3.1.0_alpha3.ebuild: + Bump, #176137 thanks to Attila Jecs. + + 22 Apr 2007; Roy Marples <uberlord@gentoo.org> dhcp-3.0.3-r9.ebuild, + dhcp-3.0.5.ebuild, dhcp-3.0.5-r1.ebuild, dhcp-3.1.0_alpha2.ebuild: + newins -> newconfd, #174266. + + 22 Mar 2007; Roy Marples <uberlord@gentoo.org> files/dhcrelay.init: + Remove bashisms from dhcrelay script, #171766 thanks to Natanael Copa. + +*dhcp-3.0.5-r1 (10 Mar 2007) + + 10 Mar 2007; Roy Marples <uberlord@gentoo.org> files/dhcpd.init, + +dhcp-3.0.5-r1.ebuild: + Bump for a non bash init script for dhcpd, #170084 thanks to Natanael Copa. + + 20 Dec 2006; Roy Marples <uberlord@gentoo.org> dhcp-3.0.5.ebuild, + dhcp-3.1.0_alpha2.ebuild: + Stop dhclient-script forcing bash, #158540 thanks to Nick Fortune. + +*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) + + 06 Nov 2006; Roy Marples <uberlord@gentoo.org> +dhcp-3.0.5.ebuild: + New upstream version. + + 17 Oct 2006; Roy Marples <uberlord@gentoo.org> dhcp-3.0.5_rc2.ebuild, + dhcp-3.1.0_alpha1.ebuild: + Added ~sparc-fbsd keyword. + + 20 Sep 2006; Roy Marples <uberlord@gentoo.org> + +files/dhcp-3.0.5-bpf-nofallback.patch, dhcp-3.0.5_rc2.ebuild, + dhcp-3.1.0_alpha1.ebuild: + Add a patch to stop using a fallback interface when using BPF. + This allows >1 instance of dhclient to run on BSD. + + 13 Sep 2006; Roy Marples <uberlord@gentoo.org> dhcp-3.0.4-r2.ebuild, + dhcp-3.0.5_rc2.ebuild, dhcp-3.1.0_alpha1.ebuild: + Quiet the freebsd logger a little + + 08 Sep 2006; Roy Marples <uberlord@gentoo.org> files/dhcrelay.conf: + dhcrelay should be configured for all interfaces used for listening and + sending, not just listening. Thanks to rmh3093 in the forums. + +*dhcp-3.1.0_alpha1 (07 Sep 2006) + + 07 Sep 2006; Roy Marples <uberlord@gentoo.org> + +files/dhcp-3.1.0a1-dhclient-resolvconf.patch, + +files/dhcp-3.1.0a1-x-option.patch, +dhcp-3.1.0_alpha1.ebuild: + New alpha version. Has FQDN support, wooooo. + + 06 Sep 2006; Roy Marples <uberlord@gentoo.org> dhcp-3.0.5_rc2.ebuild: + Just warn about Packet Socket instead of requiring linux sources + + 05 Sep 2006; Roy Marples <uberlord@gentoo.org> dhcp-3.0.5_rc2.ebuild: + dhcp requires CONFIG_PACKET to work in linux. + +*dhcp-3.0.5_rc2 (03 Sep 2006) + + 03 Sep 2006; Roy Marples <uberlord@gentoo.org> + +dhcp-3.0.5_rc2.ebuild: + Version bump. + + 11 Aug 2006; Thomas Cort <tcort@gentoo.org> dhcp-3.0.3-r9.ebuild: + Stable on alpha wrt Bug #137689. + +*dhcp-3.0.5_beta1 (27 Jul 2006) + + 27 Jul 2006; Roy Marples <uberlord@gentoo.org> + files/dhcp-3.0.3-dhclient-hostname.patch, +dhcp-3.0.5_beta1.ebuild: + Version bump and fix hostname patch slightly. + + 09 Jul 2006; Joshua Kinard <kumba@gentoo.org> dhcp-3.0.3-r9.ebuild: + Marked stable on mips. + + 02 Jul 2006; Chris White <chriswhite@gentoo.org> metadata.xml: + Japanese metadata.xml translation. Thanks to Yoshino-san in bug #134840. + +*dhcp-3.0.4-r2 (28 Jun 2006) + + 28 Jun 2006; Roy Marples <uberlord@gentoo.org> + +files/dhcp-3.0.4-64bit.patch, +dhcp-3.0.4-r2.ebuild: + Added patch to fix 64 bit DHCP servers, #133905. + + 25 Jun 2006; Marcus D. Hanwell <cryos@gentoo.org> dhcp-3.0.3-r9.ebuild: + Marked stable on amd64. bug 137689. + + 25 Jun 2006; Guy Martin <gmsoft@gentoo.org> dhcp-3.0.3-r9.ebuild: + Stable on hppa. + + 25 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org> + dhcp-3.0.3-r9.ebuild: + ppc stable, bug #137689 + + 23 Jun 2006; Markus Rothe <corsair@gentoo.org> dhcp-3.0.3-r9.ebuild: + Stable on ppc64; bug #137689 + + 23 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> dhcp-3.0.3-r9.ebuild: + Stable on x86 wrt bug #137689. + + 23 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> dhcp-3.0.3-r9.ebuild: + Stable on sparc wrt #137689 + + 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 + +*dhcp-3.0.3-r9 (23 May 2006) + + 23 May 2006; Roy Marples <uberlord@gentoo.org> + files/dhcp-3.0.3-dhclient-resolvconf.patch, +dhcp-3.0.3-r9.ebuild: + dhclient-script now works with invalid, RFC violating but sometimes used + space seperated domain names, #134101 thanks to Jan Spitalnik. + +*dhcp-3.0.3-r8 (23 May 2006) + + 23 May 2006; Roy Marples <uberlord@gentoo.org> +dhcp-3.0.3-r8.ebuild: + As 3.0.4 is a bust for 64-bit servers, push fixes downto 3.0.3-r8. + +*dhcp-3.0.4-r1 (11 May 2006) + + 11 May 2006; Roy Marples <uberlord@gentoo.org> files/dhcpd.conf, + files/dhcpd.init, +dhcp-3.0.4-r1.ebuild: + Fixed typo in conf.d/dhcpd and fixed chroot pidfile, #133019 thanks to Hod. + + 10 May 2006; Roy Marples <uberlord@gentoo.org> + files/dhcp-3.0.3-dhclient-metric.patch, + files/dhcp-3.0.3-dhclient-no-down.patch: + Tweak patches so that IF_METRIC is applied to the subnet route too. + + 09 May 2006; Roy Marples <uberlord@gentoo.org> dhcp-3.0.4.ebuild: + Correct location for default dhclient conf and pid files. + +*dhcp-3.0.4 (05 May 2006) + + 05 May 2006; Roy Marples <uberlord@gentoo.org> + +files/dhcp-3.0.4-dhclient-stdin-conf.patch, +dhcp-3.0.4.ebuild: + New upstream release. + +*dhcp-3.0.4_rc1 (21 Apr 2006) +*dhcp-3.0.3-r7 (21 Apr 2006) + + 21 Apr 2006; Roy Marples <uberlord@gentoo.org> + +files/dhcp-3.0.3-dhclient-dbus.patch, +files/dhcp-3.0.3-x-option.patch, + +dhcp-3.0.3-r7.ebuild, +dhcp-3.0.4_rc1.ebuild: + New patches for dbus and eXtended option environment support + which should allow us to be used by NetworkManager. + + 20 Apr 2006; Roy Marples <uberlord@gentoo.org> + files/dhcp-3.0.3-dhclient-hostname.patch, + files/dhcp-3.0.3-dhclient-metric.patch, + files/dhcp-3.0.3-dhclient-mtu.patch, + +files/dhcp-3.0.3-dhclient-no-down.patch, dhcp-3.0.3-r6.ebuild, + dhcp-3.0.4_beta3-r1.ebuild: + metric patch now applies to ifconfig on all OS's apart from Linux. + Split no down interface into seperate patch. + Make SEDMANPAGES instead of CATMANPAGES, #130251. + + 14 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> dhcp-3.0.3-r6.ebuild, + dhcp-3.0.4_beta3-r1.ebuild: + Confirm man installation names and category, so that the installed copies on + non-Linux are the same as the ones on Linux. + + 31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> dhcp-3.0.3-r6.ebuild: + Add ~x86-fbsd keyword. + + 22 Mar 2006; Roy Marples <uberlord@gentoo.org> + files/dhcp-3.0.3-dhclient-hostname.patch, + files/dhcp-3.0.3-dhclient-metric.patch, + files/dhcp-3.0.3-dhclient-mtu.patch, files/dhcp-3.0.3-dhclient-ntp.patch, + files/dhcp-3.0.3-dhclient-resolvconf.patch, dhcp-3.0.3-r6.ebuild, + dhcp-3.0.4_beta3-r1.ebuild: + Tweaked patchset to apply cleanly. + Support PEER_DNS and PEER_NTP options. + + 21 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> dhcp-3.0.3-r6.ebuild, + dhcp-3.0.4_beta3-r1.ebuild: + Make net-tools a dependency only for linux kernel. + + 21 Mar 2006; Roy Marples <uberlord@gentoo.org> + +files/dhcp-3.0.3-dhclient-hostname.patch, + files/dhcp-3.0.3-dhclient-metric.patch, + +files/dhcp-3.0.3-dhclient-mtu.patch, dhcp-3.0.3-r6.ebuild, + dhcp-3.0.4_beta3-r1.ebuild: + Added token ring patch back to 3.0.3-r6, #126971 + Fixed setting hostname on Linux kernels where it reports (none). + dhclient-script now supports interface mtu option. + +*dhcp-3.0.4_beta3-r1 (20 Mar 2006) +*dhcp-3.0.3-r6 (20 Mar 2006) + + 20 Mar 2006; Roy Marples <uberlord@gentoo.org> + +files/dhcp-3.0.3-dhclient-metric.patch, + files/dhcp-3.0.3-dhclient-ntp.patch, + +files/dhcp-3.0.3-dhclient-resolvconf.patch, +dhcp-3.0.3-r6.ebuild, + +dhcp-3.0.4_beta3-r1.ebuild: + dhclient-script now supports resolvconf, creates ntp.conf files and uses the + env variable IF_METRIC to set a metric on default routes. + +*dhcp-3.0.4_beta3 (28 Feb 2006) + + 28 Feb 2006; Roy Marples <uberlord@gentoo.org> +files/dhcpd.conf, + +files/dhcpd.init, +dhcp-3.0.4_beta3.ebuild: + Version bump. + 3.0.4_beta3 has had the init script and config renamed to dhcpd. + The config file has also changed slightly and the new init script can now be + fully multiplexed as a result. + You *have* to remove the old dhcp init script. + +*dhcp-3.0.4_beta2-r2 (24 Feb 2006) +*dhcp-3.0.3-r5 (24 Feb 2006) + + 24 Feb 2006; Roy Marples <uberlord@gentoo.org> + +files/dhcp-3.0.3-dhclient-stdin-conf.patch, + +files/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch, +dhcp-3.0.3-r5.ebuild, + +dhcp-3.0.4_beta2-r2.ebuild: + Added a patch to dhclient so it can read extra config from stdin. + Users won't use this, but baselayout-1.12.0_pre17 will. + +*dhcp-3.0.3-r4 (23 Feb 2006) + + 23 Feb 2006; Roy Marples <uberlord@gentoo.org> files/dhcp.init, + +dhcp-3.0.3-r4.ebuild: + Bump for a new init script that fixes non chroots, #123813. + +*dhcp-3.0.3-r3 (23 Feb 2006) + + 23 Feb 2006; Roy Marples <uberlord@gentoo.org> files/dhcp.init, + +dhcp-3.0.3-r3.ebuild: + Bump for new init script which fixes CHROOT handling, #122805. + + 18 Feb 2006; Simon Stelling <blubb@gentoo.org> ChangeLog: + stable on amd64 + + 17 Feb 2006; Markus Rothe <corsair@gentoo.org> dhcp-3.0.3-r2.ebuild: + Stable on ppc64; bug #89424 + + 17 Feb 2006; Joseph Jezak <josejx@gentoo.org> dhcp-3.0.3-r2.ebuild: + Marked ppc stable for bug #89424. + + 09 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org> dhcp-3.0.3-r2.ebuild: + Stable on sparc wrt #89424 + + 09 Feb 2006; Joshua Kinard <kumba@gentoo.org> dhcp-3.0.3-r2.ebuild: + Marked stable on mips. + + 08 Feb 2006; Mark Loeser <halcy0n@gentoo.org> dhcp-3.0.3-r2.ebuild: + Stable on x86; bug #89424 + + 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> dhcp-3.0.3-r2.ebuild: + Mark 3.0.3-r2 stable on alpha + + 28 Dec 2005; Guy Martin <gmsoft@gentoo.org> dhcp-3.0.3-r2.ebuild: + No more unaligned access on hppa. Marking stable. + + 22 Dec 2005; Roy Marples <uberlord@gentoo.org> dhcp-3.0.4_beta2-r1.ebuild: + Remove script, host-name and domain-name options from the sample dhclient.conf + + 21 Dec 2005; Roy Marples <uberlord@gentoo.org> dhcp-3.0.1-r1.ebuild, + dhcp-3.0.3-r2.ebuild, dhcp-3.0.4_beta2-r1.ebuild: + Updated post merge message to use emerge --config, #109482. + +*dhcp-3.0.4_beta2-r1 (14 Dec 2005) +*dhcp-3.0.3-r2 (14 Dec 2005) + + 14 Dec 2005; Roy Marples <uberlord@gentoo.org> files/dhcp.init, + -dhcp-3.0.3-r1.ebuild, +dhcp-3.0.3-r2.ebuild, -dhcp-3.0.4_beta2.ebuild, + +dhcp-3.0.4_beta2-r1.ebuild: + Fixed correct owner of lease file, #115554 thanks to Jan Spitalnik. + +*dhcp-3.0.4_beta2 (09 Dec 2005) + + 09 Dec 2005; Roy Marples <uberlord@gentoo.org> + +files/dhcp-3.0.3-no_isc_blurb.patch, +dhcp-3.0.4_beta2.ebuild: + New upstream beta release, fixes #101891. + Dropped token ring patch as a better fix has been made upstream. + Added patch to quiet the isc blurb if the -q option is given. + (patch nobbled from RedHat and adapted by me for dhclient and dhcrelay) + Install Japanese documentation if ja is in LINGUAS and en isn't. + Tart up the installed dhclient-script to add a comment saying + that they aren't used when using Gentoo baselayout net scripts. + Branded the binaries with Gentoo revision. + + 09 Dec 2005; Roy Marples <uberlord@gentoo.org> dhcp-3.0.3-r1.ebuild: + multilib fixed. + + 07 Dec 2005; Roy Marples <uberlord@gentoo.org> dhcp-3.0.3-r1.ebuild: + Fixed sandbox violation, #114753. + +*dhcp-3.0.3-r1 (07 Dec 2005) + + 07 Dec 2005; Roy Marples <uberlord@gentoo.org> + +files/dhcp-3.0.3-libdst.patch, +files/dhcp-3.0-fix-perms.patch, + +files/dhcp-3.0-paranoia.patch, files/dhcp.conf, +files/dhcp.init, + files/dhcrelay.conf, +files/dhcrelay.init, metadata.xml, + -dhcp-3.0.2.ebuild, -dhcp-3.0.3.ebuild, +dhcp-3.0.3-r1.ebuild: + Split patches out into FILESDIR. + Stop installing dhclient-script.sample as baselayout has its own. + chroot creation no longer assumes a default directory. + We copy resolv.conf and localtime as a real files into the chroot now. + document resolv.conf in conf.d/dhcp for chroots, #113869. + init script now parses dhcpd.conf for pidfile and leasefile locations, #89428. + libdst.a gets installed now, #75544 thanks to Ron O'Hara. + + 04 Dec 2005; Tom Gall <tgall@gentoo.org> dhcp-3.0.1-r1.ebuild: + stable on ppc64 + +*dhcp-3.0.3 (12 Oct 2005) + + 12 Oct 2005; Roy Marples <uberlord@gentoo.org> +files/dhcp-3.0.3-tr.patch, + +files/dhclient-ntp.patch, +dhcp-3.0.3.ebuild: + Version bump + Includes fixes for #102473 (tr.c not compiling, patch by Ed Catmur) + and dhclient ntp support #63868 + + 15 Sep 2005; Aron Griffis <agriffis@gentoo.org> dhcp-3.0.1-r1.ebuild: + Mark 3.0.1-r1 stable on alpha + + 04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/dhcp-3.0.2-gmake.patch, dhcp-3.0.2.ebuild: + Added patch to fix wrong 'make' calls on Gentoo/FreeBSD. + + 04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> dhcp-3.0.2.ebuild: + Remove -Werror cflag that is passed when building on FreeBSD to fix + Gentoo/FreeBSD. + + 17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> dhcp-3.0.1-r1.ebuild: + Stable on ppc. + + 20 May 2005; Rene Nussbaumer <killerfox@gentoo.org> dhcp-3.0.1-r1.ebuild: + Stable on hppa + + 19 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> dhcp-3.0.1-r1.ebuild: + Stable on sparc + + 17 May 2005; Jan Brinkmann <luckyduck@gentoo.org> dhcp-3.0.1-r1.ebuild: + stable on amd64 + +*dhcp-3.0.2 (16 May 2005) + + 16 May 2005; Seemant Kulleen <seemant@gentoo.org> + -files/dhcp-3.0.1-fix-invalid-attribute.patch, + -files/dhcp-3.0+paranoia.patch, -files/dhcp-3.0pl2-fix-perms.patch, + dhcp-3.0.1.ebuild, dhcp-3.0.1-r1.ebuild, +dhcp-3.0.2.ebuild: + Version bump thanks to: Bjarke Istrup Pedersen <Bjarke.ip@tekpunkt.dk> in + bug #88630. Additionally, moved the patches to a tarball on the mirrors. + Configs will probably follow + + 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 20 Dec 2004; <max@gentoo.org> files/dhcrelay.conf, files/dhcrelay.rc6: + Fix dhcrelay startup script for proper commandline arguments and proper + shutdown pidfile. Fixes bug #48207. + +*dhcp-3.0.1-r1 (20 Dec 2004) + + 20 Dec 2004; <max@gentoo.org> -files/conf.dhcpd, files/dhcp.conf, + files/dhcp.rc6, +dhcp-3.0.1-r1.ebuild: + Removed unused conf.dhcpd file. Move the -q option out of rc6 script into + conf.d file for easier debugging. Add localtime to the chroot setup. Add + commented LD_PRELOAD variable for proper name resoluting inside chroot. Fixes + bug #41217. + + 10 Nov 2004; Travis Tilley <lv@gentoo.org> + +files/dhcp-3.0.1-fix-invalid-attribute.patch, dhcp-3.0.1.ebuild: + fixed some invalid attributes in includes/dhcpd.h so that dhcp compiles + using gcc 3.4 again. closes bug 69555 + + 17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> dhcp-3.0.1.ebuild: + keywords ~amd64. + + 02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> dhcp-3.0.1.ebuild: + Keyword ~alpha, bug 65840. + + 07 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> dhcp-3.0.1.ebuild: + Stable on sparc + +*dhcp-3.0.1 (18 Jul 2004) + + 18 Jul 2004; Mike Frysinger <vapier@gentoo.org> + +files/dhcp-3.0+paranoia.patch, +dhcp-3.0.1.ebuild, dhcp-3.0_p2-r5.ebuild, + dhcp-3.0_p2-r6.ebuild: + Version bump #57347 by Martin Jackson. Also move paranoia patch out of + $DISTDIR and into $FILESDIR. + + 01 Jul 2004; Jon Hood <squinky86@gentoo.org> dhcp-3.0_p2-r4.ebuild, + dhcp-3.0_p2-r5.ebuild, dhcp-3.0_p2-r6.ebuild: + change virtual/glibc to virtual/libc + + 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> dhcp-3.0_p2-r4.ebuild: + Add inherit eutils + + 06 Apr 2004; Joshua Brindle <method@gentoo.org> dhcp-3.0_p2-r4.ebuild, + dhcp-3.0_p2-r5.ebuild, dhcp-3.0_p2-r6.ebuild: + added selinux policy to rdepend + +*dhcp-3.0_p2-r6 (08 Mar 2004) +*dhcp-3.0_p2-r5 (08 Mar 2004) +*dhcp-3.0_p2-r4 (08 Mar 2004) + + 08 Mar 2004; Seemant Kulleen <seemant@gentoo.org> dhcp-3.0_p2-r2.ebuild, + dhcp-3.0_p2-r3.ebuild, dhcp-3.0_p2-r4.ebuild, dhcp-3.0_p2-r5.ebuild, + dhcp-3.0_p2-r6.ebuild, dhcp-3.0_p2.ebuild: + Forced a version bump on these ebuilds. Basically -r0 is now -r4, -r2 is now + -r5 and -r3 is now -r6. The reason for the revision bump was to make this + package PROVIDE virtual/dhcp. Closes a long-standing bloat-reduction request + made on gentoo-dev mailing list by: William Hubbs <kc5eiv@kc5eiv.homeip.net> + at http://article.gmane.org/gmane.linux.gentoo.devel/11579 + + 09 Mar 2004; Bartosch Pixa <darkspecter@gentoo.org> dhcp-3.0_p2-r2.ebuild: + set ppc in keywords + + 04 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> dhcp-3.0_p2-r3.ebuild: + stable on sparc + + 24 Feb 2004; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild: + Bump to stable x86. + + 14 Jan 2004; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild, + files/dhcp.rc6, files/dhcrelay.rc6: + Use proper pid file and directory. Fixes bug #35751. + + 14 Jan 2004; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild, + files/dhcp.conf, files/dhcp.rc6, files/dhcrelay.conf, files/dhcrelay.rc6: + Add dhcrelay startup script. Contributed by Martin Jackson on bug #33895. + + 14 Jan 2004; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild: + Readd the ebuild and chown patch to address bugs #27079 and #36869. + + 05 Jan 2004; Jason Wever <weeve@gentoo.org> dhcp-3.0_p2-r2.ebuild: + Marked stable on sparc. + + 31 Dec 2003; Guy Martin <gmsoft@gentoo.org> dhcp-3.0_p2-r2.ebuild: + Marked stable on hppa. + + 18 Nov 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r2.ebuild: + Some fixes from bug 31840. + + 07 Nov 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild, + files/dhcp-3.0pl2-fix-perms.patch: + Remove experimental version. The current stable works correctly. + Finally fixes bug 31840. + +*dhcp-3.0_p2-r3 (05 Nov 2003) + + 05 Nov 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild, + files/dhcp-3.0pl2-fix-perms.patch: + Experimental attempt to fix 31840. + + 05 Nov 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r2.ebuild, + files/dhcp.rc6: + Use a PID file for startup/shutdown. + + 24 Oct 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r2.ebuild: + Fix ownership as part of pkg_postinst(). Fixes bug 31840. + + 22 Oct 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r2.ebuild: + Use enewuser() from eutils.eclass. + + 21 Oct 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r1.ebuild, + dhcp-3.0_p2-r2.ebuild: + Bump latest to stable x86. + +*dhcp-3.0_p2-r2 (02 Oct 2003) + + 02 Oct 2003; Mike Frysinger <vapier@gentoo.org> : + Add patch to fix user options to dhclient #30049 and add USE=static + support #30026. + + 16 Sep 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r1.ebuild: + Set proper ownership on /var/lib/dhcp. + + 13 Aug 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r1.ebuild, + files/dhcp.rc6: + Move dhcpd.leases file creation to the startup script. Change "use named" to + "use dns". Other cleanups. + + 25 Jul 2003; lanius@gentoo.org files/dhcp.rc6, files/dhcp.rc7: + added "use named" to rc scripts (bug #25239) + +*dhcp-3.0_p2-r1 (23 Jul 2003) + + 23 Jul 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r1.ebuild, + files/dhcp.conf, files/dhcp.rc5, files/dhcp.rc6: + Add support for the dhcp-paranoia patch which allows to run the server + chrooted and under a different user/group id. Remove unused dhcp.rc5 file. + Create a new startup script and dub it dhcp.rc6 as that file isn't currently + used by anything. Other various cleanups. + + 17 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> dhcp-3.0_p2.ebuild : + Unmasked, security update. + +*dhcp-3.0_p2 (15 Jan 2003) + + 01 Mar 2003; Jason Wever <weeve@gentoo.org> dhcp-3.0_p2.ebuild: + Applied fix for bug #11960 to omit -O flags so dhcp will no longer bus error + on sbus sparcs. + + 24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> dhcp-3.0_p2.ebuild : + Added testing mips keyword to the ebuild. + + 15 Jan 2003; Brandon Low <lostlogic@gentoo.org> dhcp-3.0_p2.ebuild: + Version update, and update the ebuild to automatically assign + it's source name. + +*dhcp-3.0_p1 (29 Dec 2002) + + 24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> dhcp-3.0_p1.ebuild : + Added testing mips keyword to the ebuild. + + 29 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: Renamed from 3.0-r4 to + reflect the version (3.0_pl1) of the sources being used. + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*dhcp-3.0-r4 (21 Sep 2002) + + 21 Sep 2002; Mike Frysinger <vapier@gentoo.org> dhcp-3.0-r4.ebuild, dhclient.c-3.0-dw-cli-fix.patch, digest-dhcp-3.0-r4 + + Added a small patch per #8088 to fix the -nw bug (patch comes from upstream) + +*dhcp-3.0-r3 (16 Jun 2002) + + 03 Sep 2002; Brandon Low <lostlogic@gentoo.org> dhcp-3.0-r3.ebuild, files/conf.dhcp, + files/dhcp.rc7, digest-dhcp-3.0-r3: + + Update ebuild to touch dhcp.leases, fix config and init.d files + to work more sanely. + +*dhcp-3.0-r2 (16 Jun 2002) + + 21 Jul 2002; Owen Stampflee <owen@gentoo.org> : + + Added PPC to KEYWORDS. + + + 6 Jul 2002; phoen][x <phoenix@gentoo.org>: dhcp-3.0-r2.ebuild: + Added KEYWORDS. + + 16 Jun 2002; Brandon Low <lostlogic@gentoo.org>: dhcp-3.0-r2.ebuild: + + This moves the definition of which ethernet ports to listen on to + /etc/conf.d where it should be this is prettier now thank TrAns13nT + for making fix this bug. + +*dhcp-3.0-r1 (6 July 2002) + + 6 Jul 2002; phoen][x <phoenix@gentoo.org>: dhcp-3.0-r1.ebuild: + Added KEYWORDS. + +*dhcp-3.0 (14 Feb 2002) + + 6 Jul 2002; phoen][x <phoenix@gentoo.org>: dhcp-3.0.ebuild: + Added KEYWORDS, SLOTS. + + 14 Feb 2002; Daniel Robbins <drobbins@gentoo.org>: New 3.0 release. + +*dhcp-3.0_rc12-r6 (1 Feb 2002) + + 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest new file mode 100644 index 0000000..6cfaed2 --- /dev/null +++ b/net-misc/dhcp/Manifest @@ -0,0 +1,16 @@ +AUX dhcp-3.0-fix-perms.patch 485 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 SHA1 1217265a8a7f1416b781e9f79e8dfb8304268e6c SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018 +AUX dhcp-3.0.3-dhclient-dbus.patch 2774 RMD160 250582d89894a58a297786c4a6884b54219c4b6f SHA1 74760ca00712ff529e6b97457408515098563f88 SHA256 d70292c5b61648ba5970ab436429ced33e807bd6f68ba06dcd2b9d4073b02ea4 +AUX dhcp-3.0.3-dhclient-no-down.patch 2332 RMD160 26d0c88534b71070e81c86c12b76a2b4ec7c9c2c SHA1 b2a00d46754414e937dc6c3d63a28b63b3b57ac9 SHA256 a5a67de79f6435d9bc4eeea416aff7a904ab567e5e8d75ecf34495bc9f2c5a44 +AUX dhcp-4.0-dhclient-ntp.patch 7966 RMD160 d6dd1c3363f06712a82231eae1eb559f5a45bbb5 SHA1 3c1b373c6649c1ccb44f205fbee116c134514f4e SHA256 e93bda7f2baae9163f96ab0408bfbe885caa96a8698f9e566b8a9dc04de9359b +AUX dhcp-4.0.1-dhclient-stdin-conf.patch 2965 RMD160 2c3dd3994f0a7f15f3fe51972dd04a2e6055613a SHA1 f4a9d51126ea489f75fcf29053ab432b68e5055d SHA256 0b25bc74ae258656dd1f0e6f4ffd6b4ef8b4ad56956624c0b6070941a180e57c +AUX dhcp-4.2.0-errwarn-message.patch 1508 RMD160 604c680c22b620ae11e4c1ab83902a0c3dacaa62 SHA1 8d645f2510dac8c68d6114cb3f3c0077d832f8c0 SHA256 e2baa7b6097a6ca20b66afcd7b0e399840a8b0f251b3750a49a03f0d5b714231 +AUX dhcp-4.2.1-dhclient-resolvconf.patch 13742 RMD160 e226e793ab4d1302dbaf288c3077f3f6c8758b97 SHA1 d4ea97c3383c7f7769ab36c8d36674a3297dc1f9 SHA256 ddc284623b421098702d3e0cc1849b37c015e78dc510aa7efdd2e5fc9b6a849c +AUX dhcp-4.2.1-nogateway.patch 1648 RMD160 820956e072e4a84ffabdee6714377ae23827b7bf SHA1 5c6c8118ee6b4b8524451827756aab052766ca09 SHA256 694caca5fbcf900cef2223307a43fb21a66fd672728cebfd873313730029acc4 +AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5 +AUX dhcpd.itit4 2639 RMD160 c3fdb1594aa88e03b6f2cf1eddb4c30ec85bb792 SHA1 a2f7d947626b18928f5a639e70c6dffa08051f0e SHA256 1c26f943deac8c41231359f303193f9845ecbf3126cfa07c12d078629c99e69f +AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecdb000382893fb49d0052ced063955b0ad9cf SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730 +AUX dhcrelay.init2 712 RMD160 2baeaf7c0fb8a5796792b5721f32104907243798 SHA1 ced20da5625b6517fa6044ce179e1c5d9a17297e SHA256 6cca726147474c600662b0c2e49eb5aa148a7a9af1358dbc56f16b1d08255ae3 +DIST dhcp-4.2.1.tar.gz 8795980 RMD160 8ecb0608f2cdb660d27ce48b9ba09c64bb7af995 SHA1 dc9be6d2d458a5a7a921eb08281a431506fcca17 SHA256 5f10bb28740c3bd2c632f6dbd9de53fb7e9db07cd274c60c7c1884ae6d5870a1 +EBUILD dhcp-4.2.1-r1.ebuild 6682 RMD160 4767cf13bbcac2788cf498dc7aaea5ffb07aac4c SHA1 cf36f08f00f68534a0408e5593bc970e728f5371 SHA256 3b2d1756a01cd3563d5b019003b075c42ec37e904304f69e1372b9c6ec676182 +MISC ChangeLog 30098 RMD160 fda3bed0f9445e7702b4ea3e8fbbc5bcfe2774ba SHA1 8a3d48b4873ef5fd6080a156997ee526e1b68cf0 SHA256 671718580e8e5fb455d953df810c2bebbcac128c027aba2618b127c9650d5045 +MISC metadata.xml 500 RMD160 b5ad909ab2b12acd20e78039e33fda0a27383c9e SHA1 2fc5cee8e105e75a251195254c96085a0f3fa9a3 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c diff --git a/net-misc/dhcp/dhcp-4.2.1-r1.ebuild b/net-misc/dhcp/dhcp-4.2.1-r1.ebuild new file mode 100644 index 0000000..894b04d --- /dev/null +++ b/net-misc/dhcp/dhcp-4.2.1-r1.ebuild @@ -0,0 +1,225 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.1-r1.ebuild,v 1.1 2011/03/23 04:36:04 vapier Exp $ + +EAPI="2" + +inherit eutils + +MY_PV="${PV//_alpha/a}" +MY_PV="${MY_PV//_beta/b}" +MY_PV="${MY_PV//_rc/rc}" +MY_PV="${MY_PV//_p/-P}" +MY_P="${PN}-${MY_PV}" +DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" +HOMEPAGE="http://www.isc.org/products/DHCP" +SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz" + +LICENSE="as-is BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" + +DEPEND="selinux? ( sec-policy/selinux-dhcp ) + kernel_linux? ( sys-apps/net-tools ) + vim-syntax? ( app-vim/dhcpd-syntax ) + ldap? ( + net-nds/openldap + ssl? ( dev-libs/openssl ) + )" + +PROVIDE="virtual/dhcpc" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # Gentoo patches - these will probably never be accepted upstream + # Fix some permission issues + epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch + # Enable dhclient to equery NTP servers + epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch + # resolvconf support in dhclient-script + epatch "${FILESDIR}"/${PN}-4.2.1-dhclient-resolvconf.patch + # Stop downing the interface on Linux as that breaks link daemons + # such as wpa_supplicant and netplug + epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch + epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch + # Enable dhclient to get extra configuration from stdin + epatch "${FILESDIR}"/${PN}-4.0.1-dhclient-stdin-conf.patch + epatch "${FILESDIR}"/${PN}-4.2.1-nogateway.patch #265531 + + # NetworkManager support patches + # If they fail to apply to future versions they will be dropped + # Add dbus support to dhclient + epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-dbus.patch + + # Brand the version with Gentoo + sed -i \ + -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + configure || 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 + + if use client && ! use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \ + Makefile.in || die + elif ! use client && use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\<client\>::' \ + Makefile.in || die + fi + + # 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 + rm -rf doc/ja_JP.eucJP +} + +src_configure() { + econf \ + --enable-paranoia \ + --sysconfdir=/etc/dhcp \ + --with-cli-pid-file=/var/run/dhcp/dhclient.pid \ + --with-cli-lease-file=/var/lib/dhcp/dhclient.leases \ + --with-cli6-pid-file=/var/run/dhcp/dhclient6.pid \ + --with-cli6-lease-file=/var/lib/dhcp/dhclient6.leases \ + --with-srv-pid-file=/var/run/dhcp/dhcpd.pid \ + --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ + --with-srv6-pid-file=/var/run/dhcp/dhcpd6.pid \ + --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ + --with-relay-pid-file=/var/run/dhcp/dhcrelay.pid \ + $(use_enable ipv6 dhcpv6) \ + $(use_with ldap) \ + $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto) +} + +src_install() { + emake install DESTDIR="${D}" || die + + dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters} + dohtml doc/References.html + + if [[ -e client/dhclient ]] ; then + # move the client to / + dodir /sbin + mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die + + exeinto /sbin + if use kernel_linux ; then + newexe "${S}"/client/scripts/linux dhclient-script || die + else + newexe "${S}"/client/scripts/freebsd dhclient-script || die + fi + + insinto /etc/dhcp + doins client/dhclient.conf || die + + keepdir /var/lib/dhclient + fi + + if [[ -e server/dhcpd ]] ; then + if use ldap ; then + insinto /etc/openldap/schema + doins contrib/ldap/dhcp.* || die + dosbin contrib/ldap/dhcpd-conf-to-ldap || die + fi + + newinitd "${FILESDIR}"/dhcpd.init4 dhcpd + newinitd "${FILESDIR}"/dhcrelay.init2 dhcrelay + newconfd "${FILESDIR}"/dhcpd.conf dhcpd + newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay + + insinto /etc/dhcp + doins server/dhcpd.conf || die + + keepdir /var/{lib,run}/dhcp + fi +} + +pkg_preinst() { + enewgroup dhcp + enewuser dhcp -1 -1 /var/lib/dhcp dhcp + + # Keep the user files over the sample ones + local f + for f in dhclient dhcpd ; do + f="/etc/dhcp/${f}.conf" + if [ -e "${ROOT}"${f} ] ; then + cp -p "${ROOT}"${f} "${D}"${f} + fi + done +} + +pkg_postinst() { + chown -R 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 -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,proc,var/lib,var/run/dhcp} + cp /etc/{localtime,resolv.conf} "${CHROOT}"/etc + cp -R /etc/dhcp "${CHROOT}"/etc + rm -f "${CHROOT}"/etc/dhcp/dhcpd.conf + 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/dhcp-3.0-fix-perms.patch b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch new file mode 100644 index 0000000..13debb2 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch @@ -0,0 +1,15 @@ +--- server/dhcpd.c 2003-11-05 14:08:09.000000000 -0800 ++++ server/dhcpd.c 2003-11-05 14:15:32.000000000 -0800 +@@ -602,6 +602,12 @@ + if (lftest) + exit (0); + ++#if defined (PARANOIA) ++ /* Set proper permissions... */ ++ if (lchown (path_dhcpd_db, set_uid, set_gid)) ++ log_fatal ("lchown(%s, %d, %d): %m", path_dhcpd_db, (int) set_uid, (int) set_gid); ++#endif /* PARANOIA */ ++ + /* Discover all the network interfaces and initialize them. */ + discover_interfaces (DISCOVER_SERVER); + diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch new file mode 100644 index 0000000..579d72f --- /dev/null +++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch @@ -0,0 +1,84 @@ +--- client/scripts/bsdos ++++ client/scripts/bsdos +@@ -47,6 +47,11 @@ + . /etc/dhcp/dhclient-exit-hooks + fi + # probably should do something with exit status of the local script ++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then ++ dbus-send --system --dest=com.redhat.dhcp \ ++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ ++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" ++ fi + exit $exit_status + } + +--- client/scripts/freebsd ++++ client/scripts/freebsd +@@ -57,6 +57,11 @@ + . /etc/dhcp/dhclient-exit-hooks + fi + # probably should do something with exit status of the local script ++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then ++ dbus-send --system --dest=com.redhat.dhcp \ ++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ ++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" ++ fi + exit $exit_status + } + +--- client/scripts/linux ++++ client/scripts/linux +@@ -69,6 +69,11 @@ + . /etc/dhcp/dhclient-exit-hooks + fi + # probably should do something with exit status of the local script ++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then ++ dbus-send --system --dest=com.redhat.dhcp \ ++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ ++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" ++ fi + exit $exit_status + } + +--- client/scripts/netbsd ++++ client/scripts/netbsd +@@ -47,6 +47,11 @@ + . /etc/dhcp/dhclient-exit-hooks + fi + # probably should do something with exit status of the local script ++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then ++ dbus-send --system --dest=com.redhat.dhcp \ ++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ ++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" ++ fi + exit $exit_status + } + +--- client/scripts/openbsd ++++ client/scripts/openbsd +@@ -47,6 +47,11 @@ + . /etc/dhcp/dhclient-exit-hooks + fi + # probably should do something with exit status of the local script ++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then ++ dbus-send --system --dest=com.redhat.dhcp \ ++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ ++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" ++ fi + exit $exit_status + } + +--- client/scripts/solaris ++++ client/scripts/solaris +@@ -47,6 +47,11 @@ + . /etc/dhcp/dhclient-exit-hooks + fi + # probably should do something with exit status of the local script ++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then ++ dbus-send --system --dest=com.redhat.dhcp \ ++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ ++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" ++ fi + exit $exit_status + } + diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch new file mode 100644 index 0000000..518efec --- /dev/null +++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch @@ -0,0 +1,70 @@ +--- client/scripts/linux ++++ client/scripts/linux +@@ -118,9 +118,9 @@ + if [ x$reason = xPREINIT ]; then + if [ x$alias_ip_address != x ]; then + # Bring down alias interface. Its routes will disappear too. +- ifconfig $interface:0- inet 0 ++ ifconfig $interface:0- inet 0.0.0.0 + fi +- ifconfig $interface 0 up ++ ifconfig $interface 0.0.0.0 up + + # We need to give the kernel some time to get the interface up. + sleep 1 +@@ -145,12 +145,12 @@ + if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ + [ x$alias_ip_address != x$old_ip_address ]; then + # Possible new alias. Remove old alias. +- ifconfig $interface:0- inet 0 ++ ifconfig $interface:0- inet 0.0.0.0 + fi + if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then + # IP address changed. Bringing down the interface will delete all routes, + # and clear the ARP cache. +- ifconfig $interface inet 0 down ++ ifconfig $interface inet 0.0.0.0 + + fi + if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ +@@ -171,7 +171,7 @@ + fi + if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; + then +- ifconfig $interface:0- inet 0 ++ ifconfig $interface:0- inet 0.0.0.0 + ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg + route add -host $alias_ip_address $interface:0 + fi +@@ -183,11 +183,11 @@ + || [ x$reason = xSTOP ]; then + if [ x$alias_ip_address != x ]; then + # Turn off alias interface. +- ifconfig $interface:0- inet 0 ++ ifconfig $interface:0- inet 0.0.0.0 + fi + if [ x$old_ip_address != x ]; then + # Shut down interface, which will delete routes and clear arp cache. +- ifconfig $interface inet 0 down ++ ifconfig $interface inet 0.0.0.0 + fi + if [ x$alias_ip_address != x ]; then + ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg +@@ -198,7 +198,7 @@ + + if [ x$reason = xTIMEOUT ]; then + if [ x$alias_ip_address != x ]; then +- ifconfig $interface:0- inet 0 ++ ifconfig $interface:0- inet 0.0.0.0 + fi + ifconfig $interface inet $new_ip_address $new_subnet_arg \ + $new_broadcast_arg $mtu_arg +@@ -223,7 +223,7 @@ + make_resolv_conf + exit_with_hooks 0 + fi +- ifconfig $interface inet 0 down ++ ifconfig $interface inet 0.0.0.0 + exit_with_hooks 1 + fi + diff --git a/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch new file mode 100644 index 0000000..d3f2971 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch @@ -0,0 +1,216 @@ +diff -uNr dhcp-4.0.0.ORIG/client/clparse.c dhcp-4.0.0/client/clparse.c +--- dhcp-4.0.0.ORIG/client/clparse.c 2008-09-01 11:38:51.000000000 +0100 ++++ dhcp-4.0.0/client/clparse.c 2008-09-01 11:48:17.000000000 +0100 +@@ -37,7 +37,7 @@ + + struct client_config top_level_config; + +-#define NUM_DEFAULT_REQUESTED_OPTS 9 ++#define NUM_DEFAULT_REQUESTED_OPTS 10 + struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1]; + + static void parse_client_default_duid(struct parse *cfile); +@@ -98,15 +98,20 @@ + dhcp_universe.code_hash, &code, 0, MDL); + + /* 8 */ +- code = D6O_NAME_SERVERS; ++ code = DHO_NTP_SERVERS; + option_code_hash_lookup(&default_requested_options[7], +- dhcpv6_universe.code_hash, &code, 0, MDL); ++ dhcp_universe.code_hash, &code, 0, MDL); + + /* 9 */ +- code = D6O_DOMAIN_SEARCH; ++ code = D6O_NAME_SERVERS; + option_code_hash_lookup(&default_requested_options[8], + dhcpv6_universe.code_hash, &code, 0, MDL); + ++ /* 10 */ ++ code = D6O_DOMAIN_SEARCH; ++ option_code_hash_lookup(&default_requested_options[9], ++ dhcpv6_universe.code_hash, &code, 0, MDL); ++ + for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) { + if (default_requested_options[code] == NULL) + log_fatal("Unable to find option definition for " +diff -uNr dhcp-4.0.0.ORIG/client/scripts/bsdos dhcp-4.0.0/client/scripts/bsdos +--- dhcp-4.0.0.ORIG/client/scripts/bsdos 2008-09-01 11:38:51.000000000 +0100 ++++ dhcp-4.0.0/client/scripts/bsdos 2008-09-01 11:39:30.000000000 +0100 +@@ -29,6 +29,26 @@ + + mv /etc/resolv.conf.dhclient6 /etc/resolv.conf + fi ++ # If we're making confs, may as well make an ntp.conf too ++ make_ntp_conf ++} ++ ++make_ntp_conf() { ++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then ++ if [ x$new_ntp_servers != x ]; then ++ conf="# Generated by dhclient for interface $interface\n" ++ conf="${conf}restrict default noquery notrust nomodify\n" ++ conf="${conf}restrict 127.0.0.1\n" ++ for ntpserver in $new_ntp_servers; do ++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n" ++ conf="${conf}server $ntpserver\n" ++ done ++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" ++ conf="${conf}logfile /var/log/ntp.log\n" ++ printf "${conf}" > /etc/ntp.conf ++ chmod 644 /etc/ntp.conf ++ fi ++ fi + } + + # Must be used on exit. Invokes the local dhcp client exit hooks, if any. +diff -uNr dhcp-4.0.0.ORIG/client/scripts/freebsd dhcp-4.0.0/client/scripts/freebsd +--- dhcp-4.0.0.ORIG/client/scripts/freebsd 2008-09-01 11:38:51.000000000 +0100 ++++ dhcp-4.0.0/client/scripts/freebsd 2008-09-01 11:39:30.000000000 +0100 +@@ -73,6 +73,26 @@ + fi + fi + fi ++ # If we're making confs, may as well make an ntp.conf too ++ make_ntp_conf ++} ++ ++make_ntp_conf() { ++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then ++ if [ "x$new_ntp_servers" != x ]; then ++ conf="# Generated by dhclient for interface $interface\n" ++ conf="${conf}restrict default noquery notrust nomodify\n" ++ conf="${conf}restrict 127.0.0.1\n" ++ for ntpserver in $new_ntp_servers; do ++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n" ++ conf="${conf}server $ntpserver\n" ++ done ++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" ++ conf="${conf}logfile /var/log/ntp.log\n" ++ printf "${conf}" > /etc/ntp.conf ++ chmod 644 /etc/ntp.conf ++ fi ++ fi + } + + # Must be used on exit. Invokes the local dhcp client exit hooks, if any. +diff -uNr dhcp-4.0.0.ORIG/client/scripts/linux dhcp-4.0.0/client/scripts/linux +--- dhcp-4.0.0.ORIG/client/scripts/linux 2008-09-01 11:38:51.000000000 +0100 ++++ dhcp-4.0.0/client/scripts/linux 2008-09-01 11:39:30.000000000 +0100 +@@ -55,6 +55,26 @@ + + mv /etc/resolv.conf.dhclient6 /etc/resolv.conf + fi ++ # If we're making confs, may as well make an ntp.conf too ++ make_ntp_conf ++} ++ ++make_ntp_conf() { ++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then ++ if [ "x$new_ntp_servers" != x ]; then ++ conf="# Generated by dhclient for interface $interface\n" ++ conf="${conf}restrict default noquery notrust nomodify\n" ++ conf="${conf}restrict 127.0.0.1\n" ++ for ntpserver in $new_ntp_servers; do ++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n" ++ conf="${conf}server $ntpserver\n" ++ done ++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" ++ conf="${conf}logfile /var/log/ntp.log\n" ++ printf "${conf}" > /etc/ntp.conf ++ chmod 644 /etc/ntp.conf ++ fi ++ fi + } + + # Must be used on exit. Invokes the local dhcp client exit hooks, if any. +diff -uNr dhcp-4.0.0.ORIG/client/scripts/netbsd dhcp-4.0.0/client/scripts/netbsd +--- dhcp-4.0.0.ORIG/client/scripts/netbsd 2008-09-01 11:38:51.000000000 +0100 ++++ dhcp-4.0.0/client/scripts/netbsd 2008-09-01 11:39:30.000000000 +0100 +@@ -29,6 +29,26 @@ + + mv /etc/resolv.conf.dhclient6 /etc/resolv.conf + fi ++ # If we're making confs, may as well make an ntp.conf too ++ make_ntp_conf ++} ++ ++make_ntp_conf() { ++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then ++ if [ "x$new_ntp_servers" != x ]; then ++ conf="# Generated by dhclient for interface $interface\n" ++ conf="${conf}restrict default noquery notrust nomodify\n" ++ conf="${conf}restrict 127.0.0.1\n" ++ for ntpserver in $new_ntp_servers; do ++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n" ++ conf="${conf}server $ntpserver\n" ++ done ++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" ++ conf="${conf}logfile /var/log/ntp.log\n" ++ printf "${conf}" > /etc/ntp.conf ++ chmod 644 /etc/ntp.conf ++ fi ++ fi + } + + # Must be used on exit. Invokes the local dhcp client exit hooks, if any. +diff -uNr dhcp-4.0.0.ORIG/client/scripts/openbsd dhcp-4.0.0/client/scripts/openbsd +--- dhcp-4.0.0.ORIG/client/scripts/openbsd 2008-09-01 11:38:51.000000000 +0100 ++++ dhcp-4.0.0/client/scripts/openbsd 2008-09-01 11:39:30.000000000 +0100 +@@ -29,6 +29,26 @@ + + mv /etc/resolv.conf.dhclient6 /etc/resolv.conf + fi ++ # If we're making confs, may as well make an ntp.conf too ++ make_ntp_conf ++} ++ ++make_ntp_conf() { ++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then ++ if [ "x$new_ntp_servers" != x ]; then ++ conf="# Generated by dhclient for interface $interface\n" ++ conf="${conf}restrict default noquery notrust nomodify\n" ++ conf="${conf}restrict 127.0.0.1\n" ++ for ntpserver in $new_ntp_servers; do ++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n" ++ conf="${conf}server $ntpserver\n" ++ done ++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" ++ conf="${conf}logfile /var/log/ntp.log\n" ++ printf "${conf}" > /etc/ntp.conf ++ chmod 644 /etc/ntp.conf ++ fi ++ fi + } + + # Must be used on exit. Invokes the local dhcp client exit hooks, if any. +diff -uNr dhcp-4.0.0.ORIG/client/scripts/solaris dhcp-4.0.0/client/scripts/solaris +--- dhcp-4.0.0.ORIG/client/scripts/solaris 2008-09-01 11:38:51.000000000 +0100 ++++ dhcp-4.0.0/client/scripts/solaris 2008-09-01 11:39:30.000000000 +0100 +@@ -17,6 +17,26 @@ + + mv /etc/resolv.conf.dhclient /etc/resolv.conf + fi ++ # If we're making confs, may as well make an ntp.conf too ++ make_ntp_conf ++} ++ ++make_ntp_conf() { ++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then ++ if [ "x$new_ntp_servers" != x ]; then ++ conf="# Generated by dhclient for interface $interface\n" ++ conf="${conf}restrict default noquery notrust nomodify\n" ++ conf="${conf}restrict 127.0.0.1\n" ++ for ntpserver in $new_ntp_servers; do ++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n" ++ conf="${conf}server $ntpserver\n" ++ done ++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" ++ conf="${conf}logfile /var/log/ntp.log\n" ++ printf "${conf}" > /etc/ntp.conf ++ chmod 644 /etc/ntp.conf ++ fi ++ fi + } + + # Must be used on exit. Invokes the local dhcp client exit hooks, if any. diff --git a/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch new file mode 100644 index 0000000..ddbe4a3 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch @@ -0,0 +1,114 @@ +diff -uNr dhcp-4.0.1.ORIG/client/clparse.c dhcp-4.0.1/client/clparse.c +--- dhcp-4.0.1.ORIG/client/clparse.c 2009-03-30 13:54:47.000000000 +0100 ++++ dhcp-4.0.1/client/clparse.c 2009-03-30 13:58:02.000000000 +0100 +@@ -174,6 +174,10 @@ + #endif + } + ++ /* Read any extra configuration from stdin */ ++ read_client_conf_stdin ((struct interface_info *)0, ++ &top_level_config); ++ + /* Set up state and config structures for clients that don't + have per-interface configuration statements. */ + config = (struct client_config *)0; +@@ -203,23 +207,13 @@ + return status; + } + +-int read_client_conf_file (const char *name, struct interface_info *ip, ++int read_client_conf_actual (struct parse *cfile, 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 = NULL; +- status = new_parse(&cfile, file, NULL, 0, path_dhclient_conf, 0); +- if (status != ISC_R_SUCCESS || cfile == NULL) +- return status; +- + do { + token = peek_token (&val, (unsigned *)0, cfile); + if (token == END_OF_FILE) +@@ -230,10 +224,74 @@ + status = (cfile -> warnings_occurred + ? ISC_R_BADPARSE + : ISC_R_SUCCESS); ++ return status; ++} ++ ++int read_client_conf_file (const char *name, struct interface_info *ip, ++ struct client_config *client) ++{ ++ int file; ++ struct parse *cfile; ++ 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); ++ status = read_client_conf_actual(cfile, ip, client); + end_parse (&cfile); + return status; + } + ++int read_client_conf_stdin (struct interface_info *ip, ++ struct client_config *client) ++{ ++ int file; ++ char *buffer = NULL, *p; ++ unsigned buflen, len = 0; ++ struct parse *cfile; ++ size_t bytes; ++ isc_result_t status; ++ ++ file = fileno(stdin); ++ if (isatty (file)) ++ return ISC_R_NOTFOUND; ++ if (fcntl (file, F_SETFL, O_NONBLOCK) < 0) ++ log_fatal ("could not set stdin to non blocking!"); ++ ++ buflen = BUFSIZ; ++ buffer = malloc (BUFSIZ + 1); ++ p = buffer; ++ do { ++ bytes = read (file, p, BUFSIZ); ++ if (bytes == 0) ++ break; ++ if (bytes == -1) ++ log_fatal ("failed to read stdin!"); ++ if (bytes >= BUFSIZ) { ++ buflen += BUFSIZ; ++ len += BUFSIZ; ++ buffer = realloc (buffer, buflen + 1); ++ if (!buffer) ++ log_fatal ("not enough buffer to read stdin!"); ++ p = buffer + len; ++ } else { ++ len += bytes; ++ break; ++ } ++ } while(1); ++ buffer[len] = '\0'; ++ ++ cfile = (struct parse *)0; ++ status = new_parse (&cfile, -1, buffer, len, "stdin", 0); ++ if (status == ISC_R_SUCCESS) { ++ status = read_client_conf_actual (cfile, ip, client); ++ end_parse (&cfile); ++ } ++ free(buffer); ++ return status; ++} + + /* lease-file :== client-lease-statements END_OF_FILE + client-lease-statements :== <nil> diff --git a/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch b/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch new file mode 100644 index 0000000..f882a13 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch @@ -0,0 +1,31 @@ +ripped from Fedora & tweaked + +--- dhcp-4.2.0/omapip/errwarn.c ++++ dhcp-4.2.0/omapip/errwarn.c +@@ -76,20 +76,13 @@ + + #if !defined (NOMINUM) + log_error ("%s", ""); +- log_error ("If you did not get this software from ftp.isc.org, please"); +- log_error ("get the latest from ftp.isc.org and install that before"); +- log_error ("requesting help."); ++ log_error ("This version of ISC DHCP is based on the release available"); ++ log_error ("on ftp.isc.org. Features have been added and other changes"); ++ log_error ("have been made to the base software release in order to make"); ++ log_error ("it work better with this distribution."); + log_error ("%s", ""); +- log_error ("If you did get this software from ftp.isc.org and have not"); +- log_error ("yet read the README, please read it before requesting help."); +- log_error ("If you intend to request help from the dhcp-server@isc.org"); +- log_error ("mailing list, please read the section on the README about"); +- log_error ("submitting bug reports and requests for help."); +- log_error ("%s", ""); +- log_error ("Please do not under any circumstances send requests for"); +- log_error ("help directly to the authors of this software - please"); +- log_error ("send them to the appropriate mailing list as described in"); +- log_error ("the README file."); ++ log_error ("Please report for this software via the Gentoo Bugzilla site:"); ++ log_error (" http://bugs.gentoo.org/"); + log_error ("%s", ""); + log_error ("exiting."); + #endif diff --git a/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch new file mode 100644 index 0000000..6d8caec --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch @@ -0,0 +1,384 @@ +--- a/client/scripts/bsdos ++++ b/client/scripts/bsdos +@@ -1,34 +1,41 @@ + #!/bin/sh + + make_resolv_conf() { ++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ return 0 ++ fi ++ local conf= + if [ x"$new_domain_name_servers" != x ]; then +- cat /dev/null > /etc/resolv.conf.dhclient + if [ "x$new_domain_search" != x ]; then +- echo search $new_domain_search >> /etc/resolv.conf.dhclient ++ conf="${conf}search ${new_domain_search}\n" + elif [ "x$new_domain_name" != x ]; then + # Note that the DHCP 'Domain Name Option' is really just a domain + # name, and that this practice of using the domain name option as + # a search path is both nonstandard and deprecated. +- echo search $new_domain_name >> /etc/resolv.conf.dhclient ++ conf="${conf}search ${new_domain_name}\n" + fi + for nameserver in $new_domain_name_servers; do +- echo nameserver $nameserver >> /etc/resolv.conf.dhclient ++ conf="${conf}nameserver ${nameserver}\n" + done +- +- mv /etc/resolv.conf.dhclient /etc/resolv.conf + elif [ "x${new_dhcp6_name_servers}" != x ] ; then +- cat /dev/null > /etc/resolv.conf.dhclient6 +- chmod 644 /etc/resolv.conf.dhclient6 +- + if [ "x${new_dhcp6_domain_search}" != x ] ; then +- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 ++ conf="${conf}search ${new_dhcp6_domain_search}\n" + fi + for nameserver in ${new_dhcp6_name_servers} ; do +- echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6 ++ conf="${conf}nameserver ${nameserver}\n" + done ++ fi + +- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf ++ if [ x"$conf" != x ]; then ++ conf="# Generated by dhclient or interface $interface\n${conf}" ++ if type resolvconf >/dev/null 2>&1; then ++ printf "${conf}" | resolvconf -a $interface ++ else ++ printf "${conf}" > /etc/resolv.conf ++ chmod 644 /etc/resolv.conf ++ fi + fi ++ + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf + } +--- a/client/scripts/freebsd ++++ b/client/scripts/freebsd +@@ -11,68 +11,41 @@ + fi + + make_resolv_conf() { ++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ return 0 ++ fi ++ local conf= + if [ x"$new_domain_name_servers" != x ]; then +- ( cat /dev/null > /etc/resolv.conf.dhclient ) +- exit_status=$? +- if [ $exit_status -ne 0 ]; then +- $LOGGER "Unable to create /etc/resolv.conf.dhclient: Error $exit_status" +- else +- if [ "x$new_domain_search" != x ]; then +- ( echo search $new_domain_search >> /etc/resolv.conf.dhclient ) +- exit_status=$? +- elif [ "x$new_domain_name" != x ]; then +- # Note that the DHCP 'Domain Name Option' is really just a domain +- # name, and that this practice of using the domain name option as +- # a search path is both nonstandard and deprecated. +- ( echo search $new_domain_name >> /etc/resolv.conf.dhclient ) +- exit_status=$? +- fi +- for nameserver in $new_domain_name_servers; do +- if [ $exit_status -ne 0 ]; then +- break +- fi +- ( echo nameserver $nameserver >>/etc/resolv.conf.dhclient ) +- exit_status=$? +- done +- +- # If there were no errors, attempt to mv the new file into place. +- if [ $exit_status -eq 0 ]; then +- ( mv /etc/resolv.conf.dhclient /etc/resolv.conf ) +- exit_status=$? +- fi +- +- if [ $exit_status -ne 0 ]; then +- $LOGGER "Error while writing new /etc/resolv.conf." +- fi ++ if [ "x$new_domain_search" != x ]; then ++ conf="${conf}search ${new_domain_search}\n" ++ elif [ "x$new_domain_name" != x ]; then ++ # Note that the DHCP 'Domain Name Option' is really just a domain ++ # name, and that this practice of using the domain name option as ++ # a search path is both nonstandard and deprecated. ++ conf="${conf}search ${new_domain_name}\n" + fi ++ for nameserver in $new_domain_name_servers; do ++ conf="${conf}nameserver ${nameserver}\n" ++ done + elif [ "x${new_dhcp6_name_servers}" != x ] ; then +- ( cat /dev/null > /etc/resolv.conf.dhclient6 ) +- exit_status=$? +- if [ $exit_status -ne 0 ] ; then +- $LOGGER "Unable to create /etc/resolv.conf.dhclient6: Error $exit_status" +- else +- if [ "x${new_dhcp6_domain_search}" != x ] ; then +- ( echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 ) +- exit_status=$? +- fi +- for nameserver in ${new_dhcp6_name_servers} ; do +- if [ $exit_status -ne 0 ] ; then +- break +- fi +- ( echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6 ) +- exit_status=$? +- done +- +- if [ $exit_status -eq 0 ] ; then +- ( mv /etc/resolv.conf.dhclient6 /etc/resolv.conf ) +- exit_status=$? +- fi ++ if [ "x${new_dhcp6_domain_search}" != x ] ; then ++ conf="${conf}search ${new_dhcp6_domain_search}\n" ++ fi ++ for nameserver in ${new_dhcp6_name_servers} ; do ++ conf="${conf}nameserver ${nameserver}\n" ++ done ++ fi + +- if [ $exit_status -ne 0 ] ; then +- $LOGGER "Error while writing new /etc/resolv.conf." +- fi ++ if [ x"$conf" != x ]; then ++ conf="# Generated by dhclient or interface $interface\n${conf}" ++ if type resolvconf >/dev/null 2>&1; then ++ printf "${conf}" | resolvconf -a $interface ++ else ++ printf "${conf}" > /etc/resolv.conf ++ chmod 644 /etc/resolv.conf + fi + fi ++ + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf + } +--- a/client/scripts/linux ++++ b/client/scripts/linux +@@ -26,35 +26,41 @@ + ip=/sbin/ip + + make_resolv_conf() { ++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ return 0 ++ fi ++ local conf= + if [ x"$new_domain_name_servers" != x ]; then +- cat /dev/null > /etc/resolv.conf.dhclient +- chmod 644 /etc/resolv.conf.dhclient +- if [ x"$new_domain_search" != x ]; then +- echo search $new_domain_search >> /etc/resolv.conf.dhclient +- elif [ x"$new_domain_name" != x ]; then ++ if [ "x$new_domain_search" != x ]; then ++ conf="${conf}search ${new_domain_search}\n" ++ elif [ "x$new_domain_name" != x ]; then + # Note that the DHCP 'Domain Name Option' is really just a domain + # name, and that this practice of using the domain name option as + # a search path is both nonstandard and deprecated. +- echo search $new_domain_name >> /etc/resolv.conf.dhclient ++ conf="${conf}search ${new_domain_name}\n" + fi + for nameserver in $new_domain_name_servers; do +- echo nameserver $nameserver >>/etc/resolv.conf.dhclient ++ conf="${conf}nameserver ${nameserver}\n" + done +- +- mv /etc/resolv.conf.dhclient /etc/resolv.conf + elif [ "x${new_dhcp6_name_servers}" != x ] ; then +- cat /dev/null > /etc/resolv.conf.dhclient6 +- chmod 644 /etc/resolv.conf.dhclient6 +- + if [ "x${new_dhcp6_domain_search}" != x ] ; then +- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 ++ conf="${conf}search ${new_dhcp6_domain_search}\n" + fi + for nameserver in ${new_dhcp6_name_servers} ; do +- echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6 ++ conf="${conf}nameserver ${nameserver}\n" + done ++ fi + +- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf ++ if [ x"$conf" != x ]; then ++ conf="# Generated by dhclient or interface $interface\n${conf}" ++ if type resolvconf >/dev/null 2>&1; then ++ printf "${conf}" | resolvconf -a $interface ++ else ++ printf "${conf}" > /etc/resolv.conf ++ chmod 644 /etc/resolv.conf ++ fi + fi ++ + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf + } +--- a/client/scripts/netbsd ++++ b/client/scripts/netbsd +@@ -1,34 +1,41 @@ + #!/bin/sh + + make_resolv_conf() { +- if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then +- cat /dev/null > /etc/resolv.conf.dhclient +- if [ "x$new_domain_search" != x ]; then +- echo search $new_domain_search >> /etc/resolv.conf.dhclient +- elif [ "x$new_domain_name" != x ]; then ++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ return 0 ++ fi ++ local conf= ++ if [ x"$new_domain_name_servers" != x ]; then ++ if [ "x$new_domain_search" != x ]; then ++ conf="${conf}search ${new_domain_search}\n" ++ elif [ "x$new_domain_name" != x ]; then + # Note that the DHCP 'Domain Name Option' is really just a domain + # name, and that this practice of using the domain name option as + # a search path is both nonstandard and deprecated. +- echo search $new_domain_name >> /etc/resolv.conf.dhclient ++ conf="${conf}search ${new_domain_name}\n" + fi + for nameserver in $new_domain_name_servers; do +- echo nameserver $nameserver >>/etc/resolv.conf.dhclient ++ conf="${conf}nameserver ${nameserver}\n" + done +- +- mv /etc/resolv.conf.dhclient /etc/resolv.conf + elif [ "x${new_dhcp6_name_servers}" != x ] ; then +- cat /dev/null > /etc/resolv.conf.dhclient6 +- chmod 644 /etc/resolv.conf.dhclient6 +- + if [ "x${new_dhcp6_domain_search}" != x ] ; then +- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 ++ conf="${conf}search ${new_dhcp6_domain_search}\n" + fi + for nameserver in ${new_dhcp6_name_servers} ; do +- echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6 ++ conf="${conf}nameserver ${nameserver}\n" + done ++ fi + +- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf ++ if [ x"$conf" != x ]; then ++ conf="# Generated by dhclient or interface $interface\n${conf}" ++ if type resolvconf >/dev/null 2>&1; then ++ printf "${conf}" | resolvconf -a $interface ++ else ++ printf "${conf}" > /etc/resolv.conf ++ chmod 644 /etc/resolv.conf ++ fi + fi ++ + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf + } +--- a/client/scripts/openbsd ++++ b/client/scripts/openbsd +@@ -1,34 +1,41 @@ + #!/bin/sh + + make_resolv_conf() { +- if x"$new_domain_name_servers" != x ]; then +- cat /dev/null > /etc/resolv.conf.dhclient +- if [ x"$new_domain_search" != x ]; then +- echo search $new_domain_search >> /etc/resolv.conf.dhclient +- elif [ x"$new_domain_name" != x ]; then ++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ return 0 ++ fi ++ local conf= ++ if [ x"$new_domain_name_servers" != x ]; then ++ if [ "x$new_domain_search" != x ]; then ++ conf="${conf}search ${new_domain_search}\n" ++ elif [ "x$new_domain_name" != x ]; then + # Note that the DHCP 'Domain Name Option' is really just a domain + # name, and that this practice of using the domain name option as + # a search path is both nonstandard and deprecated. +- echo search $new_domain_name >> /etc/resolv.conf.dhclient ++ conf="${conf}search ${new_domain_name}\n" + fi + for nameserver in $new_domain_name_servers; do +- echo nameserver $nameserver >>/etc/resolv.conf.dhclient ++ conf="${conf}nameserver ${nameserver}\n" + done +- +- mv /etc/ersolv.conf.dhclient /etc/resolv.conf + elif [ "x${new_dhcp6_name_servers}" != x ] ; then +- cat /dev/null > /etc/resolv.conf.dhclient6 +- chmod 644 /etc/resolv.conf.dhclient6 +- + if [ "x${new_dhcp6_domain_search}" != x ] ; then +- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 ++ conf="${conf}search ${new_dhcp6_domain_search}\n" + fi + for nameserver in ${new_dhcp6_name_servers} ; do +- echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6 ++ conf="${conf}nameserver ${nameserver}\n" + done ++ fi + +- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf ++ if [ x"$conf" != x ]; then ++ conf="# Generated by dhclient or interface $interface\n${conf}" ++ if type resolvconf >/dev/null 2>&1; then ++ printf "${conf}" | resolvconf -a $interface ++ else ++ printf "${conf}" > /etc/resolv.conf ++ chmod 644 /etc/resolv.conf ++ fi + fi ++ + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf + } +--- a/client/scripts/solaris ++++ b/client/scripts/solaris +@@ -1,22 +1,41 @@ + #!/bin/sh + + make_resolv_conf() { ++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ return 0 ++ fi ++ local conf= + if [ x"$new_domain_name_servers" != x ]; then +- cat /dev/null > /etc/resolv.conf.dhclient +- if [ x"$new_domain_search" != x ]; then +- echo search $new_domain_search >> /etc/resolv.conf.dhclient +- elif [ x"$new_domain_name" != x ]; then ++ if [ "x$new_domain_search" != x ]; then ++ conf="${conf}search ${new_domain_search}\n" ++ elif [ "x$new_domain_name" != x ]; then + # Note that the DHCP 'Domain Name Option' is really just a domain + # name, and that this practice of using the domain name option as + # a search path is both nonstandard and deprecated. +- echo search $new_domain_name >> /etc/resolv.conf.dhclient ++ conf="${conf}search ${new_domain_name}\n" + fi + for nameserver in $new_domain_name_servers; do +- echo nameserver $nameserver >>/etc/resolv.conf.dhclient ++ conf="${conf}nameserver ${nameserver}\n" ++ done ++ elif [ "x${new_dhcp6_name_servers}" != x ] ; then ++ if [ "x${new_dhcp6_domain_search}" != x ] ; then ++ conf="${conf}search ${new_dhcp6_domain_search}\n" ++ fi ++ for nameserver in ${new_dhcp6_name_servers} ; do ++ conf="${conf}nameserver ${nameserver}\n" + done ++ fi + +- mv /etc/resolv.conf.dhclient /etc/resolv.conf ++ if [ x"$conf" != x ]; then ++ conf="# Generated by dhclient or interface $interface\n${conf}" ++ if type resolvconf >/dev/null 2>&1; then ++ printf "${conf}" | resolvconf -a $interface ++ else ++ printf "${conf}" > /etc/resolv.conf ++ chmod 644 /etc/resolv.conf ++ fi + fi ++ + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf + } diff --git a/net-misc/dhcp/files/dhcp-4.2.1-nogateway.patch b/net-misc/dhcp/files/dhcp-4.2.1-nogateway.patch new file mode 100644 index 0000000..11aaace --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.2.1-nogateway.patch @@ -0,0 +1,46 @@ +http://bugs.gentoo.org/265531 + +--- dhcp-4.2.1/client/scripts/linux ++++ dhcp-4.2.1/client/scripts/linux +@@ -193,12 +193,14 @@ + ifconfig $interface inet $new_ip_address $new_subnet_arg \ + $new_broadcast_arg $mtu_arg + # Add a network route to the computed network address. +- for router in $new_routers; do +- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then +- route add -host $router dev $interface +- fi +- route add default gw $router $metric_arg dev $interface +- done ++ if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then ++ for router in $new_routers; do ++ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then ++ route add -host $router dev $interface ++ fi ++ route add default gw $router $metric_arg dev $interface ++ done ++ fi + fi + if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; + then +@@ -244,12 +246,14 @@ + ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg + route add -host $alias_ip_address dev $interface:0 + fi +- for router in $new_routers; do +- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then +- route add -host $router dev $interface +- fi +- route add default gw $router $metric_arg dev $interface +- done ++ if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then ++ for router in $new_routers; do ++ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then ++ route add -host $router dev $interface ++ fi ++ route add default gw $router $metric_arg dev $interface ++ done ++ fi + make_resolv_conf + exit_with_hooks 0 + fi diff --git a/net-misc/dhcp/files/dhcpd.conf b/net-misc/dhcp/files/dhcpd.conf new file mode 100644 index 0000000..1672633 --- /dev/null +++ b/net-misc/dhcp/files/dhcpd.conf @@ -0,0 +1,29 @@ +# /etc/conf.d/dhcpd: config file for /etc/init.d/dhcpd + +# If you require more than one instance of dhcpd you can create symbolic +# links to dhcpd service like so +# cd /etc/init.d +# ln -s dhcpd dhcpd.foo +# cd ../conf.d +# cp dhcpd dhcpd.foo +# Now you can edit dhcpd.foo and specify a different configuration file. +# You'll also need to specify a pidfile in that dhcpd.conf file. +# See the pid-file-name option in the dhcpd.conf man page for details. + +# If you wish to run dhcpd in a chroot, uncomment the following line +# DHCPD_CHROOT="/chroot/dhcp" + +# Then run emerge dhcp --config +# All file paths below are relative to the chroot. +# You can specify a different chroot directory but MAKE SURE it's empty. + +# Specify a configuration file - the default is /etc/dhcp/dhcpd.conf +# DHCPD_CONF="/etc/dhcp/dhcpd.conf" + +# Configure which interface or interfaces to for dhcpd to listen on. +# List all interfaces space separated. If this is not specified then +# we listen on all interfaces. +# DHCPD_IFACE="" + +# Insert any other dhcpd options - see the man page for a full list. +# DHCPD_OPTS="" diff --git a/net-misc/dhcp/files/dhcpd.itit4 b/net-misc/dhcp/files/dhcpd.itit4 new file mode 100755 index 0000000..a0809e0 --- /dev/null +++ b/net-misc/dhcp/files/dhcpd.itit4 @@ -0,0 +1,100 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init3,v 1.1 2011/03/05 23:59:20 vapier Exp $ + +opts="configtest" + +DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/${SVCNAME}.conf} + +depend() { + need net + use logger dns +} + +get_var() { + sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' \ + "${DHCPD_CONF}" +} + +checkconfig() { + dhcpd ${DHCPD_OPTS} ${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} -t 1>/dev/null 2>&1 + local ret=$? + if [ $ret -ne 0 ] ; then + eerror "${SVCNAME} has detected a syntax error in your configuration files:" + dhcpd ${DHCPD_OPTS} ${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} -t + fi + + return $ret +} + +configtest() { + ebegin "Checking ${SVCNAME} configuration" + checkconfig + eend $? +} + +start() { + # Work out our cffile if it's in our DHCPD_OPTS + case " ${DHCPD_OPTS} " in + *" -cf "*) + DHCPD_CONF=" ${DHCPD_OPTS} " + DHCPD_CONF="${DHCPD_CONF##* -cf }" + DHCPD_CONF="${DHCPD_CONF%% *}" + ;; + *) DHCPD_OPTS="${DHCPD_OPTS} -cf ${DHCPD_CONF}" + ;; + esac + + if [ ! -f "${DHCPD_CONF}" ] ; then + eerror "${DHCPD_CONF} does not exist" + return 1 + fi + + checkconfig || return 1 + + checkpath -d -o dhcp:dhcp /var/run/dhcp /var/lib/dhcp + + local leasefile="$(get_var lease-file-name)" + leasefile="${leasefile:-/var/lib/dhcp/${SVCNAME}.leases}" + if [ ! -f "${DHCPD_CHROOT}${leasefile}" ] ; then + ebegin "Creating ${leasefile}" + touch "${DHCPD_CHROOT}${leasefile}" + chown dhcp:dhcp "${DHCPD_CHROOT}${leasefile}" + eend $? || return 1 + fi + + # Setup LD_PRELOAD so name resolution works in our chroot. + if [ -n "${DHCPD_CHROOT}" ] ; then + LD_PRELOAD="${LD_PRELOAD} /usr/lib/libresolv.so" + export LD_PRELOAD="${LD_PRELOAD} /usr/lib/libnss_dns.so" + mount --bind /proc "${DHCPD_CHROOT}/proc" + fi + + local pidfile="$(get_var pid-file-name)" + pidfile="${pidfile:-/var/run/dhcp/${SVCNAME}.pid}" + + ebegin "Starting ${DHCPD_CHROOT:+chrooted }${SVCNAME}" + start-stop-daemon --start --exec /usr/sbin/dhcpd \ + --pidfile "${DHCPD_CHROOT}/${pidfile}" \ + -- ${DHCPD_OPTS} -q -pf "${pidfile}" -lf "${leasefile}" \ + -user dhcp -group dhcp \ + ${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} ${DHCPD_IFACE} + eend $? \ + && save_options chroot "${DHCPD_CHROOT}" \ + && save_options pidfile "${pidfile}" +} + +stop() { + local chroot="$(get_options chroot)" + + ebegin "Stopping ${chroot:+chrooted }${SVCNAME}" + start-stop-daemon --stop --exec /usr/sbin/dhcpd \ + --pidfile "${chroot}/$(get_options pidfile)" + res=$? + + if [ -n "${DHCPD_CHROOT}" ] ; then + umount "${DHCPD_CHROOT}/proc" + fi + eend $res +} diff --git a/net-misc/dhcp/files/dhcrelay.conf b/net-misc/dhcp/files/dhcrelay.conf new file mode 100644 index 0000000..1102d3a --- /dev/null +++ b/net-misc/dhcp/files/dhcrelay.conf @@ -0,0 +1,13 @@ +# /etc/conf.d/dhcrelay: config file for /etc/init.d/dhcrelay + +# Configure which interface or interfaces to for dhcrelay to listen on +# and send to. +# List all interfaces space separated. If this is not specified then +# we use all interfaces. +#IFACE="" + +# Insert any other options needed. See dhcrelay(8) for details. +#DHCRELAY_OPTS="" + +# Space separated list of IPs to forward BOOTP/DHCP packets to. +DHCRELAY_SERVERS="" diff --git a/net-misc/dhcp/files/dhcrelay.init2 b/net-misc/dhcp/files/dhcrelay.init2 new file mode 100755 index 0000000..4f09249 --- /dev/null +++ b/net-misc/dhcp/files/dhcrelay.init2 @@ -0,0 +1,29 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init2,v 1.2 2011/03/08 20:13:26 vapier Exp $ + +depend() { + need net + use logger +} + +start() { + if [ -z "${DHCRELAY_SERVERS}" ]; then + eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/dhcrelay" + return 1 + fi + + checkpath -d /var/run/dhcp + + ebegin "Starting dhcrelay" + start-stop-daemon --start --exec /usr/sbin/dhcrelay \ + -- -q $(printf -- '-i %s ' ${IFACE}) ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS} + eend $? +} + +stop() { + ebegin "Stopping dhcrelay" + start-stop-daemon --stop --pidfile /var/run/dhcp/dhcrelay.pid + eend $? +} diff --git a/net-misc/dhcp/metadata.xml b/net-misc/dhcp/metadata.xml new file mode 100644 index 0000000..667e06d --- /dev/null +++ b/net-misc/dhcp/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>base-system</herd> + <longdescription lang="en">The ISC DHCP client/server package.</longdescription> + <longdescription lang="ja">ISC DHCP クライアント/サーバ・パッケージです。</longdescription> + <use> + <flag name='client'>Install the dhclient program</flag> + <flag name='server'>Install the dhcpd and dhcrelay programs</flag> + </use> +</pkgmetadata> |