commit 877e93c958c33dfe1534eb33aa52c1e15042aad5
Author: Wes Hardaker <opensource at hardakers.net>
Date: Thu May 23 16:05:24 2013 -0700
update to Zonefile::Fast for misc bug fixes
dnssec-tools-zonefile-fast-misc.patch | 42 +++++++++++++++++++++++++++++++++
dnssec-tools.spec | 7 ++++-
2 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/dnssec-tools-zonefile-fast-misc.patch b/dnssec-tools-zonefile-fast-misc.patch
new file mode 100644
index 0000000..df04b7c
--- /dev/null
+++ b/dnssec-tools-zonefile-fast-misc.patch
@@ -0,0 +1,42 @@
+diff --git a/dnssec-tools/tools/modules/ZoneFile-Fast/Fast.pm b/dnssec-tools/tools/modules/ZoneFile-Fast/Fast.pm
+index 880d1a7..cc9c6d3 100644
+--- a/dnssec-tools/tools/modules/ZoneFile-Fast/Fast.pm
++++ b/dnssec-tools/tools/modules/ZoneFile-Fast/Fast.pm
+@@ -81,8 +81,8 @@ my $MAXIMUM_TTL = 0x7fffffff;
+
+ my $pat_ttl = qr{\d+[\dwdhms]*}i;
+ my $pat_skip = qr{\s*(?:;.*)?};
+-my $pat_name = qr{[-\*\w\$\d\/*]+(?:\.[-\*\w\$\d\/]+)*};
+-my $pat_maybefullnameorroot = qr{(?:\.|[-\w\$\d\/*]+(?:\.[-\w\$\d\/]+)*\.?)};
++my $pat_name = qr{(?:[-\*\w\$\d\/*]|\\[0-2]\d\d)+(?:\.(?:[-\*\w\$\d\/]|\\[0-2]\d\d)+)*};
++my $pat_maybefullnameorroot = qr{(?:\.|(?:[-\w\$\d\/*]|\\[0-2]\d\d)+(?:\.(?:[-\w\$\d\/]|\\[0-2]\d\d)+)*\.?)};
+
+ #
+ # Added the ability to have a backslash in the SOA username. This is to
+@@ -90,7 +90,7 @@ my $pat_maybefullnameorroot = qr{(?:\.|[-\w\$\d\/*]+(?:\.[-\w\$\d\/]+)*\.?)};
+ # dots in usernames. Keeping the original version here for easy reference.
+ #
+ # my $pat_maybefullname = qr{[-\w\$\d\/*]+(?:\.[-\w\$\d\/]+)*\.?};
+-my $pat_maybefullname = qr{[-\+\w\$\d\/*\\]+(?:\.[-\+\w\$\d\/]+)*\.?};
++my $pat_maybefullname = qr{(?:[-\+\w\$\d\/*\\]|\\[0-2]\d\d)+(?:\.(?:[-\+\w\$\d\/]|\\[0-2]\d\d)+)*\.?};
+
+ my $debug;
+ my $domain;
+@@ -983,7 +983,7 @@ sub parse_line
+ } elsif (/\G(nsec3)[ \t]+/igc) {
+ error ("You are missing required modules for NSEC3 support")
+ if (!$nsec3capable);
+- if (/\G\s*(\d+)\s+(\d+)\s+(\d+)\s+([-0-9A-Fa-f]+)\s+($pat_maybefullname)\s+(.*?)$pat_skip$/gc) {
++ if (/\G\s*(\d+)\s+(\d+)\s+(\d+)\s+([-0-9A-Fa-f]+)\s+($pat_maybefullname)\s*(.*?)$pat_skip$/gc) {
+ # XXX: set the typebm field ourselves?
+ my ($alg, $flags, $iters, $salt, $nxthash, $typelist) =
+ ($1, $2, $3, $4, $5, $6);
+@@ -1335,7 +1335,7 @@ sub parse_tlsa
+ sub parse_nsec3
+ {
+ #got more data
+- if ( /\G\s*((\w+\s+)+)\)\s*$/) {
++ if ( /\G\s*((\w+\s+)*)\)\s*$/) {
+ my $typelist = $1;
+ $typelist = join(" ",sort split(/\s+/,$typelist));
+ $nsec3->{ 'typelist' } = $typelist;
diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 7139778..380069a 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
Summary: A suite of tools for managing dnssec aware DNS usage
Name: dnssec-tools
Version: 1.14
-Release: 5%{?dist}
+Release: 6%{?dist}
License: BSD
Group: System Environment/Base
URL: http://www.dnssec-tools.org/
@@ -23,6 +23,7 @@ Patch9: dnssec-tools-zonefile-fast-fixes-1.14.patch
Patch10: dnssec-tools-1.13-zonesigner-soa-rewrite.patch
Patch11: dnssec-tools-1.14-zonesigner-soa-rewrite.patch
Patch12: dnssec-tools-zonefile-fast-nsec3-1.20.patch
+Patch13: dnssec-tools-zonefile-fast-misc.patch
%description
@@ -67,6 +68,7 @@ C-based libraries useful for developing dnssec aware tools.
%patch9 -p0 -d tools/modules/ZoneFile-Fast/
%patch11 -p0 -d tools/scripts
%patch12 -p2
+%patch13 -p2
%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
@@ -344,6 +346,9 @@ rm -rf %{buildroot}
%{_mandir}/man3/val_freeaddrinfo.3.gz
%changelog
+* Thu May 23 2013 Wes Hardaker <wjhns174 at hardakers.net> - 1.14-6
+- Added a fix for various Zonefile::Fast bugs
+
* Thu Apr 18 2013 Wes Hardaker <wjhns174 at hardakers.net> - 1.14-4
- Patch to support NSEC3 records from newer versions of bind