[dnssec-tools/f18: 15/15] new ZoneFile::Fast and zonesigner soa patch

[Wes Hardaker]

commit 34a48ac76de305a56cd8309c3d883c3c9fabf952
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Thu Jan 3 11:34:35 2013 -0800

    new ZoneFile::Fast and zonesigner soa patch

 dnssec-tools-zonefile-fast-fixes-1.14.patch |   44 +++++++++++++++++++++++++++
 dnssec-tools.spec                           |   31 ++++++-------------
 2 files changed, 54 insertions(+), 21 deletions(-)
---
diff --git a/dnssec-tools-zonefile-fast-fixes-1.14.patch b/dnssec-tools-zonefile-fast-fixes-1.14.patch
new file mode 100644
index 0000000..82e754a
--- /dev/null
+++ b/dnssec-tools-zonefile-fast-fixes-1.14.patch
@@ -0,0 +1,44 @@
+Index: Fast.pm
+===================================================================
+--- Fast.pm	(revision 7286)
++++ Fast.pm	(working copy)
+@@ -46,7 +46,7 @@
+ use Net::DNS::RR;
+ use MIME::Base64;
+ 
+-$VERSION = '1.17';
++$VERSION = '1.18';
+ 
+ my $MAXIMUM_TTL = 0x7fffffff;
+ 
+@@ -61,7 +61,7 @@
+ # 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\/*\\]+(?:\.[-\+\w\$\d\/]+)*\.?};
+ 
+ my $debug;
+ my $domain;
+@@ -198,8 +198,7 @@
+ 	      $z->{mbox} = uc $z->{mbox} if defined $z->{mbox};
+ 	      $z->{txtdname} = uc $z->{txtdname} if defined $z->{txtdname};
+ 	  }
+-	  my $newrec = 
+-	    Net::DNS::RR->new_from_hash(%$z);
++	  my $newrec = Net::DNS::RR->new(%$z);
+ 
+ 	  if ($newrec->{'type'} eq 'DNSKEY') {
+ 	      if (ref($newrec) ne 'Net::DNS::RR::DNSKEY') {
+Index: t/rrs.t
+===================================================================
+--- t/rrs.t	(revision 7286)
++++ t/rrs.t	(working copy)
+@@ -52,6 +52,7 @@
+ 	 q{. IN SOA dns1.acme.com hostmaster.acme.com. ( 1 1 1 1 1 )},
+ 	 q{. IN SOA dns1 hostmaster. ( 1 1 1 1 1 )},
+ 	 q{. IN SOA @ hostmaster.acme.com. ( 1 1 1 1 1 )},
++	 q{. IN SOA @ hostmaster+foo.acme.com. ( 1 1 1 1 1 )},
+ 	 q{acme.com. IN AAAA 2001:688:0:102::1:2},
+ 	 q{acme.com. IN AAAA 2001:688:0:102::3},
+ 	 q{acme.com. IN RP abuse.acme.com. acme.com.},
diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index d519d90..c679600 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -19,9 +19,9 @@ BuildRequires: perl(Test) perl(ExtUtils::MakeMaker)
 # Makes the code installation linux filesystem friendly
 Patch5: dnssec-tools-linux-conf-paths-1.13.patch
 Patch6: dnssec-tools-zonefile-fast-new-bind-1.13.patch
-Patch7: dnssec-tools-1.13-zonesigner-soa.patch
-Patch8: dnssec-tools-1.13-zonesigner-soa2.patch
-Patch9: dnssec-tools-zonefile-fast-fixes-1.13.patch
+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
 
 %description
 
@@ -61,9 +61,10 @@ C-based libraries useful for developing dnssec aware tools.
 
 %patch5 -p0 
 #%patch6 -p2
-%patch7 -p0 -d tools/scripts
-%patch8 -p2
+#%patch7 -p0 -d tools/scripts
+#%patch8 -p2
 %patch9 -p0 -d tools/modules/ZoneFile-Fast/
+%patch11 -p0  -d tools/scripts
 
 %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
@@ -340,23 +341,11 @@ rm -rf %{buildroot}
 %{_mandir}/man3/val_freeaddrinfo.3.gz
 
 %changelog
-* Fri Oct 12 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.14-2
-- updated to upstream 1.14
-
-* Wed Dec 19 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.13-6
-- fix for zonesigner's SOA serial incrementation routine
-
-* Wed Jan  2 2013 Wes Hardaker <wjhns174 at hardakers.net> - 1.13-9
-- Added fixes for Net::DNS::ZoneFile::Fast for the new Net::DNS modules
+* Wed Jan  2 2013 Wes Hardaker <wjhns174 at hardakers.net> - 1.14-2
+- added ZoneFile::Fast patch and new zonesigner soa patch
 
-* Wed Dec 19 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.13-8
-- patch2 for the zonesigner bug to fix the fix
-
-* Wed Dec 19 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.13-7
-- actually apply the patch this time
-
-* Wed Dec 19 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.13-6
-- added a patch for SOA record parsing from the upstream
+* Fri Oct 12 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.14-1
+- updated to upstream 1.14
 
 * Mon Oct  1 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.13-5
 - Rename the -config program to be unique per arch