[libnet-dns-perl] 01/02: Revert "Remove . from @INC when loading modules dynamically [CVE-2016-1238]."

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libnet-dns-perl.

commit 1c85afccfc1f8f17c58eccb6030d4ff3982cdfcf
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Oct 31 01:44:19 2016 +0100

    Revert "Remove . from @INC when loading modules dynamically [CVE-2016-1238]."
    
    This reverts commit b3183c15c75e4c8ef986b9ec4d489ca6a30b7585.
    
    The patch isn't needed after all, given that '.' has now been removed from
    @INC by default in sid.
---
 debian/patches/CVE-2016-1238.patch | 25 -------------------------
 debian/patches/series              |  1 -
 2 files changed, 26 deletions(-)

diff --git a/debian/patches/CVE-2016-1238.patch b/debian/patches/CVE-2016-1238.patch
deleted file mode 100644
index 4673aa2..0000000
--- a/debian/patches/CVE-2016-1238.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8acf39ad82f41049908cfc239e0fb3c3ff53f64 Mon Sep 17 00:00:00 2001
-From: Dominic Hargreaves <dom at earth.li>
-Date: Mon, 25 Jul 2016 10:22:43 +0100
-Subject: [PATCH] Remove . from @INC when loading modules dynamically
- [CVE-2016-1238]
-
----
- lib/Net/DNS/Domain.pm | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/lib/Net/DNS/Domain.pm
-+++ b/lib/Net/DNS/Domain.pm
-@@ -54,7 +54,11 @@
- 	LIBUTF8 && Encode::find_encoding('utf8');		# encoding object
- };
- 
--use constant LIBIDN => UTF8 && defined eval 'require Net::LibIDN';
-+use constant LIBIDN => UTF8 && defined eval {
-+	local @INC = @INC;
-+	pop @INC if $INC[-1] eq '.';
-+	require Net::LibIDN;
-+};
- 
- 
- # perlcc: address of encoding objects must be determined at runtime
diff --git a/debian/patches/series b/debian/patches/series
index 7d42970..5299247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-CVE-2016-1238.patch
 spelling.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libnet-dns-perl.git