From ca4ac4309bc285f67f40e068f72f46798066cbc2 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Aug 11 2011 07:15:02 +0000
Subject: 4.2.2: fix for CVE-2011-2748, CVE-2011-2749 (#729850)


---

diff --git a/.gitignore b/.gitignore
index e1dc43d..a8c2e3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /dhcp-4.2.1-P1.tar.gz
 /dhcp-4.2.2b1.tar.gz
 /dhcp-4.2.2rc1.tar.gz
+/dhcp-4.2.2.tar.gz
diff --git a/dhcp.spec b/dhcp.spec
index f246f1d..5954127 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -7,16 +7,16 @@
 # Patch version 
 #%global patchver P1
 # Pre-Release version
-%global prever rc1
+#%global prever rc1
 
-#%global VERSION %{version}
 #%global VERSION %{version}-%{patchver}
-%global VERSION %{version}%{prever}
+#%global VERSION %{version}%{prever}
+%global VERSION %{version}
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.2
-Release:  0.4.%{prever}%{?dist}
+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.
@@ -629,6 +629,9 @@ fi
 %{_initddir}/dhcrelay
 
 %changelog
+* Thu Aug 11 2011 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.2-1
+- 4.2.2: fix for CVE-2011-2748, CVE-2011-2749 (#729850)
+
 * Wed Aug 10 2011 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.2-0.4.rc1
 - Do not ship default /etc/dhcp/dhclient.conf (#560361,c#9)
 
diff --git a/sources b/sources
index f90187a..503d838 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02b81c4eab6316f268f3ebd025c1c86b  dhcp-4.2.2rc1.tar.gz
+bb0f0434cd796f76aa7cead391d71f31  dhcp-4.2.2.tar.gz