diff options
author | Tudor Florea <tudor.florea@enea.com> | 2014-10-16 03:05:19 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2014-10-16 03:05:19 +0200 |
commit | c527fd1f14c27855a37f2e8ac5346ce8d940ced2 (patch) | |
tree | bb002c1fdf011c41dbd2f0927bed23ecb5f83c97 /meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff | |
download | poky-daisy-140929.tar.gz |
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff | 154 |
1 files changed, 154 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff new file mode 100644 index 0000000000..aa9307fc8a --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fixes/respect_umask.diff | |||
@@ -0,0 +1,154 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From 0d1ab4f799eb14d5488fcc959f4a6bdec548b370 Mon Sep 17 00:00:00 2001 | ||
3 | From: Brendan O'Dea <bod@debian.org> | ||
4 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
5 | Subject: Respect umask during installation | ||
6 | |||
7 | This is needed to satisfy Debian policy regarding group-writable | ||
8 | site directories. | ||
9 | |||
10 | Patch-Name: fixes/respect_umask.diff | ||
11 | --- | ||
12 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 18 +++++++++--------- | ||
13 | dist/ExtUtils-Install/lib/ExtUtils/Install.pm | 18 +++++++++--------- | ||
14 | 2 files changed, 18 insertions(+), 18 deletions(-) | ||
15 | |||
16 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
17 | index 6964eea..865d36d 100644 | ||
18 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
19 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
20 | @@ -2053,7 +2053,7 @@ doc__install : doc_site_install | ||
21 | $(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site | ||
22 | |||
23 | pure_perl_install :: all | ||
24 | - $(NOECHO) $(MOD_INSTALL) \ | ||
25 | + $(NOECHO) umask 022; $(MOD_INSTALL) \ | ||
26 | read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ | ||
27 | write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ | ||
28 | $(INST_LIB) $(DESTINSTALLPRIVLIB) \ | ||
29 | @@ -2067,7 +2067,7 @@ pure_perl_install :: all | ||
30 | |||
31 | |||
32 | pure_site_install :: all | ||
33 | - $(NOECHO) $(MOD_INSTALL) \ | ||
34 | + $(NOECHO) umask 022; $(MOD_INSTALL) \ | ||
35 | read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ | ||
36 | write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \ | ||
37 | $(INST_LIB) $(DESTINSTALLSITELIB) \ | ||
38 | @@ -2080,7 +2080,7 @@ pure_site_install :: all | ||
39 | }.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{ | ||
40 | |||
41 | pure_vendor_install :: all | ||
42 | - $(NOECHO) $(MOD_INSTALL) \ | ||
43 | + $(NOECHO) umask 022; $(MOD_INSTALL) \ | ||
44 | read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ | ||
45 | write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \ | ||
46 | $(INST_LIB) $(DESTINSTALLVENDORLIB) \ | ||
47 | @@ -2092,8 +2092,8 @@ pure_vendor_install :: all | ||
48 | |||
49 | doc_perl_install :: all | ||
50 | $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
51 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
52 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
53 | + -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
54 | + -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
55 | "Module" "$(NAME)" \ | ||
56 | "installed into" "$(INSTALLPRIVLIB)" \ | ||
57 | LINKTYPE "$(LINKTYPE)" \ | ||
58 | @@ -2103,8 +2103,8 @@ doc_perl_install :: all | ||
59 | |||
60 | doc_site_install :: all | ||
61 | $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
62 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
63 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
64 | + -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
65 | + -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
66 | "Module" "$(NAME)" \ | ||
67 | "installed into" "$(INSTALLSITELIB)" \ | ||
68 | LINKTYPE "$(LINKTYPE)" \ | ||
69 | @@ -2114,8 +2114,8 @@ doc_site_install :: all | ||
70 | |||
71 | doc_vendor_install :: all | ||
72 | $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
73 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
74 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
75 | + -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
76 | + -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
77 | "Module" "$(NAME)" \ | ||
78 | "installed into" "$(INSTALLVENDORLIB)" \ | ||
79 | LINKTYPE "$(LINKTYPE)" \ | ||
80 | diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm | ||
81 | index 3b030a5..cb0e9e0 100644 | ||
82 | --- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm | ||
83 | +++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm | ||
84 | @@ -468,7 +468,7 @@ sub _can_write_dir { | ||
85 | |||
86 | =pod | ||
87 | |||
88 | -=item _mkpath($dir,$show,$mode,$verbose,$dry_run) | ||
89 | +=item _mkpath($dir,$show,$verbose,$dry_run) | ||
90 | |||
91 | Wrapper around File::Path::mkpath() to handle errors. | ||
92 | |||
93 | @@ -485,13 +485,13 @@ writable. | ||
94 | =cut | ||
95 | |||
96 | sub _mkpath { | ||
97 | - my ($dir,$show,$mode,$verbose,$dry_run)=@_; | ||
98 | + my ($dir,$show,$verbose,$dry_run)=@_; | ||
99 | if ( $verbose && $verbose > 1 && ! -d $dir) { | ||
100 | $show= 1; | ||
101 | - printf "mkpath(%s,%d,%#o)\n", $dir, $show, $mode; | ||
102 | + printf "mkpath(%s,%d)\n", $dir, $show; | ||
103 | } | ||
104 | if (!$dry_run) { | ||
105 | - if ( ! eval { File::Path::mkpath($dir,$show,$mode); 1 } ) { | ||
106 | + if ( ! eval { File::Path::mkpath($dir,$show); 1 } ) { | ||
107 | _choke("Can't create '$dir'","$@"); | ||
108 | } | ||
109 | |||
110 | @@ -796,7 +796,7 @@ sub install { #XXX OS-SPECIFIC | ||
111 | _chdir($cwd); | ||
112 | } | ||
113 | foreach my $targetdir (sort keys %check_dirs) { | ||
114 | - _mkpath( $targetdir, 0, 0755, $verbose, $dry_run ); | ||
115 | + _mkpath( $targetdir, 0, $verbose, $dry_run ); | ||
116 | } | ||
117 | foreach my $found (@found_files) { | ||
118 | my ($diff, $ffd, $origfile, $mode, $size, $atime, $mtime, | ||
119 | @@ -810,7 +810,7 @@ sub install { #XXX OS-SPECIFIC | ||
120 | $targetfile= _unlink_or_rename( $targetfile, 'tryhard', 'install' ) | ||
121 | unless $dry_run; | ||
122 | } elsif ( ! -d $targetdir ) { | ||
123 | - _mkpath( $targetdir, 0, 0755, $verbose, $dry_run ); | ||
124 | + _mkpath( $targetdir, 0, $verbose, $dry_run ); | ||
125 | } | ||
126 | print "Installing $targetfile\n"; | ||
127 | |||
128 | @@ -850,7 +850,7 @@ sub install { #XXX OS-SPECIFIC | ||
129 | |||
130 | if ($pack{'write'}) { | ||
131 | $dir = install_rooted_dir(dirname($pack{'write'})); | ||
132 | - _mkpath( $dir, 0, 0755, $verbose, $dry_run ); | ||
133 | + _mkpath( $dir, 0, $verbose, $dry_run ); | ||
134 | print "Writing $pack{'write'}\n" if $verbose; | ||
135 | $packlist->write(install_rooted_file($pack{'write'})) unless $dry_run; | ||
136 | } | ||
137 | @@ -1190,7 +1190,7 @@ be prepended as a directory to each installed file (and directory). | ||
138 | sub pm_to_blib { | ||
139 | my($fromto,$autodir,$pm_filter) = @_; | ||
140 | |||
141 | - _mkpath($autodir,0,0755); | ||
142 | + _mkpath($autodir,0); | ||
143 | while(my($from, $to) = each %$fromto) { | ||
144 | if( -f $to && -s $from == -s $to && -M $to < -M $from ) { | ||
145 | print "Skip $to (unchanged)\n"; | ||
146 | @@ -1213,7 +1213,7 @@ sub pm_to_blib { | ||
147 | # we wont try hard here. its too likely to mess things up. | ||
148 | forceunlink($to); | ||
149 | } else { | ||
150 | - _mkpath(dirname($to),0,0755); | ||
151 | + _mkpath(dirname($to),0); | ||
152 | } | ||
153 | if ($need_filtering) { | ||
154 | run_filter($pm_filter, $from, $to); | ||