summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/perl/perl-5.12.3/debian/cpanplus_config_path.diff
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-04-23 19:43:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-28 09:52:23 +0100
commit3a08c401f298095840a2aee9079845f5ff434410 (patch)
treeef5b13c0563c104a6068f1b76635800991a0a8f5 /meta/recipes-devtools/perl/perl-5.12.3/debian/cpanplus_config_path.diff
parent26858099bc104efc3b3d15d9298018285c551b9a (diff)
downloadopenembedded-core-3a08c401f298095840a2aee9079845f5ff434410.tar.gz
openembedded-core-3a08c401f298095840a2aee9079845f5ff434410.tar.bz2
openembedded-core-3a08c401f298095840a2aee9079845f5ff434410.tar.xz
openembedded-core-3a08c401f298095840a2aee9079845f5ff434410.zip
perl: upgrade from 5.12.2 to 5.12.3
And changed the perl tarball URL to more stable cpan location. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.3/debian/cpanplus_config_path.diff')
-rw-r--r--meta/recipes-devtools/perl/perl-5.12.3/debian/cpanplus_config_path.diff45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/debian/cpanplus_config_path.diff b/meta/recipes-devtools/perl/perl-5.12.3/debian/cpanplus_config_path.diff
new file mode 100644
index 000000000..8f2f5d2bd
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.12.3/debian/cpanplus_config_path.diff
@@ -0,0 +1,45 @@
+Upstream-Status:Inappropriate [debian patch]
+
+From: Niko Tyni <ntyni@debian.org>
+Subject: Save local versions of CPANPLUS::Config::System into /etc/perl.
+
+This is a configuration file and needs to go in /etc by policy.
+Besides, /usr may not even be writable.
+
+This mirrors the Debian setup of CPAN.pm in debian/cpan_config_path.
+
+See #533707.
+
+---
+ cpan/CPANPLUS/lib/CPANPLUS/Configure.pm | 1 +
+ cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm | 3 +++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
+index baac91d..a3794de 100644
+--- a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
++++ b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
+@@ -276,6 +276,7 @@ Saves the configuration to the package name you provided.
+ If this package is not C<CPANPLUS::Config::System>, it will
+ be saved in your C<.cpanplus> directory, otherwise it will
+ be attempted to be saved in the system wide directory.
++(On Debian systems, this system wide directory is /etc/perl.)
+
+ If no argument is provided, it will default to your personal
+ config.
+diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
+index 1a38200..6ee0d82 100644
+--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
++++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
+@@ -199,6 +199,9 @@ use constant CONFIG_USER_FILE => sub {
+ ) . '.pm';
+ };
+ use constant CONFIG_SYSTEM_FILE => sub {
++ # Debian-specific shortcut
++ return '/etc/perl/CPANPLUS/Config/System.pm';
++
+ require CPANPLUS::Internals;
+ require File::Basename;
+ my $dir = File::Basename::dirname(
+--
+tg: (a508b62..) debian/cpanplus_config_path (depends on: upstream)