[opendnssec: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/opendnssec

[Paul Wouters]

commit bc08bd8f2ced9156b017c9dc353029b98686ef0b
Merge: 9b8ffb6 5a22ec6
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 12 17:44:09 2012 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/opendnssec
    
    Conflicts:
    	opendnssec.spec

 opendnssec-1.4.0a1-deleterr.patch |   12 ++++++++++++
 opendnssec.spec                   |    4 +++-
 2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --cc opendnssec.spec
index c423b27,bfadb39..3fa8c18
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@@ -29,15 -30,13 +29,14 @@@ It secures zone data just before it is 
  name server. It requires a PKCS#11 crypto module library, such as softhsm
  
  %prep
 -%setup -q -n %{name}-%{version}a1
 -%patch1 -p1 -b deleterr
 +%setup -q -n %{name}-%{version}a2
 +%patch1 -p1 -b .ksmutil
  
- 
  %build
 +# for snapshots enable below
 +sh ./autogen.sh
  %configure --with-ldns=%{_libdir}
  make %{?_smp_mflags}
 -cp %{SOURCE6} LICENSE
  
  %check
  # Requires sample db not shipped with upstream
@@@ -121,11 -120,9 +120,14 @@@ if [ $1 -ge 1 ] ; the
  fi
  
  %changelog
 +* 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!)