r67132 - in /branches/squeeze/liblocal-lib-perl/debian: changelog control patches/ patches/fix-ftbfs-609192.patch patches/series

carnil at users.alioth.debian.org carnil at users.alioth.debian.org
Fri Jan 7 12:36:01 UTC 2011


Author: carnil
Date: Fri Jan  7 12:35:50 2011
New Revision: 67132

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=67132
Log:
* Update my email address.
* Patch Makefile.PL with fix-ftbfs-609192.patch to avoids CPAN client
  configuration when not required which causes FTBFS if building user
  home directory is not writeable (Closes: #609192).

Added:
    branches/squeeze/liblocal-lib-perl/debian/patches/
    branches/squeeze/liblocal-lib-perl/debian/patches/fix-ftbfs-609192.patch
    branches/squeeze/liblocal-lib-perl/debian/patches/series
Modified:
    branches/squeeze/liblocal-lib-perl/debian/changelog
    branches/squeeze/liblocal-lib-perl/debian/control

Modified: branches/squeeze/liblocal-lib-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/squeeze/liblocal-lib-perl/debian/changelog?rev=67132&op=diff
==============================================================================
--- branches/squeeze/liblocal-lib-perl/debian/changelog (original)
+++ branches/squeeze/liblocal-lib-perl/debian/changelog Fri Jan  7 12:35:50 2011
@@ -1,3 +1,12 @@
+liblocal-lib-perl (1.006005-1+squeeze1) testing-proposed-updates; urgency=low
+
+  * Update my email address.
+  * Patch Makefile.PL with fix-ftbfs-609192.patch to avoids CPAN client
+    configuration when not required which causes FTBFS if building user
+    home directory is not writeable (Closes: #609192).
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Fri, 07 Jan 2011 09:36:54 +0100
+
 liblocal-lib-perl (1.006005-1) unstable; urgency=low
 
   * New upstream release

Modified: branches/squeeze/liblocal-lib-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/branches/squeeze/liblocal-lib-perl/debian/control?rev=67132&op=diff
==============================================================================
--- branches/squeeze/liblocal-lib-perl/debian/control (original)
+++ branches/squeeze/liblocal-lib-perl/debian/control Fri Jan  7 12:35:50 2011
@@ -5,7 +5,7 @@
 Build-Depends-Indep: perl (>= 5.10), libcapture-tiny-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonathan Yu <jawnsy at cpan.org>, gregor herrmann <gregoa at debian.org>,
- Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>
+ Salvatore Bonaccorso <carnil at debian.org>
 Standards-Version: 3.9.0
 Homepage: http://search.cpan.org/dist/local-lib/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/liblocal-lib-perl/

Added: branches/squeeze/liblocal-lib-perl/debian/patches/fix-ftbfs-609192.patch
URL: http://svn.debian.org/wsvn/pkg-perl/branches/squeeze/liblocal-lib-perl/debian/patches/fix-ftbfs-609192.patch?rev=67132&op=file
==============================================================================
--- branches/squeeze/liblocal-lib-perl/debian/patches/fix-ftbfs-609192.patch (added)
+++ branches/squeeze/liblocal-lib-perl/debian/patches/fix-ftbfs-609192.patch Fri Jan  7 12:35:50 2011
@@ -1,0 +1,86 @@
+Description: Fix FTBFS when homedirectory of building user is not
+ writeable.
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/609192
+Forwarded: no
+Author: Salvatore Bonaccorso <carnil at debian.org>
+Reviewed-by: Salvatore Bonaccorso <carnil at debian.org>
+Last-Update: 2011-01-07
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -92,7 +92,8 @@
+     my $cpan = $? >> 8;
+     my $cpan_command = '';
+ 
+-    system($^X, '-MCPAN', '-e',
++    my $did_cpan_config = 0;
++    my $cpan_config_command =
+       'my $done; require ExtUtils::MakeMaker;
+        my $orig = ExtUtils::MakeMaker->can("prompt");
+        *ExtUtils::MakeMaker::prompt = sub ($;$) {
+@@ -121,8 +122,7 @@
+          delete @{$CPAN::Config}{keys %$CPAN::Config};
+          $CPAN::Config->{urllist} = $save;
+          CPAN::Config->init;
+-       }'
+-    );
++       }';
+ 
+     $ENV{PERL_MM_USE_DEFAULT} = 1;
+ 
+@@ -138,6 +138,8 @@
+       $cpan_command .= 'force("install","CPAN"); ';
+     }
+     if(length $cpan_command) {
++      system($^X, '-MCPAN', '-e', $cpan_config_command);
++      $did_cpan_config++;
+       system($^X, '-MCPAN', '-e', $cpan_command);
+     }
+     if ($cpan) {
+@@ -147,6 +149,8 @@
+       # if we call this code directly, the changes get written to
+       # $BOOTSTRAP/lib/perl5/CPAN/Config.pm, not where the user expects them to
+       # be in their ~/.cpan/CPAN/MyConfig.pm.
++      system($^X, '-MCPAN', '-e', $cpan_config_command)
++        unless $did_cpan_config;
+       system($^X, '-MCPAN',
+         '-e', 
+         q[CPAN::HandleConfig->load;],
+@@ -200,25 +204,27 @@
+     # It will already be installed by the time we reach here if bootstrapping,
+     # otherwise, if we're running from CPAN then it will be installed soon
+     # enough, and we'll come back here..
+-    if (!$@) {
+-        CPAN::HandleConfig->load;
+-        for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
+-            if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
+-                die <<"DEATH";
++    if (!$@ ) {
++        CPAN::HandleConfig->require_myconfig_or_config;
++        if ( $CPAN::Config ) {
++            for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
++                if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
++                    die <<"DEATH";
+ WHOA THERE! It looks like you've got $CPAN::Config->{$eumm_setting} set. This is
+ known to cause problems with local::lib. Please either remove this setting or
+ clear out your .cpan directory.
+ DEATH
++                }
+             }
+-        }
+ 
+-        for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
+-            if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
+-                die <<"DEATH";
++            for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
++                if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
++                    die <<"DEATH";
+ WHOA THERE! It looks like you've got $CPAN::Config->{$mb_setting} set. This is
+ known to cause problems with local::lib. Please either remove this setting or
+ clear out your .cpan directory.
+ DEATH
++                }
+             }
+         }
+     }

Added: branches/squeeze/liblocal-lib-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/branches/squeeze/liblocal-lib-perl/debian/patches/series?rev=67132&op=file
==============================================================================
--- branches/squeeze/liblocal-lib-perl/debian/patches/series (added)
+++ branches/squeeze/liblocal-lib-perl/debian/patches/series Fri Jan  7 12:35:50 2011
@@ -1,0 +1,1 @@
+fix-ftbfs-609192.patch




More information about the Pkg-perl-cvs-commits mailing list