[dhcp/f15/master] 4.2.1-P1: fix for CVE-2011-0997 (#694005)

[Jiří Popelka]

commit e3e25cab404f7481208e4f61ec05cb2e32321cee
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Apr 6 11:44:33 2011 +0200

    4.2.1-P1: fix for CVE-2011-0997 (#694005)

 .gitignore |    1 +
 dhcp.spec  |   11 +++++++----
 sources    |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8429ac3..7cb7255 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /dhcp-4.2.1b1.tar.gz
 /dhcp-4.2.1rc1.tar.gz
 /dhcp-4.2.1.tar.gz
+/dhcp-4.2.1-P1.tar.gz
diff --git a/dhcp.spec b/dhcp.spec
index c4c9040..1885815 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -5,18 +5,18 @@
 %global dhcpconfdir %{_sysconfdir}/dhcp
 
 # Patch version 
-#%global patchver P2
+%global patchver P1
 # Pre-Release version
 #%global prever rc1
 
-#%global VERSION %{version}-%{patchver}
+%global VERSION %{version}-%{patchver}
 #%global VERSION %{version}%{prever}
-%global VERSION %{version}
+#%global VERSION %{version}
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.1
-Release:  2.1%{?dist}
+Release:  3.%{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.
@@ -630,6 +630,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Apr 06 2011 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.1-3.P1
+- 4.2.1-P1: fix for CVE-2011-0997 (#694005)
+
 * Thu Mar 17 2011 Karsten Hopp <karsten at redhat.com> 4.2.1-2.1
 - bump release and rebuild on PPC, it was built with old bind-libs there
 
diff --git a/sources b/sources
index ca27a58..da855bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bddce8a23551f009fd0ac840afc89780  dhcp-4.2.1.tar.gz
+22e6f1eff6d5cfe2621a06cc62ba5b70  dhcp-4.2.1-P1.tar.gz