[libio-socket-ssl-perl] 03/05: Drop 0001-use-only-ICANN-part-in-public-suffix-list.patch patch

Salvatore Bonaccorso carnil at debian.org
Fri Dec 5 10:21:43 UTC 2014


This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to branch master
in repository libio-socket-ssl-perl.

commit 7651cee0497a1b6f7506a2fe08095762a6c3d405
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Fri Dec 5 11:02:56 2014 +0100

    Drop 0001-use-only-ICANN-part-in-public-suffix-list.patch patch
---
 ...use-only-ICANN-part-in-public-suffix-list.patch | 61 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 62 deletions(-)

diff --git a/debian/patches/0001-use-only-ICANN-part-in-public-suffix-list.patch b/debian/patches/0001-use-only-ICANN-part-in-public-suffix-list.patch
deleted file mode 100644
index 30e5df1..0000000
--- a/debian/patches/0001-use-only-ICANN-part-in-public-suffix-list.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: use only ICANN part in public suffix list
-Origin: backport, https://github.com/noxxi/p5-io-socket-ssl/commit/1f9482771fd8d71083a2e388634b3787bd9fe147
-Bug-Debian: https://bugs.debian.org/767692
-Forwarded: not-needed
-Author: Steffen Ullrich <Steffen_Ullrich at genua.de>
-Reviewed-by: Salvatore Bonaccorso <carnil at debian.org>
-Last-Update: 2014-11-01
-
----
-diff --git a/lib/IO/Socket/SSL/PublicSuffix.pm b/lib/IO/Socket/SSL/PublicSuffix.pm
-index 87c8b0b..a84aacd 100644
---- a/lib/IO/Socket/SSL/PublicSuffix.pm
-+++ b/lib/IO/Socket/SSL/PublicSuffix.pm
-@@ -293,10 +293,8 @@ sub public_suffix {
-     sub _default_data {
- 	if ( ! defined $data ) {
- 	    $data = do { local $/; <DATA> };
--	    # known exceptions of behavior of SSL certificates from PSL
--	    $data .= "!googleapis.com\n";
--	    $data .= "!s3.amazonaws.com\n"; # RT#99702
--
-+	    $data =~s{^// ===END ICANN DOMAINS.*}{}ms
-+		or die "cannot find END ICANN DOMAINS";
- 	}
- 	return $data;
-     }
-diff --git a/t/public_suffix_lib.pl b/t/public_suffix_lib.pl
-index 66bdfe4..a9dc4c8 100644
---- a/t/public_suffix_lib.pl
-+++ b/t/public_suffix_lib.pl
-@@ -30,7 +30,7 @@ sub run_with_lib {
- 
-     require IO::Socket::SSL::PublicSuffix;
- 
--    plan tests => 83;
-+    plan tests => 79;
- 
- 
-     # all one-level, but co.uk two-level
-@@ -117,10 +117,14 @@ sub run_with_lib {
-     is public_suffix('example.com'), 'com';
-     is public_suffix('b.example.com'), 'com';
-     is public_suffix('a.b.example.com'), 'com';
--    is public_suffix('uk.com'), 'uk.com';
--    is public_suffix('example.uk.com'), 'uk.com';
--    is public_suffix('b.example.uk.com'), 'uk.com';
--    is public_suffix('a.b.example.uk.com'), 'uk.com';
-+
-+    # uk.com is not in the ICANN part of the list
-+    if(0) {
-+	is public_suffix('uk.com'), 'uk.com';
-+	is public_suffix('example.uk.com'), 'uk.com';
-+	is public_suffix('b.example.uk.com'), 'uk.com';
-+	is public_suffix('a.b.example.uk.com'), 'uk.com';
-+    }
-     is public_suffix('test.ac'), 'ac';
- 
-     # TLD with only one (wildcard) rule:
--- 
-2.1.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 12003fd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-use-only-ICANN-part-in-public-suffix-list.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libio-socket-ssl-perl.git



More information about the Pkg-perl-cvs-commits mailing list