[dnssec-tools/el5] updated patch for 1.14
Wes Hardaker
hardaker at fedoraproject.org
Thu Apr 18 20:02:28 UTC 2013
commit 562b01b48a2ad46bdabdd8c228230cd2699a7783
Author: Wes Hardaker <opensource at hardakers.net>
Date: Thu Apr 18 12:39:17 2013 -0700
updated patch for 1.14
dnssec-tools-zonefile-fast-nsec3-1.20.patch | 92 +--------------------------
1 files changed, 2 insertions(+), 90 deletions(-)
---
diff --git a/dnssec-tools-zonefile-fast-nsec3-1.20.patch b/dnssec-tools-zonefile-fast-nsec3-1.20.patch
index 9a2f8cb..b24d7b2 100644
--- a/dnssec-tools-zonefile-fast-nsec3-1.20.patch
+++ b/dnssec-tools-zonefile-fast-nsec3-1.20.patch
@@ -2,47 +2,11 @@ diff --git a/dnssec-tools/tools/modules/ZoneFile-Fast/Fast.pm b/dnssec-tools/too
index 268538c..0c931a2 100644
--- a/dnssec-tools/tools/modules/ZoneFile-Fast/Fast.pm
+++ b/dnssec-tools/tools/modules/ZoneFile-Fast/Fast.pm
-@@ -32,6 +32,35 @@
- # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+# ----------------------------------------------------------------------------
-+# Copyright (c) 2013-2013 PARSONS, Inc.
-+# All rights reserved.
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions are met:
-+#
-+# * Redistributions of source code must retain the above copyright notice,
-+# this list of conditions and the following disclaimer.
-+#
-+# * Redistributions in binary form must reproduce the above copyright
-+# notice, this list of conditions and the following disclaimer in the
-+# documentation and/or other materials provided with the distribution.
-+#
-+# * Neither the name of SPARTA, Inc nor the names of its contributors may
-+# be used to endorse or promote products derived from this software
-+# without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
-+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
- # $Id$
- #
@@ -46,7 +75,7 @@ use Net::DNS;
use Net::DNS::RR;
use MIME::Base64;
--$VERSION = '1.19';
+-$VERSION = '1.18';
+$VERSION = '1.20';
my $MAXIMUM_TTL = 0x7fffffff;
@@ -52,9 +16,9 @@ index 268538c..0c931a2 100644
my $dnskey;
my $ds;
+my $nsec3;
- my $tlsa;
my $on_error;
my $quiet;
+ my $soft_errors;
@@ -953,14 +983,38 @@ sub parse_line
} elsif (/\G(nsec3)[ \t]+/igc) {
error ("You are missing required modules for NSEC3 support")
@@ -152,55 +116,3 @@ index 268538c..0c931a2 100644
sub parse_soa_number
{
error("parse_soa_number: internal error, no \$soa") unless $soa;
-@@ -1582,7 +1656,36 @@ Copyright 2003 by Anton Berezin and catpipe Systems ApS
-
- Anton Berezin
-
--Copyright (c) 2004-2013 SPARTA, Inc.
-+Copyright (c) 2004-2011 SPARTA, Inc.
-+ All rights reserved.
-+
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions are met:
-+
-+ * Redistributions of source code must retain the above copyright notice,
-+ this list of conditions and the following disclaimer.
-+
-+ * Redistributions in binary form must reproduce the above copyright
-+ notice, this list of conditions and the following disclaimer in the
-+ documentation and/or other materials provided with the distribution.
-+
-+ * Neither the name of SPARTA, Inc nor the names of its contributors may
-+ be used to endorse or promote products derived from this software
-+ without specific prior written permission.
-+
-+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
-+ IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+Copyright (c) 2013-2013 PARSONS, Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
-diff --git a/dnssec-tools/tools/modules/ZoneFile-Fast/t/rr-dnssec.t b/dnssec-tools/tools/modules/ZoneFile-Fast/t/rr-dnssec.t
-index 8bbe036..ef050de 100644
---- a/dnssec-tools/tools/modules/ZoneFile-Fast/t/rr-dnssec.t
-+++ b/dnssec-tools/tools/modules/ZoneFile-Fast/t/rr-dnssec.t
-@@ -31,6 +31,9 @@ BEGIN {
- q{nospace.dnssec-tools.org. 86400 RRSIG SOA 5 2 86400 20060429134027 20060330134027 42869 dnssec-tools.org. QZzAz5sVC5+n7vJhkXfFaN/sdjKXVpT/nv22 NJI+sDde180Sj1pDXW6mFt+Efg4uUAuyLQup jLv20EVM8/oBPA7DjNu2CZHGe8UDeuAoqIth Q/79Ltw4NtP7W1zWAs/ms/oSKiKYrAUHqt0U UskiXkCA1GKn6RNqVT4+IuSUgALLYSMLjlaA 2kE/KaffqeGnynIO2AC5BMFzUlxCSMDSxus3 bJm2xAIxMiUYomw9XfbGfrkCtfIrH+H/LVG/ X2K/kKxjcFcQhkukMUxjzzmAP3xJHq6vgwVM tpm/qaR0g5jH5B46iJefGYzwcMAyexbLOQEW uv1Xs6i/lBwQo9T7xw= },
- q{dnssec-tools.org. 10800 NSEC cvs.dnssec-tools.org A DNSKEY MX NS NSEC RRSIG SOA TXT},
- q{THA2IPMDLT9RU307BO9LQ6MF5K565A6M.example.com. 10800 IN NSEC3 1 0 100 610b88f0d9f42c74 QIVB7DNNE2T5J9HLI4FRE9PN61F754CK A RRSIG},
-+ q{THA2IPMDLT9RU307BO9LQ6MF5K565A6M.example.com. 10800 IN NSEC3 1 0 100 610b88f0d9f42c74 (
-+ QIVB7DNNE2T5J9HLI4FRE9PN61F754CK
-+ A RRSIG )},
-
- q{example.com 0 NSEC3PARAM 1 0 100 610b88f0d9f42c74},
-
More information about the scm-commits
mailing list