aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2012-03-16 00:05:19 +0400
committerAlexey Shvetsov <alexxy@gentoo.org>2012-03-16 00:05:19 +0400
commita229ec739461c3896a892dd04f2dc7185969dd92 (patch)
tree23b04268810276d9433ec7844ca1ab8bca6b2ba5 /net-misc
parent[net-misc/dhcp] once again (diff)
downloadsci-a229ec739461c3896a892dd04f2dc7185969dd92.tar.gz
sci-a229ec739461c3896a892dd04f2dc7185969dd92.tar.bz2
sci-a229ec739461c3896a892dd04f2dc7185969dd92.zip
[net-misc/dhcp] once again
(Portage version: 2.2.0_alpha90/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/dhcp/ChangeLog4
-rw-r--r--net-misc/dhcp/files/dhcp-4.2.0-ib-options.patch14
2 files changed, 12 insertions, 6 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 7a8601817..c6dc101fa 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -8,6 +8,10 @@
15 Mar 2012; Alexey Shvetsov <alexxy@gentoo.org>
files/dhcp-4.2.0-ib-options.patch:
+ [net-misc/dhcp] once again
+
+ 15 Mar 2012; Alexey Shvetsov <alexxy@gentoo.org>
+ files/dhcp-4.2.0-ib-options.patch:
[net-misc/dhcp] wrong one =D
15 Mar 2012; Alexey Shvetsov <alexxy@gentoo.org>
diff --git a/net-misc/dhcp/files/dhcp-4.2.0-ib-options.patch b/net-misc/dhcp/files/dhcp-4.2.0-ib-options.patch
index caa3614f3..a412fbf11 100644
--- a/net-misc/dhcp/files/dhcp-4.2.0-ib-options.patch
+++ b/net-misc/dhcp/files/dhcp-4.2.0-ib-options.patch
@@ -1,4 +1,4 @@
-From adb006f9d22b9001c89e0adda8c48e34c2773b16 Mon Sep 17 00:00:00 2001
+From eb2ec733aa64bf9da9e64364dbbbde3411eaf90a Mon Sep 17 00:00:00 2001
From: Alexey Shvetsov <alexxy@gentoo.org>
Date: Thu, 15 Mar 2012 23:21:21 +0400
Subject: [PATCH] ib options
@@ -8,8 +8,8 @@ Subject: [PATCH] ib options
client/dhclient.c | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++-
common/conflex.c | 2 +
includes/dhcpd.h | 3 +
- includes/dhctoken.h | 1 +
- 5 files changed, 282 insertions(+), 4 deletions(-)
+ includes/dhctoken.h | 3 +-
+ 5 files changed, 283 insertions(+), 5 deletions(-)
diff --git a/client/clparse.c b/client/clparse.c
index 9de4ce2..890647d 100644
@@ -404,13 +404,15 @@ index 5a137e6..7da8b76 100644
/* Per-interface state used in the dhcp client... */
diff --git a/includes/dhctoken.h b/includes/dhctoken.h
-index 9911d70..6110b4f 100644
+index 9911d70..3fdda93 100644
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
-@@ -364,6 +364,7 @@ enum dhcp_token {
+@@ -363,7 +363,8 @@ enum dhcp_token {
+ INITIAL_DELAY = 664,
GETHOSTBYNAME = 665,
PRIMARY6 = 666,
- SECONDARY6 = 667
+- SECONDARY6 = 667
++ SECONDARY6 = 667,
+ BOOTP_BROADCAST_ALWAYS = 668
};