r3376 - in /packages/libmodule-signature-perl/trunk: ./ debian/ inc/Module/ inc/Module/Install/ inc/Test/ lib/Module/

eloy at users.alioth.debian.org eloy at users.alioth.debian.org
Wed Aug 2 14:15:36 UTC 2006


Author: eloy
Date: Wed Aug  2 14:15:35 2006
New Revision: 3376

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=3376
Log:
eloy: new upstream version

Added:
    packages/libmodule-signature-perl/trunk/inc/Module/Install/External.pm
      - copied unchanged from r3375, packages/libmodule-signature-perl/branches/upstream/current/inc/Module/Install/External.pm
Removed:
    packages/libmodule-signature-perl/trunk/inc/Test/
Modified:
    packages/libmodule-signature-perl/trunk/AUTHORS
    packages/libmodule-signature-perl/trunk/Changes
    packages/libmodule-signature-perl/trunk/MANIFEST
    packages/libmodule-signature-perl/trunk/META.yml
    packages/libmodule-signature-perl/trunk/Makefile.PL
    packages/libmodule-signature-perl/trunk/SIGNATURE
    packages/libmodule-signature-perl/trunk/debian/changelog
    packages/libmodule-signature-perl/trunk/debian/control
    packages/libmodule-signature-perl/trunk/inc/Module/AutoInstall.pm
    packages/libmodule-signature-perl/trunk/inc/Module/Install.pm
    packages/libmodule-signature-perl/trunk/inc/Module/Install/AutoInstall.pm
    packages/libmodule-signature-perl/trunk/inc/Module/Install/Base.pm
    packages/libmodule-signature-perl/trunk/inc/Module/Install/Can.pm
    packages/libmodule-signature-perl/trunk/inc/Module/Install/Fetch.pm
    packages/libmodule-signature-perl/trunk/inc/Module/Install/Include.pm
    packages/libmodule-signature-perl/trunk/inc/Module/Install/Makefile.pm
    packages/libmodule-signature-perl/trunk/inc/Module/Install/Metadata.pm
    packages/libmodule-signature-perl/trunk/inc/Module/Install/Scripts.pm
    packages/libmodule-signature-perl/trunk/inc/Module/Install/Win32.pm
    packages/libmodule-signature-perl/trunk/inc/Module/Install/WriteAll.pm
    packages/libmodule-signature-perl/trunk/lib/Module/Signature.pm

Modified: packages/libmodule-signature-perl/trunk/AUTHORS
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/AUTHORS?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/AUTHORS (original)
+++ packages/libmodule-signature-perl/trunk/AUTHORS Wed Aug  2 14:15:35 2006
@@ -4,6 +4,7 @@
 the appropriate patches.  Corrections, additions, deletions welcome:
 
 Adam J. Foxson      (FOX)
+Adam J. Kennedy     (ADAMK)
 Alan Burlison       (ABURLISON)
 Arthur Bergman      (ABERGMAN)
 Andreas Koenig      (ANDK)

Modified: packages/libmodule-signature-perl/trunk/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/Changes?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/Changes (original)
+++ packages/libmodule-signature-perl/trunk/Changes Wed Aug  2 14:15:35 2006
@@ -1,3 +1,10 @@
+[Changes for 0.55 - 2006-07-29]
+
+* ANDK submitted a patch to fix versioning problem when
+  the user elects to install Crypt::OpenPGP.
+
+* Major refactoring of the Makefile.PL to ease the installation process.
+
 [Changes for 0.54 - 2006-05-12]
 
 * Fixed a long-standing bug where differing end-of-line conventions

Modified: packages/libmodule-signature-perl/trunk/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/MANIFEST?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/MANIFEST (original)
+++ packages/libmodule-signature-perl/trunk/MANIFEST Wed Aug  2 14:15:35 2006
@@ -6,6 +6,7 @@
 inc/Module/Install/AutoInstall.pm
 inc/Module/Install/Base.pm
 inc/Module/Install/Can.pm
+inc/Module/Install/External.pm
 inc/Module/Install/Fetch.pm
 inc/Module/Install/Include.pm
 inc/Module/Install/Makefile.pm
@@ -13,9 +14,6 @@
 inc/Module/Install/Scripts.pm
 inc/Module/Install/Win32.pm
 inc/Module/Install/WriteAll.pm
-inc/Test/Builder.pm
-inc/Test/Builder/Module.pm
-inc/Test/More.pm
 lib/Module/Signature.pm
 Makefile.PL
 MANIFEST			This list of files
@@ -23,6 +21,6 @@
 PAUSE2003.pub
 README
 script/cpansign
-SIGNATURE
 t/0-signature.t
 t/1-basic.t
+SIGNATURE                                Public-key signature (added by MakeMaker)

Modified: packages/libmodule-signature-perl/trunk/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/META.yml?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/META.yml (original)
+++ packages/libmodule-signature-perl/trunk/META.yml Wed Aug  2 14:15:35 2006
@@ -3,15 +3,14 @@
 build_requires: 
   Test::More: 0
 distribution_type: module
-generated_by: Module::Install version 0.62
+generated_by: Module::Install version 0.63
 license: MIT
 name: Module-Signature
 no_index: 
   directory: 
     - inc
     - t
-recommends: 
-  PAR::Dist: 0
 requires: 
+  IO::Socket::INET: 0
   perl: 5.005
-version: 0.54
+version: 0.55

Modified: packages/libmodule-signature-perl/trunk/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/Makefile.PL?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/Makefile.PL (original)
+++ packages/libmodule-signature-perl/trunk/Makefile.PL Wed Aug  2 14:15:35 2006
@@ -1,6 +1,3 @@
-#!/usr/bin/perl
-
-use 5.005;
 use inc::Module::Install;
 
 $|++;
@@ -9,128 +6,174 @@
 license         'MIT';
 all_from        'lib/Module/Signature.pm';
 install_script  'script/cpansign';
+build_requires  'Test::More';
 
-requires (can_cc() ? 'Digest::SHA' : 'Digest::SHA::PurePerl')
-    unless can_use 'Digest::SHA'
-        or can_use 'Digest::SHA1'
-        or can_use 'Digest::SHA::PurePerl';
+# On Win32 (excluding cygwin) we know that IO::Socket::INET,
+# which is needed for keyserver stuff, doesn't work. In fact
+# it potentially hangs forever. So bail out with a N/A on
+# Win32.
+if ( $^O eq 'MSWin32' and 0 ) {
+	print "Keyserver behaviour is dangerous unreliable on Win32\n";
+	print "Not installing on this platform.\n";
+	exit(255);
+} else {
+	requires 'IO::Socket::INET' => 0;
+}
 
-requires qw(
-    MIME::Base64
-    Compress::Zlib
-    Crypt::CBC
-    Crypt::DES
-    Crypt::Blowfish
-    Crypt::RIPEMD160
-    Tie::EncryptedHash
-    Class::Loader
-    Convert::ASCII::Armour
-    Data::Buffer    0.04
-    Digest::MD2
-    Math::Pari
-    Crypt::Random
-    Crypt::Primes
-    Crypt::DES_EDE3
-    Crypt::DSA
-    Crypt::RSA
-    Convert::ASN1
-    Convert::PEM
-    Crypt::OpenPGP  1.00
-) if want_openpgp();
+# We will need something to handle SHA1/256
+unless (
+	can_use('Digest::SHA')  or
+	can_use('Digest::SHA::PurePerl') or
+	(can_use('Digest::SHA1') and can_use('Digest::SHA256'))
+) {
+	# Nothing installed, we need to install a digest module
+	if ( can_cc() ) {
+		requires 'Digest::SHA';
+	} else {
+		requires 'Digest::SHA::PurePerl';
+	}
+}
 
-feature 'Display checksum differences', -default => 0, recommends qw(
-    Algorithm::Diff
-    Text::Diff
-) unless can_run 'diff';
+# The list of OpenPGP dependencies (which we use in several places)
+my @OPEN_PGP = qw{
+     MIME::Base64             0
+     Compress::Zlib           0
+     Crypt::CBC               0
+     Crypt::DES               0
+     Crypt::Blowfish          0
+     Crypt::RIPEMD160         0
+     Tie::EncryptedHash       0
+     Class::Loader            0
+     Convert::ASCII::Armour   0
+     Data::Buffer             0.04
+     Digest::MD2              0
+     Math::Pari               0
+     Crypt::Random            0
+     Crypt::Primes            0
+     Crypt::DES_EDE3          0
+     Crypt::DSA               0
+     Crypt::RSA               0
+     Convert::ASN1            0
+     Convert::PEM             0
+     Crypt::OpenPGP           1.00
+};
 
-feature 'Sign and verify PAR (Perl Archive) files', -default => 0, recommends qw(
-    PAR::Dist
-);
+# Is openpgp currently installed
+if ( can_use('Crypt::OpenPGP') ) {
+	# If OpenPGP is already installed, so relist all the
+	# dependencies so they will upgrade as needed.
+	requires( @OPEN_PGP );
 
-feature 'Support for SHA-256', -default => 0, recommends
-    (can_cc() ? 'Digest::SHA' : 'Digest::SHA::PurePerl')
-    unless can_use 'Digest::SHA'
-        or can_use 'Digest::SHA256'
-        or can_use 'Digest::SHA::PurePerl';
+} elsif ( locate_gpg() ) {
+	# We SHOULD have gpg, double-check formally
+	requires_external_bin 'gpg';
 
-auto_install
-    prerequisites_policy => 'follow';
+} elsif ( can_cc() and $ENV{AUTOMATED_TESTING} ) {
+	# Dive headlong into a full Crypt::OpenPGP install.
+	requires( @OPEN_PGP );
+} else {
+	# Ask the user what to do
+	ask_user();
+}
 
-build_requires  'Test::More';
-auto_include_deps;
+unless ( can_run('diff') ) {
+	# We know Text::Diff fails on Cygwin (for now)
+	if ( $^O ne 'Cygwin' ) {
+		requires 'Algorithm::Diff';
+		requires 'Text::Diff';
+	}
+}
 
+auto_install;
 sign; WriteAll;
 
-my $make = eval { require Config; $Config{make} } || 'make';
-print "\nNow, please enter '$make test' to test, and '$make install' to install.\n";
 
-sub locate_openpgp {
-    print "*** Looking for Crypt::OpenPGP (Pure-Perl OpenPGP implementation)...\n";
-    my $version = eval { require Crypt::OpenPGP; Crypt::OpenPGP->VERSION };
-    if ($version) {
-        print "Crypt::OpenPGP found (version $version), good.\n";
-        return 1;
-    }
+
+
+
+#####################################################################
+# Support Functions
+
+sub locate_gpg {
+	print "Looking for GNU Privacy Guard (gpg), a cryptographic signature tool...\n";
+
+	my $gpg = can_run('gpg');
+	my $has_gpg = (
+		$gpg and
+		`gpg --version` =~ /GnuPG/ and
+		defined `gpg --list-public-keys`
+	);
+
+	unless ( $has_gpg ) {
+		print "gpg not found.\n";
+		return;
+	}
+
+	print "GnuPG found ($gpg).\n";
+
+	return 1 if grep { /^--installdeps/} @ARGV;
+
+	if ( prompt("Import PAUSE and author keys to GnuPG?", 'y' ) =~ /^y/i) {
+		print 'Importing... ';
+		system 'gpg', '--quiet', '--import', glob('*.pub');
+		print "done.\n";
+	}
+
+	return 1;
 }
 
-sub locate_gpg {
-    print "*** Looking for GnuPG (GNU Privacy Guard, a cryptographic signature tool)...\n";
+# Defined the prompt messages
+my $message1 = <<'END_MESSAGE';
 
-    my $gpg = can_run('gpg');
-    my $has_gpg = (
-        $gpg and
-        `gpg --version` =~ /GnuPG/ and
-        defined `gpg --list-public-keys`
-    );
-
-    if ($has_gpg) {
-        print "GnuPG found ($gpg).\n";
-
-        return 1 if grep { /^--installdeps/} @ARGV;
-
-        if (prompt("Import PAUSE and author keys to GnuPG?", 'y') =~ /^y/i) {
-            print 'Importing... ';
-            system 'gpg', '--quiet', '--import', glob('*.pub');
-            print "done.\n";
-        }
-        return 1;
-    }
-
-    print "GnugPG not found anywhere in your PATH, eek.\n";
-    return;
-}
-
-sub want_openpgp {
-    return if (locate_gpg() or locate_openpgp());
-
-    print << '.';
+Could not auto-detect a signature utility on your system.
 
 What do you want me to do?
+
 1) Let you install GnuPG manually while I'm waiting for your answer;
-   it is available at http://www.gnupg.org/download/.
-.
+   it is available at http://www.gnupg.org/download/ or may be available
+   from your platforms packaging system (for Open Source platforms).
 
-    my $punt = 2;
-    if (can_cc()) {
-        $punt++;
-        print << '.';
+END_MESSAGE
+
+my $message2 = <<'END_MESSAGE';
+
 2) Automatically install Crypt::OpenPGP and the 20 modules it requires
    from CPAN, which will give the same functionality as GnuPG.
-.
-    }
 
-    print << ".";
-$punt) Forget this cryptographic signature stuff for now. 
-.
+END_MESSAGE
 
-    my $choice;
-    while (1) {
-        $choice = prompt("Your choice:", 3) || 3;
-        last if $choice =~ /^[123]$/;
-        print "Sorry, I cannot understand '$choice'.\n"
-    }
+sub ask_user {
+	# Present the options
+	print $message1;
 
-    goto &want_openpgp if $choice == 1;
-    return if $choice == $punt;
-    return 1;
+	my $option3 = 2;
+	if ( can_cc() ) {
+		$option3 = 3;
+		print $message2;
+	}
+
+	print <<"END_MESSAGE";
+
+$option3) Forget this cryptographic signature stuff for now.
+
+END_MESSAGE
+
+	my $choice;
+	foreach ( 1 .. 3 ) {
+		$choice = prompt("Your choice:", 3) || 3;
+		last if $choice =~ /^[123]$/;
+		print "Sorry, I cannot understand '$choice'.\n"
+	}
+
+	if ( $choice == 1 ) {
+		# They claim to have installed gpg
+		requires_external_bin 'gpg';
+	} elsif ( $choice == 2 and $option3 == 3 ) {
+		# They want to install Crypt::OpenPGP
+		requires( @OPEN_PGP );
+	} else {
+		# Forget about it...
+		print "Module::Signature is not wanted on this host.\n";
+		exit(255);
+	}
 }

Modified: packages/libmodule-signature-perl/trunk/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/SIGNATURE?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/SIGNATURE (original)
+++ packages/libmodule-signature-perl/trunk/SIGNATURE Wed Aug  2 14:15:35 2006
@@ -1,5 +1,5 @@
 This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.54.
+signed via the Module::Signature module, version 0.55.
 
 To verify the content in this distribution, first make sure you have
 Module::Signature installed, then type:
@@ -15,36 +15,34 @@
 Hash: SHA1
 
 SHA1 0b722678d07c66ef6992f2cc2c9e9acf3bef0ecb AUDREY2006.pub
-SHA1 6b29cb3b011d6dd95e512361c6b4ce2f5a8cdb17 AUTHORS
-SHA1 d22cf3e870ac265ac9e4a157bc811c5a813511ba Changes
-SHA1 1c0f4e6cdda728ea415bf23abfb4fc2b037ce6ee MANIFEST
-SHA1 021fae942bb13b82e0a5fd88b00230e341fb9166 META.yml
-SHA1 ed71661c09e0bf868ada85294f9d9eda7cc01d21 Makefile.PL
+SHA1 1e2b550757ebdf3ef2c0e8d1d06bcbb9c6b62a6f AUTHORS
+SHA1 8af2bc0eb8de2815948571a52a4d10764d389599 Changes
+SHA1 585041fba2c413f26294dd5bade84820be81b0d3 MANIFEST
+SHA1 5f76c68abf4c53cc80237ed397d2d1c893f815a0 META.yml
+SHA1 a5a6e61027d25366d58d4483984f21b313625ebc Makefile.PL
 SHA1 37e858c51409a297ef5d3fb35dc57cd3b57f9a4d PAUSE2003.pub
 SHA1 78d88b5919004c3cd19f2c468893d0b4a0233827 README
-SHA1 0bb5ddbe64424d40536acdee2f09e853ab39087d inc/Module/AutoInstall.pm
-SHA1 e28cf2d3ba35f6ca3a448acc7bee191b7c390379 inc/Module/Install.pm
-SHA1 d7013668911c86af441cad115b897fc675a472de inc/Module/Install/AutoInstall.pm
-SHA1 e7c1c86f57b6778f4bdc7fd8c1b950e60ef41bc0 inc/Module/Install/Base.pm
-SHA1 e1829448769445cdaac384a888bf9ccf42e0d89a inc/Module/Install/Can.pm
-SHA1 70aa5e2055e8e38b4eecc5fc8c91762c0e97f551 inc/Module/Install/Fetch.pm
-SHA1 8d88f2cb120f2e64f374136df2e25d0bb6f0595b inc/Module/Install/Include.pm
-SHA1 8ac832baf4f9e8e72d3e8f103cee6e8a94ac80e1 inc/Module/Install/Makefile.pm
-SHA1 0807e79d6dbfda4fcd3db0fc7df2e33e0cba263b inc/Module/Install/Metadata.pm
-SHA1 567fde53d9f24db2ab823d1031dec5e48f55def6 inc/Module/Install/Scripts.pm
-SHA1 4da0a1fce2339cc3f8c296c7716480d2564d9470 inc/Module/Install/Win32.pm
-SHA1 9a903a1d178954ad864c7dcc98f9fa5c005d1553 inc/Module/Install/WriteAll.pm
-SHA1 f0ebc594cf8ba858ee9a840c344d9b7ea2c3c6f4 inc/Test/Builder.pm
-SHA1 a9037004a2c3096d77169a16da95743eeb813539 inc/Test/Builder/Module.pm
-SHA1 07c750f370de7a44ee7b0ed9ec30a7e89c24c9b9 inc/Test/More.pm
-SHA1 58adc96719a7a6260d040ffe20000730a4e8cf1f lib/Module/Signature.pm
+SHA1 e974f78178f53c88fb7e3f8d20f7df184d13e1d0 inc/Module/AutoInstall.pm
+SHA1 017bedfcba1e0c72b36301e6ef21b8712b84d175 inc/Module/Install.pm
+SHA1 bcfb15c6a158831c45b5100a7aa94e0f88fced9f inc/Module/Install/AutoInstall.pm
+SHA1 b1a70869c098ba602151631386fc510b5bfd3511 inc/Module/Install/Base.pm
+SHA1 dd7313db23119d49ae78593bfa576554fb5b0fd8 inc/Module/Install/Can.pm
+SHA1 a796727e83961748d4e4211ffdfaa92da260e704 inc/Module/Install/External.pm
+SHA1 7c3a5153a5574556d895f23e121a41e680da11c1 inc/Module/Install/Fetch.pm
+SHA1 2e9c012e58c778a4a83c5eaea20c3aed306ad0c5 inc/Module/Install/Include.pm
+SHA1 176d68fe7c07b6ab7cfe09093078b8127bbde786 inc/Module/Install/Makefile.pm
+SHA1 8b37b38215d14f922b3d5132ce33d11d21d531ba inc/Module/Install/Metadata.pm
+SHA1 1d8f4739eda5d665bbfe4206bd87274ad104ba77 inc/Module/Install/Scripts.pm
+SHA1 7eb44b00058c44795038d7fa4c0c77470f20a7f8 inc/Module/Install/Win32.pm
+SHA1 6d05967a5e1680b5f118315aaa6b8a1e143d79d8 inc/Module/Install/WriteAll.pm
+SHA1 98fba81c6d713a2ecfe901d7931030dc72576bbf lib/Module/Signature.pm
 SHA1 0882c50213a28b7a30fc91fd58c19015f33348d0 script/cpansign
 SHA1 4aeb184c9bed26ab6c3be1ebdb8470c0cb353b1f t/0-signature.t
 SHA1 307a744384e704d94031df73233f24174b843bc8 t/1-basic.t
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (FreeBSD)
+Version: GnuPG v1.4.3 (Darwin)
 
-iD8DBQFEY3A4tLPdNzw1AaARArGWAJsGBCNCPU5SfuFYAvuFtZ9ArId3ewCglzZD
-0XM+u4FidKFjD9nAaalVyU4=
-=sxvS
+iD8DBQFEzAc/tLPdNzw1AaARAiSeAJ4mha0FHsfW10YCNE7cxeW1qk0wVACglKXv
+4yYZJdSvV+95Y5ZwhEZZrrE=
+=gNql
 -----END PGP SIGNATURE-----

Modified: packages/libmodule-signature-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/debian/changelog?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/debian/changelog (original)
+++ packages/libmodule-signature-perl/trunk/debian/changelog Wed Aug  2 14:15:35 2006
@@ -1,3 +1,11 @@
+libmodule-signature-perl (0.55-1) unstable; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+  * debian/control:
+   + Standards-Version: increased to 3.7.2.1
+
+ -- Krzysztof Krzyzaniak (eloy) <eloy at debian.org>  Wed,  2 Aug 2006 16:13:43 +0200
+
 libmodule-signature-perl (0.54-1) unstable; urgency=low
 
   * New upstream release.
@@ -67,4 +75,3 @@
   * Initial Release.
 
  -- Chip Salzenberg <chip at debian.org>  Sat, 15 Feb 2003 15:18:20 -0500
-

Modified: packages/libmodule-signature-perl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/debian/control?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/debian/control (original)
+++ packages/libmodule-signature-perl/trunk/debian/control Wed Aug  2 14:15:35 2006
@@ -5,7 +5,7 @@
 Build-Depends-Indep: perl (>= 5.8.0-7), libtest-simple-perl, libdigest-sha1-perl, libdigest-sha-perl, libpar-dist-perl, gnupg
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.2.1
 
 Package: libmodule-signature-perl
 Architecture: all

Modified: packages/libmodule-signature-perl/trunk/inc/Module/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/AutoInstall.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/AutoInstall.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/AutoInstall.pm Wed Aug  2 14:15:35 2006
@@ -639,7 +639,9 @@
 
     # check for version numbers that are not in decimal format
     if ( ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./ ) {
-        if ( $version::VERSION or defined( _load('version') ) ) {
+        if ( ( $version::VERSION or defined( _load('version') )) and
+             version->can('new') 
+            ) {
 
             # use version.pm if it is installed.
             return (
@@ -750,4 +752,4 @@
 
 __END__
 
-#line 988
+#line 990

Modified: packages/libmodule-signature-perl/trunk/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/Install.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/Install.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/Install.pm Wed Aug  2 14:15:35 2006
@@ -28,7 +28,7 @@
     # This is not enforced yet, but will be some time in the next few
     # releases once we can make sure it won't clash with custom
     # Module::Install extensions.
-    $VERSION = '0.62';
+    $VERSION = '0.63';
 }
 
 # Whether or not inc::Module::Install is actually loaded, the
@@ -47,6 +47,22 @@
 not:
 
     use ${\__PACKAGE__};
+
+END_DIE
+}
+
+# If the script that is loading Module::Install is from the future,
+# then make will detect this and cause it to re-run over and over
+# again. This is bad. Rather than taking action to touch it (which
+# is unreliable on some platforms and requires write permissions)
+# for now we should catch this and refuse to run.
+if ( -f $0 and (stat($0))[9] > time ) {
+	die << "END_DIE";
+Your installer $0 has a modification time in the future.
+
+This is known to create infinite loops in make.
+
+Please correct this, then run $0 again.
 
 END_DIE
 }

Modified: packages/libmodule-signature-perl/trunk/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/Install/AutoInstall.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/Install/AutoInstall.pm Wed Aug  2 14:15:35 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.62';
+	$VERSION = '0.63';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: packages/libmodule-signature-perl/trunk/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/Install/Base.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/Install/Base.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/Install/Base.pm Wed Aug  2 14:15:35 2006
@@ -1,7 +1,7 @@
 #line 1
 package Module::Install::Base;
 
-$VERSION = '0.62';
+$VERSION = '0.63';
 
 # Suspend handler for "redefined" warnings
 BEGIN {

Modified: packages/libmodule-signature-perl/trunk/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/Install/Can.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/Install/Can.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/Install/Can.pm Wed Aug  2 14:15:35 2006
@@ -11,7 +11,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.62';
+	$VERSION = '0.63';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: packages/libmodule-signature-perl/trunk/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/Install/Fetch.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/Install/Fetch.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/Install/Fetch.pm Wed Aug  2 14:15:35 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.62';
+	$VERSION = '0.63';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: packages/libmodule-signature-perl/trunk/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/Install/Include.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/Install/Include.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/Install/Include.pm Wed Aug  2 14:15:35 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.62';
+	$VERSION = '0.63';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: packages/libmodule-signature-perl/trunk/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/Install/Makefile.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/Install/Makefile.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/Install/Makefile.pm Wed Aug  2 14:15:35 2006
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.62';
+	$VERSION = '0.63';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: packages/libmodule-signature-perl/trunk/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/Install/Metadata.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/Install/Metadata.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/Install/Metadata.pm Wed Aug  2 14:15:35 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.62';
+	$VERSION = '0.63';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }
@@ -123,9 +123,9 @@
 
     require Module::Build;
     my $build = Module::Build->new(
-        dist_name    => $self->{name},
-        dist_version => $self->{version},
-        license      => $self->{license},
+        dist_name    => $self->name,
+        dist_version => $self->version,
+        license      => $self->license,
     );
     $self->provides(%{ $build->find_dist_packages || {} });
 }

Modified: packages/libmodule-signature-perl/trunk/inc/Module/Install/Scripts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/Install/Scripts.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/Install/Scripts.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/Install/Scripts.pm Wed Aug  2 14:15:35 2006
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.62';
+	$VERSION = '0.63';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: packages/libmodule-signature-perl/trunk/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/Install/Win32.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/Install/Win32.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/Install/Win32.pm Wed Aug  2 14:15:35 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.62';
+	$VERSION = '0.63';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: packages/libmodule-signature-perl/trunk/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/inc/Module/Install/WriteAll.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/inc/Module/Install/WriteAll.pm (original)
+++ packages/libmodule-signature-perl/trunk/inc/Module/Install/WriteAll.pm Wed Aug  2 14:15:35 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.62';
+	$VERSION = '0.63';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: packages/libmodule-signature-perl/trunk/lib/Module/Signature.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmodule-signature-perl/trunk/lib/Module/Signature.pm?rev=3376&op=diff
==============================================================================
--- packages/libmodule-signature-perl/trunk/lib/Module/Signature.pm (original)
+++ packages/libmodule-signature-perl/trunk/lib/Module/Signature.pm Wed Aug  2 14:15:35 2006
@@ -1,5 +1,5 @@
 package Module::Signature;
-$Module::Signature::VERSION = '0.54';
+$Module::Signature::VERSION = '0.55';
 
 use 5.005;
 use strict;




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