[libmodule-build-perl] 02/04: Refresh patches (run-debcherry)

[Florian Schlichting]

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

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

commit e386d4ed1a80859edf6e1535730b3639ebeebcb5
Author: Florian Schlichting <fsfs at debian.org>
Date:   Tue Oct 11 21:40:26 2016 +0200

    Refresh patches (run-debcherry)
---
 ...03-Make-Module-Build-set-PERL_UNSAFE_INC.patch} |  0
 ...file-lists-generated-by-rscan_dir-to-sort.patch | 32 ----------------------
 debian/patches/man-ext                             |  4 +--
 debian/patches/series                              |  3 +-
 4 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/debian/patches/0004-Make-Module-Build-set-PERL_UNSAFE_INC.patch b/debian/patches/0003-Make-Module-Build-set-PERL_UNSAFE_INC.patch
similarity index 100%
rename from debian/patches/0004-Make-Module-Build-set-PERL_UNSAFE_INC.patch
rename to debian/patches/0003-Make-Module-Build-set-PERL_UNSAFE_INC.patch
diff --git a/debian/patches/0003-Preprocess-file-lists-generated-by-rscan_dir-to-sort.patch b/debian/patches/0003-Preprocess-file-lists-generated-by-rscan_dir-to-sort.patch
deleted file mode 100644
index 503cca0..0000000
--- a/debian/patches/0003-Preprocess-file-lists-generated-by-rscan_dir-to-sort.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Niko Tyni <ntyni at debian.org>
-Date: Tue, 1 Sep 2015 22:05:27 +0300
-Subject: [PATCH] Preprocess file lists generated by rscan_dir() to sort them
-
-The rscan_dir() function traverses a directory with File::Find,
-which returns files in readdir() order. This order is nondeterministic
-and depends on the file system.
-
-The lists are used, among other things, to find C files to compile
-(in process_support_files()) and later to link (in c_link()).
-The linking order affects the generated binary, essentially rendering
-it nondeterministic and breaking reproducibility.
-
-Bug-Debian: https://bugs.debian.org/797709
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=106813
----
-
- lib/Module/Build/Base.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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
-@@ -5249,7 +5249,7 @@ sub rscan_dir {
-              ref($pattern) eq 'CODE' ? sub {push @result, $File::Find::name if $pattern->()} :
-              die "Unknown pattern type";
- 
--  File::Find::find({wanted => $subr, no_chdir => 1}, $dir);
-+  File::Find::find({wanted => $subr, no_chdir => 1, preprocess => sub { sort @_ }}, $dir);
-   return \@result;
- }
- 
diff --git a/debian/patches/man-ext b/debian/patches/man-ext
index 9cf5a54..217d64c 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
-@@ -3207,7 +3207,7 @@ sub ACTION_manpages {
+@@ -3212,7 +3212,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$') ] );
-@@ -3234,7 +3234,7 @@ sub manify_bin_pods {
+@@ -3239,7 +3239,7 @@ sub manify_bin_pods {
  
  sub manify_lib_pods {
    my $self    = shift;
diff --git a/debian/patches/series b/debian/patches/series
index 96d13ee..0f4ab66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # exported from git by git-debcherry
 man-ext
 0001-Allow-loading-from-system-path-when-running-under-au.patch
-0003-Preprocess-file-lists-generated-by-rscan_dir-to-sort.patch
-0004-Make-Module-Build-set-PERL_UNSAFE_INC.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