--- dhcpcd-3.2.3.orig/Makefile +++ dhcpcd-3.2.3/Makefile @@ -24,6 +24,7 @@ LDADD+= ${LIBRESOLV} ${LIBRT} CFLAGS+= -DINFODIR=\"${INFOD}\" ${FORK} ${RC} +CFLAGS+= ${COPTS} # As version.h is generated by us, hardcode the depend correctly. ${SRCS}: version.h --- dhcpcd-3.2.3.orig/arp.c +++ dhcpcd-3.2.3/arp.c @@ -236,10 +236,14 @@ memset (reply, 0, iface->buffer_length); if ((bytes = get_packet (iface, (unsigned char *) reply, - buffer, + iface->buffer_length, buffer, &buflen, &bufpos)) == -1) break; + /* check that we've got complete arp header */ + if ((size_t) bytes < sizeof (*reply)) + continue; + /* Only these types are recognised */ if (reply->ar_op != htons (ARPOP_REPLY)) continue; @@ -249,7 +253,7 @@ continue; if (reply->ar_pln != sizeof (address)) continue; - if ((unsigned) bytes < sizeof (reply) + + if ((size_t) bytes < sizeof (*reply) + 2 * (4 + reply->ar_hln)) continue; --- dhcpcd-3.2.3.orig/client.c +++ dhcpcd-3.2.3/client.c @@ -321,7 +321,7 @@ if (! get_old_lease (state, options)) #endif { - free (dhcp); + /* free (dhcp); */ return (false); } state->timeout = 0; @@ -1007,7 +1007,7 @@ do { if (get_packet (iface, (unsigned char *) &message, - state->buffer, + sizeof(message), state->buffer, &state->buffer_len, &state->buffer_pos) == -1) break; --- dhcpcd-3.2.3.orig/debian/README.debian +++ dhcpcd-3.2.3/debian/README.debian @@ -0,0 +1,51 @@ +dhcpcd for Debian +----------------- + +Startup +------- +If you would like an interface to be configured using dhcpcd at +boot time then add lines like + +auto eth1 +iface eth1 inet dhcp + +to /etc/network/interfaces. This will cause ifup to bring up +interface eth1 at boot time. + +Ifup will use dhcpcd to configure a particular interface if it +is set up to configure that interface according to an "iface" +description in /etc/network/interfaces of type "inet dhcp". +See the ifup(8) and interfaces(5) manual pages for more +information on how to write the /etc/network/interfaces file. + +Resolv.conf +----------- +Dhcpcd will no longer update /etc/resolv.conf and /etc/ntp.conf +directly unless this is enabled in /etc/dhcpc/config by setting +the SET_DNS environment variable to "yes". If the resolvconf +package is installed then the resolv.conf information will be +sent to resolvconf; otherwise the information will be written +to /etc/dhcpc/resolv.conf . Note that if you are using +resolvconf then you must _not_ set SET_DNS to "yes" since this +will interfere with resolvconf's operation. + +DUID-based client-ids +--------------------- +Dhcpcd version 3 constructs client-ids using the a DUID, as specified +by RFC 4361. previous versions used a client-id based on the interface +MAC address, as specified in RFC 2131. If a host which already has a +DHCP lease changes its client-id, it is probable that it will be +allocated a new IP address by the DHCP server, which may cause +problems. To avoid this, if the Debian package of dhcpcd is upgraded, +the file /etc/dhcpc/inhibit-duid will be created, which forces dhcpcd +to use the old client-id. New installations use DUID-based client-ids +from scratch and existing ones can be upgraded in a controlled manner +by deleting /etc/dhcpc/inhibit-duid and taking interfaces down and +then back up. + + + + -- Simon Kelley , Tues, 12 Feb 2008 12:22:01 +0000 + + + --- dhcpcd-3.2.3.orig/debian/changelog +++ dhcpcd-3.2.3/debian/changelog @@ -0,0 +1,547 @@ +dhcpcd (1:3.2.3-11+deb7u1build0.14.04.1) trusty-security; urgency=medium + + * fake sync from Debian (LP: #1517226) + + -- Tyler Hicks Wed, 30 Mar 2016 17:40:57 -0500 + +dhcpcd (1:3.2.3-11+deb7u1) oldstable-security; urgency=high + + * Fix CVE-2012-6698, CVE-2012-6699, CVE-2012-6700, + out-of-bound reads/writes and use-after-free issues with specially + crafted DHCP messages. + This is a forward port of the patch applied to squeeze-lts since + wheezy uses the same upstream version. (LP: #1517226) + + -- Guido Günther Sun, 27 Mar 2016 15:47:43 +0200 + +dhcpcd (1:3.2.3-11) unstable; urgency=high + + * Security fix, remote stack overflow: CVE-2012-2152. (closes: #671265) + + -- Simon Kelley Thu, 3 May 2012 14:03:12 +0000 + +dhcpcd (1:3.2.3-10) unstable; urgency=low + + * Fix inhibit-duid/duid-inhibit confusion in README. + + -- Simon Kelley Thu, 26 Jan 2012 21:04:22 +0000 + +dhcpcd (1:3.2.3-9) unstable; urgency=low + + * Fix double-free crash. (closes: #632164) + + -- Simon Kelley Thu, 30 Jun 2011 21:04:22 +0000 + +dhcpcd (1:3.2.3-8) unstable; urgency=low + + * Add --pidfile argument. (closes: #532100) + + -- Simon Kelley Mon, 14 Feb 2011 21:19:12 +0000 + +dhcpcd (1:3.2.3-7) unstable; urgency=low + + * Fix FTBFS on GNU/kFreeBSD. (closes: #594661) + + -- Simon Kelley Tue, 31 Aug 2010 21:24:13 +0000 + +dhcpcd (1:3.2.3-6) unstable; urgency=low + + * Make /sbin/dhcpcd and /usr/share/man/man8/dhcpcd.8 managed + * as alternatives, to allow co-existance with dhcpcd5. + * Correctly handle multiple options in wrapper script. (closes: #577846) + * Don't override CFLAGS in the build system. (closes: #571183) + + -- Simon Kelley Thu, 19 Aug 2010 20:41:13 +0000 + +dhcpcd (1:3.2.3-5) unstable; urgency=low + + * Remove conflict with dhcp3-client. (closes: #563627) + + -- Simon Kelley Mon, 4 Jan 2010 16:37:13 +0000 + +dhcpcd (1:3.2.3-4) unstable; urgency=low + + * Comment out dodgy declaration of __u64. (closes: #544679) + * Conflict with dhcp3-client. (closes: #485484) + * Fix location of config file in dhcpcd man page. (closes: #485483) + * Allow spaces in OPTIONS. (closes: #534561) + * Remove obsolete pid-file management from wrapper + script, since dhcpcd-3 doesn't require it. (closes: #536864) + + -- Simon Kelley Tue, 17 Nov 2009 21:00:12 +0100 + +dhcpcd (1:3.2.3-3) unstable; urgency=low + + * Fix wrong variable used for domain in dhcpcd.sh (closes: #512296) + + -- Simon Kelley Thu, 29 Jan 2009 20:49:18 +0100 + +dhcpcd (1:3.2.3-2) unstable; urgency=low + + * Patched to use correct MAC address in DHCP renewal requests. + * (closes: #502191) + + -- Simon Kelley Tue, 14 Oct 2008 20:33:38 +0100 + +dhcpcd (1:3.2.3-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix bashism in preinst maintainer script (Closes: #473515) + * Bump Standards-Version to 3.7.3. + + -- Chris Lamb Sat, 12 Apr 2008 03:50:59 +0100 + +dhcpcd (1:3.2.3-1) unstable; urgency=low + + * New upstream. + * Restore lost changelog (closes: #467083) + * Fix FTBFS on GNU/kFreeBSD. (closes: #467005) + + -- Simon Kelley Wed, 27 Feb 2008 12:06:38 +0100 + +dhcpcd (1:3.2.2-1) unstable; urgency=low + + * New upstream. + * Add /etc/dhcpc/duid-inhibit logic. + + -- Simon Kelley Thu, 21 Feb 2008 20:14:58 +0100 + +dhcpcd (1:3.0.17-2) unstable; urgency=low + + * Remove SET_DOMAIN option: this has been non-functional for + serveral years, but on 3.0.x, setting causes dhcpcd to fail + at startup. (closes: #419868) + + -- Simon Kelley Wed, 18 Apr 2007 13:34:28 +0100 + +dhcpcd (1:3.0.17-1) unstable; urgency=low + + * New upstream. + * Handle change of lease-change script from /etc/dhcpc/dhcpcd.exe + to /etc/dhcpcd.sh and the config file from /etc/dhcpc/config + to the more standards-conforming /etc/default/dhcpcd + * Apply patch from SVN to make .info file compatible with old scripts. + + -- Simon Kelley Sat, 14 Apr 2007 17:41:32 +0100 + +dhcpcd (1:2.0.3-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Fri, 10 Mar 2006 21:43:11 +0100 + +dhcpcd (1:2.0.2-1) unstable; urgency=low + + * New upstream. + + -- Simon Kelley Mon, 28 Feb 2006 11:53:41 +0100 + +dhcpcd (1:2.0.1-1) unstable; urgency=low + + * New upstream. + * Fixed various lintian warnings. + + -- Simon Kelley Mon, 23 Jan 2006 20:55:11 +0100 + +dhcpcd (1:2.0.0-2) unstable; urgency=low + + * Clear out /etc/dhcpc/resolv.conf and /var/lib/dhcpc/* + during purge. (closes: #330515) + + -- Simon Kelley Thur, 29 Sep 2005 26:21:51 +0100 + +dhcpcd (1:2.0.0-1) unstable; urgency=low + + * New upstream: the previous upstream maintainer went MIA, so the + 2.x.x series is a fork. It merges everthing relevant from the Debian + and Gentoo packages. From the Debian point of view, the changes + are therefore the things imported from Gentoo. These are the + -F -e and -m options. + + -- Simon Kelley Sat, 23 July 2005 21:55:11 +0100 + +dhcpcd (1:1.3.22pl4-22) unstable; urgency=low + + * Gut the preinst and postinst scripts. Now that Sarge is + released, we no longer need to carry baggage for upgrading from + potato. + * Add a comment to /etc/dhcpc/config in attempt to avoid confusion + over which interface it applies to. (closes: #311495) + * Fix the value of the "Maximum message size" option. This value + includes the IP and UDP headers, and it's minium value is therefore + 576, according to RFC2131. + * Fix a security hole. A malformed DHCP packet could crash dhcpcd. + + -- Simon Kelley Mon, 27 Jun 2005 21:23:21 +0100 + +dhcpcd (1:1.3.22pl4-21) unstable; urgency=low + + * Fixed my juvenile shell scripting to cope with arguments with + spaces in them. (closes: #300897) + + -- Simon Kelley Wed, 23 Mar 2005 14:30:34 +0000 + +dhcpcd (1:1.3.22pl4-20) unstable; urgency=low + + * Added -p option, for use with NFS-root. + * Made -t 0 work to disable timeouts entirely. + * Fixed the wrapper script so that is doesn't send the hostname + if one is hardcoded in the /etc/dhcpc/config. + + -- Simon Kelley Sat, 11 Dec 2004 19:13:12 +0000 + +dhcpcd (1:1.3.22pl4-19) unstable; urgency=low + + * Don't run the dhcpc.exe script when timing out or + exiting before any lease info is available. (closes: #283516) + + -- Simon Kelley Mon, 29 Nov 2004 21:13:12 +0000 + +dhcpcd (1:1.3.22pl4-18) unstable; urgency=low + + * Added rfc3397 support. (closes: #274309) + + -- Simon Kelley Sat, 10 Oct 2004 19:13:12 +0000 + +dhcpcd (1:1.3.22pl4-17) unstable; urgency=low + + * Changed dhcpcd wrapper script to bash. (closes: #269846) + + * Tweaked dhcpcd.exe. (closes: #269847) + + -- Simon Kelley Sat, 4 Sep 2004 12:11:10 +0000 + +dhcpcd (1:1.3.22pl4-16) unstable; urgency=low + + * Improved argument checking of dhcpcd wrapper script. + + * Fix bug in code to determine if we send the hostname in + a DHCP request in the dhcpcd wrapper script. (closes: #268181) + + * Add "search" directive to /etc/dhcpc/resolv.conf when domain + returned in DHCP lease. (closes: #268011) + + * Tweak comments in config file. (closes: #268009) + + -- Simon Kelley Thur, 2 Sep 2004 20:31:20 +0000 + +dhcpcd (1:1.3.22pl4-15) unstable; urgency=low + + * Don't exit with an error when calling dhcpcd -k and the process + is not running, since this is probably because dhcpcd obtained + an infinite lease and exited. Returning an error stops ifdown from + taking the interface down in that case. (closes #258641) + + * Reworded man page section on "-k" (closes #253107). + + -- Simon Kelley Wed, 4 Aug 2004 21:31:20 +0000 + +dhcpcd (1:1.3.22pl4-14) unstable; urgency=low + + * Remove prerm script entirely, since it tries to clean up + files which don't exist and fails to stop the daemon correctly + when it is running on an interface other than eth0. (closes: #253107) + + -- Simon Kelley Wed, 8 Jul 2004 21:01:20 +0000 + +dhcpcd (1:1.3.22pl4-13) unstable; urgency=low + + * Add dependency on procps. (closes: #250650) + + -- Simon Kelley Sun, 30 May 2004 18:02:10 +0000 + +dhcpcd (1:1.3.22pl4-12) unstable; urgency=low + + * Change dependency on ifupdown into a conflict with old + ifupdown verions. As a consequence, now need to check if + ifupdown in installed in postinst before mangling + /etc/network/interfaces. (closes: #249428) + + -- Simon Kelley Tue, 18 May 2004 19:19:20 +0000 + +dhcpcd (1:1.3.22pl4-11) unstable; urgency=low + + * Send the current hostname with the DHCP request, unless overridden. + + -- Simon Kelley Thur, 13 May 2004 22:29:10 +0000 + +dhcpcd (1:1.3.22pl4-10) unstable; urgency=low + + * Fixed default location of dhcpcd.exe file, which got moved + to /var/lib/dhcpc by accident. + + -- Simon Kelley Tue, 6 Jan 2004 20:19:00 +0000 + +dhcpcd (1:1.3.22pl4-9) unstable; urgency=low + + * Included Thomas Hood's rewrite of the README (closes: #203165) + * Updated postinst to reflect changed syntax of + /etc/network/interfaces in later versions. (closes: #203176) + * Changed dependency on ifupdown from pre-depends: to + depends: which is sufficient as it ensures that ifupdown + is functional before the dhcpcd postinst script is run. + + -- Simon Kelley Mon, 8 Sep 2003 21:22:05 +0000 + +dhcpcd (1:1.3.22pl4-8) unstable; urgency=low + + * Tweaked Conflicts: (closes: #196485) + * Use safe tests in the wrapper script. (closes: #197624) + * Move *cache *and *info files from /etc/dhcpc to /var/lib/dhcpc + to facilitate machines without writable root filesystems. + /etc/dhcpc/resolv.conf becomes a link to /var/lib/dhcpc/resolv.conf + for the same reason. + * Tweaked pre-depends to avoid needless conflicts when installing + on woody. + * Added version to bsdutils dependency and updated copyright, both + to please lintian. + + -- Simon Kelley Sat, 26 Jul 2003 15:32:59 +0000 + +dhcpcd (1:1.3.22pl4-7) unstable; urgency=low + + * Added support for resolvconf package in dhcpcd.exe + + -- Simon Kelley Mon, 23 Jun 2003 19:54:43 +0000 + +dhcpcd (1:1.3.22pl4-6) unstable; urgency=high + + * Check for symbolic links before using readlink + in postinst. (closes: #184043) + + -- Simon Kelley Sun, 9 Mar 2003 10:26:46 +0000 + +dhcpcd (1:1.3.22pl4-5) unstable; urgency=low + + * Fix /etc/dhcpcd.exe to cope with more than two DNS servers. + + -- Simon Kelley Sat, 8 Mar 2003 12:35:16 +0000 + +dhcpcd (1:1.3.22pl4-4) unstable; urgency=high + + * Fix typo in /etc/dhcpcd.exe (closes: #182631) + + -- Simon Kelley Thur, 27 Feb 2003 07:46:06 +0000 + +dhcpcd (1:1.3.22pl4-3) unstable; urgency=low + + * Allow wlan interfaces in dhcpcd.exe. (closes: #182046) + * Provide dhcp-client virtual package. (closes: #178962) + + -- Simon Kelley Mon, 24 Feb 2003 21:14:07 +0000 + +dhcpcd (1:1.3.22pl4-2) unstable; urgency=low + + * Fix stupid automake mess-up which stops autobuilders. + + -- Simon Kelley Tue, 28 Jan 2003 23:23:05 +0000 + +dhcpcd (1:1.3.22pl4-1) unstable; urgency=low + + * New upstream. + * Check for existance of hostinfo file in dhcpcd.exe; this + * may be missing if the first ever invokation of DHCPCD fails. + + -- Simon Kelley Mon, 27 Jan 2003 17:23:48 +0000 + +dhcpcd (1:1.3.22pl3-2) unstable; urgency=low + + * make /etc/dhcpcd.exe a bash script (closes: #169688). + + -- Simon Kelley Sun, 24 Nov 2002 20:52:18 +0000 + +dhcpcd (1:1.3.22pl3-1) unstable; urgency=low + + * New upstream. + * Set perms on /etc/dhcpc/resolv.conf to 644 (closes: #167364). + * Remove gcc arch flags in configure.in so that i386 binaries + really run on 386-and-up. + + -- Simon Kelley Sat, 23 Nov 2002 21:03:25 +0000 + +dhcpcd (1:1.3.22pl2-2) unstable; urgency=low + + * Updated config.guess, config.sub and missing with files + from automake 1.4-p6-2. (closes: #162854) + + -- Simon Kelley Mon, 30 Sept 2002 15:27:23 +0100 + +dhcpcd (1:1.3.22pl2-1) unstable; urgency=low + + * New upstream. + * Do careful check for stale pid files on startup. (closes: #161997) + + -- Simon Kelley Sun, 29 Sept 2002 18:55:17 +0100 + +dhcpcd (1:1.3.22pl1-4) unstable; urgency=high + + * Removed shopt command from preinst - not required (closes: #153452) + * Added code to automatically copy enough configuration + on upgrade to keep the machine on the net. (closes: #153293) + Detailed change as follows. + 1) No longer stop existing daemon in preinst, instead copy config file + for use in postinst. + 2) In postinst update /etc/network/interfaces, then stop old daemon, + then run ifup on the interface. + 3) Change depends to pre-depends on ifupdown, since it has to be + functional for the above to work. + + -- Simon Kelley Wed, 17 Jul 2002 23:09:14 +0100 + +dhcpcd (1:1.3.22pl1-3) unstable; urgency=low + + * Updated config.guess and config.sub (closes: #152623) + + -- Simon Kelley Sun, 15 Jul 2002 22:15:09 +0100 + +dhcpcd (1:1.3.22pl1-2) unstable; urgency=high + + * Added build-depends for debhelper (closes:#151884). + * Do fixups from old version in preinst, not postinst. + This fixes a problem where the old init.d script mangled the + newly installed files and left the package unusable. + * Really close all the bugs meant to be closed by 1.3.22pl1-1. + (closes:#143657) (closes:#143660) + (closes:#140288) (closes:#127773) (closes:#118039) (closes:#121208) + * Remove bashism from postinst. (closes:#151522) + * Update docs to reflect newer format of + /etc/network/interfaces + + -- Simon Kelley Weds, 10 Jun 2002 14:05:08 +0100 + +dhcpcd (1:1.3.22pl1-1) unstable; urgency=low + + * New maintainer. + * New upstream. (closes:143657) (closes:143660) + * Removed /etc/init.d/dhcpcd. dhcpcd is now started by ifup or the pcmcia + package. This is corresponds with the mechanism used by pump. + (closes:140288) (closes:127773) (closes:118039) (closes:121208) + * Removed kernel 2.0.x support since debian now longer supports this + kernel series. The latest upstream now allows compilation for + 2.0.x anyway, so the ancient and unsupported 0.70 source tree has gone + as well. 2.0.x users can recompile the source package. + * Added a wrapper (/sbin/dhcpcd) around the real binary (/sbin/dhcpcd-bin) + which allows options to be set in /etc/dhcpc/config. ifup allows + most common options to be set, but not some which may be useful, + and dhcpcd doesn't natively support a config file. + * Do not allow dhcpcd to alter /etc/resolv.conf, /etc/ntp.conf or + /etc/yp.conf by default: these all need settings in + /etc/dhcpc/config now. /etc/dhcpc/resolv.conf is still supported + for dnsmasq. + * Removed strange diversion of /etc/resolv.conf and /etc/ntp.conf + via symlinks. + * Patched upstream to remove security hole associated with shell + metachars in dhcpcd-.info. Without the patch talking to + a DHCP server which returned a domain name of eg `rm -rf /` would + cause big problems! + + -- Simon Kelley Tues, 11 Jun 2002 20:08:07 +0100 + +dhcpcd (1:1.3.17pl2-8) frozen unstable; urgency=low + + * Add to frozen to avoid release with critical bugs + + -- Dennis Kelly Wed, 8 Mar 2000 11:04:04 -0500 + +dhcpcd (1:1.3.17pl2-7) unstable; urgency=low + + * Fixed init script for 2.0 kernels + + -- Dennis Kelly Tue, 22 Feb 2000 16:52:37 -0500 + +dhcpcd (1:1.3.17pl2-6) unstable; urgency=low + + * "-02" w/gcc >= 2.8 will cause dhcpcd to fail (closes: #56860, #43238) + * Change /sbin/dhcpcd to be a link instead of startup script so pid file + is created properly (closes: #53501) + * exit 0 if interface is set to "none" (closes: #55836) + * Hint in postinst for pcmcia-cs (closes: #55776, #33623) + + -- Dennis Kelly Fri, 18 Feb 2000 09:43:48 -0500 + +dhcpcd (1:1.3.17pl2-5) unstable; urgency=low + + * Support for 2.3.x kernels in dhcpcd script (closes: #46761) + * Use $@ instead of $* in dhcpcd script (closes: #46914) + * Do not delete dhcpcd-$IFACE.exe (closes: #48235) + * Do nothing in init script if no interface is configured (closes: #49814) + + -- Dennis Kelly Mon, 1 Nov 1999 10:02:11 -0500 + +dhcpcd (1:1.3.17pl2-4) unstable; urgency=low + + * Start dhcpcd if upgrading from versions <= 1:1.3.17pl2-2, as they stop + and start the daemon during upgrades (closes: #32078, #46355) + * postinst: resolv.conf and ntp.conf setup did not properly check files + when moving or copying to directories (closes: #30657, #35346, #46449) + * postinst: cleaned up configure code to report and handle interfaces + better (closes: #25293) + * made /sbin/dhcpcd a wrapper that calls either dhcpcd-2.0.x or + dhcpcd-2.2.x, depending on current running kernel to make the + pcmcia-cs package happy (closes: #31701, #45536) + * postinst: don't fail if no network is configured + + -- Dennis Kelly Mon, 1 Nov 1999 10:02:01 -0500 + +dhcpcd (1:1.3.17pl2-3) unstable; urgency=low + + * Reversed order of $IFACE and $OPTIONS in init script (closes: #33204) + * Moved dhcpcd daemons to /sbin (closes: #45536) + * Remove old pid, cache, and info files which cause failure at startup + (closes: #34124, #35992) + * Removed annoying 'your IP address:' statement from console messages + and really follow policy (closes: #32373, #34601) + * Don't restart during upgrade (#32078) + * Handle upgrades from previous versions using wrong init script + properly (closes: #46202) + * Updated README to at least include correct information regarding + the package + * Update configure script to actually list available interfaces + + -- Dennis Kelly Wed, 29 Sep 1999 11:40:32 -0400 + +dhcpcd (1:1.3.17pl2-2) unstable; urgency=low + + * New maintainer + * Purge now removes init script (closes: #32371) + * Console messages from init script now follow policy (closes: #32373) + * Testing DAEMON in init script follows defining it in case (closes: #34769) + * Removed 'source' bashism in init script (closes: #35343) + * Removed '==' bashism in postinst script (closes: #35402) + * Fixed dhcpcd failing to start if pid file exists (closes: #32692) + * Remove old init script if it exists (closes: #33523) + + -- Dennis Kelly Mon, 27 Sep 1999 16:21:18 -0400 + +dhcpcd (1:1.3.17pl2-1) unstable; urgency=low + + * New upstream version of dhcpcd-sv + * Merged dhcpcd-sv and dhcpcd into same package. + * Fixes for unaligned writes on RISC architectures (sparc,arm) + + -- Steve Dunham Thu, 21 Jan 1999 19:45:53 -0500 + +dhcpcd-sv (1.3.16-2) unstable; urgency=low + + * Sparc fixes + + -- Steve Dunham Wed, 20 Jan 1999 01:36:31 -0500 + +dhcpcd-sv (1.3.16-1) unstable; urgency=low + + * New upstream version + + -- Steve Dunham Wed, 30 Dec 1998 18:42:17 -0500 + +dhcpcd-sv (1.3.7-1) unstable; urgency=low + + * New upstream version + + -- Steve Dunham Sat, 29 Aug 1998 20:27:27 -0400 + +dhcpcd-sv (1.3.6-1) unstable; urgency=low + + * Initial Release. + + -- Steve Dunham Sat, 29 Aug 1998 20:27:27 -0400 + --- dhcpcd-3.2.3.orig/debian/compat +++ dhcpcd-3.2.3/debian/compat @@ -0,0 +1 @@ +4 --- dhcpcd-3.2.3.orig/debian/conffiles +++ dhcpcd-3.2.3/debian/conffiles @@ -0,0 +1,2 @@ +/etc/dhcpcd.sh +/etc/default/dhcpcd --- dhcpcd-3.2.3.orig/debian/config +++ dhcpcd-3.2.3/debian/config @@ -0,0 +1,36 @@ +# Config file for dhcpcd. Note that you have to edit the interface +# name below, or duplicate the configuration for different interfaces. +# If you are editing this file just to get DNS servers set by DHCP, +# then you should consider installing the resolvconf package instead. + +case ${INTERFACE} in +eth0) + +# Uncomment this to allow dhcpcd to set the DNS servers in /etc/resolv.conf +# If you are using resolvconf then you can leave this commented out. +#SET_DNS='yes' + +# Uncomment this to allow dhcpcd to set hostname of the host to the +# hostname option supplied by DHCP server. +#SET_HOSTNAME='yes' + +# Uncomment this to allow dhcpcd to set the NTP servers in /etc/ntp.conf +#SET_NTP='yes' + +# Uncomment this to allow dhcpcd to set the YP servers in /etc/yp.conf +#SET_YP='yes' + +# Add other options here, see man 8 dhcpcd-bin for details. +OPTIONS=() +;; + +# Add other interfaces here +*) +;; + +esac + + + + + --- dhcpcd-3.2.3.orig/debian/control +++ dhcpcd-3.2.3/debian/control @@ -0,0 +1,17 @@ +Source: dhcpcd +Section: net +Priority: optional +Build-Depends: debhelper (>>2.0.0) +Maintainer: Simon Kelley +Standards-Version: 3.7.3 + +Package: dhcpcd +Architecture: any +Depends: ${shlibs:Depends}, bsdutils (>=2.11n), procps +Replaces: dhcpcd-sv +Conflicts: dhcpcd-sv, ifupdown (<< 0.6.4-4) +Description: DHCP client for automatically configuring IPv4 networking + Simple configuration: supports executions of a script when the + IP address changes. + + --- dhcpcd-3.2.3.orig/debian/copyright +++ dhcpcd-3.2.3/debian/copyright @@ -0,0 +1,40 @@ + +Version 1.3.x was originally downloaded from: + + ftp://phystech.com/pub/ + +Version 2.x.x was downloaded from + + http://developer.berlios.de/projects/dhcpcd/ + +Version 3.x.x was downloaded from + + http://roy.marples.name/dhcpcd + +Copyright: + + * dhcpcd - DHCP client daemon + * Copyright 2006-2008 Roy Marples + * All rights reserved + + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + --- dhcpcd-3.2.3.orig/debian/dhcpcd +++ dhcpcd-3.2.3/debian/dhcpcd @@ -0,0 +1,105 @@ +#!/bin/bash + +# dhcpcd doesn't support a config file, just command line options. +# ifup can set some options (-h -i -I -l) but no others. +# This wrapper adds any other options set in /etc/default/dhcpcd +# (and the hostname if not set by ifup or /etc/default/dhcpcd) +# and then calls the dhcpcd binary, named dhcpcd-bin. +# +# Note that this wrapper _requires_ the interface name: it doesn't support +# the eth0 default that dhcpcd proper does. + +if [ "$1" = "--version" ]; then echo "3.2.3"; exit 0; fi + +# get interface +eval INTERFACE=\${$#} +if [ $# = 0 ] || + [ ${INTERFACE:0:1} = '-' ] +then + echo "Usage: dhcpcd [options] " + exit 1 +fi + + +# determine if we will add the option to send the current hostname +sendhost=yes +sethost=no +setclid=yes + +for o +do + if [ x"$o" = x"-h" ]; then + sendhost=no + fi + if [ x"$o" = x"-H" ]; then + sethost=yes + fi + if [ x"$o" = x"-I" ]; then + setclid=no + fi +done + +# load configuration file +if [ -f /etc/default/dhcpcd ] ; then + . /etc/default/dhcpcd +fi + +for o in ${OPTIONS[@]} +do + if [ "$o" = "-h" ]; then + sendhost=no + fi + if [ "$o" = "-H" ]; then + sethost=yes + fi + if [ x"$o" = x"-I" ]; then + setclid=no + fi +done + +# Note that in the absence of /etc/default/dhcpcd we play safe and disallow +# changes to /etc/resolv.conf and friends. + +if [ "$SET_DNS" != "yes" ]; then + OPTIONS=("-R" "${OPTIONS[@]}") +fi + +#if [ "$SET_DOMAIN" = "yes" ]; then +# OPTIONS="-D $OPTIONS" +#fi + +if [ "$SET_HOSTNAME" = "yes" ]; then + OPTIONS=("-H" "${OPTIONS[@]}") + sethost=yes +fi + +if [ "$SET_NTP" != "yes" ]; then + OPTIONS=("-N" "${OPTIONS[@]}") +fi + +if [ "$SET_YP" != "yes" ]; then + OPTIONS=("-Y" "${OPTIONS[@]}") +fi + +# We tell dhcpcd to send the hostname iff the option is not +# already set by our caller, and the hostname will not be changed +# by dhcpcd + +if [ $sendhost = yes ] && + [ $sethost = no ] && + [ -x /bin/hostname ] +then + name=`/bin/hostname` + if [ ${#name} != 0 ]; then + OPTIONS=("-h" "$name" "${OPTIONS[@]}") + fi +fi + +# if we have been upgraded, /etc/dhcpc/inhibit-duid will exist, +# so for the client-id to be backwards compatible unless explicitly set +if [ $setclid = yes ] && + [ -f /etc/dhcpc/inhibit-duid ]; then + exec /sbin/dhcpcd-bin -I '' "${OPTIONS[@]}" "$@" +else + exec /sbin/dhcpcd-bin "${OPTIONS[@]}" "$@" +fi --- dhcpcd-3.2.3.orig/debian/dhcpcd.8 +++ dhcpcd-3.2.3/debian/dhcpcd.8 @@ -0,0 +1,30 @@ +.\" $Id$ +.\" +.TH dhcpcd 8 "13 May 2004" "dhcpcd" "Debian GNU/Linux" + +.SH NAME +dhcpcd \- a wrapper for the DHCP client daemon. +.SH SYNOPSIS +.B dhcpcd