Add patch to enfore a minimum dhcp message size of 300 bytes for crappy servers, #173399. Thanks to Kim for finding the issue.

Package-Manager: portage-2.1.2.3

5 files changed, 87 insertions, 5 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 47a31a25b268..b3a314901bb5 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.141 2007/04/08 10:51:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.142 2007/04/11 19:43:38 uberlord Exp $
+
+*dhcpcd-3.0.16-r1 (11 Apr 2007)
+
+  11 Apr 2007; Roy Marples <uberlord@gentoo.org>
+  +files/dhcpcd-3.0.16-min-message.patch, +dhcpcd-3.0.16-r1.ebuild:
+  Add patch to enfore a minimum dhcp message size of 300 bytes for crappy
+  servers, #173399. Thanks to Kim for finding the issue.
 
   08 Apr 2007; Markus Rothe <corsair@gentoo.org> dhcpcd-3.0.16.ebuild:
   Stable on ppc64; bug #166921
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index ebd59c0f6a37..d0324195b07b 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -2,6 +2,10 @@ AUX dhcpcd-2.0.0-alwaysup.patch 269 RMD160 32639a49176d07495704da4c9cae6237fe123
 MD5 5fa92b345c6326fcec19f2476422070b files/dhcpcd-2.0.0-alwaysup.patch 269
 RMD160 32639a49176d07495704da4c9cae6237fe12333a files/dhcpcd-2.0.0-alwaysup.patch 269
 SHA256 6c8bb55db74b400cd98d406c6f96e18956f33efb2e814f12d974a43799f0f902 files/dhcpcd-2.0.0-alwaysup.patch 269
+AUX dhcpcd-3.0.16-min-message.patch 531 RMD160 8407d4009490cda04100456f095aed5da89f2168 SHA1 335f121022a494082afe6872c4d2c7b921fd67b8 SHA256 0229c7272be152ee6c8d2f8c0fd7e31f6cb05ac9d508b3e785739723a1acd2c9
+MD5 765deccf89e4b00007e1431d0cd1ab92 files/dhcpcd-3.0.16-min-message.patch 531
+RMD160 8407d4009490cda04100456f095aed5da89f2168 files/dhcpcd-3.0.16-min-message.patch 531
+SHA256 0229c7272be152ee6c8d2f8c0fd7e31f6cb05ac9d508b3e785739723a1acd2c9 files/dhcpcd-3.0.16-min-message.patch 531
 DIST dhcpcd-2.0.5.tar.bz2 124838 RMD160 205632ea754c51d39827cfbdb9839368a4f17a78 SHA1 f2480d142dfce4128b13d434497ad933f4c337d1 SHA256 0b3acf8306f5ad1fb036703c9ede302c416d9f118950903306c647357113a411
 DIST dhcpcd-3.0.11.tar.bz2 30168 RMD160 e102057dface09048971ba6dea19174a2e57768b SHA1 81871b192eafe414e5d1dd3c45de3939cc546c46 SHA256 bf4b5789fc23e193dbe2989664847a2c761f5ca3dc250d53f2df2aec4d74f3e7
 DIST dhcpcd-3.0.12.tar.bz2 31883 RMD160 4cfb048c7b652e911d3e10c4b4510e1bfdc1ffc4 SHA1 8c3deabd5b4c005451475b7147ba87255163c211 SHA256 7e3e5baa2714538571dae538445853f2fb086ac05874fbd62feeb64cf7bde453
@@ -33,14 +37,18 @@ EBUILD dhcpcd-3.0.15.ebuild 918 RMD160 16dc51eee9f0d53ddfaa5ee6057c82b9c4729c14
 MD5 bc2db6e3fa354103adf3a86b722ad084 dhcpcd-3.0.15.ebuild 918
 RMD160 16dc51eee9f0d53ddfaa5ee6057c82b9c4729c14 dhcpcd-3.0.15.ebuild 918
 SHA256 04a61be3ad02879d951829ff2caf31f14a88bdf14df79ef8fd4ed5f0164e193c dhcpcd-3.0.15.ebuild 918
+EBUILD dhcpcd-3.0.16-r1.ebuild 960 RMD160 baeae65d394b6143edbd2e3501cc5959000e8259 SHA1 89c3d1323af966dc64964099100f3455e9a8107d SHA256 3e57bd8bb2f4fce2dff7319c799aa938ddd6e9861ea52f5e92c5067bd76d69b2
+MD5 c77593d84aa33592677bb78d37ba2b0c dhcpcd-3.0.16-r1.ebuild 960
+RMD160 baeae65d394b6143edbd2e3501cc5959000e8259 dhcpcd-3.0.16-r1.ebuild 960
+SHA256 3e57bd8bb2f4fce2dff7319c799aa938ddd6e9861ea52f5e92c5067bd76d69b2 dhcpcd-3.0.16-r1.ebuild 960
 EBUILD dhcpcd-3.0.16.ebuild 910 RMD160 fc41372e7303ccf5cf954265b4e3126e9d25ef1c SHA1 1ac443024e3e032afa48a133e7d023afd632feb1 SHA256 b67eb2ebe2e23fee853b751da1859e8005447533384fe1b82b9fde4462de3aa3
 MD5 22d9c7715b55b782a22cd108dca6d716 dhcpcd-3.0.16.ebuild 910
 RMD160 fc41372e7303ccf5cf954265b4e3126e9d25ef1c dhcpcd-3.0.16.ebuild 910
 SHA256 b67eb2ebe2e23fee853b751da1859e8005447533384fe1b82b9fde4462de3aa3 dhcpcd-3.0.16.ebuild 910
-MISC ChangeLog 20844 RMD160 c0dee290aa15e867029b2482216bce91fc2a7ecb SHA1 d1ef472894b182b766dba3cbc05b50e76d036be4 SHA256 a8b05fdc951001fec692ecadcecac7322a3247e625edc2cb417a3f45d82fb44d
-MD5 ea912d77ddfca8fb037dd9e575485b56 ChangeLog 20844
-RMD160 c0dee290aa15e867029b2482216bce91fc2a7ecb ChangeLog 20844
-SHA256 a8b05fdc951001fec692ecadcecac7322a3247e625edc2cb417a3f45d82fb44d ChangeLog 20844
+MISC ChangeLog 21127 RMD160 031601eace4800370120ca10b7f4e53beb85798b SHA1 d1f459e026a54a5f6999490bb70ec71b5278d01c SHA256 15772aa96a9a4ed0c9062de7517498c0eab04618ab3f2e1c39d698610645a12b
+MD5 3d81cdddede0303e5c5767bbb7f61e8b ChangeLog 21127
+RMD160 031601eace4800370120ca10b7f4e53beb85798b ChangeLog 21127
+SHA256 15772aa96a9a4ed0c9062de7517498c0eab04618ab3f2e1c39d698610645a12b ChangeLog 21127
 MISC metadata.xml 387 RMD160 c53e701a27189b08ae150e174d24e94813f22d9b SHA1 0c5e906b77e4bdcb49309098599d1af03fd984b2 SHA256 1a92884e5ea54c2b54b068a428431fb720e9456a62b0a2506700c80c43e94c18
 MD5 d162dd0282805d591f68cfc5d4e36901 metadata.xml 387
 RMD160 c53e701a27189b08ae150e174d24e94813f22d9b metadata.xml 387
@@ -66,3 +74,6 @@ SHA256 bdacf97b270c029fe48a8793bb7668bd9994c5eb16b034acad633597de79bc6d files/di
 MD5 2f63aa88d35117e0f9a17be4338c4244 files/digest-dhcpcd-3.0.16 241
 RMD160 9dd377d92b86c26f33ddbec4457de356c2101201 files/digest-dhcpcd-3.0.16 241
 SHA256 c140a1a36da9837aa2f496b247d4b84f14caa221972ed714d869e94f6b3b5efa files/digest-dhcpcd-3.0.16 241
+MD5 2f63aa88d35117e0f9a17be4338c4244 files/digest-dhcpcd-3.0.16-r1 241
+RMD160 9dd377d92b86c26f33ddbec4457de356c2101201 files/digest-dhcpcd-3.0.16-r1 241
+SHA256 c140a1a36da9837aa2f496b247d4b84f14caa221972ed714d869e94f6b3b5efa files/digest-dhcpcd-3.0.16-r1 241
diff --git a/net-misc/dhcpcd/dhcpcd-3.0.16-r1.ebuild b/net-misc/dhcpcd/dhcpcd-3.0.16-r1.ebuild
new file mode 100644
index 000000000000..4181f7b016de
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-3.0.16-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.0.16-r1.ebuild,v 1.1 2007/04/11 19:43:38 uberlord Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A DHCP client"
+HOMEPAGE="http://dhcpcd.berlios.de"
+SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+PROVIDE="virtual/dhcpc"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Redefine the location of ntp.drift
+	sed -i -e 's,#define NTPDRIFTFILE\t.*,#define NTPDRIFTFILE\t\t\"/var/lib/ntp/ntp.drift\",' \
+		pathnames.h || die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-min-message.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd-3.0.16-min-message.patch b/net-misc/dhcpcd/files/dhcpcd-3.0.16-min-message.patch
new file mode 100644
index 000000000000..c1448c2c493b
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-3.0.16-min-message.patch
@@ -0,0 +1,24 @@
+Index: dhcp.c
+===================================================================
+--- dhcp.c	(revision 188)
++++ dhcp.c	(working copy)
+@@ -38,6 +38,7 @@
+ #include "logger.h"
+ #include "socket.h"
+ 
++#define DHCP_PACKET_LENTH_MIN 300
+ #define BROADCAST_FLAG 0x8000
+ 
+ static const char *dhcp_message[] = {
+@@ -266,6 +267,11 @@
+ 
+   *p++ = DHCP_END;
+ 
++#ifdef DHCP_PACKET_LENTH_MIN
++  while (p - m < DHCP_PACKET_LENTH_MIN)
++	  *p++ = 0;
++#endif
++  
+   message_length = p - m;
+ 
+   memset (&packet, 0, sizeof (struct udp_dhcp_packet));
diff --git a/net-misc/dhcpcd/files/digest-dhcpcd-3.0.16-r1 b/net-misc/dhcpcd/files/digest-dhcpcd-3.0.16-r1
new file mode 100644
index 000000000000..4ddc5918d873
--- /dev/null
+++ b/net-misc/dhcpcd/files/digest-dhcpcd-3.0.16-r1
@@ -0,0 +1,3 @@
+MD5 f100349190074dced9bced60dcc1b9f7 dhcpcd-3.0.16.tar.bz2 31639
+RMD160 24ab33bf453a0eb3301fc879e7e98f607aaf14d6 dhcpcd-3.0.16.tar.bz2 31639
+SHA256 324318a4d9feabf313011bdf8e0152beb904e7f4611cc539f767304343639be7 dhcpcd-3.0.16.tar.bz2 31639