commit: 5da9909ddc459867e3c21105b9c113339c10c4e9 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Wed Apr 22 17:52:27 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Apr 22 17:52:27 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=5da9909d
net-misc/dhcp: in tree version works. Package-Manager: portage-2.2.18 Manifest-Sign-Key: 0xF52D4BBA net-misc/dhcp/ChangeLog | 1063 -------------------- net-misc/dhcp/dhcp-4.2.5_p1-r99.ebuild | 242 ----- net-misc/dhcp/files/dhcp-3.0-fix-perms.patch | 15 - .../dhcp/files/dhcp-3.0.3-dhclient-no-down.patch | 70 -- net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch | 216 ---- .../dhcp/files/dhcp-4.2.0-errwarn-message.patch | 31 - .../dhcp/files/dhcp-4.2.2-bind-build-flags.patch | 14 - net-misc/dhcp/files/dhcp-4.2.2-bind-disable.patch | 13 - .../files/dhcp-4.2.2-bind-parallel-build.patch | 14 - .../files/dhcp-4.2.2-dhclient-resolvconf.patch | 409 -------- .../files/dhcp-4.2.2-dhclient-stdin-conf.patch | 113 --- net-misc/dhcp/files/dhcp-4.2.2-nogateway.patch | 46 - .../dhcp/files/dhcp-4.2.4-always-accept-4.patch | 29 - net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch | 72 -- .../files/dhcp-4.2.5_p1-fix-uclibc-sscanf.patch | 21 - net-misc/dhcp/files/dhcpd.conf2 | 28 - net-misc/dhcp/files/dhcpd.init5 | 114 --- net-misc/dhcp/files/dhcrelay.conf | 13 - net-misc/dhcp/files/dhcrelay.init3 | 34 - net-misc/dhcp/files/dhcrelay6.conf | 8 - net-misc/dhcp/metadata.xml | 11 - 21 files changed, 2576 deletions(-) diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog deleted file mode 100644 index 8cb61cd..0000000 --- a/net-misc/dhcp/ChangeLog +++ /dev/null @@ -1,1063 +0,0 @@ -# ChangeLog for net-misc/dhcp -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.243 2013/04/14 11:44:39 ago Exp $ - - 14 Apr 2013; Agostino Sarubbo <[email protected]> dhcp-4.2.5_p1.ebuild: - Stable for sh, wrt bug #463848 - - 13 Apr 2013; Agostino Sarubbo <[email protected]> dhcp-4.2.5_p1.ebuild: - Stable for s390, wrt bug #463848 - - 13 Apr 2013; Agostino Sarubbo <[email protected]> dhcp-4.2.5_p1.ebuild: - Stable for sparc, wrt bug #463848 - - 12 Apr 2013; Agostino Sarubbo <[email protected]> dhcp-4.2.5_p1.ebuild: - Stable for arm, wrt bug #463848 - - 11 Apr 2013; Agostino Sarubbo <[email protected]> dhcp-4.2.5_p1.ebuild: - Stable for alpha, wrt bug #463848 - - 11 Apr 2013; Agostino Sarubbo <[email protected]> dhcp-4.2.5_p1.ebuild: - Stable for ppc64, wrt bug #463848 - - 11 Apr 2013; Agostino Sarubbo <[email protected]> dhcp-4.2.5_p1.ebuild: - Stable for ppc, wrt bug #463848 - - 10 Apr 2013; Jeroen Roovers <[email protected]> dhcp-4.2.5_p1.ebuild: - Inherit user.eclass. - - 10 Apr 2013; Jeroen Roovers <[email protected]> dhcp-4.2.5_p1.ebuild: - Stable for HPPA (bug #463848). - - 09 Apr 2013; Agostino Sarubbo <[email protected]> dhcp-4.2.5_p1.ebuild: - Stable for x86, wrt bug #463848 - - 09 Apr 2013; Agostino Sarubbo <[email protected]> dhcp-4.2.5_p1.ebuild: - Stable for amd64, wrt bug #463848 - -*dhcp-4.2.5_p1 (31 Mar 2013) - - 31 Mar 2013; Mike Frysinger <[email protected]> +dhcp-4.2.5_p1.ebuild: - Version bump #463848 by Agostino Sarubbo. - - 01 Jan 2013; Agostino Sarubbo <[email protected]> dhcp-4.2.4_p2-r1.ebuild: - Add ~ia64, wrt bug #449220 - - 09 Dec 2012; Ulrich Müller <[email protected]> dhcp-3.1.2_p1.ebuild, - dhcp-3.1.3_p1.ebuild, dhcp-4.2.1_p1.ebuild, dhcp-4.2.2.ebuild, - dhcp-4.2.2-r1.ebuild, dhcp-4.2.2-r2.ebuild, dhcp-4.2.2-r3.ebuild, - dhcp-4.2.3_p1.ebuild, dhcp-4.2.3_p2.ebuild, dhcp-4.2.4_p1.ebuild, - dhcp-4.2.4_p2.ebuild, dhcp-4.2.4_p2-r1.ebuild: - Fix LICENSE, bugs 446536 and 426054. - - 11 Nov 2012; Mike Frysinger <[email protected]> dhcp-4.2.4_p2-r1.ebuild, - files/dhcpd.init5, files/dhcrelay.init3: - Add slapd to use in init.d depends when built with USE=ldap #442560 by Tiziano - Müller. - - 11 Nov 2012; Mike Frysinger <[email protected]> dhcp-4.2.4_p2-r1.ebuild: - Drop NetworkManager dbus patch as NM handles this itself now #441968 by Pavel - Šimerda. - - 13 Oct 2012; Raúl Porcel <[email protected]> dhcp-4.2.4_p2.ebuild: - alpha/s390/sh/sparc stable wrt #434880 - - 12 Oct 2012; Mike Frysinger <[email protected]> dhcp-4.2.4_p2-r1.ebuild: - Set AR ourselves since dhcp's build system doesn't do it for us #437980 by - Agostino Sarubbo. - - 11 Oct 2012; Anthony G. Basile <[email protected]> dhcp-4.2.4_p2.ebuild: - stable ppc ppc64, bug #434880 - - 11 Oct 2012; Agostino Sarubbo <[email protected]> dhcp-4.2.4_p2.ebuild: - Stable for amd64, wrt bug #434880 - - 11 Oct 2012; Andreas Schuerch <[email protected]> dhcp-4.2.4_p2.ebuild: - x86 stable, see bug 434880 - - 11 Oct 2012; Markus Meier <[email protected]> dhcp-4.2.4_p2.ebuild: - arm stable, bug #434880 - - 10 Oct 2012; Jeroen Roovers <[email protected]> dhcp-4.2.4_p2.ebuild: - Stable for HPPA (bug #434880). - -*dhcp-4.2.4_p2-r1 (10 Oct 2012) - - 10 Oct 2012; Mike Frysinger <[email protected]> +dhcp-4.2.4_p2-r1.ebuild, - +files/dhcp-4.2.4-always-accept-4.patch, +files/dhcp-4.2.4-quieter-ping.patch: - Quiet ping output by default #296921 by Martin Mokrejš. Always accept the -4 - option even when USE=-ipv6 #437108 by Stefan Reimer. - -*dhcp-4.2.4_p2 (07 Oct 2012) - - 07 Oct 2012; Mike Frysinger <[email protected]> +dhcp-4.2.4_p2.ebuild, - +files/dhcp-4.2.1-dhclient-parse_option_param-Bad-format-a.patch: - Version bump. Add fix from OpenSUSE for parsing "a" options #432998 by Andreas - Steinmetz. - - 20 Sep 2012; Kacper Kowalik <[email protected]> dhcp-4.2.4_p1.ebuild: - ppc64 stable wrt #428120 - - 26 Aug 2012; Raúl Porcel <[email protected]> dhcp-4.2.4_p1.ebuild: - alpha/s390/sh/sparc stable wrt #428120 - - 09 Aug 2012; Brent Baude <[email protected]> dhcp-4.2.4_p1.ebuild: - Marking dhcp-4.2.4_p1 ppc for bug 428120 - - 02 Aug 2012; Markus Meier <[email protected]> dhcp-4.2.4_p1.ebuild: - arm stable, bug #428120 - - 26 Jul 2012; Jeroen Roovers <[email protected]> dhcp-4.2.4_p1.ebuild: - Stable for HPPA (bug #428120). - - 26 Jul 2012; Johannes Huber <[email protected]> dhcp-4.2.4_p1.ebuild: - Stable for x86, wrt bug #428120 - - 26 Jul 2012; Richard Freeman <[email protected]> dhcp-4.2.4_p1.ebuild: - amd64 stable - 428120 - -*dhcp-4.2.4_p1 (26 Jul 2012) - - 26 Jul 2012; Tony Vroon <[email protected]> +dhcp-4.2.4_p1.ebuild: - Security upgrade addressing an IPv6-only buffer overflow (CVE-2012-3570), - remotely triggerable infinite loop (CVE-2012-3571) and remotely triggerable - memory leaks (CVE-2012-3954). - - 16 May 2012; Mike Frysinger <[email protected]> files/dhcrelay.init3, - files/dhcrelay6.conf: - Drop use of IFACE for dhcrelay6 #415957#5 by Spooky Ghost. - -*dhcp-4.2.3_p2 (16 May 2012) - - 16 May 2012; Mike Frysinger <[email protected]> +dhcp-4.2.3_p2.ebuild, - +files/dhcrelay.init3, +files/dhcrelay6.conf: - Version bump, and add dhcrelay6 init.d support #415957 by Spooky Ghost. - - 28 Apr 2012; Alexis Ballier <[email protected]> dhcp-4.2.3_p1.ebuild: - keyword ~amd64-fbsd - - 21 Mar 2012; Diego E. Pettenò <[email protected]> dhcp-4.2.3_p1.ebuild: - Only depend on net-tools with client USE flag enabled (it's used by the - dhclient script). - - 01 Jan 2012; Raúl Porcel <[email protected]> dhcp-4.2.3_p1.ebuild: - alpha/s390/sh/sparc stable wrt #393617 - - 22 Dec 2011; Mark Loeser <[email protected]> dhcp-4.2.3_p1.ebuild: - Stable for ppc/ppc64; bug #393617 - - 14 Dec 2011; Markus Meier <[email protected]> dhcp-4.2.3_p1.ebuild: - arm stable, bug #393617 - - 14 Dec 2011; Pawel Hajdan jr <[email protected]> dhcp-4.2.3_p1.ebuild: - x86 stable wrt bug #393617 - - 11 Dec 2011; Agostino Sarubbo <[email protected]> dhcp-4.2.3_p1.ebuild: - Stable for AMD64, wrt security bug #393617 - - 09 Dec 2011; Jeroen Roovers <[email protected]> dhcp-4.2.3_p1.ebuild: - Stable for HPPA (bug #393617). - -*dhcp-4.2.3_p1 (08 Dec 2011) - - 08 Dec 2011; Mike Frysinger <[email protected]> +dhcp-4.2.3_p1.ebuild: - Version bump #393617 by Agostino Sarubbo. - -*dhcp-4.2.2-r3 (04 Dec 2011) - - 04 Dec 2011; Mike Frysinger <[email protected]> +dhcp-4.2.2-r3.ebuild, - +files/dhcpd.init5: - Enable --enable-early-chroot so config files can be per-chroot #388395 by - Touch. Fix up path to dhcprelay pid files #309129#2 by Milan Dadok. - - 11 Oct 2011; Jeroen Roovers <[email protected]> dhcp-4.2.2-r2.ebuild: - Stable for HPPA (bug #378799). - - 02 Oct 2011; Raúl Porcel <[email protected]> dhcp-4.2.2-r2.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #378799 - - 25 Sep 2011; Kacper Kowalik <[email protected]> dhcp-4.2.2-r2.ebuild: - ppc/ppc64 stable wrt #378799 - - 23 Sep 2011; Andreas Schuerch <[email protected]> dhcp-4.2.2-r2.ebuild: - x86 stable. Thanks Myckel SpanKY and all. bug 378799 - - 23 Sep 2011; Mike Frysinger <[email protected]> dhcp-4.2.2-r2.ebuild: - Install newer init.d script #383961 by Andreas Schürch. - - 22 Sep 2011; Mike Frysinger <[email protected]> dhcp-4.2.2-r2.ebuild, - files/dhcpd.init4: - Install the default config files commented out since they aren't useful in - the real world other than as examples #384087 by Nick Bowler. - - 22 Sep 2011; Mike Frysinger <[email protected]> dhcp-4.2.2-r2.ebuild: - Disable symtable support in local bind as it requires perl #383837 by Albert - W. Hopkins. - - 20 Sep 2011; Tony Vroon <[email protected]> dhcp-4.2.2-r2.ebuild: - Marked stable on AMD64 based on explicit recommendation by Markos "hwoarang" - Chandras in #gentoo-amd64-dev. - - 19 Sep 2011; Markos Chandras <[email protected]> dhcp-4.2.2-r1.ebuild: - Stable on amd64 wrt bug #378799 - - 18 Sep 2011; Mike Frysinger <[email protected]> dhcp-4.2.2-r2.ebuild, - files/dhcpd.conf2: - Drop old `emerge --config` comment #362535#9 by Petr Pisar. - -*dhcp-4.2.2-r2 (17 Sep 2011) - - 17 Sep 2011; Mike Frysinger <[email protected]> +dhcp-4.2.2-r2.ebuild, - +files/dhcpd.conf2, +files/dhcpd.init4: - Rewrite chroot usage to work with newer versions #362535 by Andrew Savchenko. - - 29 Aug 2011; Mike Frysinger <[email protected]> - files/dhcp-4.2.2-bind-build-flags.patch: - Use BUILD_LIBS when creating build "gen" binary to fix cross-compiling cases - where the target uses libcap. - - 29 Aug 2011; Diego E. Pettenò <[email protected]> dhcp-4.2.2-r1.ebuild: - Make sure the bind sub-build doesn't find libcap or it can rely on it for the - build process (disrupting cross-compilation). Also make the vim syntax - package a runtime dependency only, not a build-time one. - -*dhcp-4.2.2-r1 (27 Aug 2011) - - 27 Aug 2011; Mike Frysinger <[email protected]> +dhcp-4.2.2-r1.ebuild: - Fix up some bad paths to conf/run files #380829 by Agostino Sarubbo. - - 27 Aug 2011; Mike Frysinger <[email protected]> dhcp-4.2.2.ebuild, - +files/dhcp-4.2.2-bind-build-flags.patch, - +files/dhcp-4.2.2-bind-disable.patch, - +files/dhcp-4.2.2-bind-parallel-build.patch: - Fix parallel build #380717 by Cédric Jeanneret, and clean up bind tweaks - with patches. - - 26 Aug 2011; Thomas Kahle <[email protected]> dhcp-4.2.2.ebuild: - x86 stable per bug 378799 - -*dhcp-4.2.2 (26 Aug 2011) - - 26 Aug 2011; Mike Frysinger <[email protected]> +dhcp-4.2.2.ebuild, - +files/dhcp-4.2.2-dhclient-resolvconf.patch, - +files/dhcp-4.2.2-dhclient-stdin-conf.patch, - +files/dhcp-4.2.2-nogateway.patch: - Version bump for security #378799, and fix cross-compiling. - - 01 May 2011; Kacper Kowalik <[email protected]> dhcp-3.1.3_p1.ebuild: - ppc64 stable wrt #360047 - - 25 Apr 2011; Raúl Porcel <[email protected]> dhcp-3.1.3_p1.ebuild: - s390/sh/sparc stable wrt #360047 - - 15 Apr 2011; Ulrich Mueller <[email protected]> dhcp-3.1.2_p1.ebuild, - dhcp-3.1.3_p1.ebuild, dhcp-4.2.1_p1.ebuild: - Don't PROVIDE virtual/dhcpc, bug 358827. - - 11 Apr 2011; Pawel Hajdan jr <[email protected]> dhcp-3.1.3_p1.ebuild: - x86 stable wrt bug #360047 - - 10 Apr 2011; Markus Meier <[email protected]> dhcp-3.1.3_p1.ebuild: - arm stable, bug #360047 - -*dhcp-4.2.1_p1 (07 Apr 2011) - - 07 Apr 2011; Mike Frysinger <[email protected]> +dhcp-4.2.1_p1.ebuild: - Version bump #362453 by Alex Legler. - - 01 Apr 2011; Jeroen Roovers <[email protected]> dhcp-3.1.3_p1.ebuild: - Stable for HPPA (bug #360047). - - 27 Mar 2011; Tobias Klausmann <[email protected]> dhcp-3.1.3_p1.ebuild: - Stable on alpha, bug #360047 - - 25 Mar 2011; Brent Baude <[email protected]> dhcp-3.1.3_p1.ebuild: - Marking dhcp-3.1.3_p1 ppc for bug 360047 - - 23 Mar 2011; Christoph Mende <[email protected]> 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 <[email protected]> +dhcp-4.2.1-r1.ebuild, - metadata.xml: - Add USE=client/server flags. - - 08 Mar 2011; Mike Frysinger <[email protected]> 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 <[email protected]> - +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 <[email protected]> +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 <[email protected]> +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 <[email protected]> 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 <[email protected]> dhcp-3.1.2_p1.ebuild: - Marking dhcp-3.1.2_p1 ppc64 for bug 275231 - - 22 Jul 2009; Raúl Porcel <[email protected]> dhcp-3.1.2_p1.ebuild: - arm/s390/sh/sparc stable wrt #275231 - - 19 Jul 2009; nixnut <[email protected]> dhcp-3.1.2_p1.ebuild: - ppc stable #275231 - - 19 Jul 2009; Tobias Klausmann <[email protected]> dhcp-3.1.2_p1.ebuild: - Stable on alpha, bug #275231 - - 17 Jul 2009; Jeroen Roovers <[email protected]> dhcp-3.1.2_p1.ebuild: - Stable for HPPA (bug #275231). - - 16 Jul 2009; Christian Faulhammer <[email protected]> dhcp-3.1.2_p1.ebuild: - stable x86, security bug 275231 - - 16 Jul 2009; <[email protected]> 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 <[email protected]> - +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; <[email protected]> +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; <[email protected]> +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 <[email protected]> -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; <[email protected]> - +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 <[email protected]> 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; <[email protected]> +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 - <[email protected]> for patching and patch porting. - - 29 Jun 2008; Tobias Klausmann <[email protected]> dhcp-3.1.1.ebuild: - Stable on alpha, bug #227135 - - 29 Jun 2008; Friedrich Oslage <[email protected]> dhcp-3.1.1.ebuild: - Stable on sparc, bug #227135 - - 28 Jun 2008; Jeroen Roovers <[email protected]> dhcp-3.1.1.ebuild: - Stable for HPPA (bug #227135). - - 28 Jun 2008; Markus Meier <[email protected]> dhcp-3.1.1.ebuild: - x86 stable, bug #227135 - - 27 Jun 2008; Brent Baude <[email protected]> dhcp-3.1.1.ebuild: - Marking dhcp-3.1.1 ppc for bug 227135 - - 27 Jun 2008; Brent Baude <[email protected]> dhcp-3.1.1.ebuild: - Marking dhcp-3.1.1 ppc64 for bug 227135 - - 27 Jun 2008; <[email protected]> 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; <[email protected]> +dhcp-3.1.1.ebuild: - Version bump for bug #227135. - - 29 Mar 2008; Mike Frysinger <[email protected]> - 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 <[email protected]> metadata.xml: - Removing uberlord from metadata.xml as per #199318. - - 01 Oct 2007; Raúl Porcel <[email protected]> dhcp-3.0.6.ebuild, - dhcp-3.1.0.ebuild: - sparc stable wrt #190775 - - 09 Sep 2007; Roy Marples <[email protected]> dhcp-3.1.0.ebuild: - Stop installing a blank dhcpd.leases file, #191748 thanks to Kevin Pyle. - - 08 Sep 2007; Joseph Jezak <[email protected]> dhcp-3.0.6.ebuild, - dhcp-3.1.0.ebuild: - Marked ppc/ppc64 stable for bug #190775. - - 06 Sep 2007; Roy Marples <[email protected]> - -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 <[email protected]> dhcp-3.0.6.ebuild, - dhcp-3.1.0.ebuild: - Stable on mips, per 190775. - - 02 Sep 2007; Christoph Mende <[email protected]> dhcp-3.0.6.ebuild, - dhcp-3.1.0.ebuild: - Stable on amd64 wrt bug #190775 - - 02 Sep 2007; Raúl Porcel <[email protected]> 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 <[email protected]> dhcp-3.0.6.ebuild, - dhcp-3.1.0.ebuild: - x86 stable (bug #190775) - - 30 Aug 2007; Jeroen Roovers <[email protected]> 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 <[email protected]> +dhcp-3.1.0.ebuild: - Bumpage. - -*dhcp-3.1.0_rc2 (19 Jul 2007) - - 19 Jul 2007; Roy Marples <[email protected]> +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 <[email protected]> - +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 <[email protected]> +dhcp-3.0.6.ebuild: - Bump - -*dhcp-3.1.0_alpha3 (26 Apr 2007) - - 26 Apr 2007; Roy Marples <[email protected]> +dhcp-3.1.0_alpha3.ebuild: - Bump, #176137 thanks to Attila Jecs. - - 22 Apr 2007; Roy Marples <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> +dhcp-3.1.0_alpha2.ebuild: - New upstream alpha. - -*dhcp-3.0.5 (06 Nov 2006) - - 06 Nov 2006; Roy Marples <[email protected]> +dhcp-3.0.5.ebuild: - New upstream version. - - 17 Oct 2006; Roy Marples <[email protected]> dhcp-3.0.5_rc2.ebuild, - dhcp-3.1.0_alpha1.ebuild: - Added ~sparc-fbsd keyword. - - 20 Sep 2006; Roy Marples <[email protected]> - +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 <[email protected]> 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 <[email protected]> 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 <[email protected]> - +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 <[email protected]> dhcp-3.0.5_rc2.ebuild: - Just warn about Packet Socket instead of requiring linux sources - - 05 Sep 2006; Roy Marples <[email protected]> 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 <[email protected]> - +dhcp-3.0.5_rc2.ebuild: - Version bump. - - 11 Aug 2006; Thomas Cort <[email protected]> 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 <[email protected]> - 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 <[email protected]> dhcp-3.0.3-r9.ebuild: - Marked stable on mips. - - 02 Jul 2006; Chris White <[email protected]> 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 <[email protected]> - +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 <[email protected]> dhcp-3.0.3-r9.ebuild: - Marked stable on amd64. bug 137689. - - 25 Jun 2006; Guy Martin <[email protected]> dhcp-3.0.3-r9.ebuild: - Stable on hppa. - - 25 Jun 2006; Tobias Scherbaum <[email protected]> - dhcp-3.0.3-r9.ebuild: - ppc stable, bug #137689 - - 23 Jun 2006; Markus Rothe <[email protected]> dhcp-3.0.3-r9.ebuild: - Stable on ppc64; bug #137689 - - 23 Jun 2006; Chris Gianelloni <[email protected]> dhcp-3.0.3-r9.ebuild: - Stable on x86 wrt bug #137689. - - 23 Jun 2006; Gustavo Zacarias <[email protected]> dhcp-3.0.3-r9.ebuild: - Stable on sparc wrt #137689 - - 09 Jun 2006; <[email protected]> -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 <[email protected]> - 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 <[email protected]> +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 <[email protected]> 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 <[email protected]> - 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 <[email protected]> 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 <[email protected]> - +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 <[email protected]> - +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 <[email protected]> - 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ò <[email protected]> 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ò <[email protected]> dhcp-3.0.3-r6.ebuild: - Add ~x86-fbsd keyword. - - 22 Mar 2006; Roy Marples <[email protected]> - 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ò <[email protected]> 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 <[email protected]> - +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 <[email protected]> - +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 <[email protected]> +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 <[email protected]> - +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 <[email protected]> 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 <[email protected]> files/dhcp.init, - +dhcp-3.0.3-r3.ebuild: - Bump for new init script which fixes CHROOT handling, #122805. - - 18 Feb 2006; Simon Stelling <[email protected]> ChangeLog: - stable on amd64 - - 17 Feb 2006; Markus Rothe <[email protected]> dhcp-3.0.3-r2.ebuild: - Stable on ppc64; bug #89424 - - 17 Feb 2006; Joseph Jezak <[email protected]> dhcp-3.0.3-r2.ebuild: - Marked ppc stable for bug #89424. - - 09 Feb 2006; Gustavo Zacarias <[email protected]> dhcp-3.0.3-r2.ebuild: - Stable on sparc wrt #89424 - - 09 Feb 2006; Joshua Kinard <[email protected]> dhcp-3.0.3-r2.ebuild: - Marked stable on mips. - - 08 Feb 2006; Mark Loeser <[email protected]> dhcp-3.0.3-r2.ebuild: - Stable on x86; bug #89424 - - 07 Feb 2006; Aron Griffis <[email protected]> dhcp-3.0.3-r2.ebuild: - Mark 3.0.3-r2 stable on alpha - - 28 Dec 2005; Guy Martin <[email protected]> dhcp-3.0.3-r2.ebuild: - No more unaligned access on hppa. Marking stable. - - 22 Dec 2005; Roy Marples <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> - +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 <[email protected]> dhcp-3.0.3-r1.ebuild: - multilib fixed. - - 07 Dec 2005; Roy Marples <[email protected]> dhcp-3.0.3-r1.ebuild: - Fixed sandbox violation, #114753. - -*dhcp-3.0.3-r1 (07 Dec 2005) - - 07 Dec 2005; Roy Marples <[email protected]> - +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 <[email protected]> dhcp-3.0.1-r1.ebuild: - stable on ppc64 - -*dhcp-3.0.3 (12 Oct 2005) - - 12 Oct 2005; Roy Marples <[email protected]> +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 <[email protected]> dhcp-3.0.1-r1.ebuild: - Mark 3.0.1-r1 stable on alpha - - 04 Sep 2005; Diego Pettenò <[email protected]> - +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ò <[email protected]> dhcp-3.0.2.ebuild: - Remove -Werror cflag that is passed when building on FreeBSD to fix - Gentoo/FreeBSD. - - 17 Jun 2005; Michael Hanselmann <[email protected]> dhcp-3.0.1-r1.ebuild: - Stable on ppc. - - 20 May 2005; Rene Nussbaumer <[email protected]> dhcp-3.0.1-r1.ebuild: - Stable on hppa - - 19 May 2005; Gustavo Zacarias <[email protected]> dhcp-3.0.1-r1.ebuild: - Stable on sparc - - 17 May 2005; Jan Brinkmann <[email protected]> dhcp-3.0.1-r1.ebuild: - stable on amd64 - -*dhcp-3.0.2 (16 May 2005) - - 16 May 2005; Seemant Kulleen <[email protected]> - -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 <[email protected]> in - bug #88630. Additionally, moved the patches to a tarball on the mirrors. - Configs will probably follow - - 29 Dec 2004; Ciaran McCreesh <[email protected]> : - Change encoding to UTF-8 for GLEP 31 compliance - - 20 Dec 2004; <[email protected]> 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; <[email protected]> -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 <[email protected]> - +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 <[email protected]> dhcp-3.0.1.ebuild: - keywords ~amd64. - - 02 Oct 2004; Bryan Østergaard <[email protected]> dhcp-3.0.1.ebuild: - Keyword ~alpha, bug 65840. - - 07 Sep 2004; Gustavo Zacarias <[email protected]> dhcp-3.0.1.ebuild: - Stable on sparc - -*dhcp-3.0.1 (18 Jul 2004) - - 18 Jul 2004; Mike Frysinger <[email protected]> - +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 <[email protected]> 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 <[email protected]> dhcp-3.0_p2-r4.ebuild: - Add inherit eutils - - 06 Apr 2004; Joshua Brindle <[email protected]> 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 <[email protected]> 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 <[email protected]> - at http://article.gmane.org/gmane.linux.gentoo.devel/11579 - - 09 Mar 2004; Bartosch Pixa <[email protected]> dhcp-3.0_p2-r2.ebuild: - set ppc in keywords - - 04 Mar 2004; Gustavo Zacarias <[email protected]> dhcp-3.0_p2-r3.ebuild: - stable on sparc - - 24 Feb 2004; Max Kalika <[email protected]> dhcp-3.0_p2-r3.ebuild: - Bump to stable x86. - - 14 Jan 2004; Max Kalika <[email protected]> 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 <[email protected]> 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 <[email protected]> dhcp-3.0_p2-r3.ebuild: - Readd the ebuild and chown patch to address bugs #27079 and #36869. - - 05 Jan 2004; Jason Wever <[email protected]> dhcp-3.0_p2-r2.ebuild: - Marked stable on sparc. - - 31 Dec 2003; Guy Martin <[email protected]> dhcp-3.0_p2-r2.ebuild: - Marked stable on hppa. - - 18 Nov 2003; Max Kalika <[email protected]> dhcp-3.0_p2-r2.ebuild: - Some fixes from bug 31840. - - 07 Nov 2003; Max Kalika <[email protected]> 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 <[email protected]> dhcp-3.0_p2-r3.ebuild, - files/dhcp-3.0pl2-fix-perms.patch: - Experimental attempt to fix 31840. - - 05 Nov 2003; Max Kalika <[email protected]> dhcp-3.0_p2-r2.ebuild, - files/dhcp.rc6: - Use a PID file for startup/shutdown. - - 24 Oct 2003; Max Kalika <[email protected]> dhcp-3.0_p2-r2.ebuild: - Fix ownership as part of pkg_postinst(). Fixes bug 31840. - - 22 Oct 2003; Max Kalika <[email protected]> dhcp-3.0_p2-r2.ebuild: - Use enewuser() from eutils.eclass. - - 21 Oct 2003; Max Kalika <[email protected]> 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 <[email protected]> : - Add patch to fix user options to dhclient #30049 and add USE=static - support #30026. - - 16 Sep 2003; Max Kalika <[email protected]> dhcp-3.0_p2-r1.ebuild: - Set proper ownership on /var/lib/dhcp. - - 13 Aug 2003; Max Kalika <[email protected]> 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; [email protected] 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 <[email protected]> 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 <[email protected]> dhcp-3.0_p2.ebuild : - Unmasked, security update. - -*dhcp-3.0_p2 (15 Jan 2003) - - 01 Mar 2003; Jason Wever <[email protected]> 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 <[email protected]> dhcp-3.0_p2.ebuild : - Added testing mips keyword to the ebuild. - - 15 Jan 2003; Brandon Low <[email protected]> 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 <[email protected]> dhcp-3.0_p1.ebuild : - Added testing mips keyword to the ebuild. - - 29 Dec 2002; Daniel Robbins <[email protected]>: Renamed from 3.0-r4 to - reflect the version (3.0_pl1) of the sources being used. - - 06 Dec 2002; Rodney Rees <[email protected]> : changed sparc ~sparc keywords - -*dhcp-3.0-r4 (21 Sep 2002) - - 21 Sep 2002; Mike Frysinger <[email protected]> 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 <[email protected]> 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 <[email protected]> : - - Added PPC to KEYWORDS. - - - 6 Jul 2002; phoen][x <[email protected]>: dhcp-3.0-r2.ebuild: - Added KEYWORDS. - - 16 Jun 2002; Brandon Low <[email protected]>: 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 <[email protected]>: dhcp-3.0-r1.ebuild: - Added KEYWORDS. - -*dhcp-3.0 (14 Feb 2002) - - 6 Jul 2002; phoen][x <[email protected]>: dhcp-3.0.ebuild: - Added KEYWORDS, SLOTS. - - 14 Feb 2002; Daniel Robbins <[email protected]>: New 3.0 release. - -*dhcp-3.0_rc12-r6 (1 Feb 2002) - - 1 Feb 2002; G.Bevin <[email protected]> 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/dhcp-4.2.5_p1-r99.ebuild b/net-misc/dhcp/dhcp-4.2.5_p1-r99.ebuild deleted file mode 100644 index 7121d2f..0000000 --- a/net-misc/dhcp/dhcp-4.2.5_p1-r99.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.5_p1.ebuild,v 1.12 2013/04/14 11:44:39 ago Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs user - -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 - ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"; - -LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" - -DEPEND="selinux? ( sec-policy/selinux-dhcp ) - client? ( kernel_linux? ( sys-apps/net-tools ) ) - ldap? ( - net-nds/openldap - ssl? ( dev-libs/openssl ) - )" -RDEPEND="${DEPEND} - vim-syntax? ( app-vim/dhcpd-syntax )" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - # handle local bind hell - cd "${S}"/bind - unpack ./bind.tar.gz -} - -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.2-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.2.2-dhclient-stdin-conf.patch - epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531 - epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921 - epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108 - - # 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 -r \ - -e "/(script|host-name|domain-name) /d" \ - client/dhclient.conf.example || 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 - - # make the bind build work - binddir=${S}/bind - cd "${binddir}" || die - cat <<-EOF > bindvar.tmp - binddir=${binddir} - GMAKE=${MAKE:-gmake} - EOF - epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch - cd bind-*/ - epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717 - epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch - - epatch "${FILESDIR}"/${PN}-4.2.5_p1-fix-uclibc-sscanf.patch -} - -src_configure() { - # bind defaults to stupid `/usr/bin/ar` - tc-export AR BUILD_CC - export ac_cv_path_AR=${AR} - - # this is tested for by the bind build system, and can cause trouble - # when cross-building; since dhcp itself doesn't make use of libcap, - # simply disable it. - export ac_cv_lib_cap_cap_set_proc=no - - # Use FHS sane paths ... some of these have configure options, - # but not all, so just do it all here. - local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp" - cat <<-EOF >> includes/site.h - #define _PATH_DHCPD_CONF "${e}/dhcpd.conf" - #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf" - #define _PATH_DHCPD_DB "${l}/dhcpd.leases" - #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases" - #define _PATH_DHCLIENT_DB "${l}/dhclient.leases" - #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases" - #define _PATH_DHCPD_PID "${r}/dhcpd.pid" - #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid" - #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid" - #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid" - #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid" - #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid" - EOF - - econf \ - --enable-paranoia \ - --enable-early-chroot \ - --sysconfdir=${e} \ - $(use_enable ipv6 dhcpv6) \ - $(use_with ldap) \ - $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto) - - # configure local bind cruft. symtable option requires - # perl and we don't want to require that #383837. - cd bind/bind-*/ || die - eval econf \ - $(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \ - --disable-symtable \ - --without-make-clean -} - -src_compile() { - # build local bind cruft first - emake -C bind/bind-*/lib/export install - # then build standard dhcp code - emake AR="$(tc-getAR)" -} - -src_install() { - default - - 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 - else - newexe "${S}"/client/scripts/freebsd dhclient-script - fi - fi - - if [[ -e server/dhcpd ]] ; then - if use ldap ; then - insinto /etc/openldap/schema - doins contrib/ldap/dhcp.* - dosbin contrib/ldap/dhcpd-conf-to-ldap - fi - - newinitd "${FILESDIR}"/dhcpd.init5 dhcpd - newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd - newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay - newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay - newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6 - newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6 - - sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560 - fi - - # the default config files aren't terribly useful #384087 - local f - for f in "${ED}"/etc/dhcp/*.conf.example ; do - mv "${f}" "${f%.example}" || die - done - sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die -} - -pkg_preinst() { - enewgroup dhcp - enewuser dhcp -1 -1 /var/lib/dhcp dhcp - - # Keep the user files over the sample ones. The - # hashing is to ignore the crappy defaults #384087. - local f h - for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do - h=${f#*:} - f="/etc/dhcp/${f%:*}.conf" - if [ -e "${EROOT}"${f} ] ; then - case $(md5sum "${EROOT}"${f}) in - ${h}*) ;; - *) cp -p "${EROOT}"${f} "${ED}"${f};; - esac - fi - done -} - -pkg_postinst() { - 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 -} diff --git a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch deleted file mode 100644 index 13debb2..0000000 --- a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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-no-down.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch deleted file mode 100644 index 518efec..0000000 --- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- 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 deleted file mode 100644 index d3f2971..0000000 --- a/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch +++ /dev/null @@ -1,216 +0,0 @@ -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.2.0-errwarn-message.patch b/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch deleted file mode 100644 index f882a13..0000000 --- a/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 [email protected]"); -- 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.2-bind-build-flags.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch deleted file mode 100644 index ae33638..0000000 --- a/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch +++ /dev/null @@ -1,14 +0,0 @@ -bind sets up BUILD_XXX vars for building native tools, but then -doesn't use them for the "gen" tool - ---- a/bind/lib/export/dns/Makefile.in -+++ b/bind/lib/export/dns/Makefile.in -@@ -166,7 +166,7 @@ - ./gen -s ${srcdir} > code.h - - gen: ${srcdir}/gen.c -- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} -+ ${BUILD_CC} ${BUILD_CFLAGS} ${CINCLUDES} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS} - - #We don't need rbtdb64 for this library - #rbtdb64.@O@: rbtdb.c diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-disable.patch deleted file mode 100644 index 4c7810e..0000000 --- a/net-misc/dhcp/files/dhcp-4.2.2-bind-disable.patch +++ /dev/null @@ -1,13 +0,0 @@ -we take care of building this ourselves in the ebuild so -build settings are properly respected - ---- dhcp-4.2.2/bind/Makefile -+++ dhcp-4.2.2/bind/Makefile -@@ -29,6 +29,7 @@ - bindsrcdir=bind-${version} - - all: -+disable: - # Extract the source from the tarball, if it hasn't been already. - @if test -d ${bindsrcdir} ; then \ - echo ${bindsrcdir} already unpacked... ; \ diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch deleted file mode 100644 index 6136154..0000000 --- a/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -fix the bind subdir parallel builds - -https://bugs.gentoo.org/380717 - ---- a/bind/lib/export/isc/Makefile.in -+++ b/bind/lib/export/isc/Makefile.in -@@ -114,6 +114,7 @@ - -DLIBAGE=${LIBAGE} \ - -c ${srcdir}/version.c - -+${OBJS}: | subdirs - libisc.@SA@: ${OBJS} - ${AR} ${ARFLAGS} $@ ${OBJS} - ${RANLIB} $@ diff --git a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch deleted file mode 100644 index 95a0d65..0000000 --- a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch +++ /dev/null @@ -1,409 +0,0 @@ ---- a/client/scripts/bsdos -+++ b/client/scripts/bsdos -@@ -1,40 +1,46 @@ - #!/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 - # If the nameserver has a link-local address - # add a <zone_id> (interface name) to it. - case $nameserver in - fe80:*) zone_id="%$interface";; - FE80:*) zone_id="%$interface";; - *) zone_id='';; - esac -- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 -+ conf="${conf}nameserver ${nameserver}$zone_id\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 - } - ---- a/client/scripts/freebsd -+++ b/client/scripts/freebsd -@@ -11,73 +11,45 @@ - 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 - # If the nameserver has a link-local address - # add a <zone_id> (interface name) to it. - case $nameserver in - fe80:*) zone_id="%$interface";; - FE80:*) zone_id="%$interface";; - *) zone_id='';; - esac -- ( echo nameserver ${nameserver}$zone_id >> /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}$zone_id\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 - } ---- a/client/scripts/linux -+++ b/client/scripts/linux -@@ -26,44 +26,49 @@ - 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 - shopt -s nocasematch - for nameserver in ${new_dhcp6_name_servers} ; do - # If the nameserver has a link-local address - # add a <zone_id> (interface name) to it. - if [[ "$nameserver" =~ ^fe80:: ]] - then - zone_id="%$interface" - else - zone_id= - fi -- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 -+ conf="${conf}nameserver ${nameserver}$zone_id\n" - done - shopt -u nocasematch -+ 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 - } - ---- a/client/scripts/netbsd -+++ b/client/scripts/netbsd -@@ -1,40 +1,46 @@ - #!/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 - # If the nameserver has a link-local address - # add a <zone_id> (interface name) to it. - case $nameserver in - fe80:*) zone_id="%$interface";; - FE80:*) zone_id="%$interface";; - *) zone_id='';; - esac -- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 -+ conf="${conf}nameserver ${nameserver}$zone_id\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 - } - ---- a/client/scripts/openbsd -+++ b/client/scripts/openbsd -@@ -1,40 +1,46 @@ - #!/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/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 - # If the nameserver has a link-local address - # add a <zone_id> (interface name) to it. - case $nameserver in - fe80:*) zone_id="%$interface";; - FE80:*) zone_id="%$interface";; - *) zone_id='';; - esac -- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 -+ conf="${conf}nameserver ${nameserver}$zone_id\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 - } - ---- a/client/scripts/solaris -+++ b/client/scripts/solaris -@@ -1,21 +1,39 @@ - #!/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 - } - diff --git a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch deleted file mode 100644 index bf5a54c..0000000 --- a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch +++ /dev/null @@ -1,113 +0,0 @@ ---- dhcp-4.2.2/client/clparse.c -+++ dhcp-4.2.2/client/clparse.c -@@ -182,6 +182,10 @@ isc_result_t read_client_conf () - #endif - } - -+ /* Read any extra configuration from stdin */ -+ extern int read_client_conf_stdin (struct interface_info *ip, struct client_config *client); -+ read_client_conf_stdin (NULL, &top_level_config); -+ - /* Set up state and config structures for clients that don't - have per-interface configuration statements. */ - config = (struct client_config *)0; -@@ -211,23 +215,13 @@ isc_result_t read_client_conf () - 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) -@@ -238,10 +232,74 @@ int read_client_conf_file (const char *name, struct interface_info *ip, - status = (cfile -> warnings_occurred - ? DHCP_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.2-nogateway.patch b/net-misc/dhcp/files/dhcp-4.2.2-nogateway.patch deleted file mode 100644 index 27fb2b0..0000000 --- a/net-misc/dhcp/files/dhcp-4.2.2-nogateway.patch +++ /dev/null @@ -1,46 +0,0 @@ -http://bugs.gentoo.org/265531 - ---- dhcp-4.2.2/client/scripts/linux -+++ dhcp-4.2.2/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 - else - # we haven't changed the address, have we changed other options - # that we wish to update? -@@ -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/dhcp-4.2.4-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch deleted file mode 100644 index 6cec86c..0000000 --- a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugs.gentoo.org/437108 - -always accept the -4 option even if we don't have IPv6 support enabled. -the relay code does this already. - ---- a/client/dhclient.c -+++ b/client/dhclient.c -@@ -170,8 +170,8 @@ main(int argc, char **argv) { - if (!strcmp(argv[i], "-r")) { - release_mode = 1; - no_daemon = 1; --#ifdef DHCPv6 - } else if (!strcmp(argv[i], "-4")) { -+#ifdef DHCPv6 - if (local_family_set && local_family != AF_INET) - log_fatal("Client can only do v4 or v6, not " - "both."); ---- a/server/dhcpd.c -+++ b/server/dhcpd.c -@@ -373,8 +373,8 @@ main(int argc, char **argv) { - } else if (!strcmp (argv [i], "-q")) { - quiet = 1; - quiet_interface_discovery = 1; --#ifdef DHCPv6 - } else if (!strcmp(argv[i], "-4")) { -+#ifdef DHCPv6 - if (local_family_set && (local_family != AF_INET)) { - log_fatal("Server cannot run in both IPv4 and " - "IPv6 mode at the same time."); diff --git a/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch b/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch deleted file mode 100644 index 66a1fcd..0000000 --- a/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch +++ /dev/null @@ -1,72 +0,0 @@ -https://bugs.gentoo.org/296921 - -`ping -q` will still print out summary information. send that to /dev/null. - -patch by Martin Mokrejš - ---- a/client/scripts/bsdos -+++ b/client/scripts/bsdos -@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then - sleep 1 - if [ "$new_routers" != "" ]; then - set $new_routers -- if ping -q -c 1 -w 1 $1; then -+ if ping -q -c 1 -w 1 $1 >/dev/null; then - if [ x$new_ip_address != x$alias_ip_address ] && \ - [ x$alias_ip_address != x ]; then - ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg ---- a/client/scripts/freebsd -+++ b/client/scripts/freebsd -@@ -284,7 +284,7 @@ if [ x$reason = xTIMEOUT ]; then - if [ -n "$new_routers" ]; then - $LOGGER "New Routers: $new_routers" - set -- $new_routers -- if ping -q -c 1 $1; then -+ if ping -q -c 1 $1 >/dev/null; then - if [ x$new_ip_address != x$alias_ip_address ] && \ - [ x$alias_ip_address != x ]; then - ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg ---- a/client/scripts/linux -+++ b/client/scripts/linux -@@ -253,7 +253,7 @@ if [ x$reason = xTIMEOUT ]; then - ifconfig $interface inet $new_ip_address $new_subnet_arg \ - $new_broadcast_arg $mtu_arg - set $new_routers -- if ping -q -c 1 $1; then -+ if ping -q -c 1 $1 >/dev/null; then - if [ x$new_ip_address != x$alias_ip_address ] && \ - [ x$alias_ip_address != x ]; then - ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg ---- a/client/scripts/netbsd -+++ b/client/scripts/netbsd -@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then - sleep 1 - if [ "$new_routers" != "" ]; then - set $new_routers -- if ping -q -c 1 -w 1 $1; then -+ if ping -q -c 1 -w 1 $1 >/dev/null; then - if [ x$new_ip_address != x$alias_ip_address ] && \ - [ x$alias_ip_address != x ]; then - ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg ---- a/client/scripts/openbsd -+++ b/client/scripts/openbsd -@@ -245,7 +245,7 @@ if [ x$reason = xTIMEOUT ]; then - sleep 1 - if [ "$new_routers" != "" ]; then - set $new_routers -- if ping -q -c 1 -w 1 $1; then -+ if ping -q -c 1 -w 1 $1 >/dev/null; then - if [ x$new_ip_address != x$alias_ip_address ] && \ - [ x$alias_ip_address != x ]; then - ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg ---- a/client/scripts/openwrt -+++ b/client/scripts/openwrt -@@ -186,7 +186,7 @@ if [ x$reason = xTIMEOUT ]; then - ifconfig $interface $new_ip_address $new_subnet_arg \ - $new_broadcast_arg $mtu_arg $metric_arg - set $new_routers -- if ping -q -c 1 $1; then -+ if ping -q -c 1 $1 >/dev/null; then - if [ x$new_ip_address != x$alias_ip_address ] && \ - [ x$alias_ip_address != x ]; then - ifconfig $interface:0 $alias_ip_address $alias_subnet_arg diff --git a/net-misc/dhcp/files/dhcp-4.2.5_p1-fix-uclibc-sscanf.patch b/net-misc/dhcp/files/dhcp-4.2.5_p1-fix-uclibc-sscanf.patch deleted file mode 100644 index e0b8b87..0000000 --- a/net-misc/dhcp/files/dhcp-4.2.5_p1-fix-uclibc-sscanf.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur dhcp-4.2.5-P1.orig/bind/bind-9.8.4-P2/lib/dns/gen.c dhcp-4.2.5-P1/bind/bind-9.8.4-P2/lib/dns/gen.c ---- dhcp-4.2.5-P1.orig/bind/bind-9.8.4-P2/lib/dns/gen.c 2013-03-06 16:57:05.000000000 +0000 -+++ dhcp-4.2.5-P1/bind/bind-9.8.4-P2/lib/dns/gen.c 2013-08-11 15:37:14.750000000 +0000 -@@ -462,7 +462,7 @@ - if (!start_directory(dirname, &dir)) - return; - -- sprintf(fmt,"%s%c", "%20[-0-9a-z]_%d.", filetype); -+ sprintf(fmt,"%s%c", "%20[^_]_%d.", filetype); - while (next_file(&dir)) { - if (sscanf(dir.filename, fmt, typename, &type) != 2) - continue; -@@ -582,7 +582,7 @@ - exit(1); - - while (next_file(&dir)) { -- if (sscanf(dir.filename, "%10[0-9a-z]_%d", -+ if (sscanf(dir.filename, "%10[^_]_%d", - classname, &rdclass) != 2) - continue; - if ((rdclass > 65535) || (rdclass < 0)) diff --git a/net-misc/dhcp/files/dhcpd.conf2 b/net-misc/dhcp/files/dhcpd.conf2 deleted file mode 100644 index 5cd2eec..0000000 --- a/net-misc/dhcp/files/dhcpd.conf2 +++ /dev/null @@ -1,28 +0,0 @@ -# /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="/var/lib/dhcp/chroot" - -# 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.init5 b/net-misc/dhcp/files/dhcpd.init5 deleted file mode 100755 index 14c0b6a..0000000 --- a/net-misc/dhcp/files/dhcpd.init5 +++ /dev/null @@ -1,114 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init5,v 1.2 2012/11/11 21:42:02 vapier Exp $ - -extra_commands="configtest" - -: ${DHCPD_CONF:=/etc/dhcp/${SVCNAME}.conf} - -depend() { - need net - use logger dns #@slapd@ -} - -get_var() { - local var="$(sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' "${chroot}${DHCPD_CONF}")" - echo ${var:-$2} -} - -checkconfig() { - set -- ${DHCPD_OPTS} ${chroot:+-chroot} ${chroot} -t - - dhcpd "$@" 1>/dev/null 2>&1 - local ret=$? - if [ ${ret} -ne 0 ] ; then - eerror "${SVCNAME} has detected a syntax error in your configuration files:" - dhcpd "$@" - fi - - return ${ret} -} - -configtest() { - local chroot=${DHCPD_CHROOT%/} - - ebegin "Checking ${SVCNAME} configuration" - checkconfig - eend $? -} - -start() { - local chroot=${DHCPD_CHROOT%/} - - # 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 [ -n "${chroot}" ] ; then - # the config test want's these to exist - mkdir -p \ - "${chroot}"/var/run/dhcp \ - "${chroot}"/var/lib/dhcp \ - "${chroot}"/etc/dhcp - fi - - # see comment in get_var() above - if [ ! -f "${chroot}${DHCPD_CONF}" ] ; then - eerror "${chroot}${DHCPD_CONF} does not exist" - return 1 - fi - - checkconfig || return 1 - - checkpath -d -o dhcp:dhcp "${chroot}"/var/run/dhcp "${chroot}"/var/lib/dhcp - - local leasefile="$(get_var lease-file-name /var/lib/dhcp/${SVCNAME}.leases)" - checkpath -f -o dhcp:dhcp "${chroot}${leasefile}" - - # Setup LD_PRELOAD so name resolution works in our chroot. - if [ -n "${chroot}" ] ; then - checkpath -d -o root:root -m 755 "${chroot}"/dev "${chroot}"/etc "${chroot}"/proc - cp -pP /etc/localtime /etc/resolv.conf "${chroot}"/etc/ - export LD_PRELOAD="${LD_PRELOAD} libresolv.so libnss_dns.so" - if ! mountinfo -q "${chroot}/proc" ; then - mount --bind /proc "${chroot}/proc" - fi - fi - - local pidfile="$(get_var pid-file-name /var/run/dhcp/${SVCNAME}.pid)" - - ebegin "Starting ${chroot:+chrooted }${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/dhcpd \ - --pidfile "${chroot}/${pidfile}" \ - -- ${DHCPD_OPTS} -q -pf "${pidfile}" -lf "${leasefile}" \ - -user dhcp -group dhcp \ - ${chroot:+-chroot} ${chroot} ${DHCPD_IFACE} - eend $? \ - && save_options chroot "${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 [ ${res} -eq 0 ] && [ -n "${chroot}" ] ; then - if mountinfo -q "${chroot}/proc" ; then - umount "${chroot}/proc" - fi - fi - - eend $res -} diff --git a/net-misc/dhcp/files/dhcrelay.conf b/net-misc/dhcp/files/dhcrelay.conf deleted file mode 100644 index 1102d3a..0000000 --- a/net-misc/dhcp/files/dhcrelay.conf +++ /dev/null @@ -1,13 +0,0 @@ -# /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.init3 b/net-misc/dhcp/files/dhcrelay.init3 deleted file mode 100755 index fe4ec8c..0000000 --- a/net-misc/dhcp/files/dhcrelay.init3 +++ /dev/null @@ -1,34 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init3,v 1.3 2012/11/11 21:42:02 vapier Exp $ - -depend() { - need net - use logger #@slapd@ -} - -start() { - if [ -z "${DHCRELAY_SERVERS}" ] ; then - eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/${SVCNAME}" - return 1 - fi - - checkpath -d /var/run/dhcp - - local iface_opts - if [ -n "${IFACE}" ] ; then - iface_opts=$(printf -- '-i %s ' ${IFACE}) - fi - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/dhcrelay \ - -- -q ${iface_opts} ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --pidfile /var/run/dhcp/${SVCNAME}.pid - eend $? -} diff --git a/net-misc/dhcp/files/dhcrelay6.conf b/net-misc/dhcp/files/dhcrelay6.conf deleted file mode 100644 index 4e8b8c6..0000000 --- a/net-misc/dhcp/files/dhcrelay6.conf +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/conf.d/dhcrelay6: config file for /etc/init.d/dhcrelay6 - -# Insert any other options needed. See dhcrelay(8) for details. -# Make sure you specify the lower (-l)/upper (-u) interfaces. -DHCRELAY_OPTS="-6 -l lower-iface -u upper-iface" - -# Space separated list of IPs to forward BOOTP/DHCP packets to. -DHCRELAY_SERVERS="" diff --git a/net-misc/dhcp/metadata.xml b/net-misc/dhcp/metadata.xml deleted file mode 100644 index 667e06d..0000000 --- a/net-misc/dhcp/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?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>
