[dnssec-tools/f18: 12/15] Added fixxes for Net::DNS::Zonefile::Fast
Wes Hardaker
hardaker at fedoraproject.org
Thu Jan 3 19:35:26 UTC 2013
commit 4fafe0618a8f13cb7a5afbb4240d644c18cb7db2
Author: Wes Hardaker <opensource at hardakers.net>
Date: Wed Jan 2 12:03:57 2013 -0800
Added fixxes for Net::DNS::Zonefile::Fast
dnssec-tools-zonefile-fast-fixes-1.13.patch | 44 +++++++++++++++++++++++++++
dnssec-tools.spec | 20 +++++++++++-
2 files changed, 63 insertions(+), 1 deletions(-)
---
diff --git a/dnssec-tools-zonefile-fast-fixes-1.13.patch b/dnssec-tools-zonefile-fast-fixes-1.13.patch
new file mode 100644
index 0000000..718f74f
--- /dev/null
+++ b/dnssec-tools-zonefile-fast-fixes-1.13.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.16';
++$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 f7a01b7..370676b 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.13
-Release: 5%{?dist}
+Release: 9%{?dist}
License: BSD
Group: System Environment/Base
URL: http://www.dnssec-tools.org/
@@ -19,6 +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
%description
@@ -58,6 +61,9 @@ C-based libraries useful for developing dnssec aware tools.
%patch5 -p0
%patch6 -p2
+%patch7 -p0 -d tools/scripts
+%patch8 -p2
+%patch9 -p0 -d tools/modules/ZoneFile-Fast/
%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
@@ -333,6 +339,18 @@ rm -rf %{buildroot}
%{_mandir}/man3/val_freeaddrinfo.3.gz
%changelog
+* 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 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
+
* Mon Oct 1 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.13-5
- Rename the -config program to be unique per arch
More information about the scm-commits
mailing list