[validns/el5] * Fri Oct 12 2012 Paul Wouters <pwouters at redhat.com> - 0.6-2 - Added -x option to skip timing info i

[Paul Wouters]

commit be60cac7a717b9a1d61298b05b7a8b4ce969d6ba
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Oct 11 23:16:01 2012 -0400

    * Fri Oct 12 2012 Paul Wouters <pwouters at redhat.com> - 0.6-2
    - Added -x option to skip timing info in statistics

 validns-0.6-timing.patch |   82 ++++++++++++++++++++++++++++++++++++++++++++++
 validns.spec             |    9 ++++-
 2 files changed, 89 insertions(+), 2 deletions(-)
---
diff --git a/validns-0.6-timing.patch b/validns-0.6-timing.patch
new file mode 100644
index 0000000..a65d6f5
--- /dev/null
+++ b/validns-0.6-timing.patch
@@ -0,0 +1,82 @@
+diff -Naur validns-0.6-orig/common.h validns-0.6/common.h
+--- validns-0.6-orig/common.h	2012-08-13 05:37:10.000000000 -0400
++++ validns-0.6/common.h	2012-10-11 22:56:19.744337127 -0400
+@@ -51,6 +51,7 @@
+ 		int die_on_first_error;
+ 		int no_output;
+ 		int summary;
++		int notiming;
+ 		int verbose;
+ 		char *include_path;
+ 		char *current_origin;
+diff -Naur validns-0.6-orig/main.c validns-0.6/main.c
+--- validns-0.6-orig/main.c	2012-10-04 06:52:25.000000000 -0400
++++ validns-0.6/main.c	2012-10-11 22:57:32.759118220 -0400
+@@ -251,6 +251,7 @@
+ 	fprintf(stderr, "\t-n N\t\tuse N worker threads\n");
+ 	fprintf(stderr, "\t-q\t\tquiet - do not produce any output\n");
+ 	fprintf(stderr, "\t-s\t\tprint validation summary/stats\n");
++	fprintf(stderr, "\t-x\t\tskip printing 'time taken' entry in summary/stats\n");
+ 	fprintf(stderr, "\t-v\t\tbe extra verbose\n");
+ 	fprintf(stderr, "\t-I path\tuse this path for $INCLUDE files\n");
+ 	fprintf(stderr, "\t-z origin\tuse this origin as initial $ORIGIN\n");
+@@ -311,7 +312,7 @@
+ 	initialize_globals();
+ 	struct timeval start, stop;
+ 
+-	while ((o = getopt(argc, argv, "fhqsvI:z:t:p:n:")) != -1) {
++	while ((o = getopt(argc, argv, "fhqsxvI:z:t:p:n:")) != -1) {
+ 		switch(o) {
+ 		case 'h':
+ 			usage(NULL);
+@@ -325,6 +326,9 @@
+ 		case 's':
+ 			G.opt.summary = 1;
+ 			break;
++		case 'x':
++			G.opt.notiming = 1;
++			break;
+ 		case 'v':
+ 			G.opt.verbose = 1;
+ 			break;
+@@ -412,8 +416,11 @@
+ 			   "                     %d\n", G.stats.not_authoritative);
+ 		printf("validation errors:   %d\n", G.stats.error_count);
+ 		printf("signatures verified: %d\n", G.stats.signatures_verified);
+-		printf("time taken:          %.3fs\n",
++
++		if (!G.opt.notiming) {
++			printf("time taken:          %.3fs\n",
+ 			   stop.tv_sec - start.tv_sec + (stop.tv_usec - start.tv_usec)/1000000.);
++		}
+ 	}
+ 	return G.exit_code;
+ }
+diff -Naur validns-0.6-orig/usage.mdwn validns-0.6/usage.mdwn
+--- validns-0.6-orig/usage.mdwn	2012-10-04 10:52:43.000000000 -0400
++++ validns-0.6/usage.mdwn	2012-10-11 22:58:30.330728403 -0400
+@@ -61,6 +61,9 @@
+ -s
+ :   print validation summary/stats
+ 
++-x
++:   skip printing 'time taken' in summary/stats
++
+ -v
+ :   be extra verbose
+ 
+diff -Naur validns-0.6-orig/validns.1 validns-0.6/validns.1
+--- validns-0.6-orig/validns.1	2012-10-04 10:53:32.000000000 -0400
++++ validns-0.6/validns.1	2012-10-11 23:00:20.511885836 -0400
+@@ -73,6 +73,11 @@
+ .RS
+ .RE
+ .TP
++.B -x
++skip printing timing summary/stats
++.RS
++.RE
++.TP
+ .B -v
+ be extra verbose
+ .RS
diff --git a/validns.spec b/validns.spec
index 443e800..537ebb9 100644
--- a/validns.spec
+++ b/validns.spec
@@ -1,10 +1,11 @@
 Summary: DNS and DNSSEC zone file validator
 Name: validns
 Version: 0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url:  http://www.validns.net/
 Source: http://www.validns.net/download/%{name}-%{version}.tar.gz
+Patch1: validns-0.6-timing.patch
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: Judy-devel, openssl-devel
@@ -15,6 +16,7 @@ useful README or information, but it's a nice tool anyway :)
 
 %prep
 %setup -q 
+%patch1 -p1 -b .timing
 
 %build
 make %{?_smp_mflags}
@@ -35,7 +37,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/validns.1.gz
 
 %changelog
-* Thu Oct 04 2012 Paul Wouters <pwouters at redhat.com> - 0.6-0
+* Fri Oct 12 2012 Paul Wouters <pwouters at redhat.com> - 0.6-2
+- Added -x option to skip timing info in statistics
+
+* Thu Oct 04 2012 Paul Wouters <pwouters at redhat.com> - 0.6-1
 - Updated to 0.6, which incorporates all patches
 
 * Fri Aug 24 2012 Paul Wouters <pwouters at redhat.com> - 0.5-2