[dhcp/f20] 4.2.6b1
Jiří Popelka
jpopelka at fedoraproject.org
Thu Jan 23 15:02:17 UTC 2014
commit ae22e956cf13bb0c7950b54d60ae413a57ce93c1
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Thu Jan 23 15:55:18 2014 +0100
4.2.6b1
.gitignore | 1 +
dhcp-4.2.5b1-atf-pkgconfig.patch | 23 --
...se.patch => dhcp-4.2.6-64_bit_lease_parse.patch | 38 ++--
...4.2.2-CLOEXEC.patch => dhcp-4.2.6-CLOEXEC.patch | 154 +++++-----
...capability.patch => dhcp-4.2.6-capability.patch | 64 ++--
...ssage.patch => dhcp-4.2.6-errwarn-message.patch | 10 +-
dhcp-4.2.5-lpf-ib.patch => dhcp-4.2.6-lpf-ib.patch | 53 ++--
...-ifup.patch => dhcp-4.2.6-release-by-ifup.patch | 10 +-
...move-bind.patch => dhcp-4.2.6-remove-bind.patch | 65 ++--
...5-systemtap.patch => dhcp-4.2.6-systemtap.patch | 149 +++++-----
dhcp-dhclient6-bind.patch | 329 --------------------
dhcp.spec | 52 ++--
sources | 2 +-
13 files changed, 299 insertions(+), 651 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28a1b93..851ff0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/dhcp-4.2.4-P2.tar.gz
/dhcp-4.2.5rc1.tar.gz
/dhcp-4.2.5.tar.gz
+/dhcp-4.2.6b1.tar.gz
diff --git a/dhcp-4.2.4-64_bit_lease_parse.patch b/dhcp-4.2.6-64_bit_lease_parse.patch
similarity index 57%
rename from dhcp-4.2.4-64_bit_lease_parse.patch
rename to dhcp-4.2.6-64_bit_lease_parse.patch
index c1b978b..9fc1468 100644
--- a/dhcp-4.2.4-64_bit_lease_parse.patch
+++ b/dhcp-4.2.6-64_bit_lease_parse.patch
@@ -1,7 +1,7 @@
-diff -up dhcp-4.2.4b1/common/parse.c.64-bit_lease_parse dhcp-4.2.4b1/common/parse.c
---- dhcp-4.2.4b1/common/parse.c.64-bit_lease_parse 2012-03-09 12:28:10.000000000 +0100
-+++ dhcp-4.2.4b1/common/parse.c 2012-04-16 17:30:55.867045149 +0200
-@@ -906,8 +906,8 @@ TIME
+diff -up dhcp-4.2.6b1/common/parse.c.64-bit_lease_parse dhcp-4.2.6b1/common/parse.c
+--- dhcp-4.2.6b1/common/parse.c.64-bit_lease_parse 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/common/parse.c 2014-01-23 14:35:38.887313769 +0100
+@@ -938,8 +938,8 @@ TIME
parse_date_core(cfile)
struct parse *cfile;
{
@@ -12,16 +12,16 @@ diff -up dhcp-4.2.4b1/common/parse.c.64-bit_lease_parse dhcp-4.2.4b1/common/pars
const char *val;
enum dhcp_token token;
static int months[11] = { 31, 59, 90, 120, 151, 181,
-@@ -933,7 +933,7 @@ parse_date_core(cfile)
+@@ -965,7 +965,7 @@ parse_date_core(cfile)
}
- token = next_token(&val, NULL, cfile); /* consume number */
+ skip_token(&val, NULL, cfile); /* consume number */
- guess = atoi(val);
+ guess = atol(val);
return((TIME)guess);
}
-@@ -961,7 +961,7 @@ parse_date_core(cfile)
+@@ -993,7 +993,7 @@ parse_date_core(cfile)
somebody invents a time machine, I think we can safely disregard
it. This actually works around a stupid Y2K bug that was present
in a very early beta release of dhcpd. */
@@ -30,55 +30,55 @@ diff -up dhcp-4.2.4b1/common/parse.c.64-bit_lease_parse dhcp-4.2.4b1/common/pars
if (year > 1900)
year -= 1900;
-@@ -985,7 +985,7 @@ parse_date_core(cfile)
+@@ -1017,7 +1017,7 @@ parse_date_core(cfile)
return((TIME)0);
}
- token = next_token(&val, NULL, cfile); /* consume month */
+ skip_token(&val, NULL, cfile); /* consume month */
- mon = atoi(val) - 1;
+ mon = atol(val) - 1;
/* Slash separating month from day... */
token = peek_token(&val, NULL, cfile);
-@@ -1007,7 +1007,7 @@ parse_date_core(cfile)
+@@ -1039,7 +1039,7 @@ parse_date_core(cfile)
return((TIME)0);
}
- token = next_token(&val, NULL, cfile); /* consume day of month */
+ skip_token(&val, NULL, cfile); /* consume day of month */
- mday = atoi(val);
+ mday = atol(val);
/* Hour... */
token = peek_token(&val, NULL, cfile);
-@@ -1018,7 +1018,7 @@ parse_date_core(cfile)
+@@ -1050,7 +1050,7 @@ parse_date_core(cfile)
return((TIME)0);
}
- token = next_token(&val, NULL, cfile); /* consume hour */
+ skip_token(&val, NULL, cfile); /* consume hour */
- hour = atoi(val);
+ hour = atol(val);
/* Colon separating hour from minute... */
token = peek_token(&val, NULL, cfile);
-@@ -1040,7 +1040,7 @@ parse_date_core(cfile)
+@@ -1072,7 +1072,7 @@ parse_date_core(cfile)
return((TIME)0);
}
- token = next_token(&val, NULL, cfile); /* consume minute */
+ skip_token(&val, NULL, cfile); /* consume minute */
- min = atoi(val);
+ min = atol(val);
/* Colon separating minute from second... */
token = peek_token(&val, NULL, cfile);
-@@ -1062,13 +1062,13 @@ parse_date_core(cfile)
+@@ -1094,13 +1094,13 @@ parse_date_core(cfile)
return((TIME)0);
}
- token = next_token(&val, NULL, cfile); /* consume second */
+ skip_token(&val, NULL, cfile); /* consume second */
- sec = atoi(val);
+ sec = atol(val);
tzoff = 0;
token = peek_token(&val, NULL, cfile);
if (token == NUMBER) {
- token = next_token(&val, NULL, cfile); /* consume tzoff */
+ skip_token(&val, NULL, cfile); /* consume tzoff */
- tzoff = atoi(val);
+ tzoff = atol(val);
} else if (token != SEMI) {
- token = next_token(&val, NULL, cfile);
+ skip_token(&val, NULL, cfile);
parse_warn(cfile,
diff --git a/dhcp-4.2.2-CLOEXEC.patch b/dhcp-4.2.6-CLOEXEC.patch
similarity index 66%
rename from dhcp-4.2.2-CLOEXEC.patch
rename to dhcp-4.2.6-CLOEXEC.patch
index 1f4538e..a90d686 100644
--- a/dhcp-4.2.2-CLOEXEC.patch
+++ b/dhcp-4.2.6-CLOEXEC.patch
@@ -1,7 +1,7 @@
-diff -up dhcp-4.2.2b1/client/clparse.c.cloexec dhcp-4.2.2b1/client/clparse.c
---- dhcp-4.2.2b1/client/clparse.c.cloexec 2011-07-01 14:13:30.973887714 +0200
-+++ dhcp-4.2.2b1/client/clparse.c 2011-07-01 14:15:15.021580693 +0200
-@@ -246,7 +246,7 @@ int read_client_conf_file (const char *n
+diff -up dhcp-4.2.6b1/client/clparse.c.cloexec dhcp-4.2.6b1/client/clparse.c
+--- dhcp-4.2.6b1/client/clparse.c.cloexec 2014-01-23 14:29:37.762381964 +0100
++++ dhcp-4.2.6b1/client/clparse.c 2014-01-23 14:29:37.783381669 +0100
+@@ -253,7 +253,7 @@ int read_client_conf_file (const char *n
int token;
isc_result_t status;
@@ -10,7 +10,7 @@ diff -up dhcp-4.2.2b1/client/clparse.c.cloexec dhcp-4.2.2b1/client/clparse.c
return uerr2isc (errno);
cfile = NULL;
-@@ -283,7 +283,7 @@ void read_client_leases ()
+@@ -290,7 +290,7 @@ void read_client_leases ()
/* Open the lease file. If we can't open it, just return -
we can safely trust the server to remember our state. */
@@ -19,9 +19,9 @@ diff -up dhcp-4.2.2b1/client/clparse.c.cloexec dhcp-4.2.2b1/client/clparse.c
return;
cfile = NULL;
-diff -up dhcp-4.2.2b1/client/dhclient.c.cloexec dhcp-4.2.2b1/client/dhclient.c
---- dhcp-4.2.2b1/client/dhclient.c.cloexec 2011-07-01 14:13:30.970887717 +0200
-+++ dhcp-4.2.2b1/client/dhclient.c 2011-07-01 14:16:51.485930388 +0200
+diff -up dhcp-4.2.6b1/client/dhclient.c.cloexec dhcp-4.2.6b1/client/dhclient.c
+--- dhcp-4.2.6b1/client/dhclient.c.cloexec 2014-01-23 14:29:37.753382090 +0100
++++ dhcp-4.2.6b1/client/dhclient.c 2014-01-23 14:30:26.663695670 +0100
@@ -148,11 +148,11 @@ main(int argc, char **argv) {
/* Make sure that file descriptors 0 (stdin), 1, (stdout), and
2 (stderr) are open. To do this, we assume that when we
@@ -37,16 +37,16 @@ diff -up dhcp-4.2.2b1/client/dhclient.c.cloexec dhcp-4.2.2b1/client/dhclient.c
if (fd == 2)
log_perror = 0; /* No sense logging to /dev/null. */
else if (fd != -1)
-@@ -506,7 +506,7 @@ main(int argc, char **argv) {
+@@ -505,7 +505,7 @@ main(int argc, char **argv) {
+ long temp;
int e;
- oldpid = 0;
- if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) {
+ if ((pidfd = fopen(path_dhclient_pid, "re")) != NULL) {
e = fscanf(pidfd, "%ld\n", &temp);
oldpid = (pid_t)temp;
-@@ -548,7 +548,7 @@ main(int argc, char **argv) {
+@@ -555,7 +555,7 @@ main(int argc, char **argv) {
strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
@@ -55,7 +55,7 @@ diff -up dhcp-4.2.2b1/client/dhclient.c.cloexec dhcp-4.2.2b1/client/dhclient.c
e = fscanf(pidfd, "%ld\n", &temp);
oldpid = (pid_t)temp;
-@@ -573,7 +573,7 @@ main(int argc, char **argv) {
+@@ -580,7 +580,7 @@ main(int argc, char **argv) {
int dhc_running = 0;
char procfn[256] = "";
@@ -64,7 +64,7 @@ diff -up dhcp-4.2.2b1/client/dhclient.c.cloexec dhcp-4.2.2b1/client/dhclient.c
if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
snprintf(procfn,256,"/proc/%u",dhcpid);
dhc_running = (access(procfn, F_OK) == 0);
-@@ -2995,7 +2995,7 @@ void rewrite_client_leases ()
+@@ -3024,7 +3024,7 @@ void rewrite_client_leases ()
if (leaseFile != NULL)
fclose (leaseFile);
@@ -73,7 +73,7 @@ diff -up dhcp-4.2.2b1/client/dhclient.c.cloexec dhcp-4.2.2b1/client/dhclient.c
if (leaseFile == NULL) {
log_error ("can't create %s: %m", path_dhclient_db);
return;
-@@ -3105,7 +3105,7 @@ write_duid(struct data_string *duid)
+@@ -3145,7 +3145,7 @@ write_duid(struct data_string *duid)
return DHCP_R_INVALIDARG;
if (leaseFile == NULL) { /* XXX? */
@@ -82,7 +82,7 @@ diff -up dhcp-4.2.2b1/client/dhclient.c.cloexec dhcp-4.2.2b1/client/dhclient.c
if (leaseFile == NULL) {
log_error("can't create %s: %m", path_dhclient_db);
return ISC_R_IOERROR;
-@@ -3285,7 +3285,7 @@ int write_client_lease (client, lease, r
+@@ -3325,7 +3325,7 @@ int write_client_lease (client, lease, r
return 1;
if (leaseFile == NULL) { /* XXX */
@@ -91,20 +91,20 @@ diff -up dhcp-4.2.2b1/client/dhclient.c.cloexec dhcp-4.2.2b1/client/dhclient.c
if (leaseFile == NULL) {
log_error ("can't create %s: %m", path_dhclient_db);
return 0;
-@@ -3772,9 +3772,9 @@ void go_daemon ()
- close(2);
+@@ -3836,9 +3836,9 @@ void go_daemon ()
+ (void) close(2);
/* Reopen them on /dev/null. */
-- open("/dev/null", O_RDWR);
-- open("/dev/null", O_RDWR);
-- open("/dev/null", O_RDWR);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
+- (void) open("/dev/null", O_RDWR);
+- (void) open("/dev/null", O_RDWR);
+- (void) open("/dev/null", O_RDWR);
++ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
++ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
++ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
write_client_pid_file ();
-@@ -3791,14 +3791,14 @@ void write_client_pid_file ()
+@@ -3855,14 +3855,14 @@ void write_client_pid_file ()
return;
}
@@ -121,9 +121,9 @@ diff -up dhcp-4.2.2b1/client/dhclient.c.cloexec dhcp-4.2.2b1/client/dhclient.c
if (!pf) {
close(pfdesc);
log_error ("Can't fdopen %s: %m", path_dhclient_pid);
-diff -up dhcp-4.2.2b1/common/bpf.c.cloexec dhcp-4.2.2b1/common/bpf.c
---- dhcp-4.2.2b1/common/bpf.c.cloexec 2011-07-01 14:13:30.976887712 +0200
-+++ dhcp-4.2.2b1/common/bpf.c 2011-07-01 14:13:31.030887673 +0200
+diff -up dhcp-4.2.6b1/common/bpf.c.cloexec dhcp-4.2.6b1/common/bpf.c
+--- dhcp-4.2.6b1/common/bpf.c.cloexec 2014-01-23 14:29:37.766381908 +0100
++++ dhcp-4.2.6b1/common/bpf.c 2014-01-23 14:29:37.789381585 +0100
@@ -94,7 +94,7 @@ int if_register_bpf (info)
for (b = 0; 1; b++) {
/* %Audit% 31 bytes max. %2004.06.17,Safe% */
@@ -133,10 +133,10 @@ diff -up dhcp-4.2.2b1/common/bpf.c.cloexec dhcp-4.2.2b1/common/bpf.c
if (sock < 0) {
if (errno == EBUSY) {
continue;
-diff -up dhcp-4.2.2b1/common/dlpi.c.cloexec dhcp-4.2.2b1/common/dlpi.c
---- dhcp-4.2.2b1/common/dlpi.c.cloexec 2011-07-01 14:13:30.977887712 +0200
-+++ dhcp-4.2.2b1/common/dlpi.c 2011-07-01 14:13:31.032887673 +0200
-@@ -806,7 +806,7 @@ dlpiopen(const char *ifname) {
+diff -up dhcp-4.2.6b1/common/dlpi.c.cloexec dhcp-4.2.6b1/common/dlpi.c
+--- dhcp-4.2.6b1/common/dlpi.c.cloexec 2014-01-23 14:29:37.766381908 +0100
++++ dhcp-4.2.6b1/common/dlpi.c 2014-01-23 14:29:37.789381585 +0100
+@@ -804,7 +804,7 @@ dlpiopen(const char *ifname) {
}
*dp = '\0';
@@ -145,9 +145,9 @@ diff -up dhcp-4.2.2b1/common/dlpi.c.cloexec dhcp-4.2.2b1/common/dlpi.c
}
/*
-diff -up dhcp-4.2.2b1/common/nit.c.cloexec dhcp-4.2.2b1/common/nit.c
---- dhcp-4.2.2b1/common/nit.c.cloexec 2011-07-01 14:13:30.978887712 +0200
-+++ dhcp-4.2.2b1/common/nit.c 2011-07-01 14:13:31.033887672 +0200
+diff -up dhcp-4.2.6b1/common/nit.c.cloexec dhcp-4.2.6b1/common/nit.c
+--- dhcp-4.2.6b1/common/nit.c.cloexec 2014-01-23 14:29:37.767381894 +0100
++++ dhcp-4.2.6b1/common/nit.c 2014-01-23 14:29:37.790381571 +0100
@@ -81,7 +81,7 @@ int if_register_nit (info)
struct strioctl sio;
@@ -157,10 +157,10 @@ diff -up dhcp-4.2.2b1/common/nit.c.cloexec dhcp-4.2.2b1/common/nit.c
if (sock < 0)
log_fatal ("Can't open NIT device for %s: %m", info -> name);
-diff -up dhcp-4.2.2b1/common/resolv.c.cloexec dhcp-4.2.2b1/common/resolv.c
---- dhcp-4.2.2b1/common/resolv.c.cloexec 2009-11-20 02:49:01.000000000 +0100
-+++ dhcp-4.2.2b1/common/resolv.c 2011-07-01 14:13:31.033887672 +0200
-@@ -49,7 +49,7 @@ void read_resolv_conf (parse_time)
+diff -up dhcp-4.2.6b1/common/resolv.c.cloexec dhcp-4.2.6b1/common/resolv.c
+--- dhcp-4.2.6b1/common/resolv.c.cloexec 2014-01-16 03:51:26.000000000 +0100
++++ dhcp-4.2.6b1/common/resolv.c 2014-01-23 14:29:37.790381571 +0100
+@@ -50,7 +50,7 @@ void read_resolv_conf (parse_time)
struct domain_search_list *dp, *dl, *nd;
isc_result_t status;
@@ -169,9 +169,9 @@ diff -up dhcp-4.2.2b1/common/resolv.c.cloexec dhcp-4.2.2b1/common/resolv.c
log_error ("Can't open %s: %m", path_resolv_conf);
return;
}
-diff -up dhcp-4.2.2b1/common/upf.c.cloexec dhcp-4.2.2b1/common/upf.c
---- dhcp-4.2.2b1/common/upf.c.cloexec 2011-07-01 14:13:30.979887712 +0200
-+++ dhcp-4.2.2b1/common/upf.c 2011-07-01 14:13:31.034887671 +0200
+diff -up dhcp-4.2.6b1/common/upf.c.cloexec dhcp-4.2.6b1/common/upf.c
+--- dhcp-4.2.6b1/common/upf.c.cloexec 2014-01-23 14:29:37.768381880 +0100
++++ dhcp-4.2.6b1/common/upf.c 2014-01-23 14:29:37.790381571 +0100
@@ -77,7 +77,7 @@ int if_register_upf (info)
/* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */
sprintf(filename, "/dev/pf/pfilt%d", b);
@@ -181,10 +181,10 @@ diff -up dhcp-4.2.2b1/common/upf.c.cloexec dhcp-4.2.2b1/common/upf.c
if (sock < 0) {
if (errno == EBUSY) {
continue;
-diff -up dhcp-4.2.2b1/omapip/trace.c.cloexec dhcp-4.2.2b1/omapip/trace.c
---- dhcp-4.2.2b1/omapip/trace.c.cloexec 2010-05-27 02:34:57.000000000 +0200
-+++ dhcp-4.2.2b1/omapip/trace.c 2011-07-01 14:13:31.036887669 +0200
-@@ -141,10 +141,10 @@ isc_result_t trace_begin (const char *fi
+diff -up dhcp-4.2.6b1/omapip/trace.c.cloexec dhcp-4.2.6b1/omapip/trace.c
+--- dhcp-4.2.6b1/omapip/trace.c.cloexec 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/omapip/trace.c 2014-01-23 14:29:37.791381557 +0100
+@@ -142,10 +142,10 @@ isc_result_t trace_begin (const char *fi
return DHCP_R_INVALIDARG;
}
@@ -197,7 +197,7 @@ diff -up dhcp-4.2.2b1/omapip/trace.c.cloexec dhcp-4.2.2b1/omapip/trace.c
0600);
}
-@@ -431,7 +431,7 @@ void trace_file_replay (const char *file
+@@ -433,7 +433,7 @@ void trace_file_replay (const char *file
isc_result_t result;
int len;
@@ -206,10 +206,10 @@ diff -up dhcp-4.2.2b1/omapip/trace.c.cloexec dhcp-4.2.2b1/omapip/trace.c
if (!traceinfile) {
log_error("Can't open tracefile %s: %m", filename);
return;
-diff -up dhcp-4.2.2b1/relay/dhcrelay.c.cloexec dhcp-4.2.2b1/relay/dhcrelay.c
---- dhcp-4.2.2b1/relay/dhcrelay.c.cloexec 2011-05-10 15:07:37.000000000 +0200
-+++ dhcp-4.2.2b1/relay/dhcrelay.c 2011-07-01 14:18:07.630209767 +0200
-@@ -183,11 +183,11 @@ main(int argc, char **argv) {
+diff -up dhcp-4.2.6b1/relay/dhcrelay.c.cloexec dhcp-4.2.6b1/relay/dhcrelay.c
+--- dhcp-4.2.6b1/relay/dhcrelay.c.cloexec 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/relay/dhcrelay.c 2014-01-23 14:29:37.791381557 +0100
+@@ -184,11 +184,11 @@ main(int argc, char **argv) {
/* Make sure that file descriptors 0(stdin), 1,(stdout), and
2(stderr) are open. To do this, we assume that when we
open a file the lowest available file descriptor is used. */
@@ -224,7 +224,7 @@ diff -up dhcp-4.2.2b1/relay/dhcrelay.c.cloexec dhcp-4.2.2b1/relay/dhcrelay.c
if (fd == 2)
log_perror = 0; /* No sense logging to /dev/null. */
else if (fd != -1)
-@@ -540,13 +540,13 @@ main(int argc, char **argv) {
+@@ -545,13 +545,13 @@ main(int argc, char **argv) {
if (no_pid_file == ISC_FALSE) {
pfdesc = open(path_dhcrelay_pid,
@@ -240,10 +240,10 @@ diff -up dhcp-4.2.2b1/relay/dhcrelay.c.cloexec dhcp-4.2.2b1/relay/dhcrelay.c
if (!pf)
log_error("Can't fdopen %s: %m",
path_dhcrelay_pid);
-diff -up dhcp-4.2.2b1/server/confpars.c.cloexec dhcp-4.2.2b1/server/confpars.c
---- dhcp-4.2.2b1/server/confpars.c.cloexec 2010-10-14 00:34:45.000000000 +0200
-+++ dhcp-4.2.2b1/server/confpars.c 2011-07-01 14:13:31.039887666 +0200
-@@ -116,7 +116,7 @@ isc_result_t read_conf_file (const char
+diff -up dhcp-4.2.6b1/server/confpars.c.cloexec dhcp-4.2.6b1/server/confpars.c
+--- dhcp-4.2.6b1/server/confpars.c.cloexec 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/server/confpars.c 2014-01-23 14:29:37.793381529 +0100
+@@ -116,7 +116,7 @@ isc_result_t read_conf_file (const char
}
#endif
@@ -252,10 +252,10 @@ diff -up dhcp-4.2.2b1/server/confpars.c.cloexec dhcp-4.2.2b1/server/confpars.c
if (leasep) {
log_error ("Can't open lease database %s: %m --",
path_dhcpd_db);
-diff -up dhcp-4.2.2b1/server/db.c.cloexec dhcp-4.2.2b1/server/db.c
---- dhcp-4.2.2b1/server/db.c.cloexec 2010-09-14 00:15:26.000000000 +0200
-+++ dhcp-4.2.2b1/server/db.c 2011-07-01 14:13:31.040887665 +0200
-@@ -1035,7 +1035,7 @@ void db_startup (testp)
+diff -up dhcp-4.2.6b1/server/db.c.cloexec dhcp-4.2.6b1/server/db.c
+--- dhcp-4.2.6b1/server/db.c.cloexec 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/server/db.c 2014-01-23 14:29:37.793381529 +0100
+@@ -1055,7 +1055,7 @@ void db_startup (testp)
}
#endif
if (!testp) {
@@ -264,7 +264,7 @@ diff -up dhcp-4.2.2b1/server/db.c.cloexec dhcp-4.2.2b1/server/db.c
if (!db_file)
log_fatal ("Can't open %s for append.", path_dhcpd_db);
expire_all_pools ();
-@@ -1083,12 +1083,12 @@ int new_lease_file ()
+@@ -1103,12 +1103,12 @@ int new_lease_file ()
path_dhcpd_db, (int)t) >= sizeof newfname)
log_fatal("new_lease_file: lease file path too long");
@@ -279,10 +279,10 @@ diff -up dhcp-4.2.2b1/server/db.c.cloexec dhcp-4.2.2b1/server/db.c
log_error("Can't fdopen new lease file: %m");
close(db_fd);
goto fdfail;
-diff -up dhcp-4.2.2b1/server/dhcpd.c.cloexec dhcp-4.2.2b1/server/dhcpd.c
---- dhcp-4.2.2b1/server/dhcpd.c.cloexec 2011-04-21 16:08:15.000000000 +0200
-+++ dhcp-4.2.2b1/server/dhcpd.c 2011-07-01 14:19:40.354124505 +0200
-@@ -270,11 +270,11 @@ main(int argc, char **argv) {
+diff -up dhcp-4.2.6b1/server/dhcpd.c.cloexec dhcp-4.2.6b1/server/dhcpd.c
+--- dhcp-4.2.6b1/server/dhcpd.c.cloexec 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/server/dhcpd.c 2014-01-23 14:31:14.770020531 +0100
+@@ -272,11 +272,11 @@ main(int argc, char **argv) {
/* Make sure that file descriptors 0 (stdin), 1, (stdout), and
2 (stderr) are open. To do this, we assume that when we
open a file the lowest available file descriptor is used. */
@@ -297,7 +297,7 @@ diff -up dhcp-4.2.2b1/server/dhcpd.c.cloexec dhcp-4.2.2b1/server/dhcpd.c
if (fd == 2)
log_perror = 0; /* No sense logging to /dev/null. */
else if (fd != -1)
-@@ -793,7 +793,7 @@ main(int argc, char **argv) {
+@@ -795,7 +795,7 @@ main(int argc, char **argv) {
*/
if (no_pid_file == ISC_FALSE) {
/*Read previous pid file. */
@@ -306,7 +306,7 @@ diff -up dhcp-4.2.2b1/server/dhcpd.c.cloexec dhcp-4.2.2b1/server/dhcpd.c
status = read(i, pbuf, (sizeof pbuf) - 1);
close (i);
if (status > 0) {
-@@ -812,7 +812,7 @@ main(int argc, char **argv) {
+@@ -814,7 +814,7 @@ main(int argc, char **argv) {
}
/* Write new pid file. */
@@ -315,22 +315,22 @@ diff -up dhcp-4.2.2b1/server/dhcpd.c.cloexec dhcp-4.2.2b1/server/dhcpd.c
if (i >= 0) {
sprintf(pbuf, "%d\n", (int) getpid());
IGNORE_RET (write(i, pbuf, strlen(pbuf)));
-@@ -840,9 +840,9 @@ main(int argc, char **argv) {
- close(2);
+@@ -842,9 +842,9 @@ main(int argc, char **argv) {
+ (void) close(2);
/* Reopen them on /dev/null. */
-- open("/dev/null", O_RDWR);
-- open("/dev/null", O_RDWR);
-- open("/dev/null", O_RDWR);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
-+ open("/dev/null", O_RDWR | O_CLOEXEC);
+- (void) open("/dev/null", O_RDWR);
+- (void) open("/dev/null", O_RDWR);
+- (void) open("/dev/null", O_RDWR);
++ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
++ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
++ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
log_perror = 0; /* No sense logging to /dev/null. */
IGNORE_RET (chdir("/"));
-diff -up dhcp-4.2.2b1/server/ldap.c.cloexec dhcp-4.2.2b1/server/ldap.c
---- dhcp-4.2.2b1/server/ldap.c.cloexec 2010-03-25 16:26:58.000000000 +0100
-+++ dhcp-4.2.2b1/server/ldap.c 2011-07-01 14:13:31.043887665 +0200
+diff -up dhcp-4.2.6b1/server/ldap.c.cloexec dhcp-4.2.6b1/server/ldap.c
+--- dhcp-4.2.6b1/server/ldap.c.cloexec 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/server/ldap.c 2014-01-23 14:29:37.795381501 +0100
@@ -685,7 +685,7 @@ ldap_start (void)
if (ldap_debug_file != NULL && ldap_debug_fd == -1)
diff --git a/dhcp-4.2.2-capability.patch b/dhcp-4.2.6-capability.patch
similarity index 74%
rename from dhcp-4.2.2-capability.patch
rename to dhcp-4.2.6-capability.patch
index db2fb38..290dddc 100644
--- a/dhcp-4.2.2-capability.patch
+++ b/dhcp-4.2.6-capability.patch
@@ -1,6 +1,6 @@
-diff -up dhcp-4.2.2b1/client/dhclient.8.capability dhcp-4.2.2b1/client/dhclient.8
---- dhcp-4.2.2b1/client/dhclient.8.capability 2011-07-01 15:09:06.603784531 +0200
-+++ dhcp-4.2.2b1/client/dhclient.8 2011-07-01 15:09:06.663783913 +0200
+diff -up dhcp-4.2.6b1/client/dhclient.8.capability dhcp-4.2.6b1/client/dhclient.8
+--- dhcp-4.2.6b1/client/dhclient.8.capability 2014-01-23 14:37:45.340539027 +0100
++++ dhcp-4.2.6b1/client/dhclient.8 2014-01-23 14:37:45.402538157 +0100
@@ -118,6 +118,9 @@ dhclient - Dynamic Host Configuration Pr
.B -w
]
@@ -11,7 +11,7 @@ diff -up dhcp-4.2.2b1/client/dhclient.8.capability dhcp-4.2.2b1/client/dhclient.
.B -B
]
[
-@@ -296,6 +299,32 @@ has been added or removed, so that the c
+@@ -294,6 +297,32 @@ has been added or removed, so that the c
address on that interface.
.TP
@@ -44,9 +44,9 @@ diff -up dhcp-4.2.2b1/client/dhclient.8.capability dhcp-4.2.2b1/client/dhclient.
.BI \-B
Set the BOOTP broadcast flag in request packets so servers will always
broadcast replies.
-diff -up dhcp-4.2.2b1/client/dhclient.c.capability dhcp-4.2.2b1/client/dhclient.c
---- dhcp-4.2.2b1/client/dhclient.c.capability 2011-07-01 15:09:06.644784107 +0200
-+++ dhcp-4.2.2b1/client/dhclient.c 2011-07-01 15:09:06.664783903 +0200
+diff -up dhcp-4.2.6b1/client/dhclient.c.capability dhcp-4.2.6b1/client/dhclient.c
+--- dhcp-4.2.6b1/client/dhclient.c.capability 2014-01-23 14:37:45.384538409 +0100
++++ dhcp-4.2.6b1/client/dhclient.c 2014-01-23 14:37:45.403538143 +0100
@@ -39,6 +39,10 @@
#include <limits.h>
#include <dns/result.h>
@@ -99,10 +99,10 @@ diff -up dhcp-4.2.2b1/client/dhclient.c.capability dhcp-4.2.2b1/client/dhclient.
/* Set up the initial dhcp option universe. */
initialize_common_option_spaces();
-diff -up dhcp-4.2.2b1/client/dhclient-script.8.capability dhcp-4.2.2b1/client/dhclient-script.8
---- dhcp-4.2.2b1/client/dhclient-script.8.capability 2011-07-01 15:09:06.604784521 +0200
-+++ dhcp-4.2.2b1/client/dhclient-script.8 2011-07-01 15:09:06.666783883 +0200
-@@ -239,6 +239,16 @@ repeatedly initialized to the values pro
+diff -up dhcp-4.2.6b1/client/dhclient-script.8.capability dhcp-4.2.6b1/client/dhclient-script.8
+--- dhcp-4.2.6b1/client/dhclient-script.8.capability 2014-01-23 14:37:45.374538550 +0100
++++ dhcp-4.2.6b1/client/dhclient-script.8 2014-01-23 14:37:45.403538143 +0100
+@@ -246,6 +246,16 @@ repeatedly initialized to the values pro
the other. Assuming the information provided by both servers is
valid, this shouldn't cause any real problems, but it could be
confusing.
@@ -119,10 +119,10 @@ diff -up dhcp-4.2.2b1/client/dhclient-script.8.capability dhcp-4.2.2b1/client/dh
.SH SEE ALSO
dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and
dhclient.leases(5).
-diff -up dhcp-4.2.2b1/client/Makefile.am.capability dhcp-4.2.2b1/client/Makefile.am
---- dhcp-4.2.2b1/client/Makefile.am.capability 2011-07-01 15:09:06.526785327 +0200
-+++ dhcp-4.2.2b1/client/Makefile.am 2011-07-01 15:09:06.667783873 +0200
-@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
+diff -up dhcp-4.2.6b1/client/Makefile.am.capability dhcp-4.2.6b1/client/Makefile.am
+--- dhcp-4.2.6b1/client/Makefile.am.capability 2014-01-23 14:37:45.324539252 +0100
++++ dhcp-4.2.6b1/client/Makefile.am 2014-01-23 14:37:45.404538129 +0100
+@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
scripts/netbsd scripts/nextstep scripts/openbsd \
scripts/solaris scripts/openwrt
dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
@@ -131,10 +131,10 @@ diff -up dhcp-4.2.2b1/client/Makefile.am.capability dhcp-4.2.2b1/client/Makefile
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS)
-diff -up dhcp-4.2.2b1/configure.ac.capability dhcp-4.2.2b1/configure.ac
---- dhcp-4.2.2b1/configure.ac.capability 2011-07-01 15:09:06.527785317 +0200
-+++ dhcp-4.2.2b1/configure.ac 2011-07-01 15:09:06.667783873 +0200
-@@ -449,6 +449,41 @@ AC_TRY_LINK(
+diff -up dhcp-4.2.6b1/configure.ac.capability dhcp-4.2.6b1/configure.ac
+--- dhcp-4.2.6b1/configure.ac.capability 2014-01-23 14:37:45.332539139 +0100
++++ dhcp-4.2.6b1/configure.ac 2014-01-23 14:37:45.404538129 +0100
+@@ -524,6 +524,41 @@ AC_TRY_COMPILE([],[void foo() __attribut
# Look for optional headers.
AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
@@ -176,11 +176,11 @@ diff -up dhcp-4.2.2b1/configure.ac.capability dhcp-4.2.2b1/configure.ac
# Solaris needs some libraries for functions
AC_SEARCH_LIBS(socket, [socket])
AC_SEARCH_LIBS(inet_ntoa, [nsl])
-diff -up dhcp-4.2.2b1/relay/dhcrelay.c.capability dhcp-4.2.2b1/relay/dhcrelay.c
---- dhcp-4.2.2b1/relay/dhcrelay.c.capability 2011-07-01 15:09:06.626784295 +0200
-+++ dhcp-4.2.2b1/relay/dhcrelay.c 2011-07-01 15:12:05.362223794 +0200
-@@ -36,6 +36,11 @@
- #include <syslog.h>
+diff -up dhcp-4.2.6b1/relay/dhcrelay.c.capability dhcp-4.2.6b1/relay/dhcrelay.c
+--- dhcp-4.2.6b1/relay/dhcrelay.c.capability 2014-01-23 14:37:45.386538381 +0100
++++ dhcp-4.2.6b1/relay/dhcrelay.c 2014-01-23 14:39:12.035320984 +0100
+@@ -37,6 +37,11 @@
+ #include <signal.h>
#include <sys/time.h>
+#ifdef HAVE_LIBCAP_NG
@@ -191,7 +191,7 @@ diff -up dhcp-4.2.2b1/relay/dhcrelay.c.capability dhcp-4.2.2b1/relay/dhcrelay.c
TIME default_lease_time = 43200; /* 12 hours... */
TIME max_lease_time = 86400; /* 24 hours... */
struct tree_cache *global_options[256];
-@@ -356,6 +361,10 @@ main(int argc, char **argv) {
+@@ -363,6 +368,10 @@ main(int argc, char **argv) {
sl->next = upstreams;
upstreams = sl;
#endif
@@ -202,7 +202,7 @@ diff -up dhcp-4.2.2b1/relay/dhcrelay.c.capability dhcp-4.2.2b1/relay/dhcrelay.c
} else if (!strcmp(argv[i], "-pf")) {
if (++i == argc)
usage();
-@@ -426,6 +435,17 @@ main(int argc, char **argv) {
+@@ -433,6 +442,17 @@ main(int argc, char **argv) {
#endif
}
@@ -220,9 +220,9 @@ diff -up dhcp-4.2.2b1/relay/dhcrelay.c.capability dhcp-4.2.2b1/relay/dhcrelay.c
if (!quiet) {
log_info("%s %s", message, PACKAGE_VERSION);
log_info(copyright);
-@@ -573,6 +593,15 @@ main(int argc, char **argv) {
- dhcpv6_packet_handler = do_packet6;
- #endif
+@@ -582,6 +602,15 @@ main(int argc, char **argv) {
+ signal(SIGINT, dhcp_signal_handler); /* control-c */
+ signal(SIGTERM, dhcp_signal_handler); /* kill */
+#ifdef HAVE_LIBCAP_NG
+ /* Drop all capabilities */
@@ -236,9 +236,9 @@ diff -up dhcp-4.2.2b1/relay/dhcrelay.c.capability dhcp-4.2.2b1/relay/dhcrelay.c
/* Start dispatching packets and timeouts... */
dispatch();
-diff -up dhcp-4.2.2b1/relay/Makefile.am.capability dhcp-4.2.2b1/relay/Makefile.am
---- dhcp-4.2.2b1/relay/Makefile.am.capability 2011-07-01 15:09:06.546785121 +0200
-+++ dhcp-4.2.2b1/relay/Makefile.am 2011-07-01 15:09:06.670783841 +0200
+diff -up dhcp-4.2.6b1/relay/Makefile.am.capability dhcp-4.2.6b1/relay/Makefile.am
+--- dhcp-4.2.6b1/relay/Makefile.am.capability 2014-01-23 14:37:45.326539223 +0100
++++ dhcp-4.2.6b1/relay/Makefile.am 2014-01-23 14:37:45.405538115 +0100
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
sbin_PROGRAMS = dhcrelay
dhcrelay_SOURCES = dhcrelay.c
diff --git a/dhcp-4.2.0-errwarn-message.patch b/dhcp-4.2.6-errwarn-message.patch
similarity index 78%
rename from dhcp-4.2.0-errwarn-message.patch
rename to dhcp-4.2.6-errwarn-message.patch
index a0f70cd..a125428 100644
--- a/dhcp-4.2.0-errwarn-message.patch
+++ b/dhcp-4.2.6-errwarn-message.patch
@@ -1,6 +1,6 @@
-diff -up dhcp-4.2.0/omapip/errwarn.c.errwarn dhcp-4.2.0/omapip/errwarn.c
---- dhcp-4.2.0/omapip/errwarn.c.errwarn 2009-07-23 20:52:21.000000000 +0200
-+++ dhcp-4.2.0/omapip/errwarn.c 2010-07-21 13:23:47.000000000 +0200
+diff -up dhcp-4.2.6b1/omapip/errwarn.c.errwarn dhcp-4.2.6b1/omapip/errwarn.c
+--- dhcp-4.2.6b1/omapip/errwarn.c.errwarn 2014-01-23 14:13:31.440914788 +0100
++++ dhcp-4.2.6b1/omapip/errwarn.c 2014-01-23 14:15:42.134089836 +0100
@@ -76,20 +76,13 @@ void log_fatal (const char * fmt, ... )
#if !defined (NOMINUM)
@@ -15,8 +15,8 @@ diff -up dhcp-4.2.0/omapip/errwarn.c.errwarn dhcp-4.2.0/omapip/errwarn.c
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 dhcp-server at isc.org");
-- log_error ("mailing list, please read the section on the README about");
+- log_error ("If you intend to request help from the dhcp-bugs at isc.org");
+- log_error ("mailing list, please read the section on the REDDME about");
- log_error ("submitting bug reports and requests for help.");
- log_error ("%s", "");
- log_error ("Please do not under any circumstances send requests for");
diff --git a/dhcp-4.2.5-lpf-ib.patch b/dhcp-4.2.6-lpf-ib.patch
similarity index 90%
rename from dhcp-4.2.5-lpf-ib.patch
rename to dhcp-4.2.6-lpf-ib.patch
index 58b924a..c586706 100644
--- a/dhcp-4.2.5-lpf-ib.patch
+++ b/dhcp-4.2.6-lpf-ib.patch
@@ -1,6 +1,6 @@
-diff -up dhcp-4.2.5/client/dhclient.c.lpf-ib dhcp-4.2.5/client/dhclient.c
---- dhcp-4.2.5/client/dhclient.c.lpf-ib 2013-08-26 12:13:31.509170257 +0200
-+++ dhcp-4.2.5/client/dhclient.c 2013-08-26 12:13:31.515170176 +0200
+diff -up dhcp-4.2.6b1/client/dhclient.c.lpf-ib dhcp-4.2.6b1/client/dhclient.c
+--- dhcp-4.2.6b1/client/dhclient.c.lpf-ib 2014-01-23 14:49:08.088935777 +0100
++++ dhcp-4.2.6b1/client/dhclient.c 2014-01-23 14:49:08.095935679 +0100
@@ -113,6 +113,8 @@ static int check_domain_name_list(const
static int check_option_values(struct universe *universe, unsigned int opt,
const char *ptr, size_t len);
@@ -10,7 +10,7 @@ diff -up dhcp-4.2.5/client/dhclient.c.lpf-ib dhcp-4.2.5/client/dhclient.c
int
main(int argc, char **argv) {
int fd;
-@@ -909,6 +911,14 @@ main(int argc, char **argv) {
+@@ -916,6 +918,14 @@ main(int argc, char **argv) {
}
srandom(seed + cur_time + (unsigned)getpid());
@@ -25,7 +25,7 @@ diff -up dhcp-4.2.5/client/dhclient.c.lpf-ib dhcp-4.2.5/client/dhclient.c
/* Start a configuration state machine for each interface. */
#ifdef DHCPv6
if (local_family == AF_INET6) {
-@@ -1185,6 +1195,29 @@ int find_subnet (struct subnet **sp,
+@@ -1195,6 +1205,29 @@ int find_subnet (struct subnet **sp,
return 0;
}
@@ -55,9 +55,9 @@ diff -up dhcp-4.2.5/client/dhclient.c.lpf-ib dhcp-4.2.5/client/dhclient.c
/* Individual States:
*
* Each routine is called from the dhclient_state_machine() in one of
-diff -up dhcp-4.2.5/common/bpf.c.lpf-ib dhcp-4.2.5/common/bpf.c
---- dhcp-4.2.5/common/bpf.c.lpf-ib 2013-08-26 12:13:31.503170337 +0200
-+++ dhcp-4.2.5/common/bpf.c 2013-08-26 12:13:31.515170176 +0200
+diff -up dhcp-4.2.6b1/common/bpf.c.lpf-ib dhcp-4.2.6b1/common/bpf.c
+--- dhcp-4.2.6b1/common/bpf.c.lpf-ib 2014-01-23 14:49:08.077935932 +0100
++++ dhcp-4.2.6b1/common/bpf.c 2014-01-23 14:49:08.095935679 +0100
@@ -198,11 +198,44 @@ struct bpf_insn dhcp_bpf_filter [] = {
BPF_STMT(BPF_RET+BPF_K, 0),
};
@@ -103,9 +103,9 @@ diff -up dhcp-4.2.5/common/bpf.c.lpf-ib dhcp-4.2.5/common/bpf.c
#if defined (HAVE_TR_SUPPORT)
struct bpf_insn dhcp_bpf_tr_filter [] = {
/* accept all token ring packets due to variable length header */
-diff -up dhcp-4.2.5/common/lpf.c.lpf-ib dhcp-4.2.5/common/lpf.c
---- dhcp-4.2.5/common/lpf.c.lpf-ib 2013-08-26 12:13:31.503170337 +0200
-+++ dhcp-4.2.5/common/lpf.c 2013-08-26 12:14:00.196783751 +0200
+diff -up dhcp-4.2.6b1/common/lpf.c.lpf-ib dhcp-4.2.6b1/common/lpf.c
+--- dhcp-4.2.6b1/common/lpf.c.lpf-ib 2014-01-23 14:49:08.077935932 +0100
++++ dhcp-4.2.6b1/common/lpf.c 2014-01-23 14:49:08.096935665 +0100
@@ -43,6 +43,7 @@
#include "includes/netinet/udp.h"
#include "includes/netinet/if_ether.h"
@@ -531,11 +531,11 @@ diff -up dhcp-4.2.5/common/lpf.c.lpf-ib dhcp-4.2.5/common/lpf.c
+ freeifaddrs(ifaddrs);
}
#endif
-diff -up dhcp-4.2.5/common/socket.c.lpf-ib dhcp-4.2.5/common/socket.c
---- dhcp-4.2.5/common/socket.c.lpf-ib 2013-01-03 01:02:24.000000000 +0100
-+++ dhcp-4.2.5/common/socket.c 2013-08-26 12:13:31.516170162 +0200
-@@ -325,7 +325,7 @@ void if_register_send (info)
- info->wfdesc = if_register_socket(info, AF_INET, 0);
+diff -up dhcp-4.2.6b1/common/socket.c.lpf-ib dhcp-4.2.6b1/common/socket.c
+--- dhcp-4.2.6b1/common/socket.c.lpf-ib 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/common/socket.c 2014-01-23 14:49:36.377537914 +0100
+@@ -328,7 +328,7 @@ void if_register_send (info)
+ info->wfdesc = if_register_socket(info, AF_INET, 0, NULL);
/* If this is a normal IPv4 address, get the hardware address. */
if (strcmp(info->name, "fallback") != 0)
- get_hw_addr(info->name, &info->hw_address);
@@ -543,7 +543,7 @@ diff -up dhcp-4.2.5/common/socket.c.lpf-ib dhcp-4.2.5/common/socket.c
#if defined (USE_SOCKET_FALLBACK)
/* Fallback only registers for send, but may need to receive as
well. */
-@@ -388,7 +388,7 @@ void if_register_receive (info)
+@@ -391,7 +391,7 @@ void if_register_receive (info)
#endif /* IP_PKTINFO... */
/* If this is a normal IPv4 address, get the hardware address. */
if (strcmp(info->name, "fallback") != 0)
@@ -552,7 +552,7 @@ diff -up dhcp-4.2.5/common/socket.c.lpf-ib dhcp-4.2.5/common/socket.c
if (!quiet_interface_discovery)
log_info ("Listening on Socket/%s%s%s",
-@@ -498,7 +498,7 @@ if_register6(struct interface_info *info
+@@ -505,7 +505,7 @@ if_register6(struct interface_info *info
if (req_multi)
if_register_multicast(info);
@@ -561,9 +561,18 @@ diff -up dhcp-4.2.5/common/socket.c.lpf-ib dhcp-4.2.5/common/socket.c
if (!quiet_interface_discovery) {
if (info->shared_network != NULL) {
-diff -up dhcp-4.2.5/includes/dhcpd.h.lpf-ib dhcp-4.2.5/includes/dhcpd.h
---- dhcp-4.2.5/includes/dhcpd.h.lpf-ib 2013-08-26 12:13:31.510170243 +0200
-+++ dhcp-4.2.5/includes/dhcpd.h 2013-08-26 12:13:31.517170149 +0200
+@@ -561,7 +561,7 @@ if_register_linklocal6(struct interface_
+ info->rfdesc = sock;
+ info->wfdesc = sock;
+
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+
+ if (!quiet_interface_discovery) {
+ if (info->shared_network != NULL) {
+diff -up dhcp-4.2.6b1/includes/dhcpd.h.lpf-ib dhcp-4.2.6b1/includes/dhcpd.h
+--- dhcp-4.2.6b1/includes/dhcpd.h.lpf-ib 2014-01-23 14:49:08.089935763 +0100
++++ dhcp-4.2.6b1/includes/dhcpd.h 2014-01-23 14:49:08.097935651 +0100
@@ -1249,6 +1249,7 @@ struct interface_info {
struct shared_network *shared_network;
/* Networks connected to this interface. */
@@ -572,7 +581,7 @@ diff -up dhcp-4.2.5/includes/dhcpd.h.lpf-ib dhcp-4.2.5/includes/dhcpd.h
struct in_addr *addresses; /* Addresses associated with this
* interface.
*/
-@@ -2372,7 +2373,7 @@ void print_dns_status (int, struct dhcp_
+@@ -2378,7 +2379,7 @@ void print_dns_status (int, struct dhcp_
#endif
const char *print_time(TIME);
diff --git a/dhcp-4.2.0-release-by-ifup.patch b/dhcp-4.2.6-release-by-ifup.patch
similarity index 88%
rename from dhcp-4.2.0-release-by-ifup.patch
rename to dhcp-4.2.6-release-by-ifup.patch
index 300c5f3..5529ef4 100644
--- a/dhcp-4.2.0-release-by-ifup.patch
+++ b/dhcp-4.2.6-release-by-ifup.patch
@@ -1,8 +1,8 @@
-diff -up dhcp-4.2.0/client/dhclient.c.ifup dhcp-4.2.0/client/dhclient.c
---- dhcp-4.2.0/client/dhclient.c.ifup 2010-07-21 13:30:10.000000000 +0200
-+++ dhcp-4.2.0/client/dhclient.c 2010-07-21 13:37:03.000000000 +0200
-@@ -497,9 +497,81 @@ main(int argc, char **argv) {
- kill(oldpid, SIGTERM);
+diff -up dhcp-4.2.6b1/client/dhclient.c.ifup dhcp-4.2.6b1/client/dhclient.c
+--- dhcp-4.2.6b1/client/dhclient.c.ifup 2014-01-23 14:28:46.067107465 +0100
++++ dhcp-4.2.6b1/client/dhclient.c 2014-01-23 14:29:04.558847949 +0100
+@@ -522,9 +522,81 @@ main(int argc, char **argv) {
+ }
}
fclose(pidfd);
+ } else {
diff --git a/dhcp-4.2.5-remove-bind.patch b/dhcp-4.2.6-remove-bind.patch
similarity index 67%
rename from dhcp-4.2.5-remove-bind.patch
rename to dhcp-4.2.6-remove-bind.patch
index d3ef6b7..96bb270 100644
--- a/dhcp-4.2.5-remove-bind.patch
+++ b/dhcp-4.2.6-remove-bind.patch
@@ -1,6 +1,6 @@
-diff -up dhcp-4.2.5b1/client/Makefile.am.remove-bind dhcp-4.2.5b1/client/Makefile.am
---- dhcp-4.2.5b1/client/Makefile.am.remove-bind 2012-12-05 02:17:38.000000000 +0100
-+++ dhcp-4.2.5b1/client/Makefile.am 2012-12-17 16:20:58.692538252 +0100
+diff -up dhcp-4.2.6b1/client/Makefile.am.remove-bind dhcp-4.2.6b1/client/Makefile.am
+--- dhcp-4.2.6b1/client/Makefile.am.remove-bind 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/client/Makefile.am 2014-01-23 13:58:48.125259702 +0100
@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
scripts/netbsd scripts/nextstep scripts/openbsd \
scripts/solaris scripts/openwrt
@@ -10,9 +10,9 @@ diff -up dhcp-4.2.5b1/client/Makefile.am.remove-bind dhcp-4.2.5b1/client/Makefil
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS)
-diff -up dhcp-4.2.5b1/common/tests/Makefile.am.remove-bind dhcp-4.2.5b1/common/tests/Makefile.am
---- dhcp-4.2.5b1/common/tests/Makefile.am.remove-bind 2012-12-05 02:17:38.000000000 +0100
-+++ dhcp-4.2.5b1/common/tests/Makefile.am 2012-12-17 16:20:58.693538239 +0100
+diff -up dhcp-4.2.6b1/common/tests/Makefile.am.remove-bind dhcp-4.2.6b1/common/tests/Makefile.am
+--- dhcp-4.2.6b1/common/tests/Makefile.am.remove-bind 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/common/tests/Makefile.am 2014-01-23 13:58:48.125259702 +0100
@@ -13,8 +13,8 @@ ATF_TESTS += alloc_unittest
alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
alloc_unittest_LDADD = $(ATF_LDFLAGS)
@@ -24,10 +24,10 @@ diff -up dhcp-4.2.5b1/common/tests/Makefile.am.remove-bind dhcp-4.2.5b1/common/t
check: $(ATF_TESTS)
atf-run | atf-report
-diff -up dhcp-4.2.5b1/configure.ac.remove-bind dhcp-4.2.5b1/configure.ac
---- dhcp-4.2.5b1/configure.ac.remove-bind 2012-12-05 02:18:44.000000000 +0100
-+++ dhcp-4.2.5b1/configure.ac 2012-12-17 16:20:58.693538239 +0100
-@@ -581,20 +581,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro
+diff -up dhcp-4.2.6b1/configure.ac.remove-bind dhcp-4.2.6b1/configure.ac
+--- dhcp-4.2.6b1/configure.ac.remove-bind 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/configure.ac 2014-01-23 14:10:57.020069338 +0100
+@@ -589,20 +589,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro
libbind=
AC_ARG_WITH(libbind,
AC_HELP_STRING([--with-libbind=PATH],
@@ -70,18 +70,19 @@ diff -up dhcp-4.2.5b1/configure.ac.remove-bind dhcp-4.2.5b1/configure.ac
# OpenLDAP support.
AC_ARG_WITH(ldap,
-@@ -631,7 +648,7 @@ fi
+@@ -639,7 +656,8 @@ fi
CFLAGS="$CFLAGS $STD_CWARNINGS"
# Try to add the bind include directory
-CFLAGS="$CFLAGS -I$libbind/include"
+CFLAGS="$CFLAGS -I$libbind"
++
- AC_C_FLEXIBLE_ARRAY_MEMBER
-
-diff -up dhcp-4.2.5b1/dhcpctl/Makefile.am.remove-bind dhcp-4.2.5b1/dhcpctl/Makefile.am
---- dhcp-4.2.5b1/dhcpctl/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
-+++ dhcp-4.2.5b1/dhcpctl/Makefile.am 2012-12-17 16:20:58.693538239 +0100
+ case "$host" in
+ *-darwin*)
+diff -up dhcp-4.2.6b1/dhcpctl/Makefile.am.remove-bind dhcp-4.2.6b1/dhcpctl/Makefile.am
+--- dhcp-4.2.6b1/dhcpctl/Makefile.am.remove-bind 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/dhcpctl/Makefile.am 2014-01-23 13:58:48.126259688 +0100
@@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS)
omshell_SOURCES = omshell.c
@@ -96,10 +97,10 @@ diff -up dhcp-4.2.5b1/dhcpctl/Makefile.am.remove-bind dhcp-4.2.5b1/dhcpctl/Makef
- ../bind/lib/libdns.a ../bind/lib/libisc.a
\ No newline at end of file
+ $(BIND9_LIBDIR) -ldns-export -lisc-export
-diff -up dhcp-4.2.5b1/Makefile.am.remove-bind dhcp-4.2.5b1/Makefile.am
---- dhcp-4.2.5b1/Makefile.am.remove-bind 2012-12-05 02:17:38.000000000 +0100
-+++ dhcp-4.2.5b1/Makefile.am 2012-12-17 16:20:58.693538239 +0100
-@@ -22,7 +22,13 @@ EXTRA_DIST = RELNOTES LICENSE \
+diff -up dhcp-4.2.6b1/Makefile.am.remove-bind dhcp-4.2.6b1/Makefile.am
+--- dhcp-4.2.6b1/Makefile.am.remove-bind 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/Makefile.am 2014-01-23 13:58:48.126259688 +0100
+@@ -24,7 +24,13 @@ EXTRA_DIST = RELNOTES LICENSE \
bind/Makefile bind/bind.tar.gz bind/version.tmp \
common/tests/Atffile server/tests/Atffile
@@ -114,9 +115,9 @@ diff -up dhcp-4.2.5b1/Makefile.am.remove-bind dhcp-4.2.5b1/Makefile.am
nobase_include_HEADERS = dhcpctl/dhcpctl.h
-diff -up dhcp-4.2.5b1/omapip/Makefile.am.remove-bind dhcp-4.2.5b1/omapip/Makefile.am
---- dhcp-4.2.5b1/omapip/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
-+++ dhcp-4.2.5b1/omapip/Makefile.am 2012-12-17 16:20:58.693538239 +0100
+diff -up dhcp-4.2.6b1/omapip/Makefile.am.remove-bind dhcp-4.2.6b1/omapip/Makefile.am
+--- dhcp-4.2.6b1/omapip/Makefile.am.remove-bind 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/omapip/Makefile.am 2014-01-23 13:58:48.126259688 +0100
@@ -10,5 +10,5 @@ man_MANS = omapi.3
EXTRA_DIST = $(man_MANS)
@@ -124,9 +125,9 @@ diff -up dhcp-4.2.5b1/omapip/Makefile.am.remove-bind dhcp-4.2.5b1/omapip/Makefil
-svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
+svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
-diff -up dhcp-4.2.5b1/relay/Makefile.am.remove-bind dhcp-4.2.5b1/relay/Makefile.am
---- dhcp-4.2.5b1/relay/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
-+++ dhcp-4.2.5b1/relay/Makefile.am 2012-12-17 16:20:58.694538225 +0100
+diff -up dhcp-4.2.6b1/relay/Makefile.am.remove-bind dhcp-4.2.6b1/relay/Makefile.am
+--- dhcp-4.2.6b1/relay/Makefile.am.remove-bind 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/relay/Makefile.am 2014-01-23 13:58:48.127259674 +0100
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
sbin_PROGRAMS = dhcrelay
dhcrelay_SOURCES = dhcrelay.c
@@ -136,9 +137,9 @@ diff -up dhcp-4.2.5b1/relay/Makefile.am.remove-bind dhcp-4.2.5b1/relay/Makefile.
man_MANS = dhcrelay.8
EXTRA_DIST = $(man_MANS)
-diff -up dhcp-4.2.5b1/server/Makefile.am.remove-bind dhcp-4.2.5b1/server/Makefile.am
---- dhcp-4.2.5b1/server/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
-+++ dhcp-4.2.5b1/server/Makefile.am 2012-12-17 16:20:58.694538225 +0100
+diff -up dhcp-4.2.6b1/server/Makefile.am.remove-bind dhcp-4.2.6b1/server/Makefile.am
+--- dhcp-4.2.6b1/server/Makefile.am.remove-bind 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/server/Makefile.am 2014-01-23 13:58:48.127259674 +0100
@@ -14,8 +14,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
dhcpd_CFLAGS = $(LDAP_CFLAGS)
@@ -149,9 +150,9 @@ diff -up dhcp-4.2.5b1/server/Makefile.am.remove-bind dhcp-4.2.5b1/server/Makefil
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
EXTRA_DIST = $(man_MANS)
-diff -up dhcp-4.2.5b1/server/tests/Makefile.am.remove-bind dhcp-4.2.5b1/server/tests/Makefile.am
---- dhcp-4.2.5b1/server/tests/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
-+++ dhcp-4.2.5b1/server/tests/Makefile.am 2012-12-17 16:26:01.093346768 +0100
+diff -up dhcp-4.2.6b1/server/tests/Makefile.am.remove-bind dhcp-4.2.6b1/server/tests/Makefile.am
+--- dhcp-4.2.6b1/server/tests/Makefile.am.remove-bind 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/server/tests/Makefile.am 2014-01-23 13:58:48.127259674 +0100
@@ -18,8 +18,7 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
../ldap.c ../ldap_casa.c ../dhcpd.c
diff --git a/dhcp-4.2.5-systemtap.patch b/dhcp-4.2.6-systemtap.patch
similarity index 80%
rename from dhcp-4.2.5-systemtap.patch
rename to dhcp-4.2.6-systemtap.patch
index ad774ad..1fd4752 100644
--- a/dhcp-4.2.5-systemtap.patch
+++ b/dhcp-4.2.6-systemtap.patch
@@ -1,7 +1,7 @@
-diff -up dhcp-4.2.5b1/configure.ac.systemtap dhcp-4.2.5b1/configure.ac
---- dhcp-4.2.5b1/configure.ac.systemtap 2012-12-17 16:56:40.563881316 +0100
-+++ dhcp-4.2.5b1/configure.ac 2012-12-17 16:56:40.597880870 +0100
-@@ -554,6 +554,35 @@ else
+diff -up dhcp-4.2.6b1/configure.ac.systemtap dhcp-4.2.6b1/configure.ac
+--- dhcp-4.2.6b1/configure.ac.systemtap 2014-01-23 14:45:04.801357825 +0100
++++ dhcp-4.2.6b1/configure.ac 2014-01-23 14:45:04.844357220 +0100
+@@ -560,6 +560,35 @@ else
AC_MSG_RESULT(no)
fi
@@ -37,7 +37,7 @@ diff -up dhcp-4.2.5b1/configure.ac.systemtap dhcp-4.2.5b1/configure.ac
# Solaris needs some libraries for functions
AC_SEARCH_LIBS(socket, [socket])
AC_SEARCH_LIBS(inet_ntoa, [nsl])
-@@ -701,6 +730,7 @@ AC_OUTPUT([
+@@ -715,6 +744,7 @@ AC_OUTPUT([
tests/Makefile
server/tests/Makefile
doc/devel/doxyfile
@@ -45,10 +45,10 @@ diff -up dhcp-4.2.5b1/configure.ac.systemtap dhcp-4.2.5b1/configure.ac
])
sh util/bindvar.sh
-diff -up dhcp-4.2.5b1/Makefile.am.systemtap dhcp-4.2.5b1/Makefile.am
---- dhcp-4.2.5b1/Makefile.am.systemtap 2012-12-17 16:56:40.461882654 +0100
-+++ dhcp-4.2.5b1/Makefile.am 2012-12-17 16:56:40.597880870 +0100
-@@ -30,5 +30,8 @@ endif
+diff -up dhcp-4.2.6b1/Makefile.am.systemtap dhcp-4.2.6b1/Makefile.am
+--- dhcp-4.2.6b1/Makefile.am.systemtap 2014-01-23 14:45:04.678359555 +0100
++++ dhcp-4.2.6b1/Makefile.am 2014-01-23 14:45:04.844357220 +0100
+@@ -32,5 +32,8 @@ endif
SUBDIRS += includes tests common omapip client dhcpctl relay server
@@ -57,9 +57,9 @@ diff -up dhcp-4.2.5b1/Makefile.am.systemtap dhcp-4.2.5b1/Makefile.am
+
nobase_include_HEADERS = dhcpctl/dhcpctl.h
-diff -up dhcp-4.2.5b1/server/dhcp.c.systemtap dhcp-4.2.5b1/server/dhcp.c
---- dhcp-4.2.5b1/server/dhcp.c.systemtap 2012-12-17 16:56:40.483882364 +0100
-+++ dhcp-4.2.5b1/server/dhcp.c 2012-12-17 16:56:40.599880842 +0100
+diff -up dhcp-4.2.6b1/server/dhcp.c.systemtap dhcp-4.2.6b1/server/dhcp.c
+--- dhcp-4.2.6b1/server/dhcp.c.systemtap 2014-01-23 14:45:04.708359133 +0100
++++ dhcp-4.2.6b1/server/dhcp.c 2014-01-23 14:45:04.846357192 +0100
@@ -36,7 +36,7 @@
#include <errno.h>
#include <limits.h>
@@ -176,7 +176,7 @@ diff -up dhcp-4.2.5b1/server/dhcp.c.systemtap dhcp-4.2.5b1/server/dhcp.c
}
void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
-@@ -1573,6 +1596,8 @@ void ack_lease (packet, lease, offer, wh
+@@ -1570,6 +1593,8 @@ void ack_lease (packet, lease, offer, wh
if (lease -> state)
return;
@@ -185,7 +185,7 @@ diff -up dhcp-4.2.5b1/server/dhcp.c.systemtap dhcp-4.2.5b1/server/dhcp.c
/* Save original cltt for comparison later. */
lease_cltt = lease->cltt;
-@@ -2936,6 +2961,8 @@ void ack_lease (packet, lease, offer, wh
+@@ -2933,6 +2958,8 @@ void ack_lease (packet, lease, offer, wh
#endif
dhcp_reply(lease);
}
@@ -194,7 +194,7 @@ diff -up dhcp-4.2.5b1/server/dhcp.c.systemtap dhcp-4.2.5b1/server/dhcp.c
}
/*
-@@ -3088,6 +3115,8 @@ void dhcp_reply (lease)
+@@ -3085,6 +3112,8 @@ void dhcp_reply (lease)
if (!state)
log_fatal ("dhcp_reply was supplied lease with no state!");
@@ -203,7 +203,7 @@ diff -up dhcp-4.2.5b1/server/dhcp.c.systemtap dhcp-4.2.5b1/server/dhcp.c
/* Compose a response for the client... */
memset (&raw, 0, sizeof raw);
memset (&d1, 0, sizeof d1);
-@@ -3309,6 +3338,8 @@ void dhcp_reply (lease)
+@@ -3306,6 +3335,8 @@ void dhcp_reply (lease)
free_lease_state (state, MDL);
lease -> state = (struct lease_state *)0;
@@ -212,7 +212,7 @@ diff -up dhcp-4.2.5b1/server/dhcp.c.systemtap dhcp-4.2.5b1/server/dhcp.c
}
int find_lease (struct lease **lp,
-@@ -3331,6 +3362,8 @@ int find_lease (struct lease **lp,
+@@ -3328,6 +3359,8 @@ int find_lease (struct lease **lp,
struct data_string client_identifier;
struct hardware h;
@@ -221,7 +221,7 @@ diff -up dhcp-4.2.5b1/server/dhcp.c.systemtap dhcp-4.2.5b1/server/dhcp.c
#if defined(FAILOVER_PROTOCOL)
/* Quick check to see if the peer has leases. */
if (peer_has_leases) {
-@@ -4058,6 +4091,9 @@ int find_lease (struct lease **lp,
+@@ -4055,6 +4088,9 @@ int find_lease (struct lease **lp,
#if defined (DEBUG_FIND_LEASE)
log_info ("Not returning a lease.");
#endif
@@ -231,9 +231,9 @@ diff -up dhcp-4.2.5b1/server/dhcp.c.systemtap dhcp-4.2.5b1/server/dhcp.c
return 0;
}
-diff -up dhcp-4.2.5b1/server/dhcpd.c.systemtap dhcp-4.2.5b1/server/dhcpd.c
---- dhcp-4.2.5b1/server/dhcpd.c.systemtap 2012-12-17 16:56:40.578881119 +0100
-+++ dhcp-4.2.5b1/server/dhcpd.c 2012-12-17 16:56:40.599880842 +0100
+diff -up dhcp-4.2.6b1/server/dhcpd.c.systemtap dhcp-4.2.6b1/server/dhcpd.c
+--- dhcp-4.2.6b1/server/dhcpd.c.systemtap 2014-01-23 14:45:04.820357557 +0100
++++ dhcp-4.2.6b1/server/dhcpd.c 2014-01-23 14:45:49.348731180 +0100
@@ -58,6 +58,8 @@ static const char url [] =
# undef group
#endif /* PARANOIA */
@@ -243,17 +243,18 @@ diff -up dhcp-4.2.5b1/server/dhcpd.c.systemtap dhcp-4.2.5b1/server/dhcpd.c
#ifndef UNIT_TEST
static void usage(void);
#endif
-@@ -865,6 +867,7 @@ main(int argc, char **argv) {
- omapi_set_int_value ((omapi_object_t *)dhcp_control_object,
- (omapi_object_t *)0, "state", server_running);
+@@ -869,6 +871,8 @@ main(int argc, char **argv) {
+ signal(SIGINT, dhcp_signal_handler); /* control-c */
+ signal(SIGTERM, dhcp_signal_handler); /* kill */
-+ TRACE(DHCPD_MAIN());
- /* Receive packets and dispatch them... */
- dispatch ();
-
-diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
---- dhcp-4.2.5b1/server/dhcpv6.c.systemtap 2012-12-17 16:56:40.571881210 +0100
-+++ dhcp-4.2.5b1/server/dhcpv6.c 2012-12-17 16:56:40.601880816 +0100
++ TRACE(DHCPD_MAIN());
++
+ /*
+ * Receive packets and dispatch them...
+ * dispatch() will never return.
+diff -up dhcp-4.2.6b1/server/dhcpv6.c.systemtap dhcp-4.2.6b1/server/dhcpv6.c
+--- dhcp-4.2.6b1/server/dhcpv6.c.systemtap 2014-01-23 14:45:04.812357670 +0100
++++ dhcp-4.2.6b1/server/dhcpv6.c 2014-01-23 14:45:04.850357135 +0100
@@ -15,6 +15,7 @@
*/
@@ -262,7 +263,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
#ifdef DHCPv6
-@@ -4212,6 +4213,8 @@ static void
+@@ -4351,6 +4352,8 @@ static void
dhcpv6_solicit(struct data_string *reply_ret, struct packet *packet) {
struct data_string client_id;
@@ -271,7 +272,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
/*
* Validate our input.
*/
-@@ -4225,6 +4228,8 @@ dhcpv6_solicit(struct data_string *reply
+@@ -4364,6 +4367,8 @@ dhcpv6_solicit(struct data_string *reply
* Clean up.
*/
data_string_forget(&client_id, MDL);
@@ -280,7 +281,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
}
/*
-@@ -4238,6 +4243,8 @@ dhcpv6_request(struct data_string *reply
+@@ -4377,6 +4382,8 @@ dhcpv6_request(struct data_string *reply
struct data_string client_id;
struct data_string server_id;
@@ -289,7 +290,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
/*
* Validate our input.
*/
-@@ -4255,6 +4262,8 @@ dhcpv6_request(struct data_string *reply
+@@ -4394,6 +4401,8 @@ dhcpv6_request(struct data_string *reply
*/
data_string_forget(&client_id, MDL);
data_string_forget(&server_id, MDL);
@@ -298,7 +299,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
}
/* Find a DHCPv6 packet's shared network from hints in the packet.
-@@ -4367,6 +4376,8 @@ dhcpv6_confirm(struct data_string *reply
+@@ -4506,6 +4515,8 @@ dhcpv6_confirm(struct data_string *reply
struct dhcpv6_packet *reply = (struct dhcpv6_packet *)reply_data;
int reply_ofs = (int)(offsetof(struct dhcpv6_packet, options));
@@ -307,7 +308,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
/*
* Basic client message validation.
*/
-@@ -4553,6 +4564,8 @@ exit:
+@@ -4692,6 +4703,8 @@ exit:
option_state_dereference(&cli_enc_opt_state, MDL);
if (opt_state != NULL)
option_state_dereference(&opt_state, MDL);
@@ -316,7 +317,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
}
/*
-@@ -4567,6 +4580,8 @@ dhcpv6_renew(struct data_string *reply,
+@@ -4706,6 +4719,8 @@ dhcpv6_renew(struct data_string *reply,
struct data_string client_id;
struct data_string server_id;
@@ -325,7 +326,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
/*
* Validate the request.
*/
-@@ -4584,6 +4599,8 @@ dhcpv6_renew(struct data_string *reply,
+@@ -4723,6 +4738,8 @@ dhcpv6_renew(struct data_string *reply,
*/
data_string_forget(&server_id, MDL);
data_string_forget(&client_id, MDL);
@@ -334,7 +335,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
}
/*
-@@ -4597,6 +4614,8 @@ static void
+@@ -4736,6 +4753,8 @@ static void
dhcpv6_rebind(struct data_string *reply, struct packet *packet) {
struct data_string client_id;
@@ -343,7 +344,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
if (!valid_client_msg(packet, &client_id)) {
return;
}
-@@ -4604,6 +4623,8 @@ dhcpv6_rebind(struct data_string *reply,
+@@ -4743,6 +4762,8 @@ dhcpv6_rebind(struct data_string *reply,
lease_to_client(reply, packet, &client_id, NULL);
data_string_forget(&client_id, MDL);
@@ -352,7 +353,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
}
static void
-@@ -5048,6 +5069,8 @@ dhcpv6_decline(struct data_string *reply
+@@ -5187,6 +5208,8 @@ dhcpv6_decline(struct data_string *reply
struct data_string client_id;
struct data_string server_id;
@@ -361,7 +362,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
/*
* Validate our input.
*/
-@@ -5068,6 +5091,8 @@ dhcpv6_decline(struct data_string *reply
+@@ -5207,6 +5230,8 @@ dhcpv6_decline(struct data_string *reply
data_string_forget(&server_id, MDL);
data_string_forget(&client_id, MDL);
@@ -370,7 +371,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
}
static void
-@@ -5516,6 +5541,8 @@ dhcpv6_release(struct data_string *reply
+@@ -5655,6 +5680,8 @@ dhcpv6_release(struct data_string *reply
struct data_string client_id;
struct data_string server_id;
@@ -379,7 +380,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
/*
* Validate our input.
*/
-@@ -5537,6 +5564,8 @@ dhcpv6_release(struct data_string *reply
+@@ -5676,6 +5703,8 @@ dhcpv6_release(struct data_string *reply
data_string_forget(&server_id, MDL);
data_string_forget(&client_id, MDL);
@@ -388,7 +389,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
}
/*
-@@ -5549,6 +5578,8 @@ dhcpv6_information_request(struct data_s
+@@ -5688,6 +5717,8 @@ dhcpv6_information_request(struct data_s
struct data_string client_id;
struct data_string server_id;
@@ -397,7 +398,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
/*
* Validate our input.
*/
-@@ -5580,6 +5611,8 @@ dhcpv6_information_request(struct data_s
+@@ -5719,6 +5750,8 @@ dhcpv6_information_request(struct data_s
data_string_forget(&client_id, MDL);
}
data_string_forget(&server_id, MDL);
@@ -406,7 +407,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
}
/*
-@@ -5608,6 +5641,8 @@ dhcpv6_relay_forw(struct data_string *re
+@@ -5747,6 +5780,8 @@ dhcpv6_relay_forw(struct data_string *re
struct dhcpv6_relay_packet *reply;
int reply_ofs;
@@ -415,7 +416,7 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
/*
* Initialize variables for early exit.
*/
-@@ -5867,6 +5902,8 @@ exit:
+@@ -6006,6 +6041,8 @@ exit:
if (enc_packet != NULL) {
packet_dereference(&enc_packet, MDL);
}
@@ -424,9 +425,9 @@ diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
}
static void
-diff -up dhcp-4.2.5b1/server/failover.c.systemtap dhcp-4.2.5b1/server/failover.c
---- dhcp-4.2.5b1/server/failover.c.systemtap 2012-12-05 02:17:39.000000000 +0100
-+++ dhcp-4.2.5b1/server/failover.c 2012-12-17 16:56:40.603880790 +0100
+diff -up dhcp-4.2.6b1/server/failover.c.systemtap dhcp-4.2.6b1/server/failover.c
+--- dhcp-4.2.6b1/server/failover.c.systemtap 2014-01-21 20:29:10.000000000 +0100
++++ dhcp-4.2.6b1/server/failover.c 2014-01-23 14:45:04.852357107 +0100
@@ -36,6 +36,8 @@
#include "dhcpd.h"
#include <omapip/omapip_p.h>
@@ -436,7 +437,7 @@ diff -up dhcp-4.2.5b1/server/failover.c.systemtap dhcp-4.2.5b1/server/failover.c
#if defined (FAILOVER_PROTOCOL)
dhcp_failover_state_t *failover_states;
static isc_result_t do_a_failover_option (omapi_object_t *,
-@@ -1712,6 +1714,8 @@ isc_result_t dhcp_failover_set_state (dh
+@@ -1710,6 +1712,8 @@ isc_result_t dhcp_failover_set_state (dh
struct lease *l;
struct timeval tv;
@@ -445,7 +446,7 @@ diff -up dhcp-4.2.5b1/server/failover.c.systemtap dhcp-4.2.5b1/server/failover.c
/* If we're in certain states where we're sending updates, and the peer
* state changes, we need to re-schedule any pending updates just to
* be on the safe side. This results in retransmission.
-@@ -1939,6 +1943,8 @@ isc_result_t dhcp_failover_set_state (dh
+@@ -1937,6 +1941,8 @@ isc_result_t dhcp_failover_set_state (dh
break;
}
@@ -454,7 +455,7 @@ diff -up dhcp-4.2.5b1/server/failover.c.systemtap dhcp-4.2.5b1/server/failover.c
return ISC_R_SUCCESS;
}
-@@ -2422,6 +2428,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
+@@ -2420,6 +2426,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
if (state -> me.state != normal)
return 0;
@@ -463,7 +464,7 @@ diff -up dhcp-4.2.5b1/server/failover.c.systemtap dhcp-4.2.5b1/server/failover.c
state->last_balance = cur_time;
for (s = shared_networks ; s ; s = s->next) {
-@@ -2582,6 +2590,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
+@@ -2580,6 +2588,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
if (leases_queued)
commit_leases();
@@ -472,9 +473,9 @@ diff -up dhcp-4.2.5b1/server/failover.c.systemtap dhcp-4.2.5b1/server/failover.c
return leases_queued;
}
-diff -up dhcp-4.2.5b1/server/Makefile.am.systemtap dhcp-4.2.5b1/server/Makefile.am
---- dhcp-4.2.5b1/server/Makefile.am.systemtap 2012-12-17 16:56:40.563881316 +0100
-+++ dhcp-4.2.5b1/server/Makefile.am 2012-12-17 16:56:40.603880790 +0100
+diff -up dhcp-4.2.6b1/server/Makefile.am.systemtap dhcp-4.2.6b1/server/Makefile.am
+--- dhcp-4.2.6b1/server/Makefile.am.systemtap 2014-01-23 14:45:04.802357811 +0100
++++ dhcp-4.2.6b1/server/Makefile.am 2014-01-23 14:45:04.852357107 +0100
@@ -10,7 +10,7 @@ dist_sysconf_DATA = dhcpd.conf.example
sbin_PROGRAMS = dhcpd
dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
@@ -498,9 +499,9 @@ diff -up dhcp-4.2.5b1/server/Makefile.am.systemtap dhcp-4.2.5b1/server/Makefile.
+
+dhcpd_LDADD += probes.o
+endif
-diff -up dhcp-4.2.5b1/server/probes.d.systemtap dhcp-4.2.5b1/server/probes.d
---- dhcp-4.2.5b1/server/probes.d.systemtap 2012-12-17 16:56:40.603880790 +0100
-+++ dhcp-4.2.5b1/server/probes.d 2012-12-17 16:56:40.603880790 +0100
+diff -up dhcp-4.2.6b1/server/probes.d.systemtap dhcp-4.2.6b1/server/probes.d
+--- dhcp-4.2.6b1/server/probes.d.systemtap 2014-01-23 14:45:04.852357107 +0100
++++ dhcp-4.2.6b1/server/probes.d 2014-01-23 14:45:04.852357107 +0100
@@ -0,0 +1,43 @@
+provider dhcpd {
+ probe main();
@@ -545,9 +546,9 @@ diff -up dhcp-4.2.5b1/server/probes.d.systemtap dhcp-4.2.5b1/server/probes.d
+ probe failover_set_state_start(int, int) /* state, new_state */
+ probe failover_set_state_done()
+};
-diff -up dhcp-4.2.5b1/server/tests/Makefile.am.systemtap dhcp-4.2.5b1/server/tests/Makefile.am
---- dhcp-4.2.5b1/server/tests/Makefile.am.systemtap 2012-12-17 16:56:40.564881302 +0100
-+++ dhcp-4.2.5b1/server/tests/Makefile.am 2012-12-17 16:56:57.505650518 +0100
+diff -up dhcp-4.2.6b1/server/tests/Makefile.am.systemtap dhcp-4.2.6b1/server/tests/Makefile.am
+--- dhcp-4.2.6b1/server/tests/Makefile.am.systemtap 2014-01-23 14:45:04.803357797 +0100
++++ dhcp-4.2.6b1/server/tests/Makefile.am 2014-01-23 14:45:04.852357107 +0100
@@ -20,6 +20,10 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \
$(top_builddir)/dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export
@@ -559,9 +560,9 @@ diff -up dhcp-4.2.5b1/server/tests/Makefile.am.systemtap dhcp-4.2.5b1/server/tes
ATF_TESTS =
TESTS =
if HAVE_ATF
-diff -up dhcp-4.2.5b1/server/trace.h.systemtap dhcp-4.2.5b1/server/trace.h
---- dhcp-4.2.5b1/server/trace.h.systemtap 2012-12-17 16:56:40.604880777 +0100
-+++ dhcp-4.2.5b1/server/trace.h 2012-12-17 16:56:40.604880777 +0100
+diff -up dhcp-4.2.6b1/server/trace.h.systemtap dhcp-4.2.6b1/server/trace.h
+--- dhcp-4.2.6b1/server/trace.h.systemtap 2014-01-23 14:45:04.853357093 +0100
++++ dhcp-4.2.6b1/server/trace.h 2014-01-23 14:45:04.853357093 +0100
@@ -0,0 +1,11 @@
+// trace.h
+
@@ -574,9 +575,9 @@ diff -up dhcp-4.2.5b1/server/trace.h.systemtap dhcp-4.2.5b1/server/trace.h
+// Wrap the probe to allow it to be removed when no systemtap available
+#define TRACE(probe)
+#endif
-diff -up dhcp-4.2.5b1/tapset/dhcpd.stp.systemtap dhcp-4.2.5b1/tapset/dhcpd.stp
---- dhcp-4.2.5b1/tapset/dhcpd.stp.systemtap 2012-12-17 16:56:40.604880777 +0100
-+++ dhcp-4.2.5b1/tapset/dhcpd.stp 2012-12-17 16:56:40.604880777 +0100
+diff -up dhcp-4.2.6b1/tapset/dhcpd.stp.systemtap dhcp-4.2.6b1/tapset/dhcpd.stp
+--- dhcp-4.2.6b1/tapset/dhcpd.stp.systemtap 2014-01-23 14:45:04.853357093 +0100
++++ dhcp-4.2.6b1/tapset/dhcpd.stp 2014-01-23 14:45:04.853357093 +0100
@@ -0,0 +1,212 @@
+/* dhcpd tapset
+ Copyright (C) 2011, Red Hat Inc.
@@ -790,9 +791,9 @@ diff -up dhcp-4.2.5b1/tapset/dhcpd.stp.systemtap dhcp-4.2.5b1/tapset/dhcpd.stp
+{
+ probestr = sprintf("%s", $$name);
+}
-diff -up dhcp-4.2.5b1/tapset/Makefile.am.systemtap dhcp-4.2.5b1/tapset/Makefile.am
---- dhcp-4.2.5b1/tapset/Makefile.am.systemtap 2012-12-17 16:56:40.604880777 +0100
-+++ dhcp-4.2.5b1/tapset/Makefile.am 2012-12-17 16:56:40.604880777 +0100
+diff -up dhcp-4.2.6b1/tapset/Makefile.am.systemtap dhcp-4.2.6b1/tapset/Makefile.am
+--- dhcp-4.2.6b1/tapset/Makefile.am.systemtap 2014-01-23 14:45:04.853357093 +0100
++++ dhcp-4.2.6b1/tapset/Makefile.am 2014-01-23 14:45:04.853357093 +0100
@@ -0,0 +1,26 @@
+# Makefile.am for dhcp/tapset
+# Jiri Popelka
diff --git a/dhcp.spec b/dhcp.spec
index 1f41b8c..707a9df 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -9,23 +9,22 @@
#%%global patchver P2
-#%%global prever rc1
+%global prever b1
#%%global VERSION %{version}-%{patchver}
-#%%global VERSION %{version}%{prever}
-%global VERSION %{version}
+#%%global VERSION %{version}
+%global VERSION %{version}%{prever}
Summary: Dynamic host configuration protocol software
Name: dhcp
-Version: 4.2.5
-Release: 30%{?dist}
+Version: 4.2.6
+Release: 0.1.%{prever}%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was.
# So we are stuck with it.
Epoch: 12
License: ISC
-Group: System Environment/Daemons
URL: http://isc.org/products/DHCP/
Source0: ftp://ftp.isc.org/isc/dhcp/%{VERSION}/dhcp-%{VERSION}.tar.gz
Source1: dhclient-script
@@ -38,50 +37,48 @@ Source7: dhcpd6.service
Source8: dhcrelay.service
-Patch0: dhcp-4.2.0-errwarn-message.patch
+Patch0: dhcp-4.2.6-errwarn-message.patch
Patch1: dhcp-4.2.4-dhclient-options.patch
-Patch2: dhcp-4.2.0-release-by-ifup.patch
+Patch2: dhcp-4.2.6-release-by-ifup.patch
Patch3: dhcp-4.2.0-dhclient-decline-backoff.patch
Patch4: dhcp-4.2.4-unicast-bootp.patch
Patch7: dhcp-4.2.0-default-requested-options.patch
Patch8: dhcp-4.2.2-xen-checksum.patch
Patch10: dhcp-4.2.5-manpages.patch
Patch11: dhcp-4.2.4-paths.patch
-Patch12: dhcp-4.2.2-CLOEXEC.patch
+Patch12: dhcp-4.2.6-CLOEXEC.patch
Patch14: dhcp-4.2.0-garbage-chars.patch
Patch17: dhcp-4.2.0-add_timeout_when_NULL.patch
-Patch18: dhcp-4.2.4-64_bit_lease_parse.patch
-Patch19: dhcp-4.2.2-capability.patch
+Patch18: dhcp-4.2.6-64_bit_lease_parse.patch
+Patch19: dhcp-4.2.6-capability.patch
Patch20: dhcp-4.2.0-logpid.patch
Patch21: dhcp-4.2.4-UseMulticast.patch
Patch22: dhcp-4.2.5-sendDecline.patch
Patch23: dhcp-4.2.1-retransmission.patch
Patch25: dhcp-4.2.5-rfc3442-classless-static-routes.patch
Patch27: dhcp-4.2.0-honor-expired.patch
-Patch28: dhcp-4.2.5-remove-bind.patch
+Patch28: dhcp-4.2.6-remove-bind.patch
Patch29: dhcp-4.2.4-P1-remove-dst.patch
Patch30: dhcp-4.2.5-sharedlib.patch
Patch31: dhcp-4.2.5-PPP.patch
Patch32: dhcp-4.2.5-paranoia.patch
-Patch33: dhcp-4.2.5-lpf-ib.patch
+Patch33: dhcp-4.2.6-lpf-ib.patch
Patch34: dhcp-4.2.4-improved-xid.patch
Patch35: dhcp-4.2.2-gpxe-cid.patch
-Patch36: dhcp-4.2.5-systemtap.patch
+Patch36: dhcp-4.2.6-systemtap.patch
Patch37: dhcp-4.2.3-dhclient-decline-onetry.patch
Patch38: dhcp-4.2.3-P2-log_perror.patch
Patch39: dhcp-4.2.4-getifaddrs.patch
Patch40: dhcp-4.2.5-omapi-leak.patch
Patch41: dhcp-4.2.5-rfc5970-dhcpv6-options-for-network-boot.patch
Patch42: dhcp-4.2.4-failOverPeer.patch
-Patch43: dhcp-4.2.5b1-atf-pkgconfig.patch
Patch44: dhcp-4.2.4-P1-interval.patch
Patch45: dhcp-4.2.4-P2-conflex-do-forward-updates.patch
Patch46: dhcp-4.2.4-P2-dupl-key.patch
Patch47: dhcp-4.2.5-range6.patch
Patch48: dhcp-4.2.5-next-server.patch
-Patch49: dhcp-dhclient6-bind.patch
-Patch50: dhcp-no-subnet-error2info.patch
-Patch51: dhcp-ffff-checksum.patch
+Patch49: dhcp-no-subnet-error2info.patch
+Patch50: dhcp-ffff-checksum.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -127,7 +124,6 @@ the ISC DHCP service and relay agent.
%package -n dhclient
Summary: Provides the ISC DHCP client daemon and dhclient-script
-Group: System Environment/Base
# dhclient-script requires:
Requires: coreutils grep hostname initscripts iproute iputils sed
Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -146,7 +142,6 @@ provides the ISC DHCP client daemon.
%package common
Summary: Common files used by ISC dhcp client and server
-Group: System Environment/Base
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description common
@@ -160,7 +155,6 @@ This package provides common files used by dhcp and dhclient package.
%package libs
Summary: Shared libraries used by ISC dhcp client and server
-Group: System Environment/Base
%description libs
This package contains shared libraries used by ISC dhcp client and server
@@ -168,7 +162,6 @@ This package contains shared libraries used by ISC dhcp client and server
%package devel
Summary: Development headers and libraries for interfacing to the DHCP server
-Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description devel
@@ -322,10 +315,6 @@ rm -rf includes/isc-dhcp
# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #30402])
%patch42 -p1 -b .failOverPeer
-# To be able to build with '--with-atf'.
-# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #32206])
-%patch43 -p1 -b .pkgconfig
-
# isc_time_nowplusinterval() is not safe with 64-bit time_t (#662254, #789601)
# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #28038])
%patch44 -p1 -b .interval
@@ -346,16 +335,12 @@ rm -rf includes/isc-dhcp
# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #33098])
%patch48 -p1 -b .next-server
-# dhclient -6: bind socket to interface (#1001742)
-# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #34784])
-%patch49 -p1 -b .dhclient6-bind
-
# 'No subnet declaration for <iface>' should be info, not error.
-%patch50 -p1 -b .error2info
+%patch49 -p1 -b .error2info
# dhcpd rejects the udp packet with checksum=0xffff (#1015997)
# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #25587])
-%patch51 -p1 -b .ffff
+%patch50 -p1 -b .ffff
# Update paths in all man pages
for page in client/dhclient.conf.5 client/dhclient.leases.5 \
@@ -641,6 +626,9 @@ done
%changelog
+* Thu Jan 23 2014 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.6-0.1.b1
+- 4.2.6b1
+
* Tue Jan 21 2014 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.5-30
- dhclient-script: don't ping router (#1055181)
diff --git a/sources b/sources
index e7cd8d9..a3744dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6489e919ac093d17249270ee9be1020e dhcp-4.2.5.tar.gz
+ae8727a6d5bc6a133b3d39513979cba8 dhcp-4.2.6b1.tar.gz
More information about the scm-commits
mailing list