diff --git a/.gitignore b/.gitignore
index 74c50f9..150834b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 ldap-for-dhcp-4.1.1-2.tar.gz
-dhcp-4.1.1-P1.tar.gz
+/dhcp-4.1-ESV.tar.gz
diff --git a/dhcp-4.1-ESV-64_bit_lease_parse.patch b/dhcp-4.1-ESV-64_bit_lease_parse.patch
new file mode 100644
index 0000000..594849c
--- /dev/null
+++ b/dhcp-4.1-ESV-64_bit_lease_parse.patch
@@ -0,0 +1,14 @@
+diff -up dhcp-4.1-ESV/common/parse.c.64-bit_lease_parse dhcp-4.1-ESV/common/parse.c
+--- dhcp-4.1-ESV/common/parse.c.64-bit_lease_parse	2010-09-17 04:48:42.000000000 +0200
++++ dhcp-4.1-ESV/common/parse.c	2010-12-14 12:41:50.000000000 +0100
+@@ -909,8 +909,8 @@ TIME 
+ parse_date_core(cfile)
+ 	struct parse *cfile;
+ {
+-	int guess;
+-	int tzoff, wday, year, mon, mday, hour, min, sec;
++	TIME guess;
++	long int tzoff, wday, year, mon, mday, hour, min, sec;
+ 	const char *val;
+ 	enum dhcp_token token;
+ 	static int months[11] = { 31, 59, 90, 120, 151, 181,
diff --git a/dhcp-4.1-ESV-capability.patch b/dhcp-4.1-ESV-capability.patch
new file mode 100644
index 0000000..3857ca6
--- /dev/null
+++ b/dhcp-4.1-ESV-capability.patch
@@ -0,0 +1,177 @@
+diff -up dhcp-4.1-ESV/client/dhclient.8.capability dhcp-4.1-ESV/client/dhclient.8
+--- dhcp-4.1-ESV/client/dhclient.8.capability	2010-12-14 12:44:49.000000000 +0100
++++ dhcp-4.1-ESV/client/dhclient.8	2010-12-14 12:49:50.000000000 +0100
+@@ -94,6 +94,9 @@ dhclient - Dynamic Host Configuration Pr
+ .I script-file
+ ]
+ [
++.B -nc
++]
++[
+ .B -s
+ .I server
+ ]
+@@ -404,6 +407,32 @@ when it gets a lease.  If unspecified, t
+ is used.  See \fBdhclient-script(8)\fR for a description of this file.
+ 
+ .TP
++.BI \-nc
++Do not drop capabilities.
++
++Normally, if
++.B dhclient
++was compiled with libcap-ng support,
++.B dhclient
++drops most capabilities immediately upon startup.  While more secure,
++this greatly restricts the additional actions that hooks in
++.B dhclient-script (8)
++can take.  (For example, any daemons that 
++.B dhclient-script (8)
++starts or restarts will inherit the restricted capabilities as well,
++which may interfere with their correct operation.)  Thus, the
++.BI \-nc
++option can be used to prevent
++.B dhclient
++from dropping capabilities.
++
++The
++.BI \-nc
++option is ignored if
++.B dhclient
++was not compiled with libcap-ng support.
++
++.TP
+ .BI \-B
+ Set the BOOTP broadcast flag in request packets so servers will always
+ broadcast replies.
+diff -up dhcp-4.1-ESV/client/dhclient.c.capability dhcp-4.1-ESV/client/dhclient.c
+--- dhcp-4.1-ESV/client/dhclient.c.capability	2010-12-14 12:44:49.000000000 +0100
++++ dhcp-4.1-ESV/client/dhclient.c	2010-12-14 12:44:49.000000000 +0100
+@@ -37,6 +37,9 @@
+ #include <sys/time.h>
+ #include <sys/wait.h>
+ #include <limits.h>
++#ifdef HAVE_LIBCAP_NG
++#include <cap-ng.h>
++#endif
+ 
+ /*
+  * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
+@@ -89,6 +92,9 @@ int wanted_ia_ta = 0;
+ int wanted_ia_pd = 0;
+ char *mockup_relay = NULL;
+ int bootp_broadcast_always = 0;
++#ifdef HAVE_LIBCAP_NG
++static int keep_capabilities = 0;
++#endif
+ 
+ extern u_int32_t default_requested_options[];
+ 
+@@ -384,6 +390,10 @@ main(int argc, char **argv) {
+ 			}
+ 
+ 			dhclient_request_options = argv[i];
++		} else if (!strcmp(argv[i], "-nc")) {
++#ifdef HAVE_LIBCAP_NG
++			keep_capabilities = 1;
++#endif
+ 		} else if (argv[i][0] == '-') {
+ 		    usage();
+ 		} else if (interfaces_requested < 0) {
+@@ -432,6 +442,19 @@ main(int argc, char **argv) {
+ 		path_dhclient_script = s;
+ 	}
+ 
++#ifdef HAVE_LIBCAP_NG
++	/* Drop capabilities */
++	if (!keep_capabilities) {
++		capng_clear(CAPNG_SELECT_CAPS);
++		capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
++				CAP_DAC_OVERRIDE); // Drop this someday
++		capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
++				CAP_NET_ADMIN, CAP_NET_RAW,
++				CAP_NET_BIND_SERVICE, CAP_SYS_ADMIN, -1);
++		capng_apply(CAPNG_SELECT_CAPS);
++	}
++#endif
++
+ 	/* Set up the initial dhcp option universe. */
+ 	initialize_common_option_spaces();
+ 
+diff -up dhcp-4.1-ESV/client/dhclient-script.8.capability dhcp-4.1-ESV/client/dhclient-script.8
+--- dhcp-4.1-ESV/client/dhclient-script.8.capability	2010-12-14 12:44:49.000000000 +0100
++++ dhcp-4.1-ESV/client/dhclient-script.8	2010-12-14 12:44:49.000000000 +0100
+@@ -239,6 +239,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.
++.PP
++Normally, if dhclient was compiled with libcap-ng support,
++dhclient drops most capabilities immediately upon startup.
++While more secure, this greatly restricts the additional actions that
++hooks in dhclient-script can take. For example, any daemons that
++dhclient-script starts or restarts will inherit the restricted
++capabilities as well, which may interfere with their correct operation.
++Thus, the
++.BI \-nc
++option can be used to prevent dhclient from dropping capabilities.
+ .SH SEE ALSO
+ dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and
+ dhclient.leases(5).
+diff -up dhcp-4.1-ESV/client/Makefile.am.capability dhcp-4.1-ESV/client/Makefile.am
+--- dhcp-4.1-ESV/client/Makefile.am.capability	2010-09-15 00:49:47.000000000 +0200
++++ dhcp-4.1-ESV/client/Makefile.am	2010-12-14 12:44:49.000000000 +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 ../minires/libres.a \
+-		 ../omapip/libomapi.a ../dst/libdst.a
++		 ../omapip/libomapi.a ../dst/libdst.a $(CAPNG_LDADD)
+ man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
+ EXTRA_DIST = $(man_MANS)
+ 
+diff -up dhcp-4.1-ESV/configure.ac.capability dhcp-4.1-ESV/configure.ac
+--- dhcp-4.1-ESV/configure.ac.capability	2010-12-14 12:44:49.000000000 +0100
++++ dhcp-4.1-ESV/configure.ac	2010-12-14 12:51:42.000000000 +0100
+@@ -425,6 +425,41 @@ AC_TRY_LINK(
+ # Look for optional headers.
+ AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
+ 
++# look for capabilities library
++AC_ARG_WITH(libcap-ng,
++    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
++    with_libcap_ng=auto)
++
++# Check for Libcap-ng API
++#
++# libcap-ng detection
++if test x$with_libcap_ng = xno ; then
++    have_libcap_ng=no;
++else
++    # Start by checking for header file
++    AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
++
++    # See if we have libcap-ng library
++    AC_CHECK_LIB(cap-ng, capng_clear,
++                 CAPNG_LDADD=-lcap-ng,)
++
++    # Check results are usable
++    if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
++       AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
++    fi
++    if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
++       AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
++    fi
++fi
++AC_SUBST(CAPNG_LDADD)
++AC_MSG_CHECKING(whether to use libcap-ng)
++if test x$CAPNG_LDADD != x ; then
++    AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
++    AC_MSG_RESULT(yes)
++else
++    AC_MSG_RESULT(no)
++fi
++
+ # Solaris needs some libraries for functions
+ AC_SEARCH_LIBS(socket, [socket])
+ AC_SEARCH_LIBS(inet_ntoa, [nsl])
diff --git a/dhcp-4.1-ESV-manpages.patch b/dhcp-4.1-ESV-manpages.patch
new file mode 100644
index 0000000..3df75f9
--- /dev/null
+++ b/dhcp-4.1-ESV-manpages.patch
@@ -0,0 +1,287 @@
+diff -up dhcp-4.1-ESV/client/dhclient.8.man dhcp-4.1-ESV/client/dhclient.8
+--- dhcp-4.1-ESV/client/dhclient.8.man	2010-07-14 22:57:49.000000000 +0200
++++ dhcp-4.1-ESV/client/dhclient.8	2010-12-14 12:27:07.000000000 +0100
+@@ -111,6 +111,33 @@ dhclient - Dynamic Host Configuration Pr
+ .B -w
+ ]
+ [
++.B -B
++]
++[
++.B -I
++.I dhcp-client-identifier
++]
++[
++.B -H
++.I host-name
++]
++[
++.B -F
++.I fqdn.fqdn
++]
++[
++.B -V
++.I vendor-class-identifier
++]
++[
++.B -R
++.I request-option-list
++]
++[
++.B -timeout
++.I timeout
++]
++[
+ .B -v
+ ]
+ [
+@@ -376,6 +403,67 @@ when it gets a lease.  If unspecified, t
+ .B CLIENTBINDIR/dhclient-script
+ is used.  See \fBdhclient-script(8)\fR for a description of this file.
+ 
++.TP
++.BI \-B
++Set the BOOTP broadcast flag in request packets so servers will always
++broadcast replies.
++
++.TP
++.BI \-I\ <dhcp-client-identifier>
++Specify the dhcp-client-identifier option to send to the DHCP server.
++
++.TP
++.BI \-H\ <host-name>
++Specify the host-name option to send to the DHCP server.  The host-name
++string only contains the client's hostname prefix, to which the server will
++append the ddns-domainname or domain-name options, if any, to derive the
++fully qualified domain name of the client.  The
++.B -H
++option cannot be used with the
++.B -F
++option.
++
++.TP
++.BI \-F\ <fqdn.fqdn>
++Specify the fqdn.fqdn option to send to the DHCP server.  This option cannot
++be used with the
++.B -H
++option.  The fqdn.fqdn option must specify the complete domain name of the
++client host, which the server may use for dynamic DNS updates.
++
++.TP
++.BI \-V\ <vendor-class-identifier>
++Specify the vendor-class-identifier option to send to the DHCP server.
++
++.TP
++.BI \-R\ <option>[,<option>...]
++Specify the list of options the client is to request from the server.  The
++option list must be a single string consisting of option names separated
++by at least one command and optional space characters.  The default option
++list is:
++
++.BR
++    subnet-mask, broadcast-address, time-offset, routers,
++.BR
++    domain-search, domain-name, domain-name-servers, host-name, 
++.BR
++    nis-domain, nis-servers, ntp-servers, interface-mtu
++
++.B -R
++option does not append options to the default request, it overrides the
++default request list.  Keep this in mind if you want to request an
++additional option besides the default request list.  You will have to
++specify all option names for the
++.B -R
++parameter.
++
++.TP
++.BI \-timeout\ <timeout>
++Specify the time after which
++.B dhclient
++will decide that no DHCP servers can be contacted when no responses have been
++received.
++
+ 
+ .PP
+ .SH CONFIGURATION
+diff -up dhcp-4.1-ESV/client/dhclient.conf.5.man dhcp-4.1-ESV/client/dhclient.conf.5
+--- dhcp-4.1-ESV/client/dhclient.conf.5.man	2010-09-15 00:49:47.000000000 +0200
++++ dhcp-4.1-ESV/client/dhclient.conf.5	2010-12-14 12:31:46.000000000 +0100
+@@ -186,7 +186,8 @@ responding to the client send the client
+ options.   Only the option names should be specified in the request
+ statement - not option parameters.   By default, the DHCPv4 client
+ requests the subnet-mask, broadcast-address, time-offset, routers,
+-domain-name, domain-name-servers and host-name options while the DHCPv6
++domain-search, domain-name, domain-name-servers, host-name, nis-domain,
++nis-servers, ntp-servers and interface-mtu options while the DHCPv6
+ client requests the dhcp6 name-servers and domain-search options.  Note
+ that if you enter a \'request\' statement, you over-ride these defaults
+ and these options will not be requested.
+@@ -649,6 +650,18 @@ database and will record the media type 
+ Whenever the client tries to renew the lease, it will use that same
+ media type.   The lease must expire before the client will go back to
+ cycling through media types.
++.PP
++ \fBbootp-broadcast-always;\fR
++.PP
++The
++.B bootp-broadcast-always
++statement instructs dhclient to always set the bootp broadcast flag in
++request packets, so that servers will always broadcast replies.
++This is equivalent to supplying the dhclient -B argument, and has
++the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
++This option is provided as an extension to enable dhclient to work
++on IBM s390 Linux guests.
++.PP
+ .SH SAMPLE
+ The following configuration file is used on a laptop running NetBSD
+ 1.3.   The laptop has an IP alias of 192.5.5.213, and has one
+@@ -673,7 +686,7 @@ interface "ep0" {
+     supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com";
+     prepend domain-name-servers 127.0.0.1;
+     request subnet-mask, broadcast-address, time-offset, routers,
+-	    domain-name, domain-name-servers, host-name;
++	    domain-search, domain-name, domain-name-servers, host-name;
+     require subnet-mask, domain-name-servers;
+     script "CLIENTBINDIR/dhclient-script";
+     media "media 10baseT/UTP", "media 10base2/BNC";
+diff -up dhcp-4.1-ESV/client/dhclient-script.8.man dhcp-4.1-ESV/client/dhclient-script.8
+--- dhcp-4.1-ESV/client/dhclient-script.8.man	2010-07-03 01:37:06.000000000 +0200
++++ dhcp-4.1-ESV/client/dhclient-script.8	2010-12-14 11:43:23.000000000 +0100
+@@ -47,7 +47,7 @@ customizations are needed, they should b
+ exit hooks provided (see HOOKS for details).   These hooks will allow the
+ user to override the default behaviour of the client in creating a
+ .B /etc/resolv.conf
+-file.
++file, and to handle DHCP options not handled by default.
+ .PP
+ No standard client script exists for some operating systems, even though
+ the actual client may work, so a pioneering user may well need to create
+@@ -91,6 +91,26 @@ present.   The
+ .B ETCDIR/dhclient-exit-hooks
+ script can modify the valid of exit_status to change the exit status
+ of dhclient-script.
++.PP
++Immediately after dhclient brings an interface UP with a new IP address,
++subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
++existence of an executable
++.B ETCDIR/dhclient-up-hooks
++script, and source it if found. This script can handle DHCP options in
++the environment that are not handled by default. A per-interface.
++.B ETCDIR/dhclient-${IF}-up-hooks
++script will override the generic script and be sourced when interface
++$IF has been brought up.
++.PP
++Immediately before dhclient brings an interface DOWN, removing its IP
++address, subnet mask, and routes, in the STOP/RELEASE  states, it will
++check for the existence of an executable
++.B ETCDIR/dhclient-down-hooks
++script, and source it if found. This script can handle DHCP options in
++the environment that are not handled by default. A per-interface
++.B ETCDIR/dhclient-${IF}-down-hooks
++script will override the generic script and be sourced when interface
++$IF is about to be brought down.
+ .SH OPERATION
+ When dhclient needs to invoke the client configuration script, it
+ defines a set of variables in the environment, and then invokes
+diff -up dhcp-4.1-ESV/common/dhcp-options.5.man dhcp-4.1-ESV/common/dhcp-options.5
+--- dhcp-4.1-ESV/common/dhcp-options.5.man	2010-07-13 22:57:18.000000000 +0200
++++ dhcp-4.1-ESV/common/dhcp-options.5	2010-12-14 11:43:23.000000000 +0100
+@@ -905,6 +905,21 @@ classless IP routing - it does not inclu
+ classless IP routing is now the most widely deployed routing standard,
+ this option is virtually useless, and is not implemented by any of the
+ popular DHCP clients, for example the Microsoft DHCP client.
++.PP
++NOTE to Fedora dhclient users:
++.br
++dhclient-script interprets trailing 0 octets of the target as indicating
++the subnet class of the route, so for the following static-routes value:
++.br
++        option static-routes 172.0.0.0 172.16.2.254,
++.br
++                             192.168.0.0 192.168.2.254;
++.br
++dhclient-script will create routes:
++.br
++        172/8 via 172.16.2.254 dev $interface
++.br
++        192.168/16 via 192.168.2.254 dev $interface
+ .RE
+ .PP
+ .nf
+diff -up dhcp-4.1-ESV/server/dhcpd.conf.5.man dhcp-4.1-ESV/server/dhcpd.conf.5
+--- dhcp-4.1-ESV/server/dhcpd.conf.5.man	2010-07-03 01:37:07.000000000 +0200
++++ dhcp-4.1-ESV/server/dhcpd.conf.5	2010-12-14 11:43:23.000000000 +0100
+@@ -519,6 +519,9 @@ pool {
+ };
+ .fi
+ .PP
++Dynamic BOOTP leases are not compatible with failover, and, as such,
++you need to disallow BOOTP in pools that you are using failover for.
++.PP
+ The  server currently  does very  little  sanity checking,  so if  you
+ configure it wrong, it will just  fail in odd ways.  I would recommend
+ therefore that you either do  failover or don't do failover, but don't
+@@ -533,9 +536,9 @@ primary server might look like this:
+ failover peer "foo" {
+   primary;
+   address anthrax.rc.vix.com;
+-  port 519;
++  port 647;
+   peer address trantor.rc.vix.com;
+-  peer port 520;
++  peer port 847;
+   max-response-delay 60;
+   max-unacked-updates 10;
+   mclt 3600;
+@@ -594,9 +597,7 @@ statement
+ .B port \fIport-number\fR\fB;\fR
+ .PP
+ The \fBport\fR statement declares the TCP port on which the server
+-should listen for connections from its failover peer.   This statement
+-may not currently be omitted, because the failover protocol does not
+-yet have a reserved TCP port number.
++should listen for connections from its failover peer.
+ .RE
+ .PP
+ The 
+@@ -608,10 +609,8 @@ statement
+ .PP
+ The \fBpeer port\fR statement declares the TCP port to which the
+ server should connect to reach its failover peer for failover
+-messages.   This statement may not be omitted because the failover
+-protocol does not yet have a reserved TCP port number.   The port
+-number declared in the \fBpeer port\fR statement may be the same as
+-the port number declared in the \fBport\fR statement.
++messages.  The port number declared in the \fBpeer port\fR statement
++may be the same as the port number declared in the \fBport\fR statement.
+ .RE
+ .PP
+ The
+@@ -1279,7 +1278,7 @@ the zone containing PTR records - for IS
+ .PP
+ .nf
+ key DHCP_UPDATER {
+-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
++  algorithm hmac-md5;
+   secret pRP5FapFoJ95JEL06sv4PQ==;
+ };
+ 
+@@ -1302,7 +1301,7 @@ dhcpd.conf file:
+ .PP
+ .nf
+ key DHCP_UPDATER {
+-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
++  algorithm hmac-md5;
+   secret pRP5FapFoJ95JEL06sv4PQ==;
+ };
+ 
+@@ -2514,7 +2513,8 @@ statement
+ The \fInext-server\fR statement is used to specify the host address of
+ the server from which the initial boot file (specified in the
+ \fIfilename\fR statement) is to be loaded.   \fIServer-name\fR should
+-be a numeric IP address or a domain name.
++be a numeric IP address or a domain name.  If no \fInext-server\fR statement
++applies to a given client, the address 0.0.0.0 is used.
+ .RE
+ .PP
+ The
diff --git a/dhcp-4.1-ESV-retransmission.patch b/dhcp-4.1-ESV-retransmission.patch
new file mode 100644
index 0000000..05b5a0a
--- /dev/null
+++ b/dhcp-4.1-ESV-retransmission.patch
@@ -0,0 +1,48 @@
+diff -up dhcp-4.1-ESV/client/dhc6.c.retransmission dhcp-4.1-ESV/client/dhc6.c
+--- dhcp-4.1-ESV/client/dhc6.c.retransmission	2010-12-14 12:53:15.000000000 +0100
++++ dhcp-4.1-ESV/client/dhc6.c	2010-12-14 13:01:16.000000000 +0100
+@@ -358,7 +358,7 @@ dhc6_retrans_init(struct client_state *c
+ static void
+ dhc6_retrans_advance(struct client_state *client)
+ {
+-	struct timeval elapsed;
++	struct timeval elapsed, elapsed_after_RT;
+ 
+ 	/* elapsed = cur - start */
+ 	elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec;
+@@ -375,6 +375,8 @@ dhc6_retrans_advance(struct client_state
+ 		elapsed.tv_sec += 1;
+ 		elapsed.tv_usec -= 1000000;
+ 	}
++	elapsed_after_RT.tv_sec = elapsed.tv_sec;
++	elapsed_after_RT.tv_usec = elapsed.tv_usec;
+ 
+ 	/*
+ 	 * RT for each subsequent message transmission is based on the previous
+@@ -412,13 +414,10 @@ dhc6_retrans_advance(struct client_state
+ 		elapsed.tv_usec -= 1000000;
+ 	}
+ 	if (elapsed.tv_sec >= client->MRD) {
+-		/*
+-		 * wake at RT + cur = start + MRD
+-		 */
+-		client->RT = client->MRD +
+-			(client->start_time.tv_sec - cur_tv.tv_sec);
+-		client->RT = client->RT * 100 +
+-			(client->start_time.tv_usec - cur_tv.tv_usec) / 10000;
++		client->RT = client->MRD - elapsed_after_RT.tv_sec;
++		client->RT = client->RT * 100 - elapsed_after_RT.tv_usec / 10000;
++		if (client->RT < 0)
++			client->RT = 0;
+ 	}
+ 	client->txcount++;
+ }
+@@ -1494,7 +1493,7 @@ check_timing6 (struct client_state *clie
+ 	}
+ 
+ 	/* Check if finished (-1 argument). */
+-	if ((client->MRD != 0) && (elapsed.tv_sec > client->MRD)) {
++	if ((client->MRD != 0) && (elapsed.tv_sec >= client->MRD)) {
+ 		log_info("Max retransmission duration exceeded.");
+ 		return(CHK_TIM_MRD_EXCEEDED);
+ 	}
diff --git a/dhcp-4.1.1-64_bit_lease_parse.patch b/dhcp-4.1.1-64_bit_lease_parse.patch
deleted file mode 100644
index 9bcb918..0000000
--- a/dhcp-4.1.1-64_bit_lease_parse.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up dhcp-4.1.1/common/parse.c.64-bit_lease_parse dhcp-4.1.1/common/parse.c
---- dhcp-4.1.1/common/parse.c.64-bit_lease_parse	2009-07-23 21:02:09.000000000 +0200
-+++ dhcp-4.1.1/common/parse.c	2010-01-20 17:38:10.000000000 +0100
-@@ -905,8 +905,8 @@ TIME 
- parse_date_core(cfile)
- 	struct parse *cfile;
- {
--	int guess;
--	int tzoff, wday, year, mon, mday, hour, min, sec;
-+	TIME guess;
-+	long int tzoff, wday, year, mon, mday, hour, min, sec;
- 	const char *val;
- 	enum dhcp_token token;
- 	static int months [11] = { 31, 59, 90, 120, 151, 181,
diff --git a/dhcp-4.1.1-P1-CVE-2010-3611.patch b/dhcp-4.1.1-P1-CVE-2010-3611.patch
deleted file mode 100644
index 26427e9..0000000
--- a/dhcp-4.1.1-P1-CVE-2010-3611.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up dhcp-4.1.1-P1/server/dhcpv6.c.CVE-2010-3611 dhcp-4.1.1-P1/server/dhcpv6.c
---- dhcp-4.1.1-P1/server/dhcpv6.c.CVE-2010-3611	2010-11-03 13:54:03.000000000 +0100
-+++ dhcp-4.1.1-P1/server/dhcpv6.c	2010-11-03 14:01:00.000000000 +0100
-@@ -4254,10 +4254,25 @@ shared_network_from_packet6(struct share
- 	 * If there is no link address, we will use the interface
- 	 * that this packet came in on to pick the shared_network.
- 	 */
--	} else {
-+	} else if (packet->interface != NULL) {
- 		status = shared_network_reference(shared,
- 					 packet->interface->shared_network,
- 					 MDL);
-+                if (packet->dhcpv6_container_packet != NULL) {
-+			log_info("[L2 Relay] No link address in relay packet "
-+				 "assuming L2 relay and using receiving "
-+				 "interface");
-+                }
-+
-+	} else {
-+		/*
-+		 * We shouldn't be able to get here but if there is no link
-+		 * address and no interface we don't know where to get the
-+		 * pool from log an error and return an error.
-+		 */
-+		log_error("No interface and no link address " 
-+			  "can't determine pool");
-+		status = ISC_R_INVALIDARG;
- 	}
- 
- 	return status;
-@@ -5585,6 +5600,7 @@ dhcpv6_relay_forw(struct data_string *re
- 
- 	enc_packet->client_port = packet->client_port;
- 	enc_packet->client_addr = packet->client_addr;
-+	interface_reference(&enc_packet->interface, packet->interface, MDL);
- 	enc_packet->dhcpv6_container_packet = packet;
- 
- 	msg_type = enc_opt_data.data[0];
diff --git a/dhcp-4.1.1-P1-parse_date.patch b/dhcp-4.1.1-P1-parse_date.patch
deleted file mode 100644
index 4fef7ae..0000000
--- a/dhcp-4.1.1-P1-parse_date.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff -up dhcp-4.1.1-P1/common/parse.c.parse_date dhcp-4.1.1-P1/common/parse.c
---- dhcp-4.1.1-P1/common/parse.c.parse_date	2010-06-11 14:25:10.000000000 +0200
-+++ dhcp-4.1.1-P1/common/parse.c	2010-06-11 15:00:08.000000000 +0200
-@@ -913,48 +913,46 @@ parse_date_core(cfile)
- 					  212, 243, 273, 304, 334 };
- 
- 	/* Day of week, or "never"... */
--	token = next_token (&val, (unsigned *)0, cfile);
-+	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token == NEVER) {
--		if (!parse_semi (cfile))
--			return 0;
-+		next_token (&val, (unsigned *)0, cfile); /* consume NEVER*/
- 		return MAX_TIME;
- 	}
- 
- 	/* This indicates 'local' time format. */
- 	if (token == EPOCH) {
--		token = next_token(&val, NULL, cfile);
--
-+		next_token(&val, (unsigned *)0, cfile); /* consume EPOCH */
-+		token = peek_token (&val, (unsigned *)0, cfile);
- 		if (token != NUMBER) {
- 			parse_warn(cfile, "Seconds since epoch expected.");
- 			if (token != SEMI)
--				skip_to_semi(cfile);
-+				next_token(&val, (unsigned *)0, cfile);
- 			return (TIME)0;
- 		}
-+		next_token(&val, (unsigned *)0, cfile); /* consume seconds */
- 
- 		guess = atoi(val);
--
--		if (!parse_semi(cfile))
--			return (TIME)0;
--
- 		return guess;
- 	}
- 
- 	if (token != NUMBER) {
- 		parse_warn (cfile, "numeric day of week expected.");
- 		if (token != SEMI)
--			skip_to_semi (cfile);
-+			next_token(&val, (unsigned *)0, cfile);
- 		return (TIME)0;
- 	}
-+	next_token(&val, (unsigned *)0, cfile); /* consume day of week */
- 	wday = atoi (val);
- 
- 	/* Year... */
--	token = next_token (&val, (unsigned *)0, cfile);
-+	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token != NUMBER) {
- 		parse_warn (cfile, "numeric year expected.");
- 		if (token != SEMI)
--			skip_to_semi (cfile);
-+			next_token(&val, (unsigned *)0, cfile);
- 		return (TIME)0;
- 	}
-+	next_token(&val, (unsigned *)0, cfile); /* consume Year*/
- 
- 	/* Note: the following is not a Y2K bug - it's a Y1.9K bug.   Until
- 	   somebody invents a time machine, I think we can safely disregard
-@@ -965,101 +963,113 @@ parse_date_core(cfile)
- 		year -= 1900;
- 
- 	/* Slash separating year from month... */
--	token = next_token (&val, (unsigned *)0, cfile);
-+	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token != SLASH) {
- 		parse_warn (cfile,
- 			    "expected slash separating year from month.");
- 		if (token != SEMI)
--			skip_to_semi (cfile);
-+			next_token(&val, (unsigned *)0, cfile);
- 		return (TIME)0;
- 	}
-+	token = next_token(&val, (unsigned *)0, cfile); /* consume SLASH */
- 
- 	/* Month... */
--	token = next_token (&val, (unsigned *)0, cfile);
-+	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token != NUMBER) {
- 		parse_warn (cfile, "numeric month expected.");
- 		if (token != SEMI)
--			skip_to_semi (cfile);
-+			next_token(&val, (unsigned *)0, cfile);
- 		return (TIME)0;
- 	}
-+	next_token(&val, (unsigned *)0, cfile); /* consume Month */
- 	mon = atoi (val) - 1;
- 
- 	/* Slash separating month from day... */
--	token = next_token (&val, (unsigned *)0, cfile);
-+	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token != SLASH) {
- 		parse_warn (cfile,
- 			    "expected slash separating month from day.");
- 		if (token != SEMI)
--			skip_to_semi (cfile);
-+			next_token(&val, (unsigned *)0, cfile);
- 		return (TIME)0;
- 	}
-+	next_token(&val, (unsigned *)0, cfile); /* consume SLASH */
- 
- 	/* Day of month... */
--	token = next_token (&val, (unsigned *)0, cfile);
-+	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token != NUMBER) {
- 		parse_warn (cfile, "numeric day of month expected.");
- 		if (token != SEMI)
--			skip_to_semi (cfile);
-+			next_token(&val, (unsigned *)0, cfile);
- 		return (TIME)0;
- 	}
-+	next_token(&val, (unsigned *)0, cfile); /* consume Day of month */
- 	mday = atoi (val);
- 
- 	/* Hour... */
--	token = next_token (&val, (unsigned *)0, cfile);
-+	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token != NUMBER) {
- 		parse_warn (cfile, "numeric hour expected.");
- 		if (token != SEMI)
--			skip_to_semi (cfile);
-+			next_token(&val, (unsigned *)0, cfile);
- 		return (TIME)0;
- 	}
-+	next_token(&val, (unsigned *)0, cfile); /* consume Hour */
- 	hour = atoi (val);
- 
- 	/* Colon separating hour from minute... */
--	token = next_token (&val, (unsigned *)0, cfile);
-+	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token != COLON) {
- 		parse_warn (cfile,
- 			    "expected colon separating hour from minute.");
- 		if (token != SEMI)
--			skip_to_semi (cfile);
-+			next_token(&val, (unsigned *)0, cfile);
- 		return (TIME)0;
- 	}
-+	next_token(&val, (unsigned *)0, cfile); /* consume Colon */
- 
- 	/* Minute... */
--	token = next_token (&val, (unsigned *)0, cfile);
-+	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token != NUMBER) {
- 		parse_warn (cfile, "numeric minute expected.");
- 		if (token != SEMI)
--			skip_to_semi (cfile);
-+			next_token(&val, (unsigned *)0, cfile);
- 		return (TIME)0;
- 	}
-+	next_token(&val, (unsigned *)0, cfile); /* consume Minute */
- 	min = atoi (val);
- 
- 	/* Colon separating minute from second... */
--	token = next_token (&val, (unsigned *)0, cfile);
-+	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token != COLON) {
- 		parse_warn (cfile,
- 			    "expected colon separating minute from second.");
- 		if (token != SEMI)
--			skip_to_semi (cfile);
-+			next_token(&val, (unsigned *)0, cfile);
- 		return (TIME)0;
- 	}
-+	next_token(&val, (unsigned *)0, cfile); /* consume Colon */
- 
- 	/* Second... */
--	token = next_token (&val, (unsigned *)0, cfile);
-+	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token != NUMBER) {
- 		parse_warn (cfile, "numeric second expected.");
- 		if (token != SEMI)
--			skip_to_semi (cfile);
-+			next_token(&val, (unsigned *)0, cfile);
- 		return (TIME)0;
- 	}
-+	next_token(&val, (unsigned *)0, cfile); /* consume Second */
- 	sec = atoi (val);
- 
-+	tzoff = 0;
- 	token = peek_token (&val, (unsigned *)0, cfile);
- 	if (token == NUMBER) {
--		token = next_token (&val, (unsigned *)0, cfile);
-+		next_token (&val, (unsigned *)0, cfile); /* consume tzoff */
- 		tzoff = atoi (val);
--	} else
--		tzoff = 0;
-+	} else if (token != SEMI) {
-+		parse_warn (cfile, "Time zone offset or semicolon expected.");
-+		next_token (&val, (unsigned *)0, cfile);
-+	}
- 
- 	/* Guess the time value... */
- 	guess = ((((((365 * (year - 70) +	/* Days in years since '70 */
-@@ -1095,7 +1105,7 @@ parse_date(cfile)
- 
-        /* Make sure the date ends in a semicolon... */
-        if (!parse_semi(cfile))
--               return 0;
-+               return (TIME)0;
-        return guess;
- }
- 
diff --git a/dhcp-4.1.1-capability.patch b/dhcp-4.1.1-capability.patch
deleted file mode 100644
index 1a20736..0000000
--- a/dhcp-4.1.1-capability.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -up dhcp-4.1.1/client/dhclient.8.capability dhcp-4.1.1/client/dhclient.8
---- dhcp-4.1.1/client/dhclient.8.capability	2010-02-03 11:19:39.854958099 -0500
-+++ dhcp-4.1.1/client/dhclient.8	2010-02-03 11:44:57.949895909 -0500
-@@ -105,6 +105,9 @@ relay
- .B -n
- ]
- [
-+.B -nc
-+]
-+[
- .B -nw
- ]
- [
-@@ -381,6 +384,32 @@ Do not configure any interfaces.  Most u
- option.
- 
- .TP
-+.BI \-nc
-+Do not drop capabilities.
-+
-+Normally, if
-+.B dhclient
-+was compiled with libcap-ng support,
-+.B dhclient
-+drops most capabilities immediately upon startup.  While more secure,
-+this greatly restricts the additional actions that hooks in
-+.B dhclient-script (8)
-+can take.  (For example, any daemons that 
-+.B dhclient-script (8)
-+starts or restarts will inherit the restricted capabilities as well,
-+which may interfere with their correct operation.)  Thus, the
-+.BI \-nc
-+option can be used to prevent
-+.B dhclient
-+from dropping capabilities.
-+
-+The
-+.BI \-nc
-+option is ignored if
-+.B dhclient
-+was not compiled with libcap-ng support.
-+
-+.TP
- .BI \-nw
- Become a daemon process immediately (nowait) rather than waiting until an IP
- address has been acquired.
-diff -up dhcp-4.1.1/client/dhclient.c.capability dhcp-4.1.1/client/dhclient.c
---- dhcp-4.1.1/client/dhclient.c.capability	2010-02-03 11:19:39.876957973 -0500
-+++ dhcp-4.1.1/client/dhclient.c	2010-02-03 11:46:14.665957658 -0500
-@@ -37,6 +37,9 @@
- #include <sys/time.h>
- #include <sys/wait.h>
- #include <limits.h>
-+#ifdef HAVE_LIBCAP_NG
-+#include <cap-ng.h>
-+#endif
- 
- /*
-  * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
-@@ -89,6 +92,9 @@ int wanted_ia_ta = 0;
- int wanted_ia_pd = 0;
- char *mockup_relay = NULL;
- int bootp_broadcast_always = 0;
-+#ifdef HAVE_LIBCAP_NG
-+static int keep_capabilities = 0;
-+#endif
- 
- extern u_int32_t default_requested_options[];
- 
-@@ -376,6 +382,10 @@ main(int argc, char **argv) {
- 			}
- 
- 			dhclient_request_options = argv[i];
-+		} else if (!strcmp(argv[i], "-nc")) {
-+#ifdef HAVE_LIBCAP_NG
-+			keep_capabilities = 1;
-+#endif
- 		} else if (argv[i][0] == '-') {
- 		    usage();
- 		} else if (interfaces_requested < 0) {
-@@ -424,6 +434,19 @@ main(int argc, char **argv) {
- 		path_dhclient_script = s;
- 	}
- 
-+#ifdef HAVE_LIBCAP_NG
-+	/* Drop capabilities */
-+	if (!keep_capabilities) {
-+		capng_clear(CAPNG_SELECT_CAPS);
-+		capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+				CAP_DAC_OVERRIDE); // Drop this someday
-+		capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+				CAP_NET_ADMIN, CAP_NET_RAW,
-+				CAP_NET_BIND_SERVICE, CAP_SYS_ADMIN, -1);
-+		capng_apply(CAPNG_SELECT_CAPS);
-+	}
-+#endif
-+
- 	/* Set up the initial dhcp option universe. */
- 	initialize_common_option_spaces();
- 
-diff -up dhcp-4.1.1/client/dhclient-script.8.capability dhcp-4.1.1/client/dhclient-script.8
---- dhcp-4.1.1/client/dhclient-script.8.capability	2010-05-28 15:47:36.000000000 +0200
-+++ dhcp-4.1.1/client/dhclient-script.8	2010-05-28 15:53:21.000000000 +0200
-@@ -239,6 +239,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.
-+.PP
-+Normally, if dhclient was compiled with libcap-ng support,
-+dhclient drops most capabilities immediately upon startup.
-+While more secure, this greatly restricts the additional actions that
-+hooks in dhclient-script can take. For example, any daemons that
-+dhclient-script starts or restarts will inherit the restricted
-+capabilities as well, which may interfere with their correct operation.
-+Thus, the
-+.BI \-nc
-+option can be used to prevent dhclient from dropping capabilities.
- .SH SEE ALSO
- dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and
- dhclient.leases(5).
-diff -up dhcp-4.1.1/client/Makefile.am.capability dhcp-4.1.1/client/Makefile.am
---- dhcp-4.1.1/client/Makefile.am.capability	2008-11-18 17:33:22.000000000 -0500
-+++ dhcp-4.1.1/client/Makefile.am	2010-02-03 11:19:39.895958083 -0500
-@@ -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 ../minires/libres.a \
--		 ../omapip/libomapi.a ../dst/libdst.a
-+		 ../omapip/libomapi.a ../dst/libdst.a $(CAPNG_LDADD)
- man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
- EXTRA_DIST = $(man_MANS)
- 
-diff -up dhcp-4.1.1/configure.ac.capability dhcp-4.1.1/configure.ac
---- dhcp-4.1.1/configure.ac.capability	2010-02-03 11:19:39.806895971 -0500
-+++ dhcp-4.1.1/configure.ac	2010-02-03 11:19:39.895958083 -0500
-@@ -419,6 +419,41 @@ AC_TRY_LINK(
- # Look for optional headers.
- AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
- 
-+# look for capabilities library
-+AC_ARG_WITH(libcap-ng,
-+    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
-+    with_libcap_ng=auto)
-+
-+# Check for Libcap-ng API
-+#
-+# libcap-ng detection
-+if test x$with_libcap_ng = xno ; then
-+    have_libcap_ng=no;
-+else
-+    # Start by checking for header file
-+    AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
-+
-+    # See if we have libcap-ng library
-+    AC_CHECK_LIB(cap-ng, capng_clear,
-+                 CAPNG_LDADD=-lcap-ng,)
-+
-+    # Check results are usable
-+    if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
-+       AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
-+    fi
-+    if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
-+       AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
-+    fi
-+fi
-+AC_SUBST(CAPNG_LDADD)
-+AC_MSG_CHECKING(whether to use libcap-ng)
-+if test x$CAPNG_LDADD != x ; then
-+    AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
-+    AC_MSG_RESULT(yes)
-+else
-+    AC_MSG_RESULT(no)
-+fi
-+
- # find an MD5 library
- AC_SEARCH_LIBS(MD5_Init, [crypto])
- AC_SEARCH_LIBS(MD5Init, [crypto])
diff --git a/dhcp-4.1.1-invalid-dhclient-conf.patch b/dhcp-4.1.1-invalid-dhclient-conf.patch
deleted file mode 100644
index 579d7f0..0000000
--- a/dhcp-4.1.1-invalid-dhclient-conf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up dhcp-4.1.1/client/dhclient.conf.supersede dhcp-4.1.1/client/dhclient.conf
---- dhcp-4.1.1/client/dhclient.conf.supersede	1997-06-03 00:50:44.000000000 +0200
-+++ dhcp-4.1.1/client/dhclient.conf	2010-01-20 17:24:00.000000000 +0100
-@@ -1,10 +1,10 @@
- send host-name "andare.fugue.com";
- send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
- send dhcp-lease-time 3600;
--supersede domain-name "fugue.com home.vix.com";
-+supersede domain-search "fugue.com", "home.vix.com";
- prepend domain-name-servers 127.0.0.1;
- request subnet-mask, broadcast-address, time-offset, routers,
--	domain-name, domain-name-servers, host-name;
-+	domain-search, domain-name, domain-name-servers, host-name;
- require subnet-mask, domain-name-servers;
- timeout 60;
- retry 60;
diff --git a/dhcp-4.1.1-manpages.patch b/dhcp-4.1.1-manpages.patch
deleted file mode 100644
index f19e669..0000000
--- a/dhcp-4.1.1-manpages.patch
+++ /dev/null
@@ -1,676 +0,0 @@
-diff -up dhcp-4.1.1/client/dhclient.8.man dhcp-4.1.1/client/dhclient.8
---- dhcp-4.1.1/client/dhclient.8.man	2009-07-25 00:04:51.000000000 +0200
-+++ dhcp-4.1.1/client/dhclient.8	2010-02-25 17:41:36.000000000 +0100
-@@ -111,6 +111,33 @@ relay
- .B -w
- ]
- [
-+.B -B
-+]
-+[
-+.B -I
-+.I dhcp-client-identifier
-+]
-+[
-+.B -H
-+.I host-name
-+]
-+[
-+.B -F
-+.I fqdn.fqdn
-+]
-+[
-+.B -V
-+.I vendor-class-identifier
-+]
-+[
-+.B -R
-+.I request-option-list
-+]
-+[
-+.B -timeout
-+.I timeout
-+]
-+[
- .B -v
- ]
- [
-@@ -138,32 +165,6 @@ important details about the network to w
- the location of a default router, the location of a name server, and
- so on.
- .PP
--If given the -4 command line argument (default), dhclient will use the
--DHCPv4 protocol to obtain an IPv4 address and configuration parameters.
--.PP
--If given the -6 command line argument, dhclient will use the DHCPv6
--protocol to obtain whatever IPv6 addresses are available along with
--configuration parameters. But with
--.B -S
--it uses Information-request to get only (i.e., without address)
--stateless configuration parameters.
--.PP
--The default DHCPv6 behavior is modified too with
--.B -T
--which asks for IPv6 temporary addresses, one set per
--.B -T
--flag.
--.B -P
--enables the IPv6 prefix delegation.
--As temporary addresses or prefix delegation disables the normal
--address query,
--.B -N
--restores it. Note it is not recommended to mix queries of different types
--together, or even to share the lease file between them.
--.PP
--If given the --version command line argument, dhclient will print its
--version number and exit.
--.PP
- On startup, dhclient reads the
- .IR dhclient.conf
- for configuration instructions.   It then gets a list of all the
-@@ -217,141 +218,259 @@ file.   If interfaces are specified in t
- only configure interfaces that are either specified in the
- configuration file or on the command line, and will ignore all other
- interfaces.
--.PP
--If the DHCP client should listen and transmit on a port other than the
--standard (port 68), the
--.B -p
--flag may used.  It should be followed by the udp port number that
--dhclient should use.  This is mostly useful for debugging purposes.
--If a different port is specified for the client to listen on and
--transmit on, the client will also use a different destination port -
--one less than the specified port.
--.PP
--The DHCP client normally transmits any protocol messages it sends
--before acquiring an IP address to, 255.255.255.255, the IP limited
--broadcast address.   For debugging purposes, it may be useful to have
--the server transmit these messages to some other address.   This can
--be specified with the 
--.B -s
--flag, followed by the IP address or domain name of the destination.
--This feature is not supported by DHCPv6.
--.PP
--For testing purposes, the giaddr field of all packets that the client
--sends can be set using the
--.B -g
--flag, followed by the IP address to send.   This is only useful for testing,
--and should not be expected to work in any consistent or useful way.
--.PP
--The DHCP client will normally run in the foreground until it has
--configured an interface, and then will revert to running in the
--background.   To run force dhclient to always run as a foreground
--process, the
--.B -d
--flag should be specified.  This is useful when running the client
--under a debugger, or when running it out of inittab on System V
--systems.
--.PP
--The dhclient daemon creates its own environment when executing the
--dhclient-script to do the grunt work of interface configuration.
--To define extra environment variables and their values, use the
--.B -e
--flag, followed by the environment variable name and value assignment,
--just as one would assign a variable in a shell.  Eg:
--.B -e
--.I IF_METRIC=1
--.PP
--The client normally prints no output during its startup sequence.  It
--can be made to emit verbose messages displaying the startup sequence events
--until it has acquired an address by supplying the
--.B -v
--command line argument.  In either case, the client logs messages using
--the
--.B syslog (3)
--facility.  A
--.B -q
--command line argument is provided for backwards compatibility, but since
--dhclient is quiet by default, it has no effect.
--.PP
--The client normally doesn't release the current lease as it is not
--required by the DHCP protocol.  Some cable ISPs require their clients
--to notify the server if they wish to release an assigned IP address.
--The
--.B -r
--flag explicitly releases the current lease, and once the lease has been
--released, the client exits.
--.PP
-+.SH OPTIONS
-+.TP
-+.BI \-4
-+Use the DHCPv4 protocol to obtain an IPv4 address and configuration
-+parameters (default).
-+
-+.TP
-+.BI \-6
-+Use the DHCPv6 protocol to obtain whatever IPv6 addresses are available
-+along with configuration parameters.  The functionality of DHCPv6 mode
-+may be modified with the
-+.BI \-S
-+,
-+.BI \-T
-+, and
-+.BI \-N
-+options.
-+
-+.TP
-+.BI \-S
-+Perform an information-only request over DHCPv6 to get stateless
-+configuration parameters.  It is not recommended to combine this option
-+with the
-+.BI \-N
-+,
-+.BI \-P
-+, or
-+.BI \-T
-+options or to share lease files between different modes of operation.  Only
-+valid with the
-+.BI \-6
-+option.
-+
-+.TP
-+.BI \-N
-+Perform a normal (IA_NA) address query over DHCPv6.  It is not recommended
-+to combine this option with the
-+.BI \-P
-+,
-+.BI \-S
-+, or
-+.BI \-T
-+options or to share lease files between different modes of operation.  Only
-+valid with the
-+.BI \-6
-+option.
-+
-+.TP
-+.BI \-T
-+Perform a temporary (IA_TA) address query over DHCPv6 (disables normal address
-+query).  It is not recommended to combine this option with the
-+.BI \-N
-+,
-+.BI \-P
-+, or
-+.BI \-S
-+options or to share lease files between different modes of operation.  Only
-+valid with the
-+.BI \-6
-+option.
-+
-+.TP
-+.BI \-P
-+Enable IPv6 prefix delegation (disables normal address query).  It is not
-+not recommended to combine this option with the
-+.BI \-N
-+,
-+.BI \-S
-+, or
-+.BI \-T
-+options or to share lease files between different modes of operation.  Only
-+valid with the
-+.BI \-6
-+option.
-+
-+.TP
-+.BI \-p\ <port\ number>
-+The UDP port number the DHCP client should listen and transmit on.  If
-+unspecified,
-+.B dhclient
-+uses the default port 68.  This option is mostly useful for debugging
-+purposes.  If a different port is specified for the client to listen and
-+transmit on, the client will also use a different destination port - one
-+less than the specified port.
-+
-+.TP
-+.BI \-d
-+Force
-+.B dhclient
-+to run as a foreground process.  This is useful when running the client
-+under a debugger, or when running it out of inittab on System V systems.
-+
-+.TP
-+.BI \-e\ VAR=value
-+Define additional environment variables for the environment where
-+dhclient-script executes.  You may specify multiplate
-+.B \-e
-+options on the command line.  For example:
-+.B \-e IF_METRIC=1
-+
-+.TP
-+.BI \-q
-+Suppress all terminal and log output except error messages.
-+
-+.TP
-+.BI \-1
-+Try once to get a lease.  One failure, exit with code 2.
-+
-+.TP
-+.BI \-r
-+Tell
-+.B dhclient
-+to release the current lease it has from the server.  This is not required
-+by the DHCP protocol, but some ISPs require their clients to notify the
-+server if they wish to release an assigned IP address.
-+
-+.TP
-+.BI \-lf\ <lease-file>
-+Path to the lease database file.  If unspecified, the default
-+.B DBDIR/dhclient.leases
-+is used.
-+
-+.TP
-+.BI \-pf\ <pid-file>
-+Path to the process ID file.  If unspecified, the default
-+.B RUNDIR/dhclient.pid
-+is used.
-+
-+.TP
-+.BI \-cf\ <config-file>
-+Path to the client configuration file.  If unspecified, the default
-+.B ETCDIR/dhclient.conf
-+is used.
-+
-+.TP
-+.BI \-sf\ <script-file>
-+Path to the network configuration script invoked by
-+.B dhclient
-+when it gets a lease.  If unspecified, the default
-+.B CLIENTBINDIR/dhclient-script
-+is used.
-+
-+.TP
-+.BI \-s\ <server>
-+Specifiy the server IP address or fully qualified domain name to transmit
-+DHCP protocol messages to.  Normally,
-+.B dhclient
-+transmits these messages to 255.255.255.255 (the IP limited broadcast
-+address).  Overriding this is mostly useful for debugging purposes.
-+
-+.TP
-+.BI \-g\ <relay>
-+Only for debugging.  Set the giaddr field of all packets the client
-+sends to the IP address specified.  This should not be expected to work
-+in any consistent or useful way.
-+
-+.TP
-+.BI \-n
-+Do not configure any interfaces.  Most useful combined with the
-+.B -w
-+option.
-+
-+.TP
-+.BI \-nw
-+Become a daemon process immediately (nowait) rather than waiting until an IP
-+address has been acquired.
-+
-+.TP
-+.BI \-w
-+Keep running even if no network interfaces are found.  The
-+.B omshell
-+program can be used to notify the client when a network interface has been
-+added or removed so it can attempt to configure an IP address on that
-+interface.
-+
-+.TP
-+.BI \-B
-+Set the BOOTP broadcast flag in request packets so servers will always
-+broadcast replies.
-+
-+.TP
-+.BI \-I\ <dhcp-client-identifier>
-+Specify the dhcp-client-identifier option to send to the DHCP server.
-+
-+.TP
-+.BI \-H\ <host-name>
-+Specify the host-name option to send to the DHCP server.  The host-name
-+string only contains the client's hostname prefix, to which the server will
-+append the ddns-domainname or domain-name options, if any, to derive the
-+fully qualified domain name of the client.  The
-+.B -H
-+option cannot be used with the
-+.B -F
-+option.
-+
-+.TP
-+.BI \-F\ <fqdn.fqdn>
-+Specify the fqdn.fqdn option to send to the DHCP server.  This option cannot
-+be used with the
-+.B -H
-+option.  The fqdn.fqdn option must specify the complete domain name of the
-+client host, which the server may use for dynamic DNS updates.
-+
-+.TP
-+.BI \-V\ <vendor-class-identifier>
-+Specify the vendor-class-identifier option to send to the DHCP server.
-+
-+.TP
-+.BI \-R\ <option>[,<option>...]
-+Specify the list of options the client is to request from the server.  The
-+option list must be a single string consisting of option names separated
-+by at least one command and optional space characters.  The default option
-+list is:
-+
-+.BR
-+    subnet-mask, broadcast-address, time-offset, routers,
-+.BR
-+    domain-search, domain-name, domain-name-servers, host-name, 
-+.BR
-+    nis-domain, nis-servers, ntp-servers, interface-mtu
-+
- The
--.B -x
--flag tells any currently running client to exit gracefully without
--releasing leases first.
-+.B -R
-+option does not append options to the default request, it overrides the
-+default request list.  Keep this in mind if you want to request an
-+additional option besides the default request list.  You will have to
-+specify all option names for the
-+.B -R
-+parameter.
-+
-+.TP
-+.BI \-timeout\ <timeout>
-+Specify the time after which
-+.B dhclient
-+will decide that no DHCP servers can be contacted when no responses have been
-+received.
-+
-+.TP
-+.BI \-v
-+Enable verbose log messages.
-+
- .PP
--If the client is killed by a signal (for example at shutdown or reboot)
--it won't execute the
-+If the client is killed by a signale (for example at shutdown or reboot), it
-+will not execute the
- .B dhclient-script (8)
--at exit. However if you shut the client down gracefully with
--.B -r
-+at exit.  However, if you shut the client down gracefully with
-+.BI \-r
- or
--.B -x
-+.BI \-x
- it will execute
- .B dhclient-script (8)
--at shutdown with the specific reason for calling the script set.
--.PP
--The
--.B -1
--flag will cause dhclient to try once to get a lease.  If it fails, dhclient
--exits with exit code two. In DHCPv6 the
--.B -1
--flag sets the max duration of the initial exchange to
--.I timeout
--(from
--.IR dhclient.conf ,
--default sixty seconds).
--.PP
--The DHCP client normally gets its configuration information from
--.B ETCDIR/dhclient.conf,
--its lease database from
--.B DBDIR/dhclient.leases,
--stores its process ID in a file called
--.B RUNDIR/dhclient.pid,
--and configures the network interface using
--.B CLIENTBINDIR/dhclient-script
--To specify different names and/or locations for these files, use the
--.B -cf,
--.B -lf,
--.B -pf
--and
--.B -sf
--flags, respectively, followed by the name of the file.   This can be
--particularly useful if, for example,
--.B DBDIR
--or
--.B RUNDIR
--has not yet been mounted when the DHCP client is started.
--.PP
--The DHCP client normally exits if it isn't able to identify any
--network interfaces to configure.   On laptop computers and other
--computers with hot-swappable I/O buses, it is possible that a
--broadcast interface may be added after system startup.   The
--.B -w
--flag can be used to cause the client not to exit when it doesn't find
--any such interfaces.   The
--.B omshell (1)
--program can then be used to notify the client when a network interface
--has been added or removed, so that the client can attempt to configure an IP
--address on that interface.
--.PP
--The DHCP client can be directed not to attempt to configure any interfaces
--using the
--.B -n
--flag.   This is most likely to be useful in combination with the
--.B -w
--flag.
--.PP
--The client can also be instructed to become a daemon immediately, rather
--than waiting until it has acquired an IP address.   This can be done by
--supplying the
--.B -nw
--flag.
-+at shutdown with the specific reason for calling the script set in the
-+environment table.
- .SH CONFIGURATION
- The syntax of the dhclient.conf(5) file is discussed separately.
- .SH OMAPI
-diff -up dhcp-4.1.1/client/dhclient.conf.5.man dhcp-4.1.1/client/dhclient.conf.5
---- dhcp-4.1.1/client/dhclient.conf.5.man	2009-07-23 21:02:09.000000000 +0200
-+++ dhcp-4.1.1/client/dhclient.conf.5	2010-02-25 17:43:16.000000000 +0100
-@@ -184,11 +184,12 @@ are called \fIDHCP Options\fR.  DHCP Opt
- The request statement causes the client to request that any server
- responding to the client send the client its values for the specified
- options.   Only the option names should be specified in the request
--statement - not option parameters.   By default, the DHCP server
-+statement - not option parameters.   By default, the DHCPv4 client
- requests the subnet-mask, broadcast-address, time-offset, routers,
--domain-name, domain-name-servers and host-name options.  Note that if
--you enter a 'request' statement, you over-ride this default and these
--options will not be requested.
-+domain-search, domain-name, domain-name-servers, host-name, nis-domain, nis-servers,
-+ntp-servers and interface-mtu options. The DHCPv6 client requests by default
-+name-servers and domain-search. Note that if you enter a 'request' statement,
-+you over-ride this default and these options will not be requested.
- .PP
- In some cases, it may be desirable to send no parameter request list
- at all.   To do this, simply write the request statement but specify
-@@ -234,22 +235,11 @@ The send statement causes the client to 
- the server with the specified values.  These are full option
- declarations as described in \fBdhcp-options(5)\fR.  Options that are
- always sent in the DHCP protocol should not be specified here, except
--that the client can specify a \fBrequested-lease-time\fR option other
-+that the client can specify a requested \fBdhcp-lease-time\fR option other
- than the default requested lease time, which is two hours.  The other
- obvious use for this statement is to send information to the server
- that will allow it to differentiate between this client and other
- clients or kinds of clients.
--.SH DHCPV6 OPERATION
--The client does not yet have a default DHCPv6 Option Request Option (ORO),
--nor has it been integrated with the 'request' and 'require' syntax above.
--It is neccessary to configure an ORO then.
--.PP
--.nf
--  send dhcp6.oro 1, 2, 7, 12, 13, 23, 24, 39;
--.fi
--.PP
--The above ORO will request both identifiers (server, client), the preference,
--unicast, nameservers, domain-search, and FQDN(v6) options.
- .SH DYNAMIC DNS
- The client now has some very limited support for doing DNS updates
- when a lease is acquired.   This is prototypical, and probably doesn't
-@@ -659,6 +649,18 @@ database and will record the media type 
- Whenever the client tries to renew the lease, it will use that same
- media type.   The lease must expire before the client will go back to
- cycling through media types.
-+.PP
-+ \fBbootp-broadcast-always;\fR
-+.PP
-+The
-+.B bootp-broadcast-always
-+statement instructs dhclient to always set the bootp broadcast flag in
-+request packets, so that servers will always broadcast replies.
-+This is equivalent to supplying the dhclient -B argument, and has
-+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
-+This option is provided as an extension to enable dhclient to work
-+on IBM s390 Linux guests.
-+.PP
- .SH SAMPLE
- The following configuration file is used on a laptop running NetBSD
- 1.3.   The laptop has an IP alias of 192.5.5.213, and has one
-@@ -680,10 +682,10 @@ interface "ep0" {
-     send host-name "andare.fugue.com";
-     send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
-     send dhcp-lease-time 3600;
--    supersede domain-name "fugue.com rc.vix.com home.vix.com";
-+    supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com";
-     prepend domain-name-servers 127.0.0.1;
-     request subnet-mask, broadcast-address, time-offset, routers,
--	    domain-name, domain-name-servers, host-name;
-+	    domain-search, domain-name, domain-name-servers, host-name;
-     require subnet-mask, domain-name-servers;
-     script "CLIENTBINDIR/dhclient-script";
-     media "media 10baseT/UTP", "media 10base2/BNC";
-diff -up dhcp-4.1.1/client/dhclient-script.8.man dhcp-4.1.1/client/dhclient-script.8
---- dhcp-4.1.1/client/dhclient-script.8.man	2009-07-25 00:04:51.000000000 +0200
-+++ dhcp-4.1.1/client/dhclient-script.8	2010-02-25 17:45:46.000000000 +0100
-@@ -47,7 +47,7 @@ customizations are needed, they should b
- exit hooks provided (see HOOKS for details).   These hooks will allow the
- user to override the default behaviour of the client in creating a
- .B /etc/resolv.conf
--file.
-+file, and to handle DHCP options not handled by default.
- .PP
- No standard client script exists for some operating systems, even though
- the actual client may work, so a pioneering user may well need to create
-@@ -91,6 +91,26 @@ present.   The
- .B ETCDIR/dhclient-exit-hooks
- script can modify the valid of exit_status to change the exit status
- of dhclient-script.
-+.PP
-+Immediately after dhclient brings an interface UP with a new IP address,
-+subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
-+existence of an executable
-+.B ETCDIR/dhclient-up-hooks
-+script, and source it if found. This script can handle DHCP options in
-+the environment that are not handled by default. A per-interface.
-+.B ETCDIR/dhclient-${IF}-up-hooks
-+script will override the generic script and be sourced when interface
-+$IF has been brought up.
-+.PP
-+Immediately before dhclient brings an interface DOWN, removing its IP
-+address, subnet mask, and routes, in the STOP/RELEASE  states, it will
-+check for the existence of an executable
-+.B ETCDIR/dhclient-down-hooks
-+script, and source it if found. This script can handle DHCP options in
-+the environment that are not handled by default. A per-interface
-+.B ETCDIR/dhclient-${IF}-down-hooks
-+script will override the generic script and be sourced when interface
-+$IF is about to be brought down.
- .SH OPERATION
- When dhclient needs to invoke the client configuration script, it
- defines a set of variables in the environment, and then invokes
-diff -up dhcp-4.1.1/common/dhcp-options.5.man dhcp-4.1.1/common/dhcp-options.5
---- dhcp-4.1.1/common/dhcp-options.5.man	2009-07-25 00:04:52.000000000 +0200
-+++ dhcp-4.1.1/common/dhcp-options.5	2010-02-25 17:40:19.000000000 +0100
-@@ -905,6 +905,21 @@ classless IP routing - it does not inclu
- classless IP routing is now the most widely deployed routing standard,
- this option is virtually useless, and is not implemented by any of the
- popular DHCP clients, for example the Microsoft DHCP client.
-+.PP
-+NOTE to Fedora dhclient users:
-+.br
-+dhclient-script interprets trailing 0 octets of the target as indicating
-+the subnet class of the route, so for the following static-routes value:
-+.br
-+        option static-routes 172.0.0.0 172.16.2.254,
-+.br
-+                             192.168.0.0 192.168.2.254;
-+.br
-+dhclient-script will create routes:
-+.br
-+        172/8 via 172.16.2.254 dev $interface
-+.br
-+        192.168/16 via 192.168.2.254 dev $interface
- .RE
- .PP
- .nf
-diff -up dhcp-4.1.1/server/dhcpd.conf.5.man dhcp-4.1.1/server/dhcpd.conf.5
---- dhcp-4.1.1/server/dhcpd.conf.5.man	2009-07-23 21:02:10.000000000 +0200
-+++ dhcp-4.1.1/server/dhcpd.conf.5	2010-02-25 17:51:20.000000000 +0100
-@@ -519,6 +519,9 @@ pool {
- };
- .fi
- .PP
-+Dynamic BOOTP leases are not compatible with failover, and, as such,
-+you need to disallow BOOTP in pools that you are using failover for.
-+.PP
- The  server currently  does very  little  sanity checking,  so if  you
- configure it wrong, it will just  fail in odd ways.  I would recommend
- therefore that you either do  failover or don't do failover, but don't
-@@ -533,9 +536,9 @@ primary server might look like this:
- failover peer "foo" {
-   primary;
-   address anthrax.rc.vix.com;
--  port 519;
-+  port 647;
-   peer address trantor.rc.vix.com;
--  peer port 520;
-+  peer port 847;
-   max-response-delay 60;
-   max-unacked-updates 10;
-   mclt 3600;
-@@ -594,9 +597,7 @@ statement
- .B port \fIport-number\fR\fB;\fR
- .PP
- The \fBport\fR statement declares the TCP port on which the server
--should listen for connections from its failover peer.   This statement
--may not currently be omitted, because the failover protocol does not
--yet have a reserved TCP port number.
-+should listen for connections from its failover peer.
- .RE
- .PP
- The 
-@@ -608,10 +609,8 @@ statement
- .PP
- The \fBpeer port\fR statement declares the TCP port to which the
- server should connect to reach its failover peer for failover
--messages.   This statement may not be omitted because the failover
--protocol does not yet have a reserved TCP port number.   The port
--number declared in the \fBpeer port\fR statement may be the same as
--the port number declared in the \fBport\fR statement.
-+messages.  The port number declared in the \fBpeer port\fR statement
-+may be the same as the port number declared in the \fBport\fR statement.
- .RE
- .PP
- The
-@@ -1278,7 +1277,7 @@ the zone containing PTR records - for IS
- .PP
- .nf
- key DHCP_UPDATER {
--  algorithm HMAC-MD5.SIG-ALG.REG.INT;
-+  algorithm hmac-md5;
-   secret pRP5FapFoJ95JEL06sv4PQ==;
- };
- 
-@@ -1301,7 +1300,7 @@ dhcpd.conf file:
- .PP
- .nf
- key DHCP_UPDATER {
--  algorithm HMAC-MD5.SIG-ALG.REG.INT;
-+  algorithm hmac-md5;
-   secret pRP5FapFoJ95JEL06sv4PQ==;
- };
- 
-@@ -2508,7 +2507,8 @@ statement
- The \fInext-server\fR statement is used to specify the host address of
- the server from which the initial boot file (specified in the
- \fIfilename\fR statement) is to be loaded.   \fIServer-name\fR should
--be a numeric IP address or a domain name.
-+be a numeric IP address or a domain name.  If no \fInext-server\fR statement
-+applies to a given client, the address 0.0.0.0 is used.
- .RE
- .PP
- The
diff --git a/dhcp-4.1.1-release6-elapsed.patch b/dhcp-4.1.1-release6-elapsed.patch
deleted file mode 100644
index a0b4aa0..0000000
--- a/dhcp-4.1.1-release6-elapsed.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -up dhcp-4.1.1/client/dhc6.c.release6-elapsed dhcp-4.1.1/client/dhc6.c
---- dhcp-4.1.1/client/dhc6.c.release6-elapsed	2010-04-19 11:55:59.000000000 +0200
-+++ dhcp-4.1.1/client/dhc6.c	2010-04-19 12:00:00.000000000 +0200
-@@ -2174,7 +2174,7 @@ do_release6(void *input)
- 	struct client_state *client;
- 	struct data_string ds;
- 	int send_ret;
--	struct timeval tv;
-+	struct timeval elapsed, tv;
- 
- 	client = input;
- 
-@@ -2194,6 +2194,14 @@ do_release6(void *input)
- 		client->start_time.tv_usec = cur_tv.tv_usec;
- 	}
- 
-+	/* elapsed = cur - start */
-+	elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec;
-+	elapsed.tv_usec = cur_tv.tv_usec - client->start_time.tv_usec;
-+	if (elapsed.tv_usec < 0) {
-+		elapsed.tv_sec -= 1;
-+		elapsed.tv_usec += 1000000;
-+	}
-+
- 	/*
- 	 * Don't use unicast as we don't know if we still have an
- 	 * available address with enough scope.
-@@ -2210,6 +2218,18 @@ do_release6(void *input)
- 	ds.buffer->data[0] = DHCPV6_RELEASE;
- 	memcpy(ds.buffer->data + 1, client->dhcpv6_transaction_id, 3);
- 
-+	/* Form an elapsed option. */
-+	/* Maximum value is 65535 1/100s coded as 0xffff. */
-+	if ((elapsed.tv_sec < 0) || (elapsed.tv_sec > 655) ||
-+	    ((elapsed.tv_sec == 655) && (elapsed.tv_usec > 350000))) {
-+		client->elapsed = 0xffff;
-+	} else {
-+		client->elapsed = elapsed.tv_sec * 100;
-+		client->elapsed += elapsed.tv_usec / 10000;
-+	}
-+
-+	client->elapsed = htons(client->elapsed);
-+
- 	log_debug("XMT: Forming Release.");
- 	make_client6_options(client, &client->sent_options,
- 			     client->active_lease, DHCPV6_RELEASE);
diff --git a/dhcp-4.1.1-retransmission.patch b/dhcp-4.1.1-retransmission.patch
deleted file mode 100644
index 2e448d5..0000000
--- a/dhcp-4.1.1-retransmission.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -up dhcp-4.1.1/client/dhc6.c.retransmission dhcp-4.1.1/client/dhc6.c
---- dhcp-4.1.1/client/dhc6.c.retransmission	2010-03-25 18:32:17.000000000 +0100
-+++ dhcp-4.1.1/client/dhc6.c	2010-03-25 18:33:54.000000000 +0100
-@@ -354,7 +354,7 @@ dhc6_retrans_init(struct client_state *c
- static void
- dhc6_retrans_advance(struct client_state *client)
- {
--	struct timeval elapsed;
-+	struct timeval elapsed, elapsed_after_RT;
- 
- 	/* elapsed = cur - start */
- 	elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec;
-@@ -371,6 +371,8 @@ dhc6_retrans_advance(struct client_state
- 		elapsed.tv_sec += 1;
- 		elapsed.tv_usec -= 1000000;
- 	}
-+	elapsed_after_RT.tv_sec = elapsed.tv_sec;
-+	elapsed_after_RT.tv_usec = elapsed.tv_usec;
- 
- 	/*
- 	 * RT for each subsequent message transmission is based on the previous
-@@ -408,13 +410,10 @@ dhc6_retrans_advance(struct client_state
- 		elapsed.tv_usec -= 1000000;
- 	}
- 	if (elapsed.tv_sec >= client->MRD) {
--		/*
--		 * wake at RT + cur = start + MRD
--		 */
--		client->RT = client->MRD +
--			(client->start_time.tv_sec - cur_tv.tv_sec);
--		client->RT = client->RT * 100 +
--			(client->start_time.tv_usec - cur_tv.tv_usec) / 10000;
-+		client->RT = client->MRD - elapsed_after_RT.tv_sec;
-+		client->RT = client->RT * 100 - elapsed_after_RT.tv_usec / 10000;
-+		if (client->RT < 0)
-+			client->RT = 0;
- 	}
- 	client->txcount++;
- }
-@@ -1502,7 +1501,7 @@ do_init6(void *input)
- 		elapsed.tv_usec += 1000000;
- 	}
- 	/* Check if finished (-1 argument). */
--	if ((client->MRD != 0) && (elapsed.tv_sec > client->MRD)) {
-+	if ((client->MRD != 0) && (elapsed.tv_sec >= client->MRD)) {
- 		log_info("Max retransmission duration exceeded.");
- 		client->state = S_STOPPED;
- 		if (client->active_lease != NULL) {
-@@ -1922,7 +1921,7 @@ do_info_request6(void *input)
- 		elapsed.tv_usec += 1000000;
- 	}
- 	/* Check if finished (-1 argument). */
--	if ((client->MRD != 0) && (elapsed.tv_sec > client->MRD)) {
-+	if ((client->MRD != 0) && (elapsed.tv_sec >= client->MRD)) {
- 		log_info("Max retransmission duration exceeded.");
- 		exit(2);
- 	}
-@@ -2043,7 +2042,7 @@ do_confirm6(void *input)
- 		elapsed.tv_sec -= 1;
- 		elapsed.tv_usec += 1000000;
- 	}
--	if ((client->MRD != 0) && (elapsed.tv_sec > client->MRD)) {
-+	if ((client->MRD != 0) && (elapsed.tv_sec >= client->MRD)) {
- 		log_info("Max retransmission duration exceeded.");
- 		start_bound(client);
- 		return;
-@@ -3290,7 +3289,7 @@ do_select6(void *input)
- 		elapsed.tv_sec -= 1;
- 		elapsed.tv_usec += 1000000;
- 	}
--	if ((client->MRD != 0) && (elapsed.tv_sec > client->MRD)) {
-+	if ((client->MRD != 0) && (elapsed.tv_sec >= client->MRD)) {
- 		log_info("Max retransmission duration exceeded.");
- 		abort = ISC_TRUE;
- 	}
diff --git a/dhcp.spec b/dhcp.spec
index c48a967..f28584c 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -5,17 +5,17 @@
 %global dhcpconfdir %{_sysconfdir}/dhcp
 
 # Patch version
-%global patchver P1
+%global patchver ESV
 
-%global VERSION %{version}-%{patchver}
+%global VERSION 4.1-%{patchver}
 
 # LDAP patch version
-%global ldappatchver %{version}-2
+%global ldappatchver 4.1.1-2
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
-Version:  4.1.1
-Release:  27.%{patchver}%{?dist}
+Version:  4.1.2
+Release:  1.%{patchver}%{?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.
@@ -44,27 +44,23 @@ Patch6:   %{name}-4.1.1-dhclient-usage.patch
 Patch7:   %{name}-4.1.1-default-requested-options.patch
 Patch8:   %{name}-4.1.1-xen-checksum.patch
 Patch9:   %{name}-4.1.1-dhclient-anycast.patch
-Patch10:  %{name}-4.1.1-manpages.patch
+Patch10:  %{name}-4.1-ESV-manpages.patch
 Patch11:  %{name}-4.1.1-paths.patch
 Patch12:  %{name}-4.1.1-CLOEXEC.patch
 Patch13:  %{name}-4.1.1-inherit-leases.patch
 Patch14:  %{name}-4.1.1-garbage-chars.patch
-Patch15:  %{name}-4.1.1-invalid-dhclient-conf.patch
-Patch16:  %{name}-4.1.1-missing-ipv6-not-fatal.patch
-Patch17:  %{name}-4.1.1-IFNAMSIZ.patch
-Patch18:  %{name}-4.1.1-add_timeout_when_NULL.patch
-Patch19:  %{name}-4.1.1-64_bit_lease_parse.patch
-Patch20:  %{name}-4.1.1-capability.patch
-Patch21:  %{name}-4.1.1-logpid.patch
-Patch22:  %{name}-4.1.1-UseMulticast.patch
-Patch23:  %{name}-4.1.1-sendDecline.patch
-Patch24:  %{name}-4.1.1-retransmission.patch
-Patch25:  %{name}-4.1.1-release6-elapsed.patch
-Patch26:  %{name}-4.1.1-initialization-delay.patch
-Patch27:  %{name}-4.1.1-P1-parse_date.patch
-Patch28:  %{name}-4.1.1-P1-PIE-RELRO.patch
-Patch29:  %{name}-4.1.1-P1-noprefixavail.patch
-Patch30:  %{name}-4.1.1-P1-CVE-2010-3611.patch
+Patch15:  %{name}-4.1.1-missing-ipv6-not-fatal.patch
+Patch16:  %{name}-4.1.1-IFNAMSIZ.patch
+Patch17:  %{name}-4.1.1-add_timeout_when_NULL.patch
+Patch18:  %{name}-4.1-ESV-64_bit_lease_parse.patch
+Patch19:  %{name}-4.1-ESV-capability.patch
+Patch20:  %{name}-4.1.1-logpid.patch
+Patch21:  %{name}-4.1.1-UseMulticast.patch
+Patch22:  %{name}-4.1.1-sendDecline.patch
+Patch23:  %{name}-4.1-ESV-retransmission.patch
+Patch24:  %{name}-4.1.1-initialization-delay.patch
+Patch25:  %{name}-4.1.1-P1-PIE-RELRO.patch
+Patch26:  %{name}-4.1.1-P1-noprefixavail.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -132,7 +128,7 @@ libdhcpctl and libomapi static libraries are also included in this package.
 %setup -T -D -a 1 -n dhcp-%{VERSION}
 
 # Add in LDAP support
-%{__patch} -p1 < ldap-for-dhcp-%{ldappatchver}/dhcp-%{version}-ldap.patch
+%{__patch} -p1 < ldap-for-dhcp-%{ldappatchver}/dhcp-4.1.1-ldap.patch
 
 # Replace the standard ISC warning message about requesting help with an
 # explanation that this is a patched build of ISC DHCP and bugs should be
@@ -192,62 +188,50 @@ libdhcpctl and libomapi static libraries are also included in this package.
 # Fix 'garbage in format string' error (#450042)
 %patch14 -p1 -b .garbage
 
-# The sample dhclient.conf should say 'supersede domain-search' (#467955)
-# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #19147])
-%patch15 -p1 -b .supersede
-
 # If the ipv6 kernel module is missing, do not segfault
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #19367])
-%patch16 -p1 -b .noipv6
+%patch15 -p1 -b .noipv6
 
 # Read only up to IFNAMSIZ characters for the interface name in dhcpd (#441524)
-%patch17 -p1 -b .ifnamsiz
+%patch16 -p1 -b .ifnamsiz
 
 # Handle cases in add_timeout() where the function is called with a NULL
 # value for the 'when' parameter
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #19867])
-%patch18 -p1 -b .dracut
+%patch17 -p1 -b .dracut
 
 # Ensure 64-bit platforms parse lease file dates & times correctly (#448615)
-%patch19 -p1 -b .64-bit_lease_parse
+%patch18 -p1 -b .64-bit_lease_parse
 
 # Drop unnecessary capabilities in dhclient (#517649, #546765)
-%patch20 -p1 -b .capability
+%patch19 -p1 -b .capability
 
 # dhclient logs its pid to make troubleshooting NM managed systems
 # with multiple dhclients running easier (#546792)
-%patch21 -p1 -b .logpid
+%patch20 -p1 -b .logpid
 
 # Discard unicast Request/Renew/Release/Decline message
 # (unless we set unicast option) and respond with Reply
 # with UseMulticast Status Code option (#573090)
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #21235])
-%patch22 -p1 -b .UseMulticast
+%patch21 -p1 -b .UseMulticast
 
 # If any of the bound addresses are found to be in use on the link,
 # the dhcpv6 client sends a Decline message to the server
 # as described in section 18.1.7 of RFC-3315 (#559147)
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #21237])
-%patch23 -p1 -b .sendDecline
+%patch22 -p1 -b .sendDecline
 
 # In client initiated message exchanges stop retransmission
 # upon reaching the MRD rather than at some point after it (#559153)
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #21238])
-%patch24 -p1 -b .retransmission
-
-# Fill in Elapsed Time Option in Release message (#582939)
-# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #21171])
-%patch25 -p1 -b .release6-elapsed
+%patch23 -p1 -b .retransmission
 
 # Cut down the 0-4 second delay before sending first DHCPDISCOVER (#587070)
-%patch26 -p1 -b .initialization-delay
-
-# Fix parsing of date (#514828)
-# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #21501])
-%patch27 -p1 -b .parse_date
+%patch24 -p1 -b .initialization-delay
 
 # Make dhcpd/dhcrelay/dhclient PIE and RELRO
-%patch28 -p1 -b .PIE-RELRO
+%patch25 -p1 -b .PIE-RELRO
 
 # 1) When server has empty pool of addresses/prefixes it must send Advertise with
 #    NoAddrsAvail/NoPrefixAvail status in response to clients Solicit.
@@ -257,10 +241,7 @@ libdhcpctl and libomapi static libraries are also included in this package.
 #    this prefix in any pool the server should offer other free prefix.
 #    Without this patch server ignored client's Solicit in which the client was sending
 #    prefix in IA_PD (as a preference) and this prefix was not in any of server's pools.
-%patch29 -p1 -b .noprefixavail
-
-# Server Crash with Empty Link-Address Field (CVE-2010-3611)
-%patch30 -p1 -b .CVE-2010-3611
+%patch26 -p1 -b .noprefixavail
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
@@ -547,6 +528,13 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Nov 04 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.2-1.ESV
+- 4.1-ESV, extended support release.
+- We need to be able to upgrade from 4.1.1 so I called it 4.1.2-ESV,
+  because it's actually 4.1.2 with small number of bug fixes.
+- No longer need: invalid-dhclient-conf.patch, release6-elapsed.patch,
+                  parse_date.patch, CVE-2010-3611.patch
+
 * Thu Nov 04 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-27.P1
 - Fix for CVE-2010-3611 (#649880)
 
diff --git a/sources b/sources
index bf23639..d7132b4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 9fa2f64826c969a55fd28263e4b6cad6  ldap-for-dhcp-4.1.1-2.tar.gz
-ee390a35687dd75dbfc32c856c0938d1  dhcp-4.1.1-P1.tar.gz
+c687ff0f3f1adc615a6c5c5ed7a3af90  dhcp-4.1-ESV.tar.gz