Back out 21449 (MakeMaker SIGN)

Schwern will integrate and make a CPAN release first

p4raw-id: //depot/maint-5.8/perl@21597

4 files changed, 2 insertions, 74 deletions

diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
index 9c73e04d20..5d8d640b68 100644
--- a/lib/ExtUtils/MM_Any.pm
+++ b/lib/ExtUtils/MM_Any.pm
@@ -607,32 +607,6 @@ MAKE_FRAG
 }
 
 
-=item signature_target
-
-    my $target = $mm->signature_target;
-
-Generate the signature target.
-
-Writes the file SIGNATURE with "cpansign -s".
-
-=cut
-
-sub signature_target {
-    my $self = shift;
-
-    return <<'MAKE_FRAG' if !$self->{SIGN};
-signature:
-	$(NOECHO) $(NOOP)
-MAKE_FRAG
-
-    return <<'MAKE_FRAG';
-signature:
-	cpansign -s
-MAKE_FRAG
-
-}
-
-
 =item metafile_addtomanifest_target
 
   my $target = $mm->metafile_addtomanifest_target
@@ -662,35 +636,6 @@ MAKE_FRAG
 }
 
 
-=item signature_addtomanifest_target
-
-  my $target = $mm->signature_addtomanifest_target
-
-Adds the META.yml file to the MANIFEST.
-
-=cut
-
-sub signature_addtomanifest_target {
-    my $self = shift;
-
-    return <<'MAKE_FRAG' if !$self->{SIGN};
-signature_addtomanifest:
-	$(NOECHO) $(NOOP)
-MAKE_FRAG
-
-    my $add_sign = $self->oneliner(<<'CODE', ['-MExtUtils::Manifest=maniadd']);
-eval { maniadd({q{SIGNATURE} => q{Public-key signature (added by MakeMaker)}}) } 
-    or print "Could not add SIGNATURE to MANIFEST: $${'@'}\n"
-CODE
-
-    return sprintf <<'MAKE_FRAG', $add_sign;
-signature_addtomanifest:
-	$(NOECHO) %s
-MAKE_FRAG
-
-}
-
-
 =back
 
 =head2 Abstract methods
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 43c5098516..3821a3571d 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -953,7 +953,7 @@ sub distdir {
     my($self) = shift;
 
     return <<'MAKE_FRAG';
-distdir : metafile metafile_addtomanifest signature signature_addtomanifest
+distdir : metafile metafile_addtomanifest
 	$(RM_RF) $(DISTVNAME)
 	$(PERLRUN) "-MExtUtils::Manifest=manicopy,maniread" \
 		-e "manicopy(maniread(),'$(DISTVNAME)', '$(DIST_CP)');"
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 22ee8af866..9b7d6ebfad 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -226,7 +226,7 @@ sub full_setup {
     PERL_SRC PERM_RW PERM_RWX
     PL_FILES PM PM_FILTER PMLIBDIRS POLLUTE PPM_INSTALL_EXEC
     PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
-    SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG
+    SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG
     XS_VERSION clean depend dist dynamic_lib linkext macro realclean
     tool_autosplit
 
@@ -265,7 +265,6 @@ sub full_setup {
  installbin subdirs
  clean_subdirs clean realclean_subdirs realclean 
  metafile metafile_addtomanifest
- signature signature_addtomanifest
  dist_basics dist_core distdir dist_test dist_ci
  install force perldepend makefile staticmake test ppd
 
@@ -1992,16 +1991,6 @@ $Config{installprefix} will be used.
 
 Overridable by PREFIX
 
-=item SIGN
-
-When true, perform the generation and addition to the MANIFEST of
-the SIGNATURE file during 'make distdir', via 'cpansign -s'.
-
-Note that you need to install the Module::Signature module to
-perform this operation.
-
-Defaults to false.
-
 =item SKIP
 
 Arrayref. E.g. [qw(name1 name2)] skip (do not write) sections of the
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 331c5515a3..aa469df59c 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -48,12 +48,6 @@ The following modules and pragmata have been updated since Perl 5.8.1:
 
 =item Digest::MD5
 
-=item ExtUtils::MakeMaker
-
-Now able to generate a SIGNATURE file if Module::Signature is installed,
-by passing (SIGN => 1) to WriteMakefile().  (Work completed as part of
-The Perl Foundation's grant to Autrijus Tang)
-
 =item I18N::LangTags
 
 =item libnet