6546677 usr/src/cmd/perl/ build installs Subversion directories (.svn) in the proto area

Contributed by Roland Mainz <roland.mainz@nrubsig.org>

4 files changed, 8 insertions, 49 deletions

diff --git a/usr/src/cmd/perl/5.6.1/distrib/ext/IPC/SysV/Makefile.PL b/usr/src/cmd/perl/5.6.1/distrib/ext/IPC/SysV/Makefile.PL
index e24a25ade0..8d88f7bc14 100644
--- a/usr/src/cmd/perl/5.6.1/distrib/ext/IPC/SysV/Makefile.PL
+++ b/usr/src/cmd/perl/5.6.1/distrib/ext/IPC/SysV/Makefile.PL
@@ -1,24 +1,3 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
 # This -*- perl -*- script makes the Makefile
 # $Id: Makefile.PL,v 1.3 1997/03/04 09:21:12 gbarr Exp $
 
@@ -32,7 +11,7 @@ sub MY::libscan
  my($self,$path) = @_;
 
  return '' 
-	if($path =~ m:/(RCS|CVS|SCCS)/: ||
+	if($path =~ m:/(RCS|CVS|SCCS|\.svn)/: ||
 	   $path =~ m:[~%]$: ||
 	   $path =~ m:\.(orig|rej)$:
 	  );
diff --git a/usr/src/cmd/perl/5.6.1/distrib/installperl b/usr/src/cmd/perl/5.6.1/distrib/installperl
index 31e3ec1c28..bfe6eb950f 100644
--- a/usr/src/cmd/perl/5.6.1/distrib/installperl
+++ b/usr/src/cmd/perl/5.6.1/distrib/installperl
@@ -657,8 +657,9 @@ sub installlib {
 
     my $name = $_;
 
-    # Ignore SCCS, RCS and CVS directories.
-    if ((($name eq 'SCCS' or $name eq 'CVS' or $name eq 'RCS') and -d $name)
+    # Ignore SCCS, RCS, CVS and Subversion directories.
+    if ((($name eq 'SCCS' or $name eq 'CVS' or $name eq 'RCS'
+	or $name eq '.svn') and -d $name)
         or ($name eq '.tstamp' and -f $name)) {
 	$File::Find::prune = 1;
 	return;
diff --git a/usr/src/cmd/perl/5.6.1/distrib/lib/ExtUtils/MM_Unix.pm b/usr/src/cmd/perl/5.6.1/distrib/lib/ExtUtils/MM_Unix.pm
index c11333d780..06ee487c02 100644
--- a/usr/src/cmd/perl/5.6.1/distrib/lib/ExtUtils/MM_Unix.pm
+++ b/usr/src/cmd/perl/5.6.1/distrib/lib/ExtUtils/MM_Unix.pm
@@ -1485,7 +1485,7 @@ sub init_dirscan {	# --- File and Directory Lists (.xs .pm .pod etc)
 	require File::Find;
 	File::Find::find(sub {
 	    if (-d $_){
-		if ($_ eq "CVS" || $_ eq "RCS"){
+		if ($_ eq "CVS" || $_ eq "RCS" || $_ eq ".svn"){
 		    $File::Find::prune = 1;
 		}
 		return;
@@ -2249,7 +2249,7 @@ $to: $from $self->{MAKEFILE} " . $self->catdir($todir,'.exists') . "
 
 Takes a path to a file that is found by init_dirscan and returns false
 if we don't want to include this file in the library. Mainly used to
-exclude RCS, CVS, and SCCS directories from installation.
+exclude RCS, CVS, SCCS and Subversion directories from installation.
 
 =cut
 
@@ -2257,7 +2257,7 @@ exclude RCS, CVS, and SCCS directories from installation.
 
 sub libscan {
     my($self,$path) = @_;
-    return '' if $path =~ m:\b(RCS|CVS|SCCS)\b: ;
+    return '' if $path =~ m:\b(RCS|CVS|SCCS|\.svn)\b: ;
     $path;
 }
 
diff --git a/usr/src/cmd/perl/5.8.4/distrib/ext/IPC/SysV/Makefile.PL b/usr/src/cmd/perl/5.8.4/distrib/ext/IPC/SysV/Makefile.PL
index e24a25ade0..8d88f7bc14 100644
--- a/usr/src/cmd/perl/5.8.4/distrib/ext/IPC/SysV/Makefile.PL
+++ b/usr/src/cmd/perl/5.8.4/distrib/ext/IPC/SysV/Makefile.PL
@@ -1,24 +1,3 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
 # This -*- perl -*- script makes the Makefile
 # $Id: Makefile.PL,v 1.3 1997/03/04 09:21:12 gbarr Exp $
 
@@ -32,7 +11,7 @@ sub MY::libscan
  my($self,$path) = @_;
 
  return '' 
-	if($path =~ m:/(RCS|CVS|SCCS)/: ||
+	if($path =~ m:/(RCS|CVS|SCCS|\.svn)/: ||
 	   $path =~ m:[~%]$: ||
 	   $path =~ m:\.(orig|rej)$:
 	  );