gentoo resync : 14.12.2020

6 files changed, 2 insertions, 195 deletions

diff --git a/net-dns/valtz/Manifest b/net-dns/valtz/Manifest
index c7c7eb9835d9..1b2f948ca8da 100644
--- a/net-dns/valtz/Manifest
+++ b/net-dns/valtz/Manifest
@@ -1,8 +1,3 @@
-AUX add-support-for-srv-records.patch 2565 BLAKE2B 8e858bbb93991ccdb033318dec6c81c391181ea7c43044ff3f660995b114a7592c23099306e67eeb99bed05f6ec04bcab7153512b45c8031175f24a85f6a82b2 SHA512 6c4616f1df43530f1ccebd900ac19bac6b8f217dfebfa81b6eaf25afa0dbd96c616a5e7b859a326eb903d82f7d165997a695c21c8a457be467fc51d92bc40f0b
-AUX allow-underscores-in-records.patch 1561 BLAKE2B 7aba9fc4ca4f0b25d1bed1f7dbe524073b1b16b701a4c3d7830fd20e40af1983284a640a7c4ad913e9d8b2b27a864225989b0a8e7e9ec55c5d56841e65d837a3 SHA512 c23aaadab40863710b0ff9de964ab639c4dec2ef5aec0bf2fb402e7631436081012e80302aac5dbc81611b127fc2a6b549b7bb433d0220f012a7ae39fa0a0381
-AUX fix-generic-records-support.patch 1165 BLAKE2B e164ea03315bbbb0d9641f66a37c22a97a4f8e05f4dae86af542619b3299ad764417a40718e944bf10e6119419fad29beff55b947b00e601f86a5297cc2826fa SHA512 0613180930e526feeffa4367d1bf3e0050d2dcffe2181464b9084a1223ec4482c23890868aa761ae1a046da67b16f61761026fd2194c44bdaf6c4c5c556e3e62
-DIST valtz-0.7.tgz 10638 BLAKE2B f6c8c476f523bc72531dd6537a7ed096b4fe15122db8ac8398b6ce325e8d61aecd3ef496c6102127bb8df4c8e0651201826ed4ccf79fd47616b6e083967412c4 SHA512 173e9f04399f8011b565ddfa7ad542c87af03da1b829d40b616271a993a282a1a3f54fb434db4837fb9ee4c3eb66a39f70ebf5ff5f13aff9c6fccfeabb3a3df7
 DIST valtz-0.8.tar.xz 9644 BLAKE2B f5a102931fdd58e9ac85ff09f93243f76268cf3fd7c8cd3853b463115d292250293ca17e430ce93d0e7e5b78d90805126e24538b2f10bbf314a9ca0dbfd54d9f SHA512 87ad87445fb68b962b43e1d4cd08f155bdd3fe83480134dc141371bec87a2facce7f45381df655921e2875bb77c24bfb184487d8055f18a3acff50d8f4fa5c71
-EBUILD valtz-0.7-r3.ebuild 575 BLAKE2B 7fd7cdd50df24786611af4da7dcc86e7bcbf1fcce6c31de44092cac87aeff92406d52aa75aa61393a9c9b69d4277452edc1f52ab82d56262a893747678f7ca38 SHA512 aaca95ea3315239811cc6cc31d078af6195364a018e663b3f247829f73f3962bf8e55a4b63469349ab45e33d47295d15a64b5f6eae4982a694a39e2338bec96f
-EBUILD valtz-0.8.ebuild 448 BLAKE2B 9cf16ba539e2abd6dc932b31c548e694285d36c0862d4e549b882ed773c18508965e09d1dd3b2cc5a09377e58c029355b10802827aefdb1980268a42aeb430d4 SHA512 cdec3924b6a7a5ded8c8d4936bdff2c0981f9ea1042a0c411fb7b357f3c783a71d5170b82b5b0af2e5a5f659ed58e44a0fae1e85dad4d2a7088315d875dae0e6
+EBUILD valtz-0.8.ebuild 446 BLAKE2B 70a2047599863922f2c63a816fdda78b07df3c01354f45c2c53dd076a1956a71c3ec0438feeafdbd32be612f452e601149e2a882cdd48eccb2705e5f353cbfbc SHA512 cd3cfbcbc4ee5bb7658878ba010e6f8e5ea6e779932d3a2b43944befc0c373ca8483ae08d0b7e59251470545985ebb2d292f115cd7182b7caa4979f3cc7b63b7
 MISC metadata.xml 425 BLAKE2B 4d19148fc299036fffdd0c0c5b2dbbd35ee256071c36fad39a3595a95cc560466e10d680cf720c6b2a51d7304d21d734b7039c3fbc74f304cc9d5c8293ece42e SHA512 028d54f6c591f211acc6ae3605158053516e17424db39e34b8cf01706619421f65efbbb422e0bdfad88be4b1f539672782ad754201499ae3a40deb00c05c0ab4
diff --git a/net-dns/valtz/files/add-support-for-srv-records.patch b/net-dns/valtz/files/add-support-for-srv-records.patch
deleted file mode 100644
index f8b9435c2ba8..000000000000
--- a/net-dns/valtz/files/add-support-for-srv-records.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 9d29c28941ca629e223d0d4f20a833f10375d331 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 5 Dec 2019 10:28:40 -0500
-Subject: [PATCH 2/3] Add support for SRV records.
-
-There is a patch for djbdns that adds support for SRV records to both
-tinydns-data and axfr-get:
-
-  From: Michael Handler <handler@sub-rosa.com>
-  To: dns@list.cr.yp.to
-  Subject: tinydns-data SRV & axfr-get SRV/PTR patches
-  Date: Thu, 14 Sep 2000 20:37:50 -040
-
-Many distributions carry the patch, but valtz rejects the SRV records
-because it doesn't recognize the "S" indicator or know how to validate
-the port, weight, or priority fields.
-
-This commit adds support for the new record type, and adds validation
-routines for the three new fields. All of them are the same: ports,
-weights, and priorities are all integers between 0 and 65536.
----
- valtz | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
- mode change 100644 => 100755 valtz
-
-diff --git a/valtz b/valtz
-old mode 100644
-new mode 100755
-index eebda76..92aaa40
---- a/valtz
-+++ b/valtz
-@@ -100,6 +100,9 @@ my %token_name = (
-     'min' => 'Minimum time',
-     'n' => 'Record type number',
-     'rdata' => 'Resource data',
-+    'port' => 'Port',
-+    'priority' => 'Priority',
-+    'weight' => 'Weight'
- );
- 
- my %record_type = (
-@@ -114,6 +117,7 @@ my %record_type = (
-     "'" => 'TXT',
-     '^' => 'PTR',
-     'C' => 'CNAME',
-+    'S' => 'SRV',
-     'Z' => 'SOA',
-     ':' => 'GENERIC'
- );
-@@ -131,6 +135,8 @@ my %line_type = (
-     "'" => [ 'TXT', 'fqdn:s:ttl:timestamp:lo', 'fqdn:s' ],
-     '^' => [ 'PTR', 'fqdn:p:ttl:timestamp:lo', 'fqdn:p' ],
-     'C' => [ 'CNAME', 'fqdn:p:ttl:timestamp:lo', 'fqdn:p' ],
-+    'S' => [ 'SRV', 'fqdn:ip:x:port:weight:priority:ttl:timestamp:lo',
-+	     'fqdn:x:port' ],
-     'Z' => [ 'SOA', 'fqdn:mname:rname:ser:ref:ret:exp:min:ttl:timestamp:lo',
-             'fqdn:mname:rname' ],
-     ':' => [ 'GENERIC', 'fqdn:n:rdata:ttl:timestamp:lo', 'fqdn:n:rdata' ]
-@@ -340,6 +346,21 @@ my %token_validator = (
-         # TODO : Validation needed? 
-         my $result = 0;
-         return $result;
-+     }],
-+    'port' => [ 21, sub {
-+        my ($type, $s) = @_;
-+        my $result = validate_integer($s, 65536);
-+        return $result;
-+    }],
-+    'priority' => [ 22, sub {
-+        my ($type, $s) = @_;
-+        my $result = validate_integer($s, 65536);
-+        return $result;
-+    }],
-+    'weight' => [ 23, sub {
-+        my ($type, $s) = @_;
-+        my $result = validate_integer($s, 65536);
-+        return $result;
-     }],
- 
- 
--- 
-2.23.0
-
diff --git a/net-dns/valtz/files/allow-underscores-in-records.patch b/net-dns/valtz/files/allow-underscores-in-records.patch
deleted file mode 100644
index b76b231e6f15..000000000000
--- a/net-dns/valtz/files/allow-underscores-in-records.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7c5df8ad5c18a9f8b9440dbd1ae4faacf55b452a Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 5 Dec 2019 10:34:54 -0500
-Subject: [PATCH 1/3] Allow underscore characters in FQDNs and pointers.
-
-Modern DNS records can contain underscores for a number of reasons. In
-particular, DKIM records involve a "_domainkey" part,
-
-  https://tools.ietf.org/html/rfc6376
-
-that is rejected by the current "fqdn" and "p" validation routines.
-Moreover, any SRV records will have a service name prefixed with an
-underscore:
-
-  https://tools.ietf.org/html/rfc2782
-
-To recognize these tokens as valid, this commit expands the "fqdn" and
-"p" regular expressions to allow underscores as the first character in
-each component of an FQDN.
----
- valtz | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/valtz b/valtz
-index c68c120..eebda76 100644
---- a/valtz
-+++ b/valtz
-@@ -202,7 +202,7 @@ my %token_validator = (
-         # check all parts
-         for my $hostpart (split /\./, $s)
-         {
--            return 1005 unless $hostpart =~ /^[-a-z0-9]+$/i;
-+            return 1005 unless $hostpart =~ /^_?[-a-z0-9]+$/i;
-             return 1006 if $hostpart =~ /^-/;
-             return 1007 if $hostpart =~ /-$/;
-         }
-@@ -268,7 +268,7 @@ my %token_validator = (
-         # check all parts
-         for (split /\./, $s)
-         {
--            return 1005 unless /^[-[a-z0-9]+$/i;
-+            return 1005 unless /^_?[-[a-z0-9]+$/i;
-             return 1006 if /^-/;
-             return 1007 if /-$/;
-         }
--- 
-2.23.0
-
diff --git a/net-dns/valtz/files/fix-generic-records-support.patch b/net-dns/valtz/files/fix-generic-records-support.patch
deleted file mode 100644
index b266340a471b..000000000000
--- a/net-dns/valtz/files/fix-generic-records-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-mjo: cherry-picked from https://github.com/wKovacs64/valtz
-
-From 422cc33cf0da52d10c271a75cda271d5963da4eb Mon Sep 17 00:00:00 2001
-From: wKovacs64 <justin.r.hall@gmail.com>
-Date: Tue, 16 Dec 2014 17:13:17 -0700
-Subject: [PATCH] Fix support for generic records
-
----
- valtz | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/valtz b/valtz
-index e9b831f..c68c120 100644
---- a/valtz
-+++ b/valtz
-@@ -75,7 +75,7 @@ my %validation_msg = (
-     1007 => 'parts must not end with the - character',
-     1008 => 'integer out of bounds',
-     1009 => 'must have at least three labels to be valid as mail address',
--    1010 => 'must not 2(NS), 5(CNAME), 6(SOA), 12(PTR), 15(MX) or 252(AXFR)',
-+    1010 => 'must not be 2(NS), 5(CNAME), 6(SOA), 12(PTR), 15(MX) or 252(AXFR)',
- );
- 
- # NOTE : ONLY translate the right-hand part
-@@ -331,7 +331,7 @@ my %token_validator = (
-         my ($type, $s) = @_;
-         my $result = validate_integer($s, 65535);
-     
--        return 1010 if ($s==2)||($s==5)||($s==6)||($s==12)||($s==15)||($s=252);
-+        return 1010 if ($s==2)||($s==5)||($s==6)||($s==12)||($s==15)||($s==252);
- 
-         return $result;
-     }],
diff --git a/net-dns/valtz/valtz-0.7-r3.ebuild b/net-dns/valtz/valtz-0.7-r3.ebuild
deleted file mode 100644
index 131ff011aed8..000000000000
--- a/net-dns/valtz/valtz-0.7-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Validation tool for tinydns-data zone files"
-SRC_URI="https://x42.com/software/valtz/${PN}.tgz -> ${P}.tgz"
-HOMEPAGE="https://x42.com/software/valtz/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-
-PATCHES=( "${FILESDIR}/fix-generic-records-support.patch"
-		  "${FILESDIR}/allow-underscores-in-records.patch"
-		  "${FILESDIR}/add-support-for-srv-records.patch" )
-
-src_install() {
-	dobin valtz
-	dodoc README CHANGES
-}
diff --git a/net-dns/valtz/valtz-0.8.ebuild b/net-dns/valtz/valtz-0.8.ebuild
index b98620fc1489..66aaf7aaee85 100644
--- a/net-dns/valtz/valtz-0.8.ebuild
+++ b/net-dns/valtz/valtz-0.8.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://michael.orlitzky.com/code/valtz.xhtml"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl"