diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-05-29 23:29:24 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-05-29 23:29:24 +0000 |
| commit | fe5d8859a0c235d3ac7dcce6120950f8155f20f6 (patch) | |
| tree | 1ea708591d1737c3aee32eeaec19bd7818f67ee5 /net-misc/dhcpcd/files | |
| parent | Version bump #267402 by Paul Mulders. (diff) | |
| download | gentoo-2-fe5d8859a0c235d3ac7dcce6120950f8155f20f6.tar.gz gentoo-2-fe5d8859a0c235d3ac7dcce6120950f8155f20f6.tar.bz2 gentoo-2-fe5d8859a0c235d3ac7dcce6120950f8155f20f6.zip | |
old
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/dhcpcd/files')
| -rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-3.0.16-min-message.patch | 24 | ||||
| -rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-4.0.1-no-empty-clientid.patch | 18 |
2 files changed, 0 insertions, 42 deletions
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 deleted file mode 100644 index c1448c2c493b..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-3.0.16-min-message.patch +++ /dev/null @@ -1,24 +0,0 @@ -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/dhcpcd-4.0.1-no-empty-clientid.patch b/net-misc/dhcpcd/files/dhcpcd-4.0.1-no-empty-clientid.patch deleted file mode 100644 index e8de24d40f93..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-4.0.1-no-empty-clientid.patch +++ /dev/null @@ -1,18 +0,0 @@ -Restore the 3.x behavior of an empty -I '' argument. - -Bug: http://bugs.marples.name/show_bug.cgi?id=116 -Patch: http://bugs.marples.name/attachment.cgi?id=56 - -diff --git a/dhcpcd.c b/dhcpcd.c -index 0219b02..d492a2d 100644 ---- a/dhcpcd.c -+++ b/dhcpcd.c -@@ -511,7 +511,7 @@ parse_option(int opt, char *oarg, struct options *options) - case 'I': - /* Strings have a type of 0 */; - options->clientid[1] = 0; -- if (oarg) -+ if (oarg && *oarg) - s = parse_string_hwaddr((char *)options->clientid + 1, - CLIENTID_MAX_LEN, oarg, 1); - else |