Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/Mozilla-PublicSuffix/, dev-perl/Mozilla-PublicSuffix/files/
Date: Fri, 09 Jul 2021 21:00:55
Message-Id: 1625864441.9ae842aba0c4ab7934666222742adeade99ea931.dilfridge@gentoo
1 commit: 9ae842aba0c4ab7934666222742adeade99ea931
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 9 20:59:43 2021 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 9 21:00:41 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae842ab
7
8 dev-perl/Mozilla-PublicSuffix: Version bump 1.0.4
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
12
13 dev-perl/Mozilla-PublicSuffix/Manifest | 1 +
14 .../Mozilla-PublicSuffix-1.0.4.ebuild | 34 +++++++++
15 .../files/1.0.4-no-dynamic-update.patch | 81 ++++++++++++++++++++++
16 3 files changed, 116 insertions(+)
17
18 diff --git a/dev-perl/Mozilla-PublicSuffix/Manifest b/dev-perl/Mozilla-PublicSuffix/Manifest
19 index 70b5faa9975..8d895074419 100644
20 --- a/dev-perl/Mozilla-PublicSuffix/Manifest
21 +++ b/dev-perl/Mozilla-PublicSuffix/Manifest
22 @@ -1 +1,2 @@
23 DIST Mozilla-PublicSuffix-v1.0.0.tar.gz 71669 BLAKE2B 5a5866b6446cf56df24d5113e2ce663dec3ace6025ff9888b40914b577215dcb65f3f57bae1ac31bc82ff5dc3a0ae4d79f1d63dbe6fa717358ebf92d0779b579 SHA512 79ed7256bccb33f1f428657bd60cccaf7be5d4793424337b94a812a41f46e90507b8c32b3aa8b381bf16d77f4a3f911301f757332e9144718efd2341996d9cc6
24 +DIST Mozilla-PublicSuffix-v1.0.4.tar.gz 85940 BLAKE2B a3f8266dc0c48b302cc5c9a488318f2b3668ffdb6e50bc567362d1e00b1798f7a37470e2b3f78321b48567f411d6e10e9b1ffd88bd82caa0659ce2b7f67c43e5 SHA512 681803f51fbc8aca961874607f1f3a6a91c95a0e1397e3d702b013a9ab3cfcca7b08340414f977dcc9af7ee01610bdf8b60ce6bcea3bffab6156d80b2063f008
25
26 diff --git a/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.4.ebuild b/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.4.ebuild
27 new file mode 100644
28 index 00000000000..4cb39f043ae
29 --- /dev/null
30 +++ b/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.4.ebuild
31 @@ -0,0 +1,34 @@
32 +# Copyright 1999-2021 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=8
36 +
37 +DIST_AUTHOR=TOMHUKINS
38 +DIST_VERSION="v${PV}"
39 +inherit perl-module
40 +
41 +DESCRIPTION="Get a domain name's public suffix via the Mozilla Public Suffix List"
42 +SLOT="0"
43 +KEYWORDS="~amd64 ~x86"
44 +
45 +RDEPEND="
46 + virtual/perl-Exporter
47 + dev-perl/URI
48 +"
49 +BDEPEND="${RDEPEND}
50 + virtual/perl-IO
51 + >=dev-perl/Module-Build-0.280.0
52 + test? (
53 + virtual/perl-Test-Simple
54 + virtual/perl-File-Spec
55 + )
56 +"
57 +
58 +PATCHES=(
59 + "${FILESDIR}/${PV}-no-dynamic-update.patch"
60 +)
61 +
62 +src_test() {
63 + perl_rm_files t/author-* t/release-*
64 + perl-module_src_test
65 +}
66
67 diff --git a/dev-perl/Mozilla-PublicSuffix/files/1.0.4-no-dynamic-update.patch b/dev-perl/Mozilla-PublicSuffix/files/1.0.4-no-dynamic-update.patch
68 new file mode 100644
69 index 00000000000..7dfdc7a4416
70 --- /dev/null
71 +++ b/dev-perl/Mozilla-PublicSuffix/files/1.0.4-no-dynamic-update.patch
72 @@ -0,0 +1,81 @@
73 +From 7dcc6afa75d5318325856fdef0456f4ddf1672b1 Mon Sep 17 00:00:00 2001
74 +From: Kent Fredric <kentfredric@×××××.com>
75 +Date: Fri, 6 Jan 2017 12:32:50 +1300
76 +Subject: [PATCH] Remove dynamic update code
77 +
78 +As this basically makes builds unreproducale anyway, and the download
79 +URI is invariant meaning we can't even approximate the same logic via
80 +SRC_URI without having frequently changing Manifests, but no change in
81 +URI.
82 +
83 +diff -ruN Mozilla-PublicSuffix-v1.0.4.orig/Build.PL Mozilla-PublicSuffix-v1.0.4/Build.PL
84 +--- Mozilla-PublicSuffix-v1.0.4.orig/Build.PL 2021-05-04 21:45:11.000000000 +0200
85 ++++ Mozilla-PublicSuffix-v1.0.4/Build.PL 2021-07-09 22:58:00.434038763 +0200
86 +@@ -5,11 +5,9 @@
87 + use utf8;
88 + use open ":encoding(UTF-8)";
89 + use Carp qw(croak);
90 +-use HTTP::Tiny;
91 + use Module::Build;
92 + use IO::File;
93 + use Tie::File;
94 +-use URI;
95 +
96 + my $builder = Module::Build->new(
97 + dist_name => "Mozilla-PublicSuffix",
98 +@@ -27,11 +25,9 @@
99 + 'perl' => '5.008'
100 + },
101 + 'configure_requires' => {
102 +- 'HTTP::Tiny' => '0',
103 + 'IO::File' => '0',
104 + 'Module::Build' => '0.28',
105 + 'Tie::File' => '0',
106 +- 'URI' => '0',
107 + 'perl' => '5.008'
108 + },
109 + 'requires' => {
110 +@@ -42,28 +38,6 @@
111 + );
112 +
113 + my $dat_file = "effective_tld_names.dat";
114 +-my $get_new_list = $builder->y_n(
115 +- "Check for a new version of the Public Suffix List?", "N"
116 +-);
117 +-if ($get_new_list) {
118 +- my $http = HTTP::Tiny->new( timeout => 6 );
119 +- my $list_uri = URI->new(
120 +- "https://publicsuffix.org/list/public_suffix_list.dat"
121 +- );
122 +- $list_uri->query_form({ raw => 1 });
123 +- my %options = (
124 +- headers => {
125 +- "If-Modified-Since" => "Fri, 17 May 2013 00:00:00 UTC"
126 +- }
127 +- );
128 +- my $response = $http->get($list_uri, \%options);
129 +- if ( $response->{status} == 200 ) {
130 +- IO::File->new($dat_file, "w")->print($response->{content});
131 +- }
132 +- elsif ( $response->{status} != 304 ) {
133 +- croak "Unable to download public suffix list.";
134 +- }
135 +-}
136 +
137 + # Divide rules from list into sets:
138 + my $rules = join " ", map {
139 +diff -ruN Mozilla-PublicSuffix-v1.0.4.orig/META.yml Mozilla-PublicSuffix-v1.0.4/META.yml
140 +--- Mozilla-PublicSuffix-v1.0.4.orig/META.yml 2021-05-04 21:45:11.000000000 +0200
141 ++++ Mozilla-PublicSuffix-v1.0.4/META.yml 2021-07-09 22:58:15.717235925 +0200
142 +@@ -11,11 +11,9 @@
143 + Test::More: '0'
144 + perl: '5.008'
145 + configure_requires:
146 +- HTTP::Tiny: '0'
147 + IO::File: '0'
148 + Module::Build: '0.28'
149 + Tie::File: '0'
150 +- URI: '0'
151 + perl: '5.008'
152 + dynamic_config: 0
153 + generated_by: 'Dist::Zilla version 6.015, CPAN::Meta::Converter version 2.150010'