[dnssec-tools/el6/master: 26/26] Merge branch 'master' into el6

[Wes Hardaker]

commit e32d9c41f7a3a00b244474cc64f97186f760d781
Merge: 9ee793c 7b5cb9e
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Thu Mar 24 15:19:48 2011 -0700

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	dnssec-tools.spec
    	sources

 .gitignore                              |    4 ++-
 dnssec-tools-dnsval.conf                |   13 +++++++----
 dnssec-tools-linux-conf-paths-1.9.patch |   35 +++++++++++++++++++++++++++++++
 dnssec-tools.spec                       |   32 +++++++++++++++++++++++-----
 sources                                 |    2 +-
 5 files changed, 73 insertions(+), 13 deletions(-)
---
diff --cc .gitignore
index a82bc84,ebd37b8..235b9d3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,3 @@@
- dnssec-tools-1.7.tar.gz
++/dnssec-tools-1.7.tar.gz
+ /dnssec-tools-1.8.tar.gz
+ /dnssec-tools-1.9.tar.gz
diff --cc dnssec-tools.spec
index 8d21208,6353c27..2035df7
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@@ -301,12 -303,24 +303,30 @@@ rm -rf %{buildroot
  %{_mandir}/man3/val_freeaddrinfo.3.gz
  
  %changelog
+ * Thu Mar 24 2011 Wes Hardaker <wjhns174 at hardakers.net> - 1.9-1
+ - Upgrade to 1.9 from upstream
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Tue Oct 26 2010 Wes Hardaker <wjhns174 at hardakers.net> - 1.8-4
+ - Require getop
+ 
+ * Tue Oct  5 2010 Wes Hardaker <wjhns174 at hardakers.net> - 1.8-3
+ - Added the . trust anchor and set default policy
+ 
+ * Tue Oct  5 2010 Wes Hardaker <wjhns174 at hardakers.net> - 1.8-2
+ - Added nsec3 option
+ 
+ * Fri Sep 24 2010 Wes Hardaker <wjhns174 at hardakers.net> - 1.8-1
+ - Update to the upstream 1.8 release
+ 
 +* Thu Jul  8 2010 Wes Hardaker <wjhns174 at hardakers.net> - 1.7-3
 +- EL-6 perl does install the module man pages
 +
 +* Thu Jul  8 2010 Wes Hardaker <wjhns174 at hardakers.net> - 1.7-2
 +- removed trustanchor module man pages since they're not installing
 +
  * Thu Jul  1 2010 Wes Hardaker <wjhns174 at hardakers.net> - 1.7-1
  - Update to upstream version 1.7