[dhcp] 4.2.2rc1

[Jiří Popelka]

commit e3472df151d2b68518b54ecd13c405fa6edf0a25
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jul 18 13:49:16 2011 +0200

    4.2.2rc1

 .gitignore |    1 +
 dhcp.spec  |   11 +++++------
 sources    |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d7fafe9..e1dc43d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /dhcp-4.2.1.tar.gz
 /dhcp-4.2.1-P1.tar.gz
 /dhcp-4.2.2b1.tar.gz
+/dhcp-4.2.2rc1.tar.gz
diff --git a/dhcp.spec b/dhcp.spec
index 7c40bc5..f14e905 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -7,7 +7,7 @@
 # Patch version 
 #%global patchver P1
 # Pre-Release version
-%global prever b1
+%global prever rc1
 
 #%global VERSION %{version}
 #%global VERSION %{version}-%{patchver}
@@ -16,7 +16,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.2
-Release:  0.1.%{prever}%{?dist}
+Release:  0.2.%{prever}%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -66,7 +66,6 @@ Patch28:  dhcp-4.2.0-noprefixavail.patch
 Patch29:  dhcp420-rh637017.patch
 Patch30:  dhcp420-sharedlib.patch
 Patch31:  dhcp-4.2.0-PPP.patch
-Patch32:  dhcp-4.2.1-P1-CVE-2011-0997.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -304,9 +303,6 @@ rm bind/bind.tar.gz
 # DHCPv6 over PPP support (#626514)
 %patch31 -p1 -b .PPP
 
-# Better fix for CVE-2011-0997: making domain-name check more lenient (#694005)
-%patch32 -p1 -b .CVE-2011-0997
-
 # Copy in the Fedora/RHEL dhclient script
 %{__install} -p -m 0755 %{SOURCE4} client/scripts/linux
 %{__install} -p -m 0644 %{SOURCE5} .
@@ -648,6 +644,9 @@ fi
 %{_initddir}/dhcrelay
 
 %changelog
+* Mon Jul 18 2011 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.2-0.2.rc1
+- 4.2.2rc1
+
 * Fri Jul 01 2011 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.2-0.1.b1
 - 4.2.2b1: upstream merged initialization-delay.patch
 - Drop all capabilities in dhcpd/dhcrelay (#699713)
diff --git a/sources b/sources
index 69c9811..f90187a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8522920f79ec79614a8f0dae30ae14c8  dhcp-4.2.2b1.tar.gz
+02b81c4eab6316f268f3ebd025c1c86b  dhcp-4.2.2rc1.tar.gz