diff --git a/.gitignore b/.gitignore index 0cd90c9..1469b59 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /opendnssec-1.4.0b1.tar.gz /opendnssec-1.4.0b2.tar.gz /opendnssec-1.4.0rc1.tar.gz +/opendnssec-1.4.0rc2.tar.gz diff --git a/opendnssec-ksk-premature-retirement.patch b/opendnssec-ksk-premature-retirement.patch deleted file mode 100644 index 0b59af8..0000000 --- a/opendnssec-ksk-premature-retirement.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 b503425..8ec0e5c 100644 --- a/opendnssec.spec +++ b/opendnssec.spec @@ -1,8 +1,8 @@ -%global prever rc1 +%global prever rc2 Summary: DNSSEC key and zone management software Name: opendnssec Version: 1.4.0 -Release: 0.6.%{?prever}%{?dist} +Release: 0.7.%{?prever}%{?dist} License: BSD Url: http://www.opendnssec.org/ Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz @@ -12,7 +12,6 @@ Source3: ods.sysconfig Source4: conf.xml Source5: tmpfiles-opendnssec.conf Source6: opendnssec.cron -Patch: opendnssec-ksk-premature-retirement.patch Group: Applications/System Requires: opencryptoki, softhsm, systemd-units BuildRequires: ldns-devel >= 1.6.12, sqlite-devel , openssl-devel @@ -36,7 +35,6 @@ 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} @@ -113,6 +111,9 @@ fi %systemd_postun_with_restart ods-signerd.service %changelog +* Fri Jan 25 2013 Patrick Uiterwijk - 1.4.0-0.7.rc2 +- Updated to 1.4.0rc2 + * Fri Jan 18 2013 Patrick Uiterwijk - 1.4.0-0.6.rc1 - Updated to 1.4.0rc1 - Applied opendnssec-ksk-premature-retirement.patch (svn r6952) diff --git a/sources b/sources index b2f5549..a502c90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bfd92b2830e1723acc90f20e575cf8cb opendnssec-1.4.0rc1.tar.gz +b9f39643c1f7cee1cd53ff3a5386ea63 opendnssec-1.4.0rc2.tar.gz