rpms/dnssec-tools/devel dnssec-tools-donuts-fix-help.patch, NONE, 1.1 dnssec-tools.spec, 1.9, 1.10

[Wes Hardaker (hardaker)]

Author: hardaker

Update of /cvs/extras/rpms/dnssec-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1080

Modified Files:
	dnssec-tools.spec 
Added Files:
	dnssec-tools-donuts-fix-help.patch 
Log Message:
fix donuts help output; require Getopt::GUI::Long

dnssec-tools-donuts-fix-help.patch:

--- NEW FILE dnssec-tools-donuts-fix-help.patch ---
Index: tools/donuts/donuts
===================================================================
--- tools/donuts/donuts	(revision 3808)
+++ tools/donuts/donuts	(working copy)
@@ -29,7 +29,8 @@
 	    c => $ENV{'HOME'} . "/.donuts.conf",
 	    T => 'port 53 || ip[6:2] & 0x1fff != 0',
 	    o => '%d.%t.pcap',
-	    r => "/usr/local/share/dnssec-tools/donuts/rules/*");
+	    r => "/usr/local/share/dnssec-tools/donuts/rules/*.txt," .
+	    $ENV{'HOME'} . "/.dnssec-tools/donuts/rules/*.txt");
 
 our (@rules, %rules, $rf, $current_zone_file, %nrecs,
     @ignorelist, $netdns, $netdns_error, %outstructure, $current_domain,
@@ -168,7 +169,8 @@
 		 dnssec_tools_get_qwprimitives(%primaries)],
 	       ) || exit;
 
-if ($#ARGV == -1 || $#ARGV % 2 != 1) {
+if (!$opts{'R'} && !$opts{'F'} && !$opts{'H'} && 
+    ($#ARGV == -1 || $#ARGV % 2 != 1)) {
     print STDERR "\nUsage Error: $0 called with wrong number of arguments\n";
     print STDERR "  file and zone name arguments are both needed\n";
     print STDERR "  (EG: $0 FILE1 example.com FILE2 other.example.com)\n\n";
@@ -814,6 +816,9 @@
 A comma-separated list of rule files to load.  The strings will be
 passed to I<glob()> so * wildcards can be used to specify multiple files.
 
+Defaults to /usr/local/share/dnssec-tools/donuts/rules/*.txt and
+$HOME/.dnssec-tools/donuts/rules/*.txt .
+
 =item -i I<IGNORELIST>
 
 A comma-separated list of regex patterns which are checked against


Index: dnssec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-tools/devel/dnssec-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dnssec-tools.spec	7 Jan 2008 16:16:34 -0000	1.9
+++ dnssec-tools.spec	9 Jan 2008 22:45:29 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 1.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD-like
 Group: System Environment/Base
 URL: http://www.dnssec-tools.org/
@@ -19,6 +19,7 @@
 
 Patch4: dnssec-tools-linux-conf-paths-1.2.patch
 Patch5: dnssec-tools-donuts-install-path-fix.patch
+Patch6: dnssec-tools-donuts-fix-help.patch
 
 %description
 
@@ -57,6 +58,7 @@
 
 %patch4 -p0
 %patch5 -p0
+%patch6 -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/named.root.hints --with-resolv-conf=/etc/resolv.conf