[opendnssec/f17: 29/29] Merge branch 'f18' into f17

Fri Jan 25 18:48:45 UTC 2013

commit 00a23b2b21ee62a90d684bbcbf5f3f01105b1ab0
Merge: b39d5f8 c54ce2d
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Jan 25 13:22:47 2013 -0500

    Merge branch 'f18' into f17
    
    Conflicts:
    	.gitignore
    	opendnssec.spec
    	sources

 .gitignore                                |    4 +++
 opendnssec-ksk-premature-retirement.patch |   20 +++++++++++++
 opendnssec.spec                           |   42 +++++++++-------------------
 sources                                   |    4 +++
 4 files changed, 42 insertions(+), 28 deletions(-)
---
diff --cc opendnssec.spec
index a073ed4,a5d7c5c..a9f6c3d

--- a/opendnssec.spec
+++ b/opendnssec.spec
@@@ -12,11 -12,8 +12,9 @@@ Source3: ods.sysconfi
  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
  Group: Applications/System
- Requires: opencryptoki, softhsm
- BuildRequires: systemd-units
++Group: Applications/System
+ Requires: opencryptoki, softhsm, systemd-units
  BuildRequires: ldns-devel >= 1.6.12, sqlite-devel , openssl-devel
  BuildRequires: libxml2-devel CUnit-devel, doxygen
  # It tests for pkill/killall and would use /bin/false if not found
@@@ -107,44 -103,66 +103,34 @@@ if [ "$1" -eq 1 ]; the
  fi
  
  %preun
 -%systemd_preun ods-enforcerd.service
 -%systemd_preun ods-signerd.service
 +if [ $1 -eq 0 ]; then
 +    # Package removal, not upgrade
 +    /bin/systemctl --no-reload disable ods-signerd.service > /dev/null 2>&1 || :
 +    /bin/systemctl stop ods-signerd.service > /dev/null 2>&1 || :
 +    /bin/systemctl --no-reload disable ods-enforcerd.service > /dev/null 2>&1 || :
 +    /bin/systemctl stop ods-enforcerd.service > /dev/null 2>&1 || :
 +fi
  
  %postun
 -%systemd_postun_with_restart ods-enforcerd.service
 -%systemd_postun_with_restart ods-signerd.service
 +/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 +if [ $1 -ge 1 ] ; then
 +    # Package upgrade, not uninstall
 +    /bin/systemctl try-restart ods-enforcerd.service >/dev/null 2>&1 || :
 +    /bin/systemctl try-restart ods-signerd.service >/dev/null 2>&1 || :
 +fi
 +
 +%changelog
- * Wed Sep 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.4.b1
- - UNRELEASED - placeholder
+ 
+ %changelog
+ * Fri Jan 25 2013 Patrick Uiterwijk <puiterwijk at gmail.com> - 1.4.0-0.7.rc2
+ - Updated to 1.4.0rc2, which includes svn r6952
 -
 -* 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.5.b2
 -- Updated to 1.4.0b2
+ - All patches have been merged upstream
+ - cron job should be marked as config file
 -
 -* Tue Oct 30 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.4.b1
  - Added BuildRequires: procps-ng for bug OPENDNSSEC-345
+ - Change RRSIG inception offset to -2h to avoid possible
+   daylight saving issues on resolvers
 -- Patch to prevent removal of occluded data
 -
 -* Wed Sep 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.3.b1
 -- Just an EVR fix to the proper standard
 -- Cleanup of spec file
 -- Introduce new systemd-rpm macros (rhbz#850242)
 -
 -* Wed Sep 12 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.b1.1
 -- Updated to 1.4.0b1
 -- Patch for NSEC3PARAM TTL
 -- Cron job to assist narrowing ods-enforcerd timing differences
 -
 -* Wed Aug 29 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.a3.1
 -- Updated to 1.4.0a3
 -- Patch to more aggressively try to resign
 -- Patch to fix locking issue eating up cpu
 -
 -* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-0.a2.2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Tue Jun 12 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.a2.1
 -- Updated to 1.4.0a2
 -- ksm-utils patch for ods-ksmutil to die sooner when it can't lock
 -  the HSM.
 -
 -* Wed May 16 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.a1.3
 -- Patch for crasher with deleted RRsets and NSEC3/OPTOUT chains
 -
 -* Mon Mar 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.a1.2
 -- Added opendnssec LICENSE file from trunk (Thanks Jakob!) 
 -
 -* Mon Mar 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.a1.1
 -- Fix macros in comment
 -- Added missing -m to install target
  
- * Wed Sep 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.3.b1
- - Upgraded to 1.4.0b1
- - EVR fix to the proper standard
- - Cleanup of spec file
- - Cron job to assist narrowing ods-enforcerd timing differences
- - Patch for NSEC3PARAM TTL
- - Patch to more aggressively try to resign
- 
- * Wed May 16 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.a1.3
- - Patch for crasher with deleted RRsets and NSEC3/OPTOUT chains
- - Remove EL5 required spec items (clean section, buildroot, etc)
- 
- * Wed Apr 04 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.a1.2
- - Initial package for f17
- - Added opendnssec LICENSE file from trunk (Thanks Jakob!) 
- - Fix macros in comment
- - Added missing -m to install target
+ * Sun Mar 25 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.a1
  - The 1.4.x branch no longer needs ruby, as the auditor has been removed
  - Added missing openssl-devel BuildRequire
  - Comment out <SkipPublicKey/> so keys generated by ods can be used by bind
diff --cc sources
index 78313c5,a502c90..b253b10
--- a/sources
+++ b/sources
@@@ -1,2 -1,1 +1,6 @@@
++<<<<<<< HEAD
 +c7e00424dbbf87ccf4667f3b397b0aa1  opendnssec-1.4.0a1.tar.gz
 +c5951e833a9414e3cbe575e7c66ee3ee  opendnssec-1.4.0b1.tar.gz
++=======
+ b9f39643c1f7cee1cd53ff3a5386ea63  opendnssec-1.4.0rc2.tar.gz
++>>>>>>> f18
