Upgrade to real CPAN.pm 1.76.

p4raw-id: //depot/perl@20383

diff --git a/MANIFEST b/MANIFEST
index cc2b4f5..2b40f3e 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1048,10 +1048,14 @@ lib/constant.t                  See if compile-time constants work
 lib/CPAN.pm                    Interface to Comprehensive Perl Archive Network
 lib/CPAN/bin/cpan              easily interact with CPAN from the command line
 lib/CPAN/FirstTime.pm          Utility for creating CPAN config files
+lib/CPAN/META.yml              CPAN metainfo
 lib/CPAN/Nox.pm                        Runs CPAN while avoiding compiled extensions
+lib/CPAN/PAUSE2003.pub         CPAN public key
+lib/CPAN/SIGNATURE             CPAN signature
 lib/CPAN/t/loadme.t            See if CPAN the module works
 lib/CPAN/t/mirroredby.t                See if CPAN::Mirrored::By works
 lib/CPAN/t/Nox.t               See if CPAN::Nox works
+lib/CPAN/t/signature.t         CPAN signature test
 lib/CPAN/t/vcmp.t              See if CPAN the module works
 lib/ctime.pl                   A ctime workalike
 lib/Cwd.pm                     Various cwd routines (getcwd, fastcwd, chdir)
@@ -2400,10 +2404,10 @@ Porting/fixCORE         Find and fix modules that generate warnings
 Porting/fixvars                Find undeclared variables with C compiler and fix em
 Porting/genlog         Generate formatted changelogs by querying p4d
 Porting/Glossary       Glossary of config.sh variables
-Porting/makerel                Release making utility
-Porting/manicheck      Check against MANIFEST
 Porting/Maintainers    Program to pretty print info in Maintainers.pl
 Porting/Maintainers.pl Information about maintainers
+Porting/makerel                Release making utility
+Porting/manicheck      Check against MANIFEST
 Porting/p4d2p          Generate patch from p4 diff
 Porting/p4genpatch     Generate patch from p4 change in repository (obsoletes p4desc)
 Porting/patching.pod   How to report changes made to Perl

diff --git a/lib/CPAN.pm b/lib/CPAN.pm
index a7f3a64..d4776dd 100644 (file)
--- a/lib/CPAN.pm
+++ b/lib/CPAN.pm
@@ -1,11 +1,11 @@
 # -*- Mode: cperl; coding: utf-8; cperl-indent-level: 4 -*-
 package CPAN;
 $VERSION = '1.76';
-# $Id: CPAN.pm,v 1.405 2003/07/04 08:06:11 k Exp $
+# $Id: CPAN.pm,v 1.412 2003/07/31 14:53:04 k Exp $
 
 # only used during development:
 $Revision = "";
-# $Revision = "[".substr(q$Revision: 1.405 $, 10)."]";
+# $Revision = "[".substr(q$Revision: 1.412 $, 10)."]";
 
 use Carp ();
 use Config ();
@@ -3961,7 +3961,7 @@ sub get {
     }
 
     $self->{'build_dir'} = $packagedir;
-    $self->safe_chdir(File::Spec->updir);
+    $self->safe_chdir($builddir);
     File::Path::rmtree("tmp");
 
     my($mpl) = File::Spec->catfile($packagedir,"Makefile.PL");

diff --git a/lib/CPAN/META.yml b/lib/CPAN/META.yml
new file mode 100644 (file)
index 0000000..658d5c6
--- /dev/null
+++ b/lib/CPAN/META.yml
@@ -0,0 +1,11 @@
+#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
+name:         CPAN
+version:      1.76
+version_from: lib/CPAN.pm
+installdirs:  perl
+requires:
+    Test::More:                    0
+    File::Spec:                    0
+
+distribution_type: module
+generated_by: ExtUtils::MakeMaker version 6.12

diff --git a/lib/CPAN/PAUSE2003.pub b/lib/CPAN/PAUSE2003.pub
new file mode 100644 (file)
index 0000000..7817562
--- /dev/null
+++ b/lib/CPAN/PAUSE2003.pub
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: OpenKeyServer v1.2
+Comment: Extracted from belgium.keyserver.net
+
+mQGiBD4+cJARBACxOByY0SJBBuJoFrH2hoqRFny423gY6V3jq1uTgGY/PPaxP+Sq
+r3RzxPct4vJcsoo48pwBsMHLrWfORq26zb6eKgmMq/CQo2gzaRbeRxCi3ke4KBmu
+aREi6RjaZSU94yABtDmspUBrpYV8zfZMv5ZIQlg9W1Tu66BFOUrrNeDpKwCgosCp
+9dtNAMhHkzxs8UJH5i3Uzb0D/0VLoAE8sOfUXqjc38rxiHuGBFSNC70Ih4mzGUCJ
+MGT4z1X3K6uUawnXMoc8XqPaYnEgOzztMymydtr+urjUwcGnuXDSpV6nulE5irxh
+zlikSTJy/42QzTMcrdRynffmJo9PRgymMI8GgWaYG5g3zzGAhi5BA6G8JKfC93IV
+xiRPBACXJpLBYQljqJY9UDNJuq8nHhKiWHBXdZzrC3LM0FSF3PKuP/ugc+KBIKXm
+clNPNFKla/SRbH6dMHsGIy8wnGPI5AtTS0roNQrttv3/ghRT7+OKXrGmBxZ/KHVr
+v3PVgiRA5MDr1mIsovfuc9WQnFu2TkgnN/F3pDcrVVSi5b+rZLQzUEFVU0UgQmF0
+Y2ggU2lnbmluZyBLZXkgMjAwMyA8cGF1c2VAcGF1c2UucGVybC5vcmc+iF8EExEC
+AB8FAj4+cJAFCQPCZwAECwcDAgMVAgMDFgIBAh4BAheAAAoJEDKNqGdFD4nsd4sA
+n3gYvr37VkUycx61wm5t4BoSO904AJ9dkl/zU5BbDnXEPKk0FNWFSnwnxbkCDQQ+
+PnCyEAgAjAKDcvpogvJvSrg3rkstDhxP4O+JZvfxzrdL9Qk0FPBlb31ECxPMBf2z
+KObrwGKwxgD3+lSb/y9SgOYnAsuwztn6BqjQ8AVKiI0MFDTa+tLrtY5860X7TxJD
+9bzMx/A4gEsYoFZYR4s/alGAzcqFcdQ2IiFnKE4KPtNXEMQ67lCEw5zdYSoJta9J
+UKsCX3KI/DOne1NnjNZL2dQadqjsEc8mjvUOTXSG1sCawzTP5tNoPHg13GeyJ0XG
+HbHY35BbF33yr9kP76+zQFaiMyLDUnyQAU/0P+rm/I6Ts6q4OZwKK/tC5LD0SPDe
+08uAzkb4krRqxheo6seHdT7HjdDbKwADBgf/RGpQhhZc+F9o79S9aLV4XnY5CFev
+4EJvUqq6TF9V0rvZg148mbO/b8EtOfcBSdvAfo3H8w6wcC7X8Kt/6Pl69UZKuQOt
+354092gTrjJyg1uZBK9Ey/LSh0k+BNCfIw04+6W8ijARkpdoBrU3CwDKTyroWYkS
+FDkkzLvJRTkMpVpqyI0xIEExPXZTf67Abv1dzceTDciblLJfQcsfDyWYv8D12ELE
+zLYQnFM1s6yD6Q51Xk/XQ6MJ59bB3uuFO8VpkCMEvqIxZXsLjgqyQgo73y1qFizs
+KnFG+TTvooBdG3yqSt9OsLSoRrJkZbMX3PKpbT0ceWL8dULc1v2ol4fJGohMBBgR
+AgAMBQI+PnCyBQkDwmcAAAoJEDKNqGdFD4nsS44An14sFX5E2jJc87HFJeqPmeas
+hdayAKCCmOqjo0CW5uepN19pXdP7BujUOw==
+=ocE3
+-----END PGP PUBLIC KEY BLOCK-----

diff --git a/lib/CPAN/SIGNATURE b/lib/CPAN/SIGNATURE
new file mode 100644 (file)
index 0000000..b890132
--- /dev/null
+++ b/lib/CPAN/SIGNATURE
@@ -0,0 +1,45 @@
+This file contains message digests of all files listed in MANIFEST,
+signed via the Module::Signature module, version 0.26.
+
+To verify the content in this distribution, first make sure you have
+Module::Signature installed, then type:
+
+    % cpansign -v
+
+It would check each file's integrity, as well as the signature's
+validity.  If "==> Signature verified OK! <==" is not displayed,
+the distribution may already have been compromised, and you should
+not run its Makefile.PL or Build.PL.
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+SHA1 efbe8e6882a2caa0d741b113959a706830ab5882 BUNDLE/Test/Builder.pm
+SHA1 ae1d68262bedc2475e2c6fd478d99b259b4fb109 BUNDLE/Test/More.pm
+SHA1 2b02ead396d701c16a93a54b0f15f7073addb407 ChangeLog
+SHA1 a029ffa2f2252bb8914eb658666244710994d256 Changes.old
+SHA1 ed0c9e6c6b83e39e3822cf71aeed81f829386dd9 MANIFEST
+SHA1 21e313600b36ee8adb724a43c247ee0f873b5b81 MANIFEST.SKIP
+SHA1 1b0753e38574181a9d0e041cb9082d09c32f0fbf META.yml
+SHA1 441f9a3ec80bfa266d889d5c56a9a75eeb119626 Makefile.PL
+SHA1 37e858c51409a297ef5d3fb35dc57cd3b57f9a4d PAUSE2003.pub
+SHA1 0006bf6573858fbeb094d0becc5030c36d41a46d README
+SHA1 9e6e9cf9ae517d91ef3bda61f2c5d0c6409073d6 Todo
+SHA1 859ee1f3ba026d269c44b29d715d9af1e35333bc lib/Bundle/CPAN.pm
+SHA1 3aaaaf913748abe1cfa3f89ccf70d8f6315e5fe8 lib/CPAN.pm
+SHA1 e00d87017076b26de7696ae8b75d397bee737bbb lib/CPAN/Admin.pm
+SHA1 536e9720a6161510b50a2948c768d1daabc87dcd lib/CPAN/FirstTime.pm
+SHA1 33dd610c4b5d679bbcf3e61df290e33b460feaab lib/CPAN/Nox.pm
+SHA1 0a7b5d987e699afe63d9e314f1aa456214c8e1d0 scripts/cpan
+SHA1 1ef040435bd29f7d46db02c079fcb79cc279780c t/Nox.t
+SHA1 6a3fa699be244f587ef1d14e4c345bc57affd0c8 t/loadme.t
+SHA1 d765dc589a77265e305ef27ff386e31f562ad70b t/mirroredby.t
+SHA1 44ee216f4a129193a62fc1cd61088fd2de8e9538 t/signature.t
+SHA1 ada872f52e59a537c444e12ca9d79e4df4bd18c4 t/vcmp.t
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.2 (GNU/Linux)
+
+iD8DBQE/KTBH7IA58KMXwV0RAvwzAKDqt5FPLl5zA2RkWRoLz/ASslZqKACfV1pg
+VUyR6PLFLNoGHDZXCzmn1co=
+=8wMs
+-----END PGP SIGNATURE-----

diff --git a/lib/CPAN/t/signature.t b/lib/CPAN/t/signature.t
new file mode 100644 (file)
index 0000000..cf81f88
--- /dev/null
+++ b/lib/CPAN/t/signature.t
@@ -0,0 +1,16 @@
+# -*- mode: cperl -*-
+
+use strict;
+print "1..1\n";
+
+if (!eval { require Module::Signature; 1 }) {
+  print "ok 1 # skip - no Module::Signature found\n";
+}
+elsif (!eval { require Socket; Socket::inet_aton('pgp.mit.edu') }) {
+  print "ok 1 # skip - Cannot connect to the keyserver";
+}
+else {
+  (Module::Signature::verify() == Module::Signature::SIGNATURE_OK())
+      or print "not ";
+  print "ok 1 # Valid signature\n";
+}