[opendnssec/f18] Updated to 1.4.0rc1 Applied opendnssec-ksk-premature-retirement.patch (svn r6952)

[Paul Wouters]

commit a3df9cab1acc765f9c76ac4566ed9c5e0bc175be
Author: Patrick Uiterwijk <puiterwijk at gmail.com>
Date:   Fri Jan 18 19:29:12 2013 +0100

    Updated to 1.4.0rc1
    Applied opendnssec-ksk-premature-retirement.patch (svn r6952)
    
    Conflicts:
    	.gitignore
    	opendnssec.spec
    	sources

 .gitignore                                |    5 ++
 opendnssec-1.4.0-ksmutil.patch            |   31 -------------
 opendnssec-1.4.0a1-deleterr.patch         |   12 -----
 opendnssec-1.4.0a3-aggressive-retry.patch |   15 ------
 opendnssec-1.4.0a3-cpu.patch              |   68 -----------------------------
 opendnssec-1.4.0a3-nsec3param.patch       |   12 -----
 opendnssec-ksk-premature-retirement.patch |   20 ++++++++
 opendnssec.spec                           |   15 +++---
 sources                                   |    4 ++
 9 files changed, 36 insertions(+), 146 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a85b0c4..ec5ac0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
 /opendnssec-1.4.0a1.tar.gz
 /opendnssec-1.4.0a2.tar.gz
 /opendnssec-1.4.0b1.tar.gz
+<<<<<<< HEAD
+=======
+/opendnssec-1.4.0b2.tar.gz
+/opendnssec-1.4.0rc1.tar.gz
+>>>>>>> ebc1d51... Updated to 1.4.0rc1
diff --git a/opendnssec-ksk-premature-retirement.patch b/opendnssec-ksk-premature-retirement.patch
new file mode 100644
index 0000000..0b59af8
--- /dev/null
+++ b/opendnssec-ksk-premature-retirement.patch
@@ -0,0 +1,20 @@
+--- enforcer/enforcerd/enforcer.c   (revision 6951)
++++ enforcer/enforcerd/enforcer.c   (revision 6952)
+@@ -1291,7 +1291,7 @@
+                 /* turn this zone and policy into a file */
+ #ifdef ENFORCER_USE_WORKERS
+                 {
+-                    int NewDS;
++                    int NewDS = 0;
+                     status2 = commGenSignConf(zone_name, zone_id, current_filename, policy, &signer_flag, config->interval, config->manualKeyGeneration, config->DSSubmitCmd, config->DSSubCKA_ID, &NewDS);
+                     if (status2 == 0) {
+                         /* If the DS set changed then log/do something about it */
+--- NEWS    (revision 6951)
++++ NEWS    (revision 6952)
+@@ -1,5 +1,7 @@
+ $Id: NEWS 6934 2013-01-10 14:32:16Z jerry $
+ 
++* OPENDNSSEC-365: Enforcer: Nasty bug where KSKs could get prematurely retired.
++
+ 
+ OpenDNSSEC 1.4.0rc1 - 2013-01-10
diff --git a/opendnssec.spec b/opendnssec.spec
index 2999256..2aba15f 100644
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@ -1,8 +1,8 @@
-%global prever b1
+%global prever rc1
 Summary: DNSSEC key and zone management software
 Name: opendnssec
 Version: 1.4.0
-Release: 0.3.%{?prever}%{?dist}
+Release: 0.6.%{?prever}%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
 Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz
@@ -12,8 +12,7 @@ Source3: ods.sysconfig
 Source4: conf.xml
 Source5: tmpfiles-opendnssec.conf
 Source6: opendnssec.cron
-PAtch1: opendnssec-1.4.0a3-aggressive-retry.patch
-Patch2: opendnssec-1.4.0a3-nsec3param.patch
+Patch1:   opendnssec-ksk-premature-retirement.patch
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: opencryptoki, softhsm, systemd-units
@@ -38,8 +37,7 @@ name server. It requires a PKCS#11 crypto module library, such as softhsm
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch1 -p1 -b .aggressive-retry
-%patch2 -p1 -b .nsec3param
+%patch
 
 %build
 %configure --with-ldns=%{_libdir}
@@ -114,8 +112,9 @@ fi
 %systemd_postun_with_restart ods-signerd.service
 
 %changelog
-* Wed Sep 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.4.b1
-- UNRELEASED - placeholder
+* Fri Jan 18 2013 Patrick Uiterwijk <puiterwijk at gmail.com> - 1.4.0-0.6.rc1
+- Updated to 1.4.0rc1
+- Applied opendnssec-ksk-premature-retirement.patch (svn r6952)
 - Added BuildRequires: procps-ng for bug OPENDNSSEC-345
 
 * Wed Sep 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.3.b1
diff --git a/sources b/sources
index d6a78e8..72d057c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 c7e00424dbbf87ccf4667f3b397b0aa1  opendnssec-1.4.0a1.tar.gz
 52c7fc307a0db647e2f74adb939b75cb  opendnssec-1.4.0a2.tar.gz
 c5951e833a9414e3cbe575e7c66ee3ee  opendnssec-1.4.0b1.tar.gz
+=======
+bfd92b2830e1723acc90f20e575cf8cb  opendnssec-1.4.0rc1.tar.gz
+>>>>>>> ebc1d51... Updated to 1.4.0rc1