[dhcp/f17] do-forward-updates statement wasn't recognized (#863646)

[Jiří Popelka]

commit 5858de9320da14195b3657492fcc3a291582b6ad
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Oct 9 14:25:50 2012 +0200

    do-forward-updates statement wasn't recognized (#863646)

 dhcp-4.2.4-P2-conflex-do-forward-updates.patch |   12 ++++++++++++
 dhcp.spec                                      |   11 +++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/dhcp-4.2.4-P2-conflex-do-forward-updates.patch b/dhcp-4.2.4-P2-conflex-do-forward-updates.patch
new file mode 100644
index 0000000..679fdd3
--- /dev/null
+++ b/dhcp-4.2.4-P2-conflex-do-forward-updates.patch
@@ -0,0 +1,12 @@
+diff -up dhcp-4.2.4-P2/common/conflex.c.orig dhcp-4.2.4-P2/common/conflex.c
+--- dhcp-4.2.4-P2/common/conflex.c.orig	2012-08-28 04:13:03.000000000 +0200
++++ dhcp-4.2.4-P2/common/conflex.c	2012-10-09 14:01:29.922104149 +0200
+@@ -889,7 +889,7 @@ intern(char *atom, enum dhcp_token dfv)
+ 			if (!strcasecmp(atom + 7, "list"))
+ 				return DOMAIN_LIST;
+ 		}
+-		if (!strcasecmp (atom + 1, "o-forward-update"))
++		if (!strcasecmp (atom + 1, "o-forward-updates"))
+ 			return DO_FORWARD_UPDATE;
+ 		if (!strcasecmp (atom + 1, "ebug"))
+ 			return TOKEN_DEBUG;
diff --git a/dhcp.spec b/dhcp.spec
index ebc75b4..f94032e 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.4
-Release:  14.%{patchver}%{?dist}
+Release:  15.%{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.
@@ -74,7 +74,8 @@ Patch40:  dhcp-4.2.4-send_release.patch
 Patch41:  dhcp-4.2.3-P2-rfc5970-dhcpv6-options-for-network-boot.patch
 Patch42:  dhcp-4.2.4-failOverPeer.patch 
 Patch43:  dhcp-4.2.4-P1-dhclient6-leases_semicolon_expected.patch
-Patch44:  dhcp-4.2.4-P1-interval.patch 
+Patch44:  dhcp-4.2.4-P1-interval.patch
+Patch45:  dhcp-4.2.4-P2-conflex-do-forward-updates.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -311,6 +312,9 @@ rm bind/bind.tar.gz
 # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #28038])
 %patch44 -p1 -b .interval
 
+# do-forward-updates statement wasn't recognized (#863646)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #31328])
+%patch45 -p1 -b .forward-updates.patch
 
 pushd contrib
 %{__chmod} -x 3.0b1-lease-convert dhclient-tz-exithook.sh ldap/dhcpd-conf-to-ldap
@@ -579,6 +583,9 @@ fi
 
 
 %changelog
+* Tue Oct 09 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-15.P2
+- do-forward-updates statement wasn't recognized (#863646)
+
 * Wed Sep 26 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-14.P2
 - dhclient-usage.patch+part of manpages.patch merged with dhclient-options.patch