[dhcp/f16] 4.2.3

Jiří Popelka jpopelka at fedoraproject.org
Thu Oct 20 08:51:14 UTC 2011 

commit 95aa8c784ce4968c69c78ad9a53fd43ed6a5ba41
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Oct 20 10:49:25 2011 +0200

    4.2.3

 ...-rh637017.patch => dhcp-4.2.2-remove-bind.patch |   64 ++++++++++-------
 ...0-sharedlib.patch => dhcp-4.2.2-sharedlib.patch |    0
 ...4.2.2-options.patch => dhcp-4.2.3-options.patch |   50 +++++++-------
 ...hcp-4.2.3-rfc3442-classless-static-routes.patch |   76 ++++++++++----------
 dhcp.spec                                          |   17 +++--
 5 files changed, 110 insertions(+), 97 deletions(-)
---
diff --git a/dhcp420-rh637017.patch b/dhcp-4.2.2-remove-bind.patch
similarity index 61%
rename from dhcp420-rh637017.patch
rename to dhcp-4.2.2-remove-bind.patch
index c1292df..6297772 100644
--- a/dhcp420-rh637017.patch
+++ b/dhcp-4.2.2-remove-bind.patch
@@ -1,7 +1,7 @@
-diff -up dhcp-4.2.0/client/Makefile.am.rh637017 dhcp-4.2.0/client/Makefile.am
---- dhcp-4.2.0/client/Makefile.am.rh637017	2010-10-01 13:41:16.320002774 +0200
-+++ dhcp-4.2.0/client/Makefile.am	2010-10-01 13:41:16.320002774 +0200
-@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
+diff -up dhcp-4.2.2/client/Makefile.am.rh637017 dhcp-4.2.2/client/Makefile.am
+--- dhcp-4.2.2/client/Makefile.am.rh637017	2010-09-15 00:32:36.000000000 +0200
++++ dhcp-4.2.2/client/Makefile.am	2011-08-11 17:28:58.923897561 +0200
+@@ -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 \
@@ -10,11 +10,22 @@ diff -up dhcp-4.2.0/client/Makefile.am.rh637017 dhcp-4.2.0/client/Makefile.am
  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  EXTRA_DIST = $(man_MANS)
  
- man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
-diff -up dhcp-4.2.0/configure.ac.rh637017 dhcp-4.2.0/configure.ac
---- dhcp-4.2.0/configure.ac.rh637017	2010-10-01 13:41:16.280002774 +0200
-+++ dhcp-4.2.0/configure.ac	2010-10-01 13:44:24.790002776 +0200
-@@ -488,20 +488,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_control,,
+diff -up dhcp-4.2.2/common/tests/Makefile.am.rh637017 dhcp-4.2.2/common/tests/Makefile.am
+--- dhcp-4.2.2/common/tests/Makefile.am.rh637017	2009-10-28 05:12:30.000000000 +0100
++++ dhcp-4.2.2/common/tests/Makefile.am	2011-08-11 17:33:45.258637236 +0200
+@@ -6,6 +6,5 @@ TESTS = test_alloc
+ 
+ test_alloc_SOURCES = test_alloc.c
+ test_alloc_LDADD = ../libdhcp.a ../../tests/libt_api.a \
+-	../../omapip/libomapi.a ../../bind/lib/libdns.a \
+-        ../../bind/lib/libisc.a
+-
++	../../omapip/libomapi.a \
++	 $(BIND9_LIBDIR) -ldns-export -lisc-export
+diff -up dhcp-4.2.2/configure.ac.rh637017 dhcp-4.2.2/configure.ac
+--- dhcp-4.2.2/configure.ac.rh637017	2011-07-20 02:32:18.000000000 +0200
++++ dhcp-4.2.2/configure.ac	2011-08-11 17:28:58.924897535 +0200
+@@ -512,20 +512,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro
  libbind=
  AC_ARG_WITH(libbind,
  	AC_HELP_STRING([--with-libbind=PATH],
@@ -57,7 +68,7 @@ diff -up dhcp-4.2.0/configure.ac.rh637017 dhcp-4.2.0/configure.ac
  
  # OpenLDAP support.
  AC_ARG_WITH(ldap,
-@@ -538,7 +555,7 @@ fi
+@@ -562,7 +579,7 @@ fi
  CFLAGS="$CFLAGS $STD_CWARNINGS"
  
  # Try to add the bind include directory
@@ -66,9 +77,9 @@ diff -up dhcp-4.2.0/configure.ac.rh637017 dhcp-4.2.0/configure.ac
  
  AC_C_FLEXIBLE_ARRAY_MEMBER
  
-diff -up dhcp-4.2.0/dhcpctl/Makefile.am.rh637017 dhcp-4.2.0/dhcpctl/Makefile.am
---- dhcp-4.2.0/dhcpctl/Makefile.am.rh637017	2009-10-28 05:12:30.000000000 +0100
-+++ dhcp-4.2.0/dhcpctl/Makefile.am	2010-10-01 13:41:16.320002774 +0200
+diff -up dhcp-4.2.2/dhcpctl/Makefile.am.rh637017 dhcp-4.2.2/dhcpctl/Makefile.am
+--- dhcp-4.2.2/dhcpctl/Makefile.am.rh637017	2009-10-28 05:12:30.000000000 +0100
++++ dhcp-4.2.2/dhcpctl/Makefile.am	2011-08-11 17:28:58.924897535 +0200
 @@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS)
  
  omshell_SOURCES = omshell.c
@@ -83,9 +94,9 @@ diff -up dhcp-4.2.0/dhcpctl/Makefile.am.rh637017 dhcp-4.2.0/dhcpctl/Makefile.am
 -	       ../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.0/Makefile.am.rh637017 dhcp-4.2.0/Makefile.am
---- dhcp-4.2.0/Makefile.am.rh637017	2010-03-25 00:30:38.000000000 +0100
-+++ dhcp-4.2.0/Makefile.am	2010-10-01 13:41:16.320002774 +0200
+diff -up dhcp-4.2.2/Makefile.am.rh637017 dhcp-4.2.2/Makefile.am
+--- dhcp-4.2.2/Makefile.am.rh637017	2010-03-25 00:30:38.000000000 +0100
++++ dhcp-4.2.2/Makefile.am	2011-08-11 17:28:58.925897509 +0200
 @@ -21,7 +21,13 @@ EXTRA_DIST = RELNOTES LICENSE \
  	     util/bindvar.sh \
  	     bind/Makefile bind/bind.tar.gz bind/version.tmp 
@@ -101,9 +112,9 @@ diff -up dhcp-4.2.0/Makefile.am.rh637017 dhcp-4.2.0/Makefile.am
  
  nobase_include_HEADERS = dhcpctl/dhcpctl.h
  
-diff -up dhcp-4.2.0/omapip/Makefile.am.rh637017 dhcp-4.2.0/omapip/Makefile.am
---- dhcp-4.2.0/omapip/Makefile.am.rh637017	2010-10-01 13:41:16.320002774 +0200
-+++ dhcp-4.2.0/omapip/Makefile.am	2010-10-01 13:41:16.320002774 +0200
+diff -up dhcp-4.2.2/omapip/Makefile.am.rh637017 dhcp-4.2.2/omapip/Makefile.am
+--- dhcp-4.2.2/omapip/Makefile.am.rh637017	2010-02-12 01:13:54.000000000 +0100
++++ dhcp-4.2.2/omapip/Makefile.am	2011-08-11 17:28:58.939897149 +0200
 @@ -10,5 +10,5 @@ man_MANS = omapi.3
  EXTRA_DIST = $(man_MANS)
  
@@ -111,10 +122,10 @@ diff -up dhcp-4.2.0/omapip/Makefile.am.rh637017 dhcp-4.2.0/omapip/Makefile.am
 -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.0/relay/Makefile.am.rh637017 dhcp-4.2.0/relay/Makefile.am
---- dhcp-4.2.0/relay/Makefile.am.rh637017	2010-10-01 13:41:16.320002774 +0200
-+++ dhcp-4.2.0/relay/Makefile.am	2010-10-01 13:41:16.320002774 +0200
-@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
+diff -up dhcp-4.2.2/relay/Makefile.am.rh637017 dhcp-4.2.2/relay/Makefile.am
+--- dhcp-4.2.2/relay/Makefile.am.rh637017	2009-10-28 05:12:30.000000000 +0100
++++ dhcp-4.2.2/relay/Makefile.am	2011-08-11 17:28:58.940897123 +0200
+@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
  sbin_PROGRAMS = dhcrelay
  dhcrelay_SOURCES = dhcrelay.c
  dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
@@ -123,10 +134,9 @@ diff -up dhcp-4.2.0/relay/Makefile.am.rh637017 dhcp-4.2.0/relay/Makefile.am
  man_MANS = dhcrelay.8
  EXTRA_DIST = $(man_MANS)
  
- man_MANS = dhcrelay.8
-diff -up dhcp-4.2.0/server/Makefile.am.rh637017 dhcp-4.2.0/server/Makefile.am
---- dhcp-4.2.0/server/Makefile.am.rh637017	2010-10-01 13:41:16.320002774 +0200
-+++ dhcp-4.2.0/server/Makefile.am	2010-10-01 13:41:16.320002774 +0200
+diff -up dhcp-4.2.2/server/Makefile.am.rh637017 dhcp-4.2.2/server/Makefile.am
+--- dhcp-4.2.2/server/Makefile.am.rh637017	2010-03-24 22:49:47.000000000 +0100
++++ dhcp-4.2.2/server/Makefile.am	2011-08-11 17:28:58.944897021 +0200
 @@ -8,8 +8,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
  
  dhcpd_CFLAGS = $(LDAP_CFLAGS)
diff --git a/dhcp420-sharedlib.patch b/dhcp-4.2.2-sharedlib.patch
similarity index 100%
rename from dhcp420-sharedlib.patch
rename to dhcp-4.2.2-sharedlib.patch
diff --git a/dhcp-4.2.2-options.patch b/dhcp-4.2.3-options.patch
similarity index 89%
rename from dhcp-4.2.2-options.patch
rename to dhcp-4.2.3-options.patch
index 054729a..09726ce 100644
--- a/dhcp-4.2.2-options.patch
+++ b/dhcp-4.2.3-options.patch
@@ -1,6 +1,6 @@
-diff -up dhcp-4.2.2b1/client/clparse.c.options dhcp-4.2.2b1/client/clparse.c
---- dhcp-4.2.2b1/client/clparse.c.options	2011-04-21 16:08:14.000000000 +0200
-+++ dhcp-4.2.2b1/client/clparse.c	2011-07-01 13:51:52.935755570 +0200
+diff -up dhcp-4.2.3rc1/client/clparse.c.options dhcp-4.2.3rc1/client/clparse.c
+--- dhcp-4.2.3rc1/client/clparse.c.options	2011-04-21 16:08:14.000000000 +0200
++++ dhcp-4.2.3rc1/client/clparse.c	2011-10-18 18:43:04.341962957 +0200
 @@ -146,6 +146,7 @@ isc_result_t read_client_conf ()
  	/* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
  	 */
@@ -19,7 +19,7 @@ diff -up dhcp-4.2.2b1/client/clparse.c.options dhcp-4.2.2b1/client/clparse.c
  
  void parse_client_statement (cfile, ip, config)
  	struct parse *cfile;
-@@ -732,6 +734,12 @@ void parse_client_statement (cfile, ip, 
+@@ -732,6 +734,12 @@ void parse_client_statement (cfile, ip,
  		parse_reject_statement (cfile, config);
  		return;
  
@@ -32,9 +32,9 @@ diff -up dhcp-4.2.2b1/client/clparse.c.options dhcp-4.2.2b1/client/clparse.c
  	      default:
  		lose = 0;
  		stmt = (struct executable_statement *)0;
-diff -up dhcp-4.2.2b1/client/dhclient.c.options dhcp-4.2.2b1/client/dhclient.c
---- dhcp-4.2.2b1/client/dhclient.c.options	2011-05-11 16:20:59.000000000 +0200
-+++ dhcp-4.2.2b1/client/dhclient.c	2011-07-01 13:51:52.936755545 +0200
+diff -up dhcp-4.2.3rc1/client/dhclient.c.options dhcp-4.2.3rc1/client/dhclient.c
+--- dhcp-4.2.3rc1/client/dhclient.c.options	2011-07-01 13:58:53.000000000 +0200
++++ dhcp-4.2.3rc1/client/dhclient.c	2011-10-18 18:43:04.342962944 +0200
 @@ -39,6 +39,12 @@
  #include <limits.h>
  #include <dns/result.h>
@@ -48,7 +48,7 @@ diff -up dhcp-4.2.2b1/client/dhclient.c.options dhcp-4.2.2b1/client/dhclient.c
  TIME default_lease_time = 43200; /* 12 hours... */
  TIME max_lease_time = 86400; /* 24 hours... */
  
-@@ -87,6 +93,9 @@ int wanted_ia_na = -1;		/* the absolute 
+@@ -87,6 +93,9 @@ int wanted_ia_na = -1;		/* the absolute
  int wanted_ia_ta = 0;
  int wanted_ia_pd = 0;
  char *mockup_relay = NULL;
@@ -138,7 +138,7 @@ diff -up dhcp-4.2.2b1/client/dhclient.c.options dhcp-4.2.2b1/client/dhclient.c
 +			}
 +
 +			if ((timeout_arg = atoi(argv[i])) <= 0) {
-+				log_error("-timeout timeout option must be > 0 - bad value: %s",argv[i]);
++				log_error("-T timeout option must be > 0 - bad value: %s",argv[i]);
 +				exit(1);
 +			}
 +		} else if (!strcmp(argv[i], "-V")) {
@@ -361,10 +361,10 @@ diff -up dhcp-4.2.2b1/client/dhclient.c.options dhcp-4.2.2b1/client/dhclient.c
  		client -> packet.flags = 0;
  	else
  		client -> packet.flags = htons (BOOTP_BROADCAST);
-diff -up dhcp-4.2.2b1/common/conflex.c.options dhcp-4.2.2b1/common/conflex.c
---- dhcp-4.2.2b1/common/conflex.c.options	2011-05-11 16:20:59.000000000 +0200
-+++ dhcp-4.2.2b1/common/conflex.c	2011-07-01 13:51:52.938755494 +0200
-@@ -808,6 +808,8 @@ intern(char *atom, enum dhcp_token dfv) 
+diff -up dhcp-4.2.3rc1/common/conflex.c.options dhcp-4.2.3rc1/common/conflex.c
+--- dhcp-4.2.3rc1/common/conflex.c.options	2011-09-21 22:43:10.000000000 +0200
++++ dhcp-4.2.3rc1/common/conflex.c	2011-10-18 18:43:04.347962883 +0200
+@@ -808,6 +808,8 @@ intern(char *atom, enum dhcp_token dfv)
  			return BALANCE;
  		if (!strcasecmp (atom + 1, "ound"))
  			return BOUND;
@@ -373,9 +373,9 @@ diff -up dhcp-4.2.2b1/common/conflex.c.options dhcp-4.2.2b1/common/conflex.c
  		break;
  	      case 'c':
  		if (!strcasecmp(atom + 1, "ase"))
-diff -up dhcp-4.2.2b1/includes/dhcpd.h.options dhcp-4.2.2b1/includes/dhcpd.h
---- dhcp-4.2.2b1/includes/dhcpd.h.options	2011-05-20 16:21:11.000000000 +0200
-+++ dhcp-4.2.2b1/includes/dhcpd.h	2011-07-01 13:51:52.940755442 +0200
+diff -up dhcp-4.2.3rc1/includes/dhcpd.h.options dhcp-4.2.3rc1/includes/dhcpd.h
+--- dhcp-4.2.3rc1/includes/dhcpd.h.options	2011-10-04 21:43:12.000000000 +0200
++++ dhcp-4.2.3rc1/includes/dhcpd.h	2011-10-18 18:43:04.388962369 +0200
 @@ -1147,6 +1147,9 @@ struct client_config {
  	int do_forward_update;		/* If nonzero, and if we have the
  					   information we need, update the
@@ -386,16 +386,16 @@ diff -up dhcp-4.2.2b1/includes/dhcpd.h.options dhcp-4.2.2b1/includes/dhcpd.h
  };
  
  /* Per-interface state used in the dhcp client... */
-diff -up dhcp-4.2.2b1/includes/dhctoken.h.options dhcp-4.2.2b1/includes/dhctoken.h
---- dhcp-4.2.2b1/includes/dhctoken.h.options	2011-05-12 14:02:47.000000000 +0200
-+++ dhcp-4.2.2b1/includes/dhctoken.h	2011-07-01 13:53:43.316861637 +0200
-@@ -361,7 +361,8 @@ enum dhcp_token {
- 	GETHOSTNAME = 662,
- 	REWIND = 663,
+diff -up dhcp-4.2.3rc1/includes/dhctoken.h.options dhcp-4.2.3rc1/includes/dhctoken.h
+--- dhcp-4.2.3rc1/includes/dhctoken.h.options	2011-09-21 22:43:10.000000000 +0200
++++ dhcp-4.2.3rc1/includes/dhctoken.h	2011-10-18 18:47:08.039916315 +0200
+@@ -363,7 +363,8 @@ enum dhcp_token {
  	INITIAL_DELAY = 664,
--	GETHOSTBYNAME = 665
-+	GETHOSTBYNAME = 665,
-+	BOOTP_BROADCAST_ALWAYS = 666
+ 	GETHOSTBYNAME = 665,
+ 	PRIMARY6 = 666,
+-	SECONDARY6 = 667
++	SECONDARY6 = 667,
++	BOOTP_BROADCAST_ALWAYS = 668
  };
  
  #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\
diff --git a/dhcp-4.2.2-rfc3442-classless-static-routes.patch b/dhcp-4.2.3-rfc3442-classless-static-routes.patch
similarity index 82%
rename from dhcp-4.2.2-rfc3442-classless-static-routes.patch
rename to dhcp-4.2.3-rfc3442-classless-static-routes.patch
index 0a0bfcb..5897c21 100644
--- a/dhcp-4.2.2-rfc3442-classless-static-routes.patch
+++ b/dhcp-4.2.3-rfc3442-classless-static-routes.patch
@@ -1,6 +1,6 @@
-diff -up dhcp-4.2.2b1/client/clparse.c.rfc3442 dhcp-4.2.2b1/client/clparse.c
---- dhcp-4.2.2b1/client/clparse.c.rfc3442	2011-07-01 14:22:38.031534508 +0200
-+++ dhcp-4.2.2b1/client/clparse.c	2011-07-01 14:22:38.128532940 +0200
+diff -up dhcp-4.2.3rc1/client/clparse.c.rfc3442 dhcp-4.2.3rc1/client/clparse.c
+--- dhcp-4.2.3rc1/client/clparse.c.rfc3442	2011-10-18 18:50:11.564621939 +0200
++++ dhcp-4.2.3rc1/client/clparse.c	2011-10-18 18:50:11.661620727 +0200
 @@ -37,7 +37,7 @@
  
  struct client_config top_level_config;
@@ -35,10 +35,10 @@ diff -up dhcp-4.2.2b1/client/clparse.c.rfc3442 dhcp-4.2.2b1/client/clparse.c
  	for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
  		if (default_requested_options[code] == NULL)
  			log_fatal("Unable to find option definition for "
-diff -up dhcp-4.2.2b1/common/dhcp-options.5.rfc3442 dhcp-4.2.2b1/common/dhcp-options.5
---- dhcp-4.2.2b1/common/dhcp-options.5.rfc3442	2011-07-01 14:22:38.020534686 +0200
-+++ dhcp-4.2.2b1/common/dhcp-options.5	2011-07-01 14:22:38.129532924 +0200
-@@ -115,6 +115,26 @@ hexadecimal, separated by colons.   For 
+diff -up dhcp-4.2.3rc1/common/dhcp-options.5.rfc3442 dhcp-4.2.3rc1/common/dhcp-options.5
+--- dhcp-4.2.3rc1/common/dhcp-options.5.rfc3442	2011-10-18 18:50:11.550622114 +0200
++++ dhcp-4.2.3rc1/common/dhcp-options.5	2011-10-18 18:50:11.662620715 +0200
+@@ -115,6 +115,26 @@ hexadecimal, separated by colons.   For
  or
    option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
  .fi
@@ -95,9 +95,9 @@ diff -up dhcp-4.2.2b1/common/dhcp-options.5.rfc3442 dhcp-4.2.2b1/common/dhcp-opt
  .B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR
                                             [\fB,\fR \fIip-address\fR...]\fB;\fR
  .fi
-diff -up dhcp-4.2.2b1/common/inet.c.rfc3442 dhcp-4.2.2b1/common/inet.c
---- dhcp-4.2.2b1/common/inet.c.rfc3442	2011-05-11 02:47:22.000000000 +0200
-+++ dhcp-4.2.2b1/common/inet.c	2011-07-01 14:22:38.130532908 +0200
+diff -up dhcp-4.2.3rc1/common/inet.c.rfc3442 dhcp-4.2.3rc1/common/inet.c
+--- dhcp-4.2.3rc1/common/inet.c.rfc3442	2011-05-11 02:47:22.000000000 +0200
++++ dhcp-4.2.3rc1/common/inet.c	2011-10-18 18:50:11.665620676 +0200
 @@ -528,6 +528,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne
  	return ISC_R_SUCCESS;
  }
@@ -159,9 +159,9 @@ diff -up dhcp-4.2.2b1/common/inet.c.rfc3442 dhcp-4.2.2b1/common/inet.c
  /* piaddr() turns an iaddr structure into a printable address. */
  /* XXX: should use a const pointer rather than passing the structure */
  const char *
-diff -up dhcp-4.2.2b1/common/options.c.rfc3442 dhcp-4.2.2b1/common/options.c
---- dhcp-4.2.2b1/common/options.c.rfc3442	2011-03-24 22:57:13.000000000 +0100
-+++ dhcp-4.2.2b1/common/options.c	2011-07-01 14:22:38.132532876 +0200
+diff -up dhcp-4.2.3rc1/common/options.c.rfc3442 dhcp-4.2.3rc1/common/options.c
+--- dhcp-4.2.3rc1/common/options.c.rfc3442	2011-07-20 00:22:48.000000000 +0200
++++ dhcp-4.2.3rc1/common/options.c	2011-10-18 18:50:11.725619925 +0200
 @@ -706,7 +706,11 @@ cons_options(struct packet *inpacket, st
  		 * packet.
  		 */
@@ -246,9 +246,9 @@ diff -up dhcp-4.2.2b1/common/options.c.rfc3442 dhcp-4.2.2b1/common/options.c
  			      case '6':
  				iaddr.len = 16;
  				memcpy(iaddr.iabuf, dp, 16);
-diff -up dhcp-4.2.2b1/common/parse.c.rfc3442 dhcp-4.2.2b1/common/parse.c
---- dhcp-4.2.2b1/common/parse.c.rfc3442	2011-07-01 14:22:38.097533441 +0200
-+++ dhcp-4.2.2b1/common/parse.c	2011-07-01 14:22:38.135532828 +0200
+diff -up dhcp-4.2.3rc1/common/parse.c.rfc3442 dhcp-4.2.3rc1/common/parse.c
+--- dhcp-4.2.3rc1/common/parse.c.rfc3442	2011-10-18 18:50:11.609621377 +0200
++++ dhcp-4.2.3rc1/common/parse.c	2011-10-18 18:50:11.731619852 +0200
 @@ -341,6 +341,39 @@ int parse_ip_addr (cfile, addr)
  }	
  
@@ -311,7 +311,7 @@ diff -up dhcp-4.2.2b1/common/parse.c.rfc3442 dhcp-4.2.2b1/common/parse.c
  	      case IP6_ADDRESS:
  		type = '6';
  		break;
-@@ -5288,6 +5326,15 @@ int parse_option_token (rv, cfile, fmt, 
+@@ -5372,6 +5410,15 @@ int parse_option_token (rv, cfile, fmt,
  		}
  		break;
  
@@ -327,7 +327,7 @@ diff -up dhcp-4.2.2b1/common/parse.c.rfc3442 dhcp-4.2.2b1/common/parse.c
  	      case '6': /* IPv6 address. */
  		if (!parse_ip6_addr(cfile, &addr)) {
  			return 0;
-@@ -5548,6 +5595,13 @@ int parse_option_decl (oc, cfile)
+@@ -5632,6 +5679,13 @@ int parse_option_decl (oc, cfile)
  					goto exit;
  				len = ip_addr.len;
  				dp = ip_addr.iabuf;
@@ -341,9 +341,9 @@ diff -up dhcp-4.2.2b1/common/parse.c.rfc3442 dhcp-4.2.2b1/common/parse.c
  
  			      alloc:
  				if (hunkix + len > sizeof hunkbuf) {
-diff -up dhcp-4.2.2b1/common/tables.c.rfc3442 dhcp-4.2.2b1/common/tables.c
---- dhcp-4.2.2b1/common/tables.c.rfc3442	2011-07-01 14:22:38.087533601 +0200
-+++ dhcp-4.2.2b1/common/tables.c	2011-07-01 14:22:38.137532796 +0200
+diff -up dhcp-4.2.3rc1/common/tables.c.rfc3442 dhcp-4.2.3rc1/common/tables.c
+--- dhcp-4.2.3rc1/common/tables.c.rfc3442	2011-10-18 18:50:11.600621489 +0200
++++ dhcp-4.2.3rc1/common/tables.c	2011-10-18 18:50:11.736619789 +0200
 @@ -51,6 +51,7 @@ HASH_FUNCTIONS (option_code, const unsig
     Format codes:
  
@@ -360,10 +360,10 @@ diff -up dhcp-4.2.2b1/common/tables.c.rfc3442 dhcp-4.2.2b1/common/tables.c
  	{ "vivco", "Evendor-class.",		&dhcp_universe, 124, 1 },
  	{ "vivso", "Evendor.",			&dhcp_universe, 125, 1 },
  #if 0
-diff -up dhcp-4.2.2b1/includes/dhcpd.h.rfc3442 dhcp-4.2.2b1/includes/dhcpd.h
---- dhcp-4.2.2b1/includes/dhcpd.h.rfc3442	2011-07-01 14:22:38.000000000 +0200
-+++ dhcp-4.2.2b1/includes/dhcpd.h	2011-07-01 14:24:19.999810333 +0200
-@@ -2662,6 +2662,7 @@ isc_result_t range2cidr(struct iaddrcidr
+diff -up dhcp-4.2.3rc1/includes/dhcpd.h.rfc3442 dhcp-4.2.3rc1/includes/dhcpd.h
+--- dhcp-4.2.3rc1/includes/dhcpd.h.rfc3442	2011-10-18 18:50:11.561621977 +0200
++++ dhcp-4.2.3rc1/includes/dhcpd.h	2011-10-18 18:50:11.767619401 +0200
+@@ -2665,6 +2665,7 @@ isc_result_t range2cidr(struct iaddrcidr
  			const struct iaddr *lo, const struct iaddr *hi);
  isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
  const char *piaddr (struct iaddr);
@@ -371,7 +371,7 @@ diff -up dhcp-4.2.2b1/includes/dhcpd.h.rfc3442 dhcp-4.2.2b1/includes/dhcpd.h
  char *piaddrmask(struct iaddr *, struct iaddr *);
  char *piaddrcidr(const struct iaddr *, unsigned int);
  u_int16_t validate_port(char *);
-@@ -2869,6 +2870,7 @@ void parse_client_lease_declaration (str
+@@ -2872,6 +2873,7 @@ void parse_client_lease_declaration (str
  int parse_option_decl (struct option_cache **, struct parse *);
  void parse_string_list (struct parse *, struct string_list **, int);
  int parse_ip_addr (struct parse *, struct iaddr *);
@@ -379,9 +379,9 @@ diff -up dhcp-4.2.2b1/includes/dhcpd.h.rfc3442 dhcp-4.2.2b1/includes/dhcpd.h
  int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *);
  void parse_reject_statement (struct parse *, struct client_config *);
  
-diff -up dhcp-4.2.2b1/includes/dhcp.h.rfc3442 dhcp-4.2.2b1/includes/dhcp.h
---- dhcp-4.2.2b1/includes/dhcp.h.rfc3442	2009-11-20 02:49:01.000000000 +0100
-+++ dhcp-4.2.2b1/includes/dhcp.h	2011-07-01 14:22:38.145532665 +0200
+diff -up dhcp-4.2.3rc1/includes/dhcp.h.rfc3442 dhcp-4.2.3rc1/includes/dhcp.h
+--- dhcp-4.2.3rc1/includes/dhcp.h.rfc3442	2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.3rc1/includes/dhcp.h	2011-10-18 18:50:11.772619339 +0200
 @@ -158,6 +158,7 @@ struct dhcp_packet {
  #define DHO_ASSOCIATED_IP			92
  #define DHO_SUBNET_SELECTION			118 /* RFC3011! */
@@ -390,16 +390,16 @@ diff -up dhcp-4.2.2b1/includes/dhcp.h.rfc3442 dhcp-4.2.2b1/includes/dhcp.h
  #define DHO_VIVCO_SUBOPTIONS			124
  #define DHO_VIVSO_SUBOPTIONS			125
  
-diff -up dhcp-4.2.2b1/includes/dhctoken.h.rfc3442 dhcp-4.2.2b1/includes/dhctoken.h
---- dhcp-4.2.2b1/includes/dhctoken.h.rfc3442	2011-07-01 14:22:37.000000000 +0200
-+++ dhcp-4.2.2b1/includes/dhctoken.h	2011-07-01 14:25:12.541867623 +0200
-@@ -362,7 +362,8 @@ enum dhcp_token {
- 	REWIND = 663,
- 	INITIAL_DELAY = 664,
+diff -up dhcp-4.2.3rc1/includes/dhctoken.h.rfc3442 dhcp-4.2.3rc1/includes/dhctoken.h
+--- dhcp-4.2.3rc1/includes/dhctoken.h.rfc3442	2011-10-18 18:50:11.000000000 +0200
++++ dhcp-4.2.3rc1/includes/dhctoken.h	2011-10-18 18:50:55.753069508 +0200
+@@ -364,7 +364,8 @@ enum dhcp_token {
  	GETHOSTBYNAME = 665,
--	BOOTP_BROADCAST_ALWAYS = 666
-+	BOOTP_BROADCAST_ALWAYS = 666,
-+	DESTINATION_DESCRIPTOR = 667
+ 	PRIMARY6 = 666,
+ 	SECONDARY6 = 667,
+-	BOOTP_BROADCAST_ALWAYS = 668
++	BOOTP_BROADCAST_ALWAYS = 668,
++	DESTINATION_DESCRIPTOR = 669
  };
  
  #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\
diff --git a/dhcp.spec b/dhcp.spec
index 68e129e..deb720b 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,8 +18,8 @@
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
-Version:  4.2.2
-Release:  10%{?dist}
+Version:  4.2.3
+Release:  1%{?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.
@@ -42,7 +42,7 @@ Source10:  dhcpd6.service
 Source11:  dhcrelay.service
 
 Patch0:   dhcp-4.2.0-errwarn-message.patch
-Patch1:   dhcp-4.2.2-options.patch
+Patch1:   dhcp-4.2.3-options.patch
 Patch2:   dhcp-4.2.0-release-by-ifup.patch
 Patch3:   dhcp-4.2.0-dhclient-decline-backoff.patch
 Patch4:   dhcp-4.2.0-unicast-bootp.patch
@@ -62,11 +62,11 @@ Patch20:  dhcp-4.2.0-logpid.patch
 Patch21:  dhcp-4.2.0-UseMulticast.patch
 Patch22:  dhcp-4.2.1-sendDecline.patch
 Patch23:  dhcp-4.2.1-retransmission.patch
-Patch25:  dhcp-4.2.2-rfc3442-classless-static-routes.patch
+Patch25:  dhcp-4.2.3-rfc3442-classless-static-routes.patch
 Patch27:  dhcp-4.2.0-honor-expired.patch
 Patch28:  dhcp-4.2.0-noprefixavail.patch
-Patch29:  dhcp420-rh637017.patch
-Patch30:  dhcp420-sharedlib.patch
+Patch29:  dhcp-4.2.2-remove-bind.patch
+Patch30:  dhcp-4.2.2-sharedlib.patch
 Patch31:  dhcp-4.2.0-PPP.patch
 Patch32:  dhcp-4.2.2-paranoia-pid.patch
 
@@ -191,7 +191,7 @@ which do not support the systemd unit file format.
 rm bind/bind.tar.gz
 
 # Fire away bundled BIND source.
-%patch29 -p1 -b .rh637017 %{?_rawbuild}
+%patch29 -p1 -b .remove-bind %{?_rawbuild}
 
 # 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
@@ -642,6 +642,9 @@ fi
 %{_initddir}/dhcrelay
 
 %changelog
+* Thu Oct 20 2011 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.3-1
+- 4.2.3
+
 * Sun Oct 09 2011 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.2-10
 - change ownership of /var/lib/dhcpd/ to dhcpd:dhcpd (#744292)
 - no need to drop capabilies in dhcpd since it's been running as regular user

More information about the scm-commits mailing list