[libmodule-build-perl] 06/08: Update patches with git-debcherry.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libmodule-build-perl.

commit b7ba659131db4c630657845269ac522a39d36222
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Jun 19 19:23:41 2017 +0200

    Update patches with git-debcherry.
    
    - Remove 0003-Make-Module-Build-set-PERL_UNSAFE_INC.patch (fixed upstream)
    - Refresh patch man-ext (offset)
---
 ...003-Make-Module-Build-set-PERL_UNSAFE_INC.patch | 26 ----------------------
 debian/patches/man-ext                             |  4 ++--
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/debian/patches/0003-Make-Module-Build-set-PERL_UNSAFE_INC.patch b/debian/patches/0003-Make-Module-Build-set-PERL_UNSAFE_INC.patch
deleted file mode 100644
index 55ad224..0000000
--- a/debian/patches/0003-Make-Module-Build-set-PERL_UNSAFE_INC.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Niko Tyni <ntyni at debian.org>
-Date: Fri, 8 Jul 2016 15:55:37 +0200
-Subject: [PATCH] Make Module::Build set PERL_UNSAFE_INC.
-
-Cf. CVE-2016-1238
-
-Author: Todd Rinaldo <toddr at cpan.org>
-Origin: https://gist.githubusercontent.com/toddr/d77d8d5fa9caa8f96b7758a126caa4dc/raw/3b1a327efdd9a6babf5eed8fb9c241a6d4909be6/fix.patch
-Bug: https://github.com/Perl-Toolchain-Gang/Module-Build/issues/69
----
-
- lib/Module/Build/Base.pm | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/Module/Build/Base.pm b/lib/Module/Build/Base.pm
---- a/lib/Module/Build/Base.pm
-+++ b/lib/Module/Build/Base.pm
-@@ -1860,6 +1860,8 @@ BEGIN {
-     (
- $quoted_INC
-     );
-+  push \@INC, "." unless grep { \$_ eq "." } \@INC; # Force my process to include . in \@INC.
-+  \$ENV{"PERL_USE_UNSAFE_INC"} = 1; # Force all child processes to include . in \@INC.
- }
- 
- close(*DATA) unless eof(*DATA); # ensure no open handles to this script
diff --git a/debian/patches/man-ext b/debian/patches/man-ext
index 217d64c..15fc4f6 100644
--- a/debian/patches/man-ext
+++ b/debian/patches/man-ext
@@ -14,7 +14,7 @@ Patch-Name: man-ext
 diff --git a/lib/Module/Build/Base.pm b/lib/Module/Build/Base.pm
 --- a/lib/Module/Build/Base.pm
 +++ b/lib/Module/Build/Base.pm
-@@ -3212,7 +3212,7 @@ sub ACTION_manpages {
+@@ -3218,7 +3218,7 @@ sub ACTION_manpages {
  
  sub manify_bin_pods {
    my $self    = shift;
@@ -23,7 +23,7 @@ diff --git a/lib/Module/Build/Base.pm b/lib/Module/Build/Base.pm
  
    my $files   = $self->_find_pods( $self->{properties}{bindoc_dirs},
                                     exclude => [ $self->file_qr('\.bat$') ] );
-@@ -3239,7 +3239,7 @@ sub manify_bin_pods {
+@@ -3245,7 +3245,7 @@ sub manify_bin_pods {
  
  sub manify_lib_pods {
    my $self    = shift;
diff --git a/debian/patches/series b/debian/patches/series
index 0f4ab66..9876b21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 # exported from git by git-debcherry
 man-ext
 0001-Allow-loading-from-system-path-when-running-under-au.patch
-0003-Make-Module-Build-set-PERL_UNSAFE_INC.patch

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