[dnssec-tools: 3/3] new version of the conf-path patch

[Wes Hardaker]

commit 18956b5c45b82ba6d98726b6adf83b653ee811e4
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Wed Oct 12 10:46:07 2011 -0700

    new version of the conf-path patch

 dnssec-tools-linux-conf-paths-1.11.patch |   35 ++++++++++++++++++++++++++++++
 dnssec-tools.spec                        |    4 +-
 2 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/dnssec-tools-linux-conf-paths-1.11.patch b/dnssec-tools-linux-conf-paths-1.11.patch
new file mode 100644
index 0000000..4bdee5d
--- /dev/null
+++ b/dnssec-tools-linux-conf-paths-1.11.patch
@@ -0,0 +1,35 @@
+--- tools/etc/dnssec-tools/dnssec-tools.conf.orig	2011-09-27 09:00:31.000000000 -0700
++++ tools/etc/dnssec-tools/dnssec-tools.conf	2011-10-12 10:14:38.802667778 -0700
+@@ -19,10 +19,10 @@
+ rollctl		/usr/bin/rollctl
+ zonesigner	/usr/bin/zonesigner
+ 
+-keygen		/usr/local/sbin/dnssec-keygen
+-rndc		/usr/local/sbin/rndc
+-zonecheck	/usr/local/sbin/named-checkzone
+-zonesign	/usr/local/sbin/dnssec-signzone
++keygen		/usr/sbin/dnssec-keygen
++rndc		/usr/sbin/rndc
++zonecheck	/usr/sbin/named-checkzone
++zonesign	/usr/sbin/dnssec-signzone
+ 
+ #
+ # Settings for dnssec-keygen.
+@@ -62,7 +62,7 @@
+ # Settings that will be noticed by zonesigner.
+ #
+ # default_keyrec        output.krf
+-archivedir      /usr/local/etc/dnssec-tools/KEY-SAFE
++archivedir      /var/dnssec-tools/KEY-SAFE
+ entropy_msg	1
+ savekeys        1
+ kskcount	1
+@@ -72,7 +72,7 @@
+ # Settings for rollover-manager.
+ #
+ roll_loadzone	1
+-roll_logfile	/usr/local/etc/dnssec-tools/log-rollerd
++roll_logfile	/var/log/dnssec-tools/log-rollerd
+ roll_loglevel	info
+ roll_phasemsg	long
+ roll_sleeptime	60
diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 09b9f66..9b6b871 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -16,7 +16,7 @@ Requires: perl(Net::DNS), perl(Net::DNS::SEC), dnssec-tools-perlmods, bind, perl
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: openssl-devel
 BuildRequires: perl(Test) perl(ExtUtils::MakeMaker)
-Patch5: dnssec-tools-linux-conf-paths-1.9.patch
+Patch5: dnssec-tools-linux-conf-paths-1.11.patch
 
 %description
 
@@ -54,7 +54,7 @@ C-based libraries useful for developing dnssec aware tools.
 %prep
 %setup -q
 
-%patch5 -p1
+%patch5 -p0
 
 %build
 %configure --with-validator-testcases-file=%{_datadir}/dnssec-tools/validator-testcases --with-perl-build-args="INSTALLDIRS=vendor OPTIMIZE='$RPM_OPT_FLAGS'" --sysconfdir=/etc --with-root-hints=/etc/dnssec-tools/root.hints --with-resolv-conf=/etc/dnssec-tools/resolv.conf --disable-static --with-nsec3 --with-ipv6 --with-dlv --disable-bind-checks