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

[Paul Wouters]

commit e86b6e93ff88a3e042db798b1ebed39b64a5a9d6
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:
    	opendnssec-aggressive-retry.patch
    	opendnssec.spec

 .gitignore                                |    1 +
 opendnssec-1.4.0a1-deleterr.patch         |   12 -----
 opendnssec-1.4.0a3-cpu.patch              |   68 -----------------------------
 opendnssec-1.4.0a3-nsec3param.patch       |   12 -----
 opendnssec-1.4.0b1-occluded.patch         |   37 ----------------
 opendnssec-ksk-premature-retirement.patch |   20 ++++++++
 opendnssec.spec                           |    8 +++-
 sources                                   |    2 +-
 8 files changed, 29 insertions(+), 131 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc88a48..379f1b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /opendnssec-1.4.0b1.tar.gz
 /opendnssec-1.4.0b2.tar.gz
+/opendnssec-1.4.0rc1.tar.gz
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 48917c6..a937ed8 100644
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@ -1,4 +1,4 @@
-%global prever b2
+%global prever rc1
 Summary: DNSSEC key and zone management software
 Name: opendnssec
 Version: 1.4.0
@@ -12,6 +12,7 @@ Source3: ods.sysconfig
 Source4: conf.xml
 Source5: opendnssec.cron
 Source6: kasp.xml
+Patch:   opendnssec-ksk-premature-retirement.patch
 Group: Applications/System
 Requires: opencryptoki, softhsm
 BuildRequires: ldns-devel >= 1.6.13, sqlite-devel , openssl-devel
@@ -32,6 +33,7 @@ name server. It requires a PKCS#11 crypto module library, such as softhsm
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
+%patch
 
 %build
 %configure --with-ldns=%{_libdir}
@@ -110,6 +112,10 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* 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)
+
 * Tue Dec 18 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.6.b2
 - Updated to 1.4.0b2
 - All patches synced to/from with new release
diff --git a/sources b/sources
index b7e3f52..b2f5549 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17fd1b721fb568817be6866a82b19991  opendnssec-1.4.0b2.tar.gz
+bfd92b2830e1723acc90f20e575cf8cb  opendnssec-1.4.0rc1.tar.gz