[dhcp/f13/master] 4.1-ESV-R2: fix for CVE-2011-0997 (#694005)

[Jiří Popelka]

commit 9db37e0d92e520740707b76fa44fca469f20f37b
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Apr 6 12:26:59 2011 +0200

    4.1-ESV-R2: fix for CVE-2011-0997 (#694005)

 .gitignore |    2 +-
 dhcp.spec  |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 579cc2a..8b9d0fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 ldap-for-dhcp-4.1.1-2.tar.gz
-/dhcp-4.1-ESV-R1.tar.gz
+/dhcp-4.1-ESV-R2.tar.gz
diff --git a/dhcp.spec b/dhcp.spec
index 1f061ca..065d351 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -5,7 +5,7 @@
 %global dhcpconfdir %{_sysconfdir}/dhcp
 
 # Patch version
-%global patchver R1
+%global patchver R2
 
 %global VERSION 4.1-ESV-%{patchver}
 
@@ -15,7 +15,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.2
-Release:  2.ESV.%{patchver}%{?dist}
+Release:  3.ESV.%{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.
@@ -528,6 +528,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Apr 06 2011 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.2-3.ESV.R2
+- 4.1-ESV-R2: fix for CVE-2011-0997 (#694005)
+
 * Thu Jan 27 2011 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.2-2.ESV.R1
 - 4.1-ESV-R1: fix for CVE-2011-0413 (#672996)
 
diff --git a/sources b/sources
index a432620..bb4396c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 9fa2f64826c969a55fd28263e4b6cad6  ldap-for-dhcp-4.1.1-2.tar.gz
-011ac5e019c33a18f3eb1ebb6581b9c6  dhcp-4.1-ESV-R1.tar.gz
+70ff4cc73b9110f65218858fa7ae4f6f  dhcp-4.1-ESV-R2.tar.gz