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

[Paul Wouters]

commit bd02f3bdff2c030b2585d3c58eec3452c51b7c7c
Merge: e440db7 b8dacaf
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Apr 16 00:09:13 2013 -0400

    Merge branch 'el6' of ssh://pkgs.fedoraproject.org/opendnssec into el6
    
    Conflicts:
    	.gitignore
    	opendnssec.spec
    	sources

 .gitignore                                  |    3 +
 kasp.xml                                    |   88 +++++++++++++++++++++++++++
 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-nonempty-terminals.patch |   54 ++++++++++++++++
 opendnssec-1.4.0b1-r6816.patch              |   62 +++++++++++++++++++
 opendnssec-1.4.0b1-r6817.patch              |   48 +++++++++++++++
 opendnssec-ksk-premature-retirement.patch   |   20 ++++++
 opendnssec.spec                             |   44 +++++++++++--
 10 files changed, 312 insertions(+), 99 deletions(-)
---
diff --cc .gitignore
index e85a3b7,93c3c18..10779c3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,5 @@@
  /opendnssec-1.4.0b1.tar.gz
+ /opendnssec-1.4.0b2.tar.gz
+ /opendnssec-1.4.0rc1.tar.gz
+ /opendnssec-1.4.0rc2.tar.gz
 +/opendnssec-1.4.0rc3.tar.gz
diff --cc opendnssec.spec
index 3dc3dc8,a87481a..e7d8ecd
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@@ -2,7 -2,7 +2,7 @@@
  Summary: DNSSEC key and zone management software
  Name: opendnssec
  Version: 1.4.0
- Release: 0.3.%{?prever}%{?dist}
 -Release: 0.7.%{?prever}%{?dist}
++Release: 0.8.%{?prever}%{?dist}
  License: BSD
  Url: http://www.opendnssec.org/
  Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz
@@@ -105,9 -110,31 +110,34 @@@ if [ "$1" -ge "1" ]; the
  fi
  
  %changelog
- * Mon Apr 15 2013 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.3.rc3
++* Mon Apr 15 2013 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.8.rc3
 +- Updated to 1.4.0rc3
 +
+ * Mon Jan 28 2013 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.7.rc2
+ - Updaed to 1.4.0rc2
+ - This merges in 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.6.b2
+ - Updated to 1.4.0b2
+ - All patches synced to/from with new release
+ 
+ * Fri Nov 23 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.6.b1
+ - Patch for empty nonterminal NSEC3 records
+ 
+ * Sat Nov 10 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.5.b1
+ - Patch r6816 fixes enforcer/signer communication
+ - Patch r6817 Don't add double RRSIGs generated by same key for DNSKEY RRset
+ 
+ * 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.2.b1
  - Just an EVR fix to the proper standard
  - Remove accidentally added (but not released) Epoch: