[dnssec-tools/el6: 18/18] manual merge

[Wes Hardaker]

commit b951cfb6db9276d609eeb953e3bf0ba2039d49cd
Merge: e9d53f5 4a8e830
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Fri Jan 27 15:23:34 2012 -0800

    manual merge

 .gitignore                                        |    1 +
 dnssec-tools-linux-conf-paths-1.12.patch          |   35 +++++++++++++++++++++
 dnssec-tools-perl-validator-header-fix-1.12.patch |   11 ++++++
 dnssec-tools.spec                                 |   17 ++++++---
 sources                                           |    2 +-
 5 files changed, 59 insertions(+), 7 deletions(-)
---
diff --cc dnssec-tools.spec
index 39e15bc,bb61a8c..0b5f6f9
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@@ -308,9 -307,13 +307,15 @@@ rm -rf %{buildroot
  %{_mandir}/man3/val_freeaddrinfo.3.gz
  
  %changelog
 +* Mon Nov 21 2011 Wes Hardaker <wjhns174 at hardakers.net> - 1.11-2
 +- added a patch from the upstream to fix a null dereference
 +
+ * Fri Jan 27 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.12-1
+ - Upgraded to version 1.12
+ - Added a patch to fix the perl validator
+ 
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Wed Oct 12 2011 Wes Hardaker <wjhns174 at hardakers.net> - 1.11-1
  - Upgrade to the upstream 1.11