Move Digest::SHA from ext/ to cpan/

Move the shasum binary to the top level, to remove the need for a MAP entry in
Maintainers.PL

diff --git a/MANIFEST b/MANIFEST
index 050d8ca..f2b9520 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -656,6 +656,40 @@ cpan/Digest-MD5/t/files.t          See if Digest::MD5 extension works
 cpan/Digest-MD5/t/md5-aaa.t            See if Digest::MD5 extension works
 cpan/Digest-MD5/t/utf8.t               See if Digest::MD5 extension works
 cpan/Digest-MD5/typemap                        Digest::MD5 extension
+cpan/Digest-SHA/Changes                        Digest::SHA changes
+cpan/Digest-SHA/lib/Digest/SHA.pm      Digest::SHA extension
+cpan/Digest-SHA/Makefile.PL            Digest::SHA Makefile.PL
+cpan/Digest-SHA/README                 Digest::SHA README
+cpan/Digest-SHA/shasum                 shasum script
+cpan/Digest-SHA/SHA.xs                 Digest::SHA extension
+cpan/Digest-SHA/src/hmac.c             Digest::SHA extension
+cpan/Digest-SHA/src/hmac.h             Digest::SHA extension
+cpan/Digest-SHA/src/hmacxtra.c         Digest::SHA extension
+cpan/Digest-SHA/src/sha64bit.c         Digest::SHA extension
+cpan/Digest-SHA/src/sha64bit.h         Digest::SHA extension
+cpan/Digest-SHA/src/sha.c              Digest::SHA extension
+cpan/Digest-SHA/src/sha.h              Digest::SHA extension
+cpan/Digest-SHA/src/shaxtra.c          Digest::SHA extension
+cpan/Digest-SHA/t/allfcns.t            See if Digest::SHA works
+cpan/Digest-SHA/t/base64.t             See if Digest::SHA works
+cpan/Digest-SHA/t/bitbuf.t             See if Digest::SHA works
+cpan/Digest-SHA/t/dumpload.t           See if Digest::SHA works
+cpan/Digest-SHA/t/fips198.t            See if Digest::SHA works
+cpan/Digest-SHA/t/gglong.t             See if Digest::SHA works
+cpan/Digest-SHA/t/gg.t                 See if Digest::SHA works
+cpan/Digest-SHA/t/hmacsha.t            See if Digest::SHA works
+cpan/Digest-SHA/t/ireland.t            See if Digest::SHA works
+cpan/Digest-SHA/t/methods.t            See if Digest::SHA works
+cpan/Digest-SHA/t/nistbit.t            See if Digest::SHA works
+cpan/Digest-SHA/t/nistbyte.t           See if Digest::SHA works
+cpan/Digest-SHA/t/rfc2202.t            See if Digest::SHA works
+cpan/Digest-SHA/t/sha1.t               See if Digest::SHA works
+cpan/Digest-SHA/t/sha224.t             See if Digest::SHA works
+cpan/Digest-SHA/t/sha256.t             See if Digest::SHA works
+cpan/Digest-SHA/t/sha384.t             See if Digest::SHA works
+cpan/Digest-SHA/t/sha512.t             See if Digest::SHA works
+cpan/Digest-SHA/t/woodbury.t           See if Digest::SHA works
+cpan/Digest-SHA/typemap                        Typemap for Digest::SHA
 cpan/Digest/t/base.t           See if Digest extensions work
 cpan/Digest/t/digest.t         See if Digest extensions work
 cpan/Digest/t/file.t           See if Digest extensions work
@@ -1694,40 +1728,6 @@ ext/Devel-Peek/Peek.xs           Data debugging tool, externals
 ext/Devel-Peek/t/Peek.t                See if Devel::Peek works
 ext/Devel-SelfStubber/lib/Devel/SelfStubber.pm Generate stubs for SelfLoader.pm
 ext/Devel-SelfStubber/t/Devel-SelfStubber.t    See if Devel::SelfStubber works
-ext/Digest-SHA/bin/shasum      shasum script
-ext/Digest-SHA/Changes         Digest::SHA changes
-ext/Digest-SHA/lib/Digest/SHA.pm       Digest::SHA extension
-ext/Digest-SHA/Makefile.PL     Digest::SHA Makefile.PL
-ext/Digest-SHA/README          Digest::SHA README
-ext/Digest-SHA/SHA.xs          Digest::SHA extension
-ext/Digest-SHA/src/hmac.c      Digest::SHA extension
-ext/Digest-SHA/src/hmac.h      Digest::SHA extension
-ext/Digest-SHA/src/hmacxtra.c  Digest::SHA extension
-ext/Digest-SHA/src/sha64bit.c  Digest::SHA extension
-ext/Digest-SHA/src/sha64bit.h  Digest::SHA extension
-ext/Digest-SHA/src/sha.c       Digest::SHA extension
-ext/Digest-SHA/src/sha.h       Digest::SHA extension
-ext/Digest-SHA/src/shaxtra.c   Digest::SHA extension
-ext/Digest-SHA/t/allfcns.t     See if Digest::SHA works
-ext/Digest-SHA/t/base64.t      See if Digest::SHA works
-ext/Digest-SHA/t/bitbuf.t      See if Digest::SHA works
-ext/Digest-SHA/t/dumpload.t    See if Digest::SHA works
-ext/Digest-SHA/t/fips198.t     See if Digest::SHA works
-ext/Digest-SHA/t/gglong.t      See if Digest::SHA works
-ext/Digest-SHA/t/gg.t          See if Digest::SHA works
-ext/Digest-SHA/t/hmacsha.t     See if Digest::SHA works
-ext/Digest-SHA/t/ireland.t     See if Digest::SHA works
-ext/Digest-SHA/t/methods.t     See if Digest::SHA works
-ext/Digest-SHA/t/nistbit.t     See if Digest::SHA works
-ext/Digest-SHA/t/nistbyte.t    See if Digest::SHA works
-ext/Digest-SHA/t/rfc2202.t     See if Digest::SHA works
-ext/Digest-SHA/t/sha1.t                See if Digest::SHA works
-ext/Digest-SHA/t/sha224.t      See if Digest::SHA works
-ext/Digest-SHA/t/sha256.t      See if Digest::SHA works
-ext/Digest-SHA/t/sha384.t      See if Digest::SHA works
-ext/Digest-SHA/t/sha512.t      See if Digest::SHA works
-ext/Digest-SHA/t/woodbury.t    See if Digest::SHA works
-ext/Digest-SHA/typemap         Typemap for Digest::SHA
 ext/DynaLoader/dl_aix.xs       AIX implementation
 ext/DynaLoader/dl_beos.xs      BeOS implementation
 ext/DynaLoader/dl_dld.xs       GNU dld style implementation

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 98ed508..0a10238 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -502,11 +502,8 @@ use File::Glob qw(:case);
        {
        'MAINTAINER'    => 'mshelor',
        'DISTRIBUTION'  => 'MSHELOR/Digest-SHA-5.47.tar.gz',
-       'FILES'         => q[ext/Digest-SHA],
+       'FILES'         => q[cpan/Digest-SHA],
        'EXCLUDED'      => [ qw{t/pod.t t/podcover.t examples/dups} ],
-       'MAP'           => { 'shasum'   => 'ext/Digest-SHA/bin/shasum',
-                            ''         => 'ext/Digest-SHA/',
-                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },

diff --git a/ext/Digest-SHA/Changes b/cpan/Digest-SHA/Changes
similarity index 100%
rename from ext/Digest-SHA/Changes
rename to cpan/Digest-SHA/Changes

diff --git a/ext/Digest-SHA/Makefile.PL b/cpan/Digest-SHA/Makefile.PL
similarity index 100%
rename from ext/Digest-SHA/Makefile.PL
rename to cpan/Digest-SHA/Makefile.PL

diff --git a/ext/Digest-SHA/README b/cpan/Digest-SHA/README
similarity index 100%
rename from ext/Digest-SHA/README
rename to cpan/Digest-SHA/README

diff --git a/ext/Digest-SHA/SHA.xs b/cpan/Digest-SHA/SHA.xs
similarity index 100%
rename from ext/Digest-SHA/SHA.xs
rename to cpan/Digest-SHA/SHA.xs

diff --git a/ext/Digest-SHA/lib/Digest/SHA.pm b/cpan/Digest-SHA/lib/Digest/SHA.pm
similarity index 100%
rename from ext/Digest-SHA/lib/Digest/SHA.pm
rename to cpan/Digest-SHA/lib/Digest/SHA.pm

diff --git a/ext/Digest-SHA/bin/shasum b/cpan/Digest-SHA/shasum
similarity index 100%
rename from ext/Digest-SHA/bin/shasum
rename to cpan/Digest-SHA/shasum

diff --git a/ext/Digest-SHA/src/hmac.c b/cpan/Digest-SHA/src/hmac.c
similarity index 100%
rename from ext/Digest-SHA/src/hmac.c
rename to cpan/Digest-SHA/src/hmac.c

diff --git a/ext/Digest-SHA/src/hmac.h b/cpan/Digest-SHA/src/hmac.h
similarity index 100%
rename from ext/Digest-SHA/src/hmac.h
rename to cpan/Digest-SHA/src/hmac.h

diff --git a/ext/Digest-SHA/src/hmacxtra.c b/cpan/Digest-SHA/src/hmacxtra.c
similarity index 100%
rename from ext/Digest-SHA/src/hmacxtra.c
rename to cpan/Digest-SHA/src/hmacxtra.c

diff --git a/ext/Digest-SHA/src/sha.c b/cpan/Digest-SHA/src/sha.c
similarity index 100%
rename from ext/Digest-SHA/src/sha.c
rename to cpan/Digest-SHA/src/sha.c

diff --git a/ext/Digest-SHA/src/sha.h b/cpan/Digest-SHA/src/sha.h
similarity index 100%
rename from ext/Digest-SHA/src/sha.h
rename to cpan/Digest-SHA/src/sha.h

diff --git a/ext/Digest-SHA/src/sha64bit.c b/cpan/Digest-SHA/src/sha64bit.c
similarity index 100%
rename from ext/Digest-SHA/src/sha64bit.c
rename to cpan/Digest-SHA/src/sha64bit.c

diff --git a/ext/Digest-SHA/src/sha64bit.h b/cpan/Digest-SHA/src/sha64bit.h
similarity index 100%
rename from ext/Digest-SHA/src/sha64bit.h
rename to cpan/Digest-SHA/src/sha64bit.h

diff --git a/ext/Digest-SHA/src/shaxtra.c b/cpan/Digest-SHA/src/shaxtra.c
similarity index 100%
rename from ext/Digest-SHA/src/shaxtra.c
rename to cpan/Digest-SHA/src/shaxtra.c

diff --git a/ext/Digest-SHA/t/allfcns.t b/cpan/Digest-SHA/t/allfcns.t
similarity index 100%
rename from ext/Digest-SHA/t/allfcns.t
rename to cpan/Digest-SHA/t/allfcns.t

diff --git a/ext/Digest-SHA/t/base64.t b/cpan/Digest-SHA/t/base64.t
similarity index 100%
rename from ext/Digest-SHA/t/base64.t
rename to cpan/Digest-SHA/t/base64.t

diff --git a/ext/Digest-SHA/t/bitbuf.t b/cpan/Digest-SHA/t/bitbuf.t
similarity index 100%
rename from ext/Digest-SHA/t/bitbuf.t
rename to cpan/Digest-SHA/t/bitbuf.t

diff --git a/ext/Digest-SHA/t/dumpload.t b/cpan/Digest-SHA/t/dumpload.t
similarity index 100%
rename from ext/Digest-SHA/t/dumpload.t
rename to cpan/Digest-SHA/t/dumpload.t

diff --git a/ext/Digest-SHA/t/fips198.t b/cpan/Digest-SHA/t/fips198.t
similarity index 100%
rename from ext/Digest-SHA/t/fips198.t
rename to cpan/Digest-SHA/t/fips198.t

diff --git a/ext/Digest-SHA/t/gg.t b/cpan/Digest-SHA/t/gg.t
similarity index 100%
rename from ext/Digest-SHA/t/gg.t
rename to cpan/Digest-SHA/t/gg.t

diff --git a/ext/Digest-SHA/t/gglong.t b/cpan/Digest-SHA/t/gglong.t
similarity index 100%
rename from ext/Digest-SHA/t/gglong.t
rename to cpan/Digest-SHA/t/gglong.t

diff --git a/ext/Digest-SHA/t/hmacsha.t b/cpan/Digest-SHA/t/hmacsha.t
similarity index 100%
rename from ext/Digest-SHA/t/hmacsha.t
rename to cpan/Digest-SHA/t/hmacsha.t

diff --git a/ext/Digest-SHA/t/ireland.t b/cpan/Digest-SHA/t/ireland.t
similarity index 100%
rename from ext/Digest-SHA/t/ireland.t
rename to cpan/Digest-SHA/t/ireland.t

diff --git a/ext/Digest-SHA/t/methods.t b/cpan/Digest-SHA/t/methods.t
similarity index 100%
rename from ext/Digest-SHA/t/methods.t
rename to cpan/Digest-SHA/t/methods.t

diff --git a/ext/Digest-SHA/t/nistbit.t b/cpan/Digest-SHA/t/nistbit.t
similarity index 100%
rename from ext/Digest-SHA/t/nistbit.t
rename to cpan/Digest-SHA/t/nistbit.t

diff --git a/ext/Digest-SHA/t/nistbyte.t b/cpan/Digest-SHA/t/nistbyte.t
similarity index 100%
rename from ext/Digest-SHA/t/nistbyte.t
rename to cpan/Digest-SHA/t/nistbyte.t

diff --git a/ext/Digest-SHA/t/rfc2202.t b/cpan/Digest-SHA/t/rfc2202.t
similarity index 100%
rename from ext/Digest-SHA/t/rfc2202.t
rename to cpan/Digest-SHA/t/rfc2202.t

diff --git a/ext/Digest-SHA/t/sha1.t b/cpan/Digest-SHA/t/sha1.t
similarity index 100%
rename from ext/Digest-SHA/t/sha1.t
rename to cpan/Digest-SHA/t/sha1.t

diff --git a/ext/Digest-SHA/t/sha224.t b/cpan/Digest-SHA/t/sha224.t
similarity index 100%
rename from ext/Digest-SHA/t/sha224.t
rename to cpan/Digest-SHA/t/sha224.t

diff --git a/ext/Digest-SHA/t/sha256.t b/cpan/Digest-SHA/t/sha256.t
similarity index 100%
rename from ext/Digest-SHA/t/sha256.t
rename to cpan/Digest-SHA/t/sha256.t

diff --git a/ext/Digest-SHA/t/sha384.t b/cpan/Digest-SHA/t/sha384.t
similarity index 100%
rename from ext/Digest-SHA/t/sha384.t
rename to cpan/Digest-SHA/t/sha384.t

diff --git a/ext/Digest-SHA/t/sha512.t b/cpan/Digest-SHA/t/sha512.t
similarity index 100%
rename from ext/Digest-SHA/t/sha512.t
rename to cpan/Digest-SHA/t/sha512.t

diff --git a/ext/Digest-SHA/t/woodbury.t b/cpan/Digest-SHA/t/woodbury.t
similarity index 100%
rename from ext/Digest-SHA/t/woodbury.t
rename to cpan/Digest-SHA/t/woodbury.t

diff --git a/ext/Digest-SHA/typemap b/cpan/Digest-SHA/typemap
similarity index 100%
rename from ext/Digest-SHA/typemap
rename to cpan/Digest-SHA/typemap

diff --git a/utils/shasum.PL b/utils/shasum.PL
index 06f5cfc..852e6d2 100644 (file)
--- a/utils/shasum.PL
+++ b/utils/shasum.PL
@@ -35,7 +35,7 @@ use File::Spec;
 
 my $script = File::Spec->catfile(
             File::Spec->catdir(
-                File::Spec->updir, qw[ext Digest-SHA bin]
+                File::Spec->updir, qw[cpan Digest-SHA]
             ), "shasum");
 
 if (open(IN, $script)) {