1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
From 30cfc2bf7a7360e6f7e05f6c37b7afbcb5c4847d Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories.
Bug-Debian: http://bugs.debian.org/290336
- ignore missing directories,
- follow symlinks (/usr/share/perl/5.8 -> 5.8.4).
- filter "." out when running "enc2xs -C", it's unnecessary and causes
issues with follow => 1 (see #603686 and [rt.cpan.org #64585])
Patch-Name: debian/enc2xs_inc.diff
---
cpan/Encode/bin/enc2xs | 8 ++++----
t/porting/customized.t | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
index f8d9f52f2a..5f6bb43fea 100644
--- a/cpan/Encode/bin/enc2xs
+++ b/cpan/Encode/bin/enc2xs
@@ -985,11 +985,11 @@ use vars qw(
sub find_e2x{
eval { require File::Find; };
my (@inc, %e2x_dir);
- for my $inc (@INC){
+ for my $inc (grep -d, @INC){
push @inc, $inc unless $inc eq '.'; #skip current dir
}
File::Find::find(
- sub {
+ { wanted => sub {
my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
$atime,$mtime,$ctime,$blksize,$blocks)
= lstat($_) or return;
@@ -999,7 +999,7 @@ sub find_e2x{
$e2x_dir{$File::Find::dir} ||= $mtime;
}
return;
- }, @inc);
+ }, follow => 1}, @inc);
warn join("\n", keys %e2x_dir), "\n";
for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){
$_E2X = $d;
@@ -1066,7 +1066,7 @@ sub make_configlocal_pm {
$LocalMod{$enc} ||= $mod;
}
};
- File::Find::find({wanted => $wanted}, @INC);
+ File::Find::find({wanted => $wanted, follow => 1}, grep -d && !/^\./, @INC);
$_ModLines = "";
for my $enc ( sort keys %LocalMod ) {
$_ModLines .=
diff --git a/t/porting/customized.t b/t/porting/customized.t
index 45fcafb100..3bd6adb33a 100644
--- a/t/porting/customized.t
+++ b/t/porting/customized.t
@@ -101,8 +101,11 @@ foreach my $module ( sort keys %Modules ) {
print $data_fh join(' ', $module, $file, $id), "\n";
next;
}
+SKIP: {
+ skip("$file modified for Debian", 1) if $file eq 'cpan/Encode/bin/enc2xs';
my $should_be = $customised{ $module }->{ $file };
is( $id, $should_be, "SHA for $file matches stashed SHA" );
+}
}
}
|
