diff options
| -rw-r--r-- | dev-lang/perl/ChangeLog | 19 | ||||
| -rw-r--r-- | dev-lang/perl/Manifest | 59 | ||||
| -rw-r--r-- | dev-lang/perl/files/CAN-2005-0448-rmtree.patch | 279 | ||||
| -rw-r--r-- | dev-lang/perl/files/digest-perl-5.8.2-r4 | 1 | ||||
| -rw-r--r-- | dev-lang/perl/files/digest-perl-5.8.4-r4 | 1 | ||||
| -rw-r--r-- | dev-lang/perl/files/digest-perl-5.8.5-r5 | 1 | ||||
| -rw-r--r-- | dev-lang/perl/files/digest-perl-5.8.6-r4 | 1 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.2-r2.ebuild | 6 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.2-r3.ebuild | 6 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.2-r4.ebuild | 369 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.4-r2.ebuild | 7 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.4-r3.ebuild | 7 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.4-r4.ebuild | 431 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.5-r3.ebuild | 6 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.5-r4.ebuild | 6 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.5-r5.ebuild | 420 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.6-r2.ebuild | 7 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.6-r3.ebuild | 7 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.6-r4.ebuild | 421 |
19 files changed, 2003 insertions, 51 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index 21731bbc0c2f..cc9536c6c21a 100644 --- a/dev-lang/perl/ChangeLog +++ b/dev-lang/perl/ChangeLog @@ -1,6 +1,23 @@ # ChangeLog for dev-lang/perl # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.110 2005/03/08 23:53:51 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.111 2005/03/11 15:10:30 mcummings Exp $ + +*perl-5.8.6-r4 (11 Mar 2005) + + 11 Mar 2005; Michael Cummings <mcummings@gentoo.org> + +files/CAN-2005-0448-rmtree.patch, perl-5.8.2-r2.ebuild, + perl-5.8.2-r3.ebuild, +perl-5.8.2-r4.ebuild, perl-5.8.4-r2.ebuild, + perl-5.8.4-r3.ebuild, +perl-5.8.4-r4.ebuild, perl-5.8.5-r3.ebuild, + perl-5.8.5-r4.ebuild, +perl-5.8.5-r5.ebuild, perl-5.8.6-r2.ebuild, + perl-5.8.6-r3.ebuild, +perl-5.8.6-r4.ebuild: + Version bump to finalize patch + + 11 Mar 2005; Michael Cummings <mcummings@gentoo.org> + +files/CAN-2005-0448-rmtree.patch, perl-5.8.2-r2.ebuild, + perl-5.8.2-r3.ebuild, perl-5.8.4-r2.ebuild, perl-5.8.4-r3.ebuild, + perl-5.8.5-r3.ebuild, perl-5.8.5-r4.ebuild, perl-5.8.6-r2.ebuild, + perl-5.8.6-r3.ebuild: + Changed file_path_rmtree to CAN-2005-0448-rmtree.patch per bug 79685 08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> perl-5.8.6-r3.ebuild: diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index fb3e6c3dbcd3..6d337b147f26 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -1,26 +1,36 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 9ae5af247965e9313c66b2d8ea90b304 ChangeLog 33549 +MD5 6c1ee47c036f459405a7311c86e08234 perl-5.8.2-r3.ebuild 11040 +MD5 ae1220ed4fe97e6c8ebce5e6e67be64f ChangeLog 33895 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 -MD5 4315c7aadac04c4889e28e6143f97640 perl-5.8.2-r2.ebuild 10938 -MD5 119bf65a7ef55b041a1cd8c22d346c83 perl-5.8.4-r2.ebuild 13077 -MD5 002911479bdf48ed34fa43cfb64fe51c perl-5.8.5-r3.ebuild 12716 -MD5 14dbeaf848ce9f120ef08efc6391160b perl-5.8.6-r2.ebuild 12733 -MD5 f698e47b4a04dd8b957246c87e3780de perl-5.8.2-r3.ebuild 10938 -MD5 c4015772f2815a9e6229f6e2436d4fbf perl-5.8.4-r3.ebuild 13077 -MD5 1ea6a65a3dedd421685955456a9804a9 perl-5.8.5-r4.ebuild 12716 -MD5 10a909c580f20dc318192141a0b7b007 perl-5.8.6-r3.ebuild 12797 +MD5 bf573e6da9008c5ee4f9972100691e75 perl-5.8.2-r2.ebuild 11040 +MD5 914c269b05feb9932f54ea6f96ecc83f perl-5.8.4-r3.ebuild 13178 +MD5 794f814d146fca07c88b5f399c9919ea perl-5.8.5-r4.ebuild 12818 +MD5 87b10622bf06d5a4cf7a5979f2c94b64 perl-5.8.6-r3.ebuild 12898 +MD5 6c1ee47c036f459405a7311c86e08234 perl-5.8.2-r4.ebuild 11040 +MD5 914c269b05feb9932f54ea6f96ecc83f perl-5.8.4-r4.ebuild 13178 +MD5 78ad1e97211f5bb34cc0fd03b789bd01 perl-5.8.4-r2.ebuild 13178 +MD5 314fbf69c3ce2c2f0165f645b62ffffa perl-5.8.5-r3.ebuild 12818 +MD5 5199d9dcd8a0328e1e1a43821e6ec723 perl-5.8.6-r2.ebuild 12834 +MD5 794f814d146fca07c88b5f399c9919ea perl-5.8.5-r5.ebuild 12818 +MD5 87b10622bf06d5a4cf7a5979f2c94b64 perl-5.8.6-r4.ebuild 12898 +MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250 +MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r3 64 +MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-perl-5.8.4-r3 64 +MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-perl-5.8.5-r4 64 +MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r3 64 +MD5 7d524860f97d7a73cb497f34b6c32099 files/CAN-2005-0448-rmtree.patch 7670 +MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r4 64 +MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-perl-5.8.4-r4 64 MD5 3195cf2f1f12f77ecc5b9c4fe9ea0995 files/libperl_rebuilder 10556 +MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428 +MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.2-reorder-INC.patch 2211 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446 MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.2-perldoc-emptydirs.patch 489 -MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.2-prelink-lpthread.patch 476 -MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.2-reorder-INC.patch 2211 MD5 ce442db939c59218a16be167f793b817 files/perl-5.8.2-uclibc.patch 573 -MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428 -MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.4-noksh.patch 611 MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.4-nonblock.patch 400 +MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.4-noksh.patch 611 +MD5 2e12f5128439c83b3c5a3615253f4d8f files/perl-cleaner 8606 +MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884 MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.4-perldoc-emptydirs.patch 489 MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.4-picdl.patch 250 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.4-prelink-lpthread.patch 476 @@ -38,22 +48,11 @@ MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.6-picdl.patch 250 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.6-prelink-lpthread.patch 476 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.6-reorder-INC.patch 2211 MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115 -MD5 2e12f5128439c83b3c5a3615253f4d8f files/perl-cleaner 8606 -MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884 +MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r2 64 MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-perl-5.8.4-r2 64 MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-perl-5.8.5-r3 64 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r2 64 -MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703 -MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r3 64 -MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-perl-5.8.4-r3 64 -MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-perl-5.8.5-r4 64 -MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r3 64 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCLjswArHZZzCEUG0RApA0AJ9EuJKc9i3kttR74KmCexXOZ9Oi+ACeJq54 -YQWXYzh9GfW2tI1SD4bijTc= -=Oil8 ------END PGP SIGNATURE----- +MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-perl-5.8.5-r5 64 +MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r4 64 diff --git a/dev-lang/perl/files/CAN-2005-0448-rmtree.patch b/dev-lang/perl/files/CAN-2005-0448-rmtree.patch new file mode 100644 index 000000000000..3f06f6118f56 --- /dev/null +++ b/dev-lang/perl/files/CAN-2005-0448-rmtree.patch @@ -0,0 +1,279 @@ +--- perl-5.8.4.orig/lib/File/Path.pm ++++ perl-5.8.4/lib/File/Path.pm +@@ -72,27 +72,17 @@ + + =item * + +-a boolean value, which if TRUE will cause C<rmtree> to +-skip any files to which you do not have delete access +-(if running under VMS) or write access (if running +-under another OS). This will change in the future when +-a criterion for 'delete permission' under OSs other +-than VMS is settled. (defaults to FALSE) ++a boolean value, which if FALSE (the default for non-root users) will ++cause C<rmtree> to adjust the mode of directories (if required) prior ++to attempting to remove the contents. Note that on interruption or ++failure of C<rmtree>, directories may be left with more permissive ++modes for the owner. + + =back + + It returns the number of files successfully deleted. Symlinks are + simply deleted and not followed. + +-B<NOTE:> If the third parameter is not TRUE, C<rmtree> is B<unsecure> +-in the face of failure or interruption. Files and directories which +-were not deleted may be left with permissions reset to allow world +-read and write access. Note also that the occurrence of errors in +-rmtree can be determined I<only> by trapping diagnostic messages +-using C<$SIG{__WARN__}>; it is not apparent from the return value. +-Therefore, you must be extremely careful about using C<rmtree($foo,$bar,0)> +-in situations where security is an issue. +- + =head1 DIAGNOSTICS + + =over 4 +@@ -118,6 +108,7 @@ + use Exporter (); + use strict; + use warnings; ++use Cwd 'getcwd'; + + our $VERSION = "1.06"; + our @ISA = qw( Exporter ); +@@ -166,111 +157,133 @@ + @created; + } + +-sub rmtree { +- my($roots, $verbose, $safe) = @_; +- my(@files); +- my($count) = 0; +- $verbose ||= 0; +- $safe ||= 0; +- +- if ( defined($roots) && length($roots) ) { +- $roots = [$roots] unless ref $roots; +- } +- else { +- carp "No root path(s) specified\n"; +- return 0; +- } +- +- my($root); +- foreach $root (@{$roots}) { +- if ($Is_MacOS) { +- $root = ":$root" if $root !~ /:/; +- $root =~ s#([^:])\z#$1:#; +- } else { +- $root =~ s#/\z##; ++sub _rmtree; ++sub _rmtree ++{ ++ my ($path, $prefix, $up, $up_dev, $up_ino, $verbose, $safe) = @_; ++ ++ my ($dev, $ino) = lstat $path or do { ++ carp "Can't stat $prefix$path ($!)" unless $!{ENOENT}; ++ return 0; ++ }; ++ ++ unless (-d _) ++ { ++ print "unlink $prefix$path\n" if $verbose; ++ unless (unlink $path) ++ { ++ carp "Can't remove file $prefix$path ($!)"; ++ return 0; + } +- (undef, undef, my $rp) = lstat $root or next; +- $rp &= 07777; # don't forget setuid, setgid, sticky bits +- if ( -d _ ) { +- # notabene: 0777 is for making readable in the first place, +- # it's also intended to change it to writable in case we have +- # to recurse in which case we are better than rm -rf for +- # subtrees with strange permissions +- chmod(0777, ($Is_VMS ? VMS::Filespec::fileify($root) : $root)) +- or carp "Can't make directory $root read+writeable: $!" +- unless $safe; +- +- if (opendir my $d, $root) { +- no strict 'refs'; +- if (!defined ${"\cTAINT"} or ${"\cTAINT"}) { +- # Blindly untaint dir names +- @files = map { /^(.*)$/s ; $1 } readdir $d; +- } else { +- @files = readdir $d; +- } +- closedir $d; +- } +- else { +- carp "Can't read $root: $!"; +- @files = (); +- } + +- # Deleting large numbers of files from VMS Files-11 filesystems +- # is faster if done in reverse ASCIIbetical order +- @files = reverse @files if $Is_VMS; +- ($root = VMS::Filespec::unixify($root)) =~ s#\.dir\z## if $Is_VMS; +- if ($Is_MacOS) { +- @files = map("$root$_", @files); +- } else { +- @files = map("$root/$_", grep $_!~/^\.{1,2}\z/s,@files); +- } +- $count += rmtree(\@files,$verbose,$safe); +- if ($safe && +- ($Is_VMS ? !&VMS::Filespec::candelete($root) : !-w $root)) { +- print "skipped $root\n" if $verbose; +- next; +- } +- chmod 0777, $root +- or carp "Can't make directory $root writeable: $!" +- if $force_writeable; +- print "rmdir $root\n" if $verbose; +- if (rmdir $root) { +- ++$count; +- } +- else { +- carp "Can't remove directory $root: $!"; +- chmod($rp, ($Is_VMS ? VMS::Filespec::fileify($root) : $root)) +- or carp("and can't restore permissions to " +- . sprintf("0%o",$rp) . "\n"); +- } +- } +- else { +- if ($safe && +- ($Is_VMS ? !&VMS::Filespec::candelete($root) +- : !(-l $root || -w $root))) +- { +- print "skipped $root\n" if $verbose; +- next; +- } +- chmod 0666, $root +- or carp "Can't make file $root writeable: $!" +- if $force_writeable; +- print "unlink $root\n" if $verbose; +- # delete all versions under VMS +- for (;;) { +- unless (unlink $root) { +- carp "Can't unlink file $root: $!"; +- if ($force_writeable) { +- chmod $rp, $root +- or carp("and can't restore permissions to " +- . sprintf("0%o",$rp) . "\n"); +- } +- last; +- } +- ++$count; +- last unless $Is_VMS && lstat $root; +- } ++ return 1; ++ } ++ ++ unless (chdir $path) ++ { ++ carp "Can't chdir to $prefix$path ($!)"; ++ return 0; ++ } ++ ++ # avoid a race condition where a directory may be replaced by a ++ # symlink between the lstat and the chdir ++ my ($new_dev, $new_ino, $perm) = stat '.'; ++ unless ("$new_dev:$new_ino" eq "$dev:$ino") ++ { ++ croak "Directory $prefix$path changed before chdir, aborting"; ++ } ++ ++ $perm &= 07777; ++ my $nperm = $perm | 0700; ++ unless ($safe or $nperm == $perm or chmod $nperm, '.') ++ { ++ carp "Can't make directory $prefix$path read+writeable ($!)"; ++ $nperm = $perm; ++ } ++ ++ my $count = 0; ++ if (opendir my $dir, '.') ++ { ++ my $entry; ++ while (defined ($entry = readdir $dir)) ++ { ++ next if $entry =~ /^\.\.?$/; ++ $entry =~ /^(.*)$/s; $entry = $1; # untaint ++ $count += _rmtree $entry, "$prefix$path/", '..', $dev, $ino, ++ $verbose, $safe; + } ++ ++ closedir $dir; ++ } ++ ++ # restore directory permissions if required (in case the rmdir ++ # below fails) now, while we're still in the directory and may do ++ # so without a race via '.' ++ unless ($nperm == $perm or chmod $perm, '.') ++ { ++ carp "Can't restore permissions on directory $prefix$path ($!)"; ++ } ++ ++ # don't leave the caller in an unexpected directory ++ unless (chdir $up) ++ { ++ croak "Can't return to $up from $prefix$path ($!)"; ++ } ++ ++ # ensure that a chdir .. didn't take us somewhere other than ++ # where we expected (see CVE-2002-0435) ++ unless (($new_dev, $new_ino) = stat '.' ++ and "$new_dev:$new_ino" eq "$up_dev:$up_ino") ++ { ++ croak "Previous directory $up changed since entering $prefix$path"; ++ } ++ ++ print "rmdir $prefix$path\n" if $verbose; ++ if (rmdir $path) ++ { ++ $count++; ++ } ++ else ++ { ++ carp "Can't remove directory $prefix$path ($!)"; ++ } ++ ++ return $count; ++} ++ ++sub rmtree ++{ ++ my ($p, $verbose, $safe) = @_; ++ $p = [] unless defined $p and length $p; ++ $p = [ $p ] unless ref $p; ++ my @paths = grep defined && length, @$p; ++ ++ # default to "unsafe" for non-root (will chmod dirs) ++ $safe = $> ? 0 : 1 unless defined $safe; ++ ++ unless (@paths) ++ { ++ carp "No root path(s) specified"; ++ return; ++ } ++ ++ my $oldpwd = getcwd or do { ++ carp "Can't fetch initial working directory"; ++ return; ++ }; ++ ++ my ($dev, $ino) = stat '.' or do { ++ carp "Can't stat initial working directory"; ++ return; ++ }; ++ ++ # untaint ++ for ($oldpwd) { /^(.*)$/s; $_ = $1 } ++ ++ my $count = 0; ++ for my $path (@paths) ++ { ++ $count += _rmtree $path, '', $oldpwd, $dev, $ino, $verbose, $safe; + } + + $count; diff --git a/dev-lang/perl/files/digest-perl-5.8.2-r4 b/dev-lang/perl/files/digest-perl-5.8.2-r4 new file mode 100644 index 000000000000..03c9dcc55731 --- /dev/null +++ b/dev-lang/perl/files/digest-perl-5.8.2-r4 @@ -0,0 +1 @@ +MD5 fa356b74f99166b63a68a322c3c68f91 perl-5.8.2.tar.gz 11896287 diff --git a/dev-lang/perl/files/digest-perl-5.8.4-r4 b/dev-lang/perl/files/digest-perl-5.8.4-r4 new file mode 100644 index 000000000000..a13f719f8c75 --- /dev/null +++ b/dev-lang/perl/files/digest-perl-5.8.4-r4 @@ -0,0 +1 @@ +MD5 912050a9cb6b0f415b76ba56052fb4cf perl-5.8.4.tar.gz 12094233 diff --git a/dev-lang/perl/files/digest-perl-5.8.5-r5 b/dev-lang/perl/files/digest-perl-5.8.5-r5 new file mode 100644 index 000000000000..a774272cdab6 --- /dev/null +++ b/dev-lang/perl/files/digest-perl-5.8.5-r5 @@ -0,0 +1 @@ +MD5 49baa8d7d29b4a9713c06edeb81e6b1b perl-5.8.5.tar.gz 11930764 diff --git a/dev-lang/perl/files/digest-perl-5.8.6-r4 b/dev-lang/perl/files/digest-perl-5.8.6-r4 new file mode 100644 index 000000000000..666169141e1e --- /dev/null +++ b/dev-lang/perl/files/digest-perl-5.8.6-r4 @@ -0,0 +1 @@ +MD5 3d030b6ff2a433840edb1a407d18dc0a perl-5.8.6.tar.bz2 9693085 diff --git a/dev-lang/perl/perl-5.8.2-r2.ebuild b/dev-lang/perl/perl-5.8.2-r2.ebuild index 388b1e8558cd..016bf64a6f66 100644 --- a/dev-lang/perl/perl-5.8.2-r2.ebuild +++ b/dev-lang/perl/perl-5.8.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r2.ebuild,v 1.4 2005/02/11 12:34:23 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r2.ebuild,v 1.5 2005/03/11 15:10:30 mcummings Exp $ inherit eutils flag-o-matic gcc @@ -96,7 +96,9 @@ src_unpack() { epatch ${FILESDIR}/perl-5.8.2-uclibc.patch # An additional tempfile patch, bug 75696 - epatch ${FILESDIR}/file_path_rmtree.patch + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch # Bug 80460, perlsuid vulnerability if use perlsuid diff --git a/dev-lang/perl/perl-5.8.2-r3.ebuild b/dev-lang/perl/perl-5.8.2-r3.ebuild index 3e1b86b30570..724815e72510 100644 --- a/dev-lang/perl/perl-5.8.2-r3.ebuild +++ b/dev-lang/perl/perl-5.8.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r3.ebuild,v 1.1 2005/02/11 12:34:23 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r3.ebuild,v 1.2 2005/03/11 15:10:30 mcummings Exp $ inherit eutils flag-o-matic gcc @@ -96,7 +96,9 @@ src_unpack() { epatch ${FILESDIR}/perl-5.8.2-uclibc.patch # An additional tempfile patch, bug 75696 - epatch ${FILESDIR}/file_path_rmtree.patch + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch # Bug 80460, perlsuid vulnerability if use perlsuid diff --git a/dev-lang/perl/perl-5.8.2-r4.ebuild b/dev-lang/perl/perl-5.8.2-r4.ebuild new file mode 100644 index 000000000000..69e3466f074e --- /dev/null +++ b/dev-lang/perl/perl-5.8.2-r4.ebuild @@ -0,0 +1,369 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r4.ebuild,v 1.1 2005/03/11 15:10:30 mcummings Exp $ + +inherit eutils flag-o-matic gcc + +# The slot of this binary compat version of libperl.so +PERLSLOT="1" + +SHORT_PV="${PV%.*}" +MY_P="perl-${PV/_rc/-RC}" +DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language" +S="${WORKDIR}/${MY_P}" +SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz" +HOMEPAGE="http://www.perl.org/" +SLOT="0" +LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}" +LICENSE="Artistic GPL-2" +KEYWORDS="x86 amd64 sparc ppc alpha mips hppa ia64 ppc64" +IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc" + +DEPEND="!uclibc? ( sys-apps/groff ) + berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + >=sys-devel/libperl-${PV} + !<dev-perl/ExtUtils-MakeMaker-6.17 + !<dev-perl/File-Spec-0.84-r1 + !<dev-perl/Test-Simple-0.47-r1" +RDEPEND=">=sys-devel/libperl-${PV} + berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.0 )" + +pkg_setup() { + # I think this should rather be displayed if you *have* 'ithreads' + # in USE if it could break things ... + if use ithreads + then + ewarn "" + ewarn "PLEASE NOTE: You are compiling perl-5.8 with" + ewarn "interpreter-level threading enabled." + ewarn "Threading is not supported by all applications " + ewarn "that compile against perl. You use threading at " + ewarn "your own discretion. " + ewarn "" + epause 10 + else + ewarn "" + ewarn "PLEASE NOTE: If you want to compile perl-5.8 with" + ewarn "threading enabled , you must restart this emerge" + ewarn "with USE=ithreads emerge...." + ewarn "Threading is not supported by all applications " + ewarn "that compile against perl. You use threading at " + ewarn "your own discretion. " + ewarn "" + fi + + if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ] + then + # Make sure we have libperl installed ... + eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}! Make sure that you" + eerror "have sys-libs/libperl installed properly ..." + die "Cannot find /usr/lib/${LIBPERL}!" + fi +} + +src_unpack() { + unpack ${A} + + # Get -lpthread linked before -lc. This is needed + # when using glibc >= 2.3, or else runtime signal + # handling breaks. Fixes bug #14380. + # <rac@gentoo.org> (14 Feb 2003) + # reinstated to try to avoid sdl segfaults 03.10.02 + cd ${S}; epatch ${FILESDIR}/${P}-prelink-lpthread.patch + + # Patch perldoc to not abort when it attempts to search + # nonexistent directories; fixes bug #16589. + # <rac@gentoo.org> (28 Feb 2003) + + cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch + + # this lays the groundwork for solving the issue of what happens + # when people (or ebuilds) install different versiosn of modules + # that are in the core, by rearranging the @INC directory to look + # site -> vendor -> core. + cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch + + # some well-intentioned stuff in http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=Pine.SOL.4.10.10205231231200.5399-100000%40maxwell.phys.lafayette.edu + # attempts to avoid bringing cccdlflags to bear on static + # extensions (like DynaLoader). i believe this is + # counterproductive on a Gentoo system which has both a shared + # and static libperl, so effectively revert this here. + cd ${S}; epatch ${FILESDIR}/${P}-picdl.patch + + # uclibc support + epatch ${FILESDIR}/perl-5.8.2-uclibc.patch + + # An additional tempfile patch, bug 75696 + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch + + # Bug 80460, perlsuid vulnerability + if use perlsuid + then + epatch ${FILESDIR}/CAN-2005-0156-suid.patch + fi + +} + +src_compile() { + # Perl has problems compiling with -Os in your flags with glibc + use uclibc || replace-flags "-Os" "-O2" + # This flag makes compiling crash in interesting ways + filter-flags -malign-double + + export LC_ALL="C" + local myconf="" + + if use ithreads + then + einfo "using ithreads" + mythreading="-multi" + myconf="-Dusethreads ${myconf}" + myarch="${CHOST%%-*}-linux-thread" + else + myarch="${CHOST%%-*}-linux" + fi + + if use gdbm + then + myconf="${myconf} -Di_gdbm" + fi + if use berkdb + then + myconf="${myconf} -Di_db" + + # ndbm.h is only provided by db1 (and perhaps by gdbm in + # error). an alternate approach here would be to check for the + # presence (or some string therein) of /usr/include/ndbm.h + # itself. + + if has_version '=sys-libs/db-1*' + then + myconf="${myconf} -Di_ndbm" + else + myconf="${myconf} -Ui_ndbm" + fi + else + myconf="${myconf} -Ui_db -Ui_ndbm" + fi + if use mips + then + # this is needed because gcc 3.3-compiled kernels will hang + # the machine trying to run this test - check with `Kumba + # <rac@gentoo.org> 2003.06.26 + myconf="${myconf} -Dd_u32align" + fi + + if use debug + then + CFLAGS="${CFLAGS} -g" + fi + + if use perlsuid + then + myconf="${myconf} -Dd_dosuid" + ewarn "You have enabled Perl's suid compile. Please" + ewarn "read http://perldoc.com/perl5.8.2/INSTALL.html#suidperl" + epause 3 + fi + + if use sparc + then + myconf="${myconf} -Ud_longdbl" + fi + + if use alpha && "$(gcc-getCC)" == "ccc" + then + ewarn "Perl will not be built with berkdb support, use gcc if you needed it..." + myconf="${myconf} -Ui_db -Ui_ndbm" + fi + + # These are temporary fixes. Need to edit the build so that that libraries created + # only get compiled with -fPIC, since they get linked into shared objects, they + # must be compiled with -fPIC. Don't have time to parse through the build system + # at this time. + [ "${ARCH}" = "hppa" ] && append-flags -fPIC +# [ "${ARCH}" = "amd64" ] && append-flags -fPIC + + sh Configure -des \ + -Darchname="${myarch}" \ + -Dcccdlflags='-fPIC' \ + -Dccdlflags='-rdynamic' \ + -Dcc="${CC:-gcc}" \ + -Dprefix='/usr' \ + -Dvendorprefix='/usr' \ + -Dsiteprefix='/usr' \ + -Dlocincpth=' ' \ + -Doptimize="${CFLAGS}" \ + -Duselargefiles \ + -Dd_semctl_semun \ + -Dscriptdir=/usr/bin \ + -Dman3ext='3pm' \ + -Dcf_by='Gentoo' \ + -Ud_csh \ + ${myconf} || die "Unable to configure" + + MAKEOPTS="${MAKEOPTS} -j1" emake || die "Unable to make" + + emake -i test CCDLFLAGS= +} + +src_install() { + + export LC_ALL="C" + + # Need to do this, else apps do not link to dynamic version of + # the library ... + local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE" + dodir ${coredir} + dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL} + dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT} + dosym ../../../../${LIBPERL} ${coredir}/libperl.so + + # Fix for "stupid" modules and programs + dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading} + + make DESTDIR="${D}" \ + INSTALLMAN1DIR="${D}/usr/share/man/man1" \ + INSTALLMAN3DIR="${D}/usr/share/man/man3" \ + install || die "Unable to make install" + + cp -f utils/h2ph utils/h2ph_patched + epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch + + LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \ + -a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF +asm/termios.h +syscall.h +syslimits.h +syslog.h +sys/ioctl.h +sys/socket.h +sys/time.h +wait.h +EOF + + # This is to fix a missing c flag for backwards compat + for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do + sed -e "s:ccflags=':ccflags='-DPERL5 :" \ + -e "s:cppflags=':cppflags='-DPERL5 :" \ + ${i} > ${i}.new &&\ + mv ${i}.new ${i} || die "Sed failed" + done + + # A poor fix for the miniperl issues + dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp + fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp + dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp + fperms 0755 /usr/bin/xsubpp + + ./perl installman \ + --destdir="${D}" --man1ext='1' --man3ext='3' + + # This removes ${D} from Config.pm and .packlist + for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do + einfo "Removing ${D} from ${i}..." + sed -e "s:${D}::" ${i} > ${i}.new &&\ + mv ${i}.new ${i} || die "Sed failed" + done + + dodoc Changes* Artistic Copying README Todo* AUTHORS + + if use doc + then + # HTML Documentation + # We expect errors, warnings, and such with the following. + + dodir /usr/share/doc/${PF}/html + ./perl installhtml \ + --podroot='.' \ + --podpath='lib:ext:pod:vms' \ + --recurse \ + --htmldir="${D}/usr/share/doc/${PF}/html" \ + --libpods='perlfunc:perlguts:perlvar:perlrun:perlop' + fi +} + +pkg_postinst() { + + # Make sure we do not have stale/invalid libperl.so 's ... + if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ] + then + mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old + fi + + local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`" + + # If we are installing perl, we need the /usr/lib/libperl.so symlink to + # point to the version of perl we are running, else builing something + # against libperl.so will break ... + if [ "${perllib}" != "${LIBPERL}" ] + then + # Delete stale symlinks + rm -f ${ROOT}usr/lib/libperl.so + rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT} + # Regenerate libperl.so.${PERLSLOT} + ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT} + # Create libperl.so (we use the *soname* versioned lib here ..) + ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so + fi + + INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PV}'|etc|local|perl$/; print "$line\n" }') + if [ "${ROOT}" = "/" ] + then + ebegin "Removing old .ph files" + for DIR in $INC; do + if [ -d ${ROOT}/$DIR ]; then + for file in $(find ${ROOT}/$DIR -name "*.ph" -type f); do + rm ${ROOT}/$file + einfo "<< $file" + done + fi + done + ebegin "Converting C header files to the corresponding Perl format" + cd /usr/include; + h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/* + cd /usr/include/linux; + h2ph * + + fi + + +# This has been moved into a function because rumor has it that a future release +# of portage will allow us to check what version was just removed - which means +# we will be able to invoke this only as needed :) + + # Tried doing this via -z, but $INC is too big... + if [ "${INC}x" != "x" ]; then + cleaner_msg + epause 10 + fi + +} + +cleaner_msg() { + eerror "You have changed versions of perl. It is recommended" + eerror "that you run" + eerror "${FILESDIR}/perl-cleaner " + eerror "to assist with this transition. This script is capable" + eerror "of cleaning out old .ph files, rebuilding modules for " + eerror "your new version of perl, as well as re-emerging" + eerror "applications that compiled against your old libperl.so" + eerror + eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT." + eerror "Part of the rebuilding of applications compiled against " + eerror "your old libperl involves temporarily unmerging" + eerror "them - interruptions could leave you with unmerged" + eerror "packages before they can be remerged." + eerror "" + eerror "If you have run the rebuilder and a package still gives" + eerror "you trouble, and re-emerging it fails to correct" + eerror "the problem, please check http://bugs.gentoo.org/" + eerror "for more information or to report a bug." + eerror "" + eerror "" + +} diff --git a/dev-lang/perl/perl-5.8.4-r2.ebuild b/dev-lang/perl/perl-5.8.4-r2.ebuild index 9bea7ee161e7..4ced61fd9570 100644 --- a/dev-lang/perl/perl-5.8.4-r2.ebuild +++ b/dev-lang/perl/perl-5.8.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r2.ebuild,v 1.4 2005/02/11 12:34:23 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r2.ebuild,v 1.5 2005/03/11 15:10:30 mcummings Exp $ inherit eutils flag-o-matic gcc @@ -118,8 +118,9 @@ src_unpack() { epatch ${FILESDIR}/${P}-nonblock.patch # An additional tempfile patch, bug 75696 - - epatch ${FILESDIR}/file_path_rmtree.patch + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch # Bug 80460, perlsuid vulnerability if use perlsuid diff --git a/dev-lang/perl/perl-5.8.4-r3.ebuild b/dev-lang/perl/perl-5.8.4-r3.ebuild index b127ce3d2599..6e63a9dd0452 100644 --- a/dev-lang/perl/perl-5.8.4-r3.ebuild +++ b/dev-lang/perl/perl-5.8.4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r3.ebuild,v 1.1 2005/02/11 12:34:23 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r3.ebuild,v 1.2 2005/03/11 15:10:30 mcummings Exp $ inherit eutils flag-o-matic gcc @@ -118,8 +118,9 @@ src_unpack() { epatch ${FILESDIR}/${P}-nonblock.patch # An additional tempfile patch, bug 75696 - - epatch ${FILESDIR}/file_path_rmtree.patch + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch # Bug 80460, perlsuid vulnerability if use perlsuid diff --git a/dev-lang/perl/perl-5.8.4-r4.ebuild b/dev-lang/perl/perl-5.8.4-r4.ebuild new file mode 100644 index 000000000000..b604cfcdd639 --- /dev/null +++ b/dev-lang/perl/perl-5.8.4-r4.ebuild @@ -0,0 +1,431 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r4.ebuild,v 1.1 2005/03/11 15:10:30 mcummings Exp $ + +inherit eutils flag-o-matic gcc + +# The slot of this binary compat version of libperl.so +PERLSLOT="1" + +SHORT_PV="${PV%.*}" +MY_P="perl-${PV/_rc/-RC}" +DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language" +S="${WORKDIR}/${MY_P}" +SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz" +HOMEPAGE="http://www.perl.org/" +LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}" + +LICENSE="Artistic GPL-2" +SLOT="0" +KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ~ppc64 s390 sh" +IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc" + +DEPEND="!uclibc? ( sys-apps/groff ) + berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + >=sys-devel/libperl-${PV} + !<dev-perl/ExtUtils-MakeMaker-6.17 + !<dev-perl/File-Spec-0.84-r1 + !<dev-perl/Test-Simple-0.47-r1" +RDEPEND=">=sys-devel/libperl-${PV} + berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.0 )" + +pkg_setup() { + # I think this should rather be displayed if you *have* 'ithreads' + # in USE if it could break things ... + if use ithreads + then + ewarn "" + ewarn "PLEASE NOTE: You are compiling perl-5.8 with" + ewarn "interpreter-level threading enabled." + ewarn "Threading is not supported by all applications " + ewarn "that compile against perl. You use threading at " + ewarn "your own discretion. " + ewarn "" + epause 10 + else + ewarn "" + ewarn "PLEASE NOTE: If you want to compile perl-5.8 with" + ewarn "threading enabled , you must restart this emerge" + ewarn "with USE=ithreads emerge...." + ewarn "Threading is not supported by all applications " + ewarn "that compile against perl. You use threading at " + ewarn "your own discretion. " + ewarn "" + fi + + if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ] + then + # Make sure we have libperl installed ... + eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}! Make sure that you" + eerror "have sys-libs/libperl installed properly ..." + die "Cannot find /usr/lib/${LIBPERL}!" + fi +} + +src_unpack() { + unpack ${A} + + # Get -lpthread linked before -lc. This is needed + # when using glibc >= 2.3, or else runtime signal + # handling breaks. Fixes bug #14380. + # <rac@gentoo.org> (14 Feb 2003) + # reinstated to try to avoid sdl segfaults 03.10.02 + cd ${S}; epatch ${FILESDIR}/${P}-prelink-lpthread.patch + + # Patch perldoc to not abort when it attempts to search + # nonexistent directories; fixes bug #16589. + # <rac@gentoo.org> (28 Feb 2003) + + cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch + + # this lays the groundwork for solving the issue of what happens + # when people (or ebuilds) install different versiosn of modules + # that are in the core, by rearranging the @INC directory to look + # site -> vendor -> core. + cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch + + # some well-intentioned stuff in http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=Pine.SOL.4.10.10205231231200.5399-100000%40maxwell.phys.lafayette.edu + # attempts to avoid bringing cccdlflags to bear on static + # extensions (like DynaLoader). i believe this is + # counterproductive on a Gentoo system which has both a shared + # and static libperl, so effectively revert this here. + cd ${S}; epatch ${FILESDIR}/${P}-picdl.patch + + # Configure makes an unwarranted assumption that /bin/ksh is a + # good shell. This patch makes it revert to using /bin/sh unless + # /bin/ksh really is executable. Should fix bug 42665. + # rac 2004.06.09 + cd ${S}; epatch ${FILESDIR}/${P}-noksh.patch + + # see bug 52660 + # i'm not entirely thrilled with this has_version, but can't see + # how else to handle it. attempting to link libgdbm_compat is + # fatal on systems where it doesn't exist. + + has_version ">=sys-libs/gdbm-1.8.3" && epatch ${FILESDIR}/${P}-NDBM-GDBM-compat.patch + + # uclibc support + epatch ${FILESDIR}/perl-5.8.2-uclibc.patch + + # this one only affects sparc64, as best weeve and rac can tell, + # but seems sane for all linux. we don't have to worry about + # drifting into obscure SysV non-posix semantics, and the current + # code in IO.xs that checks for this sort of thing dies in LDAP on + # sparc64. + + epatch ${FILESDIR}/${P}-nonblock.patch + + # An additional tempfile patch, bug 75696 + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch + + # Bug 80460, perlsuid vulnerability + if use perlsuid + then + epatch ${FILESDIR}/CAN-2005-0156-suid.patch + fi + +} + +src_configure() { + # some arches and -O do not mix :) + use arm && replace-flags -O? -O1 + use ppc && replace-flags -O? -O1 + use ia64 && replace-flags -O? -O1 + # Perl has problems compiling with -Os in your flags with glibc + use uclibc || replace-flags "-Os" "-O2" + # This flag makes compiling crash in interesting ways + filter-flags -malign-double + + export LC_ALL="C" + local myconf="" + + if use ithreads + then + einfo "using ithreads" + mythreading="-multi" + myconf="-Dusethreads ${myconf}" + myarch="${CHOST%%-*}-linux-thread" + else + myarch="${CHOST%%-*}-linux" + fi + + # allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1 + + myndbm='U' + mygdbm='U' + mydb='U' + + if use gdbm + then + mygdbm='D' + myndbm='D' + fi + + if use berkdb + then + mydb='D' + has_version '=sys-libs/db-1*' && myndbm='D' + fi + + myconf="${myconf} -${myndbm}i_ndbm -${mygdbm}i_gdbm -${mydb}i_db" + + if use mips + then + # this is needed because gcc 3.3-compiled kernels will hang + # the machine trying to run this test - check with `Kumba + # <rac@gentoo.org> 2003.06.26 + myconf="${myconf} -Dd_u32align" + fi + + if use perlsuid + then + myconf="${myconf} -Dd_dosuid" + ewarn "You have enabled Perl's suid compile. Please" + ewarn "read http://perldoc.com/perl5.8.2/INSTALL.html#suidperl" + epause 3 + fi + + if use debug + then + CFLAGS="${CFLAGS} -g" + fi + + if use sparc + then + myconf="${myconf} -Ud_longdbl" + fi + + if use alpha && "$(gcc-getCC)" == "ccc" + then + ewarn "Perl will not be built with berkdb support, use gcc if you needed it..." + myconf="${myconf} -Ui_db -Ui_ndbm" + fi + + # These are temporary fixes. Need to edit the build so that that libraries created + # only get compiled with -fPIC, since they get linked into shared objects, they + # must be compiled with -fPIC. Don't have time to parse through the build system + # at this time. + [ "${ARCH}" = "hppa" ] && append-flags -fPIC +# [ "${ARCH}" = "amd64" ] && append-flags -fPIC + + sh Configure -des \ + -Darchname="${myarch}" \ + -Dcccdlflags='-fPIC' \ + -Dccdlflags='-rdynamic' \ + -Dcc="${CC:-gcc}" \ + -Dprefix='/usr' \ + -Dvendorprefix='/usr' \ + -Dsiteprefix='/usr' \ + -Dlocincpth=' ' \ + -Doptimize="${CFLAGS}" \ + -Duselargefiles \ + -Dd_semctl_semun \ + -Dscriptdir=/usr/bin \ + -Dman1dir=/usr/share/man/man1 \ + -Dman3dir=/usr/share/man/man3 \ + -Dinstallman1dir=${D}/usr/share/man/man1 \ + -Dinstallman3dir=${D}/usr/share/man/man3 \ + -Dman1ext='1' \ + -Dman3ext='3pm' \ + -Dcf_by='Gentoo' \ + -Ud_csh \ + ${myconf} || die "Unable to configure" +} + +src_compile() { + + # would like to bracket this with a test for the existence of a + # dotfile, but can't clean it automatically now. + + src_configure + + emake -j1 || die "Unable to make" + + + # i want people to have to take actions to disable tests, because + # they reveal lots of important problems in clear ways. if that + # happens, you can revisit this, but portage .51 will call + # src_test if FEATURES=maketest is enabled, and we'll call it here + # if it isn't. + + if ! hasq maketest $FEATURES; then + src_test + fi +} + +src_test() { + use uclibc && export MAKEOPTS="${MAKEOPTS} -j1" + emake -i test CCDLFLAGS= || die "test failed" +} + +src_install() { + + export LC_ALL="C" + + # Need to do this, else apps do not link to dynamic version of + # the library ... + local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE" + dodir ${coredir} + dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL} + dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT} + dosym ../../../../${LIBPERL} ${coredir}/libperl.so + + # Fix for "stupid" modules and programs + dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading} + + make DESTDIR="${D}" install || die "Unable to make install" + + # 2004.07.28 rac + + # suidperl has had a history of security trouble, and the + # perldelta has recommended against using it for a while. genone + # alerted me to the fact that the hardlinks aren't carrying + # through the staging directory, and we end up with four copies of + # perl, basically. two normal, two suid. fix this up here, and + # delete suidperl entirely. if this causes outrage, here's where + # to fix. + + # Moved to a use flag enablement - bug 64823 - mcummings + #rm ${D}/usr/bin/sperl${PV} + #rm ${D}/usr/bin/suidperl + rm ${D}/usr/bin/perl + ln -s perl${PV} ${D}/usr/bin/perl + + cp -f utils/h2ph utils/h2ph_patched + epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch + + LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \ + -a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF +asm/termios.h +syscall.h +syslimits.h +syslog.h +sys/ioctl.h +sys/socket.h +sys/time.h +wait.h +EOF + + # This is to fix a missing c flag for backwards compat + for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do + sed -e "s:ccflags=':ccflags='-DPERL5 :" \ + -e "s:cppflags=':cppflags='-DPERL5 :" \ + ${i} > ${i}.new &&\ + mv ${i}.new ${i} || die "Sed failed" + done + + # A poor fix for the miniperl issues + dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp + fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp + dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp + fperms 0755 /usr/bin/xsubpp + + # This removes ${D} from Config.pm and .packlist + for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do + einfo "Removing ${D} from ${i}..." + sed -e "s:${D}::" ${i} > ${i}.new &&\ + mv ${i}.new ${i} || die "Sed failed" + done + + # Note: find out from psm why we would need/want this. + # ( use berkdb && has_version '=sys-libs/db-1*' ) || + # find ${D} -name "*NDBM*" | xargs rm -f + + dodoc Changes* Artistic Copying README Todo* AUTHORS + + if use doc + then + # HTML Documentation + # We expect errors, warnings, and such with the following. + + dodir /usr/share/doc/${PF}/html + ./perl installhtml \ + --podroot='.' \ + --podpath='lib:ext:pod:vms' \ + --recurse \ + --htmldir="${D}/usr/share/doc/${PF}/html" \ + --libpods='perlfunc:perlguts:perlvar:perlrun:perlop' + fi +} + +pkg_postinst() { + + # Make sure we do not have stale/invalid libperl.so 's ... + if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ] + then + mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old + fi + + local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`" + + # If we are installing perl, we need the /usr/lib/libperl.so symlink to + # point to the version of perl we are running, else builing something + # against libperl.so will break ... + if [ "${perllib}" != "${LIBPERL}" ] + then + # Delete stale symlinks + rm -f ${ROOT}usr/lib/libperl.so + rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT} + # Regenerate libperl.so.${PERLSLOT} + ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT} + # Create libperl.so (we use the *soname* versioned lib here ..) + ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so + fi + + INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PV}'|etc|local|perl$/; print "$line\n" }') + if [ "${ROOT}" = "/" ] + then + ebegin "Removing old .ph files" + for DIR in $INC; do + if [ -d ${ROOT}/$DIR ]; then + for file in $(find ${ROOT}/$DIR -name "*.ph" -type f); do + rm ${ROOT}/$file + einfo "<< $file" + done + fi + done + ebegin "Converting C header files to the corresponding Perl format" + cd /usr/include; + h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/* + cd /usr/include/linux; + h2ph * + fi +# This has been moved into a function because rumor has it that a future release +# of portage will allow us to check what version was just removed - which means +# we will be able to invoke this only as needed :) + + # Tried doing this via -z, but $INC is too big... + if [ "${INC}x" != "x" ]; then + cleaner_msg + epause 10 + fi + +} + +cleaner_msg() { + eerror "You have changed versions of perl. It is recommended" + eerror "that you run" + eerror "${FILESDIR}/perl-cleaner " + eerror "to assist with this transition. This script is capable" + eerror "of cleaning out old .ph files, rebuilding modules for " + eerror "your new version of perl, as well as re-emerging" + eerror "applications that compiled against your old libperl.so" + eerror + eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT." + eerror "Part of the rebuilding of applications compiled against " + eerror "your old libperl involves temporarily unmerging" + eerror "them - interruptions could leave you with unmerged" + eerror "packages before they can be remerged." + eerror "" + eerror "If you have run the rebuilder and a package still gives" + eerror "you trouble, and re-emerging it fails to correct" + eerror "the problem, please check http://bugs.gentoo.org/" + eerror "for more information or to report a bug." + eerror "" + eerror "" + +} diff --git a/dev-lang/perl/perl-5.8.5-r3.ebuild b/dev-lang/perl/perl-5.8.5-r3.ebuild index 9f73d42b5545..364076d68d8a 100644 --- a/dev-lang/perl/perl-5.8.5-r3.ebuild +++ b/dev-lang/perl/perl-5.8.5-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r3.ebuild,v 1.4 2005/02/11 12:34:23 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r3.ebuild,v 1.5 2005/03/11 15:10:30 mcummings Exp $ inherit eutils flag-o-matic gcc @@ -121,7 +121,9 @@ src_unpack() { epatch ${FILESDIR}/${P}-tempfiles.patch # An additional tempfile patch, bug 75696 - epatch ${FILESDIR}/file_path_rmtree.patch + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch # Bug 80460, perlsuid vulnerability if use perlsuid diff --git a/dev-lang/perl/perl-5.8.5-r4.ebuild b/dev-lang/perl/perl-5.8.5-r4.ebuild index 0fc20e4c060a..ef5165db9efd 100644 --- a/dev-lang/perl/perl-5.8.5-r4.ebuild +++ b/dev-lang/perl/perl-5.8.5-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r4.ebuild,v 1.1 2005/02/11 12:34:23 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r4.ebuild,v 1.2 2005/03/11 15:10:30 mcummings Exp $ inherit eutils flag-o-matic gcc @@ -121,7 +121,9 @@ src_unpack() { epatch ${FILESDIR}/${P}-tempfiles.patch # An additional tempfile patch, bug 75696 - epatch ${FILESDIR}/file_path_rmtree.patch + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch # Bug 80460, perlsuid vulnerability if use perlsuid diff --git a/dev-lang/perl/perl-5.8.5-r5.ebuild b/dev-lang/perl/perl-5.8.5-r5.ebuild new file mode 100644 index 000000000000..1627c539159f --- /dev/null +++ b/dev-lang/perl/perl-5.8.5-r5.ebuild @@ -0,0 +1,420 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r5.ebuild,v 1.1 2005/03/11 15:10:30 mcummings Exp $ + +inherit eutils flag-o-matic gcc + +# The slot of this binary compat version of libperl.so +PERLSLOT="1" + +SHORT_PV="${PV%.*}" +MY_P="perl-${PV/_rc/-RC}" +DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language" +S="${WORKDIR}/${MY_P}" +SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz" +HOMEPAGE="http://www.perl.org/" +LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}" + +LICENSE="Artistic GPL-2" +SLOT="0" +KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 sh" +IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc" +PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4" + +DEPEND="!uclibc? ( sys-apps/groff ) + berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.3 ) + >=sys-devel/libperl-${PV} + !<dev-perl/ExtUtils-MakeMaker-6.17 + !<dev-perl/File-Spec-0.84-r1 + !<dev-perl/Test-Simple-0.47-r1" +RDEPEND=">=sys-devel/libperl-${PV} + berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.3 )" + +pkg_setup() { + # I think this should rather be displayed if you *have* 'ithreads' + # in USE if it could break things ... + if use ithreads + then + ewarn "" + ewarn "PLEASE NOTE: You are compiling perl-5.8 with" + ewarn "interpreter-level threading enabled." + ewarn "Threading is not supported by all applications " + ewarn "that compile against perl. You use threading at " + ewarn "your own discretion. " + ewarn "" + epause 10 + else + ewarn "" + ewarn "PLEASE NOTE: If you want to compile perl-5.8 with" + ewarn "threading enabled , you must restart this emerge" + ewarn "with USE=ithreads emerge...." + ewarn "Threading is not supported by all applications " + ewarn "that compile against perl. You use threading at " + ewarn "your own discretion. " + ewarn "" + fi + + if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ] + then + # Make sure we have libperl installed ... + eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}! Make sure that you" + eerror "have sys-libs/libperl installed properly ..." + die "Cannot find /usr/lib/${LIBPERL}!" + fi +} + +src_unpack() { + unpack ${A} + + # Get -lpthread linked before -lc. This is needed + # when using glibc >= 2.3, or else runtime signal + # handling breaks. Fixes bug #14380. + # <rac@gentoo.org> (14 Feb 2003) + # reinstated to try to avoid sdl segfaults 03.10.02 + cd ${S}; epatch ${FILESDIR}/${P}-prelink-lpthread.patch + + # Patch perldoc to not abort when it attempts to search + # nonexistent directories; fixes bug #16589. + # <rac@gentoo.org> (28 Feb 2003) + + cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch + + # this lays the groundwork for solving the issue of what happens + # when people (or ebuilds) install different versiosn of modules + # that are in the core, by rearranging the @INC directory to look + # site -> vendor -> core. + cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch + + # some well-intentioned stuff in http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=Pine.SOL.4.10.10205231231200.5399-100000%40maxwell.phys.lafayette.edu + # attempts to avoid bringing cccdlflags to bear on static + # extensions (like DynaLoader). i believe this is + # counterproductive on a Gentoo system which has both a shared + # and static libperl, so effectively revert this here. + cd ${S}; epatch ${FILESDIR}/${P}-picdl.patch + + # Configure makes an unwarranted assumption that /bin/ksh is a + # good shell. This patch makes it revert to using /bin/sh unless + # /bin/ksh really is executable. Should fix bug 42665. + # rac 2004.06.09 + cd ${S}; epatch ${FILESDIR}/${P}-noksh.patch + + # uclibc support + epatch ${FILESDIR}/perl-5.8.2-uclibc.patch + + # this one only affects sparc64, as best weeve and rac can tell, + # but seems sane for all linux. we don't have to worry about + # drifting into obscure SysV non-posix semantics, and the current + # code in IO.xs that checks for this sort of thing dies in LDAP on + # sparc64. + + epatch ${FILESDIR}/${P}-nonblock.patch + + # since we build in non-world-writeable portage directories, none + # of the .t sections of the original version of this patch matter + # much. the PPPort section is apparently obsolete, because i see + # no /tmp in there now. ditto on perlbug.SH, which has secure + # tempfile handling if resources are present. originally from bug + # 66360. + + epatch ${FILESDIR}/${P}-tempfiles.patch + + # An additional tempfile patch, bug 75696 + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch + + # Bug 80460, perlsuid vulnerability + if use perlsuid + then + epatch ${FILESDIR}/CAN-2005-0156-suid.patch + fi + +} + +src_configure() { + # some arches and -O do not mix :) + use arm && replace-flags -O? -O1 + use ppc && replace-flags -O? -O1 + use ia64 && replace-flags -O? -O1 + # Perl has problems compiling with -Os in your flags with glibc + use uclibc || replace-flags "-Os" "-O2" + # This flag makes compiling crash in interesting ways + filter-flags -malign-double + + export LC_ALL="C" + local myconf="" + + if use ithreads + then + einfo "using ithreads" + mythreading="-multi" + myconf="-Dusethreads ${myconf}" + myarch="${CHOST%%-*}-linux-thread" + else + myarch="${CHOST%%-*}-linux" + fi + + local inclist=$(for v in $PERL_OLDVERSEN; do echo -n "$v $v/$myarch$mythreading "; done) + + # allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1 + + myndbm='U' + mygdbm='U' + mydb='U' + + if use gdbm + then + mygdbm='D' + myndbm='D' + fi + if use berkdb + then + mydb='D' + has_version '=sys-libs/db-1*' && myndbm='D' + fi + + myconf="${myconf} -${myndbm}i_ndbm -${mygdbm}i_gdbm -${mydb}i_db" + + if use mips + then + # this is needed because gcc 3.3-compiled kernels will hang + # the machine trying to run this test - check with `Kumba + # <rac@gentoo.org> 2003.06.26 + myconf="${myconf} -Dd_u32align" + fi + + if use perlsuid + then + myconf="${myconf} -Dd_dosuid" + ewarn "You have enabled Perl's suid compile. Please" + ewarn "read http://perldoc.com/perl5.8.2/INSTALL.html#suidperl" + epause 3 + fi + + if use debug + then + CFLAGS="${CFLAGS} -g" + fi + + if use sparc + then + myconf="${myconf} -Ud_longdbl" + fi + + if use alpha && "$(gcc-getCC)" == "ccc" + then + ewarn "Perl will not be built with berkdb support, use gcc if you needed it..." + myconf="${myconf} -Ui_db -Ui_ndbm" + fi + + [ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)" + + sh Configure -des \ + -Darchname="${myarch}" \ + -Dcccdlflags='-fPIC' \ + -Dccdlflags='-rdynamic' \ + -Dcc="${CC:-gcc}" \ + -Dprefix='/usr' \ + -Dvendorprefix='/usr' \ + -Dsiteprefix='/usr' \ + -Dlocincpth=' ' \ + -Doptimize="${CFLAGS}" \ + -Duselargefiles \ + -Dd_semctl_semun \ + -Dscriptdir=/usr/bin \ + -Dman1dir=/usr/share/man/man1 \ + -Dman3dir=/usr/share/man/man3 \ + -Dinstallman1dir=${D}/usr/share/man/man1 \ + -Dinstallman3dir=${D}/usr/share/man/man3 \ + -Dman1ext='1' \ + -Dman3ext='3pm' \ + -Dinc_version_list="$inclist" \ + -Dcf_by='Gentoo' \ + -Ud_csh \ + ${myconf} || die "Unable to configure" +} + +src_compile() { + + # would like to bracket this with a test for the existence of a + # dotfile, but can't clean it automatically now. + + src_configure + + emake -j1 || die "Unable to make" +} + +src_test() { + use uclibc && export MAKEOPTS="${MAKEOPTS} -j1" + emake -i test CCDLFLAGS= || die "test failed" +} + +src_install() { + + export LC_ALL="C" + + # Need to do this, else apps do not link to dynamic version of + # the library ... + local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE" + dodir ${coredir} + dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL} + dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT} + dosym ../../../../${LIBPERL} ${coredir}/libperl.so + + # Fix for "stupid" modules and programs + dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading} + + make DESTDIR="${D}" install || die "Unable to make install" + + # 2004.07.28 rac + + # suidperl has had a history of security trouble, and the + # perldelta has recommended against using it for a while. genone + # alerted me to the fact that the hardlinks aren't carrying + # through the staging directory, and we end up with four copies of + # perl, basically. two normal, two suid. fix this up here, and + # delete suidperl entirely. if this causes outrage, here's where + # to fix. + + # Moved to a use flag enablement - bug 64823 - mcummings + #rm ${D}/usr/bin/sperl${PV} + #rm ${D}/usr/bin/suidperl + rm ${D}/usr/bin/perl + ln -s perl${PV} ${D}/usr/bin/perl + + cp -f utils/h2ph utils/h2ph_patched + epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch + + LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \ + -a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF +asm/termios.h +syscall.h +syslimits.h +syslog.h +sys/ioctl.h +sys/socket.h +sys/time.h +wait.h +EOF + + # This is to fix a missing c flag for backwards compat + for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do + sed -e "s:ccflags=':ccflags='-DPERL5 :" \ + -e "s:cppflags=':cppflags='-DPERL5 :" \ + ${i} > ${i}.new &&\ + mv ${i}.new ${i} || die "Sed failed" + done + + # A poor fix for the miniperl issues + dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp + fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp + dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp + fperms 0755 /usr/bin/xsubpp + + # This removes ${D} from Config.pm and .packlist + for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do + einfo "Removing ${D} from ${i}..." + sed -e "s:${D}::" ${i} > ${i}.new &&\ + mv ${i}.new ${i} || die "Sed failed" + done + + # Note: find out from psm why we would need/want this. + # ( use berkdb && has_version '=sys-libs/db-1*' ) || + # find ${D} -name "*NDBM*" | xargs rm -f + + dodoc Changes* Artistic Copying README Todo* AUTHORS + + if use doc + then + # HTML Documentation + # We expect errors, warnings, and such with the following. + + dodir /usr/share/doc/${PF}/html + ./perl installhtml \ + --podroot='.' \ + --podpath='lib:ext:pod:vms' \ + --recurse \ + --htmldir="${D}/usr/share/doc/${PF}/html" \ + --libpods='perlfunc:perlguts:perlvar:perlrun:perlop' + fi +} + +pkg_postinst() { + # Make sure we do not have stale/invalid libperl.so 's ... + if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ] + then + mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old + fi + + local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`" + + # If we are installing perl, we need the /usr/lib/libperl.so symlink to + # point to the version of perl we are running, else builing something + # against libperl.so will break ... + if [ "${perllib}" != "${LIBPERL}" ] + then + # Delete stale symlinks + rm -f ${ROOT}usr/lib/libperl.so + rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT} + # Regenerate libperl.so.${PERLSLOT} + ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT} + # Create libperl.so (we use the *soname* versioned lib here ..) + ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so + fi + + INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PV}'|etc|local|perl$/; print "$line\n" }') + if [ "${ROOT}" = "/" ] + then + ebegin "Removing old .ph files" + for DIR in $INC; do + if [ -d ${ROOT}/$DIR ]; then + for file in $(find ${ROOT}/$DIR -name "*.ph" -type f); do + rm ${ROOT}/$file + einfo "<< $file" + done + fi + done + ebegin "Converting C header files to the corresponding Perl format" + cd /usr/include; + h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/* + cd /usr/include/linux; + h2ph * + fi + +# This has been moved into a function because rumor has it that a future release +# of portage will allow us to check what version was just removed - which means +# we will be able to invoke this only as needed :) + + # Tried doing this via -z, but $INC is too big... + if [ "${INC}x" != "x" ]; then + cleaner_msg + epause 10 + fi + +} + +cleaner_msg() { + eerror "You have changed versions of perl. It is recommended" + eerror "that you run" + eerror "${FILESDIR}/perl-cleaner " + eerror "to assist with this transition. This script is capable" + eerror "of cleaning out old .ph files, rebuilding modules for " + eerror "your new version of perl, as well as re-emerging" + eerror "applications that compiled against your old libperl.so" + eerror + eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT." + eerror "Part of the rebuilding of applications compiled against " + eerror "your old libperl involves temporarily unmerging" + eerror "them - interruptions could leave you with unmerged" + eerror "packages before they can be remerged." + eerror "" + eerror "If you have run the rebuilder and a package still gives" + eerror "you trouble, and re-emerging it fails to correct" + eerror "the problem, please check http://bugs.gentoo.org/" + eerror "for more information or to report a bug." + eerror "" + eerror "" + +} diff --git a/dev-lang/perl/perl-5.8.6-r2.ebuild b/dev-lang/perl/perl-5.8.6-r2.ebuild index 3ab5fa6c42c1..63ee0b045d50 100644 --- a/dev-lang/perl/perl-5.8.6-r2.ebuild +++ b/dev-lang/perl/perl-5.8.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r2.ebuild,v 1.4 2005/02/11 12:34:23 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r2.ebuild,v 1.5 2005/03/11 15:10:30 mcummings Exp $ inherit eutils flag-o-matic gcc @@ -121,8 +121,9 @@ src_unpack() { epatch ${FILESDIR}/${P}-tempfiles.patch # An additional tempfile patch, bug 75696 - - epatch ${FILESDIR}/file_path_rmtree.patch + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch # Bug 80460, perlsuid vulnerability if use perlsuid diff --git a/dev-lang/perl/perl-5.8.6-r3.ebuild b/dev-lang/perl/perl-5.8.6-r3.ebuild index 4d7eea6d4021..02fac8b75f26 100644 --- a/dev-lang/perl/perl-5.8.6-r3.ebuild +++ b/dev-lang/perl/perl-5.8.6-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r3.ebuild,v 1.2 2005/03/08 23:53:51 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r3.ebuild,v 1.3 2005/03/11 15:10:30 mcummings Exp $ inherit eutils flag-o-matic gcc multilib @@ -121,8 +121,9 @@ src_unpack() { epatch ${FILESDIR}/${P}-tempfiles.patch # An additional tempfile patch, bug 75696 - - epatch ${FILESDIR}/file_path_rmtree.patch + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch # Bug 80460, perlsuid vulnerability if use perlsuid diff --git a/dev-lang/perl/perl-5.8.6-r4.ebuild b/dev-lang/perl/perl-5.8.6-r4.ebuild new file mode 100644 index 000000000000..1c057da59089 --- /dev/null +++ b/dev-lang/perl/perl-5.8.6-r4.ebuild @@ -0,0 +1,421 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r4.ebuild,v 1.1 2005/03/11 15:10:30 mcummings Exp $ + +inherit eutils flag-o-matic gcc multilib + +# The slot of this binary compat version of libperl.so +PERLSLOT="1" + +SHORT_PV="${PV%.*}" +MY_P="perl-${PV/_rc/-RC}" +DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language" +S="${WORKDIR}/${MY_P}" +SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.bz2" +HOMEPAGE="http://www.perl.org/" +LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}" + +LICENSE="Artistic GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh" +IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc" +PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5" + +DEPEND="!uclibc? ( sys-apps/groff ) + berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.3 ) + >=sys-devel/libperl-${PV} + !<dev-perl/ExtUtils-MakeMaker-6.17 + !<dev-perl/File-Spec-0.87 + !<dev-perl/Test-Simple-0.47-r1" +RDEPEND=">=sys-devel/libperl-${PV} + berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.3 )" + +pkg_setup() { + # I think this should rather be displayed if you *have* 'ithreads' + # in USE if it could break things ... + if use ithreads + then + ewarn "" + ewarn "PLEASE NOTE: You are compiling perl-5.8 with" + ewarn "interpreter-level threading enabled." + ewarn "Threading is not supported by all applications " + ewarn "that compile against perl. You use threading at " + ewarn "your own discretion. " + ewarn "" + epause 10 + else + ewarn "" + ewarn "PLEASE NOTE: If you want to compile perl-5.8 with" + ewarn "threading enabled , you must restart this emerge" + ewarn "with USE=ithreads emerge...." + ewarn "Threading is not supported by all applications " + ewarn "that compile against perl. You use threading at " + ewarn "your own discretion. " + ewarn "" + fi + + if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ] + then + # Make sure we have libperl installed ... + eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}! Make sure that you" + eerror "have sys-libs/libperl installed properly ..." + die "Cannot find /usr/lib/${LIBPERL}!" + fi +} + +src_unpack() { + unpack ${A} + + # Get -lpthread linked before -lc. This is needed + # when using glibc >= 2.3, or else runtime signal + # handling breaks. Fixes bug #14380. + # <rac@gentoo.org> (14 Feb 2003) + # reinstated to try to avoid sdl segfaults 03.10.02 + cd ${S}; epatch ${FILESDIR}/${P}-prelink-lpthread.patch + + # Patch perldoc to not abort when it attempts to search + # nonexistent directories; fixes bug #16589. + # <rac@gentoo.org> (28 Feb 2003) + + cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch + + # this lays the groundwork for solving the issue of what happens + # when people (or ebuilds) install different versiosn of modules + # that are in the core, by rearranging the @INC directory to look + # site -> vendor -> core. + cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch + + # some well-intentioned stuff in http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=Pine.SOL.4.10.10205231231200.5399-100000%40maxwell.phys.lafayette.edu + # attempts to avoid bringing cccdlflags to bear on static + # extensions (like DynaLoader). i believe this is + # counterproductive on a Gentoo system which has both a shared + # and static libperl, so effectively revert this here. + cd ${S}; epatch ${FILESDIR}/${P}-picdl.patch + + # Configure makes an unwarranted assumption that /bin/ksh is a + # good shell. This patch makes it revert to using /bin/sh unless + # /bin/ksh really is executable. Should fix bug 42665. + # rac 2004.06.09 + cd ${S}; epatch ${FILESDIR}/${P}-noksh.patch + + # uclibc support + epatch ${FILESDIR}/perl-5.8.2-uclibc.patch + + # this one only affects sparc64, as best weeve and rac can tell, + # but seems sane for all linux. we don't have to worry about + # drifting into obscure SysV non-posix semantics, and the current + # code in IO.xs that checks for this sort of thing dies in LDAP on + # sparc64. + + #epatch ${FILESDIR}/${P}-nonblock.patch + + # since we build in non-world-writeable portage directories, none + # of the .t sections of the original version of this patch matter + # much. the PPPort section is apparently obsolete, because i see + # no /tmp in there now. ditto on perlbug.SH, which has secure + # tempfile handling if resources are present. originally from bug + # 66360. + + epatch ${FILESDIR}/${P}-tempfiles.patch + + # An additional tempfile patch, bug 75696 + #epatch ${FILESDIR}/file_path_rmtree.patch + # Superceded by the following CAN patch in bug 79685 + epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch + + # Bug 80460, perlsuid vulnerability + if use perlsuid + then + epatch ${FILESDIR}/CAN-2005-0156-suid.patch + fi + +} + +src_configure() { + + # some arches and -O do not mix :) + use arm && replace-flags -O? -O1 + use ppc && replace-flags -O? -O1 + use ia64 && replace-flags -O? -O1 + # Perl has problems compiling with -Os in your flags with glibc + use uclibc || replace-flags "-Os" "-O2" + # This flag makes compiling crash in interesting ways + filter-flags -malign-double + + export LC_ALL="C" + local myconf="" + + if use ithreads + then + einfo "using ithreads" + mythreading="-multi" + myconf="-Dusethreads ${myconf}" + myarch=$(get_abi_CHOST) + myarch="${myarch%%-*}-linux-thread" + else + myarch=$(get_abi_CHOST) + myarch="${myarch%%-*}-linux" + fi + + local inclist=$(for v in $PERL_OLDVERSEN; do echo -n "$v $v/$myarch$mythreading "; done) + + # allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1 + + myndbm='U' + mygdbm='U' + mydb='U' + + if use gdbm + then + mygdbm='D' + myndbm='D' + fi + if use berkdb + then + mydb='D' + has_version '=sys-libs/db-1*' && myndbm='D' + fi + + myconf="${myconf} -${myndbm}i_ndbm -${mygdbm}i_gdbm -${mydb}i_db" + + if use mips + then + # this is needed because gcc 3.3-compiled kernels will hang + # the machine trying to run this test - check with `Kumba + # <rac@gentoo.org> 2003.06.26 + myconf="${myconf} -Dd_u32align" + fi + + if use perlsuid + then + myconf="${myconf} -Dd_dosuid" + ewarn "You have enabled Perl's suid compile. Please" + ewarn "read http://perldoc.com/perl5.8.2/INSTALL.html#suidperl" + epause 3 + fi + + if use debug + then + CFLAGS="${CFLAGS} -g" + fi + + if use sparc + then + myconf="${myconf} -Ud_longdbl" + fi + + if use alpha && "$(gcc-getCC)" == "ccc" + then + ewarn "Perl will not be built with berkdb support, use gcc if you needed it..." + myconf="${myconf} -Ui_db -Ui_ndbm" + fi + + [ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)" + + sh Configure -des \ + -Darchname="${myarch}" \ + -Dcccdlflags='-fPIC' \ + -Dccdlflags='-rdynamic' \ + -Dcc="${CC:-gcc}" \ + -Dprefix='/usr' \ + -Dvendorprefix='/usr' \ + -Dsiteprefix='/usr' \ + -Dlocincpth=' ' \ + -Doptimize="${CFLAGS}" \ + -Duselargefiles \ + -Dd_semctl_semun \ + -Dscriptdir=/usr/bin \ + -Dman1dir=/usr/share/man/man1 \ + -Dman3dir=/usr/share/man/man3 \ + -Dinstallman1dir=${D}/usr/share/man/man1 \ + -Dinstallman3dir=${D}/usr/share/man/man3 \ + -Dman1ext='1' \ + -Dman3ext='3pm' \ + -Dinc_version_list="$inclist" \ + -Dcf_by='Gentoo' \ + -Ud_csh \ + ${myconf} || die "Unable to configure" +} + +src_compile() { + + # would like to bracket this with a test for the existence of a + # dotfile, but can't clean it automatically now. + + src_configure + + emake -j1 || die "Unable to make" +} + +src_test() { + use uclibc && export MAKEOPTS="${MAKEOPTS} -j1" + emake -i test CCDLFLAGS= || die "test failed" +} + +src_install() { + + export LC_ALL="C" + + # Need to do this, else apps do not link to dynamic version of + # the library ... + local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE" + dodir ${coredir} + dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL} + dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT} + dosym ../../../../${LIBPERL} ${coredir}/libperl.so + + # Fix for "stupid" modules and programs + dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading} + + make DESTDIR="${D}" install || die "Unable to make install" + + # 2004.07.28 rac + + # suidperl has had a history of security trouble, and the + # perldelta has recommended against using it for a while. genone + # alerted me to the fact that the hardlinks aren't carrying + # through the staging directory, and we end up with four copies of + # perl, basically. two normal, two suid. fix this up here, and + # delete suidperl entirely. if this causes outrage, here's where + # to fix. + + # Moved to a use flag enablement - bug 64823 - mcummings + #rm ${D}/usr/bin/sperl${PV} + #rm ${D}/usr/bin/suidperl + rm ${D}/usr/bin/perl + ln -s perl${PV} ${D}/usr/bin/perl + + cp -f utils/h2ph utils/h2ph_patched + epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch + + LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \ + -a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF +asm/termios.h +syscall.h +syslimits.h +syslog.h +sys/ioctl.h +sys/socket.h +sys/time.h +wait.h +EOF + + # This is to fix a missing c flag for backwards compat + for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do + sed -e "s:ccflags=':ccflags='-DPERL5 :" \ + -e "s:cppflags=':cppflags='-DPERL5 :" \ + ${i} > ${i}.new &&\ + mv ${i}.new ${i} || die "Sed failed" + done + + # A poor fix for the miniperl issues + dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp + fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp + dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp + fperms 0755 /usr/bin/xsubpp + + # This removes ${D} from Config.pm and .packlist + for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do + einfo "Removing ${D} from ${i}..." + sed -e "s:${D}::" ${i} > ${i}.new &&\ + mv ${i}.new ${i} || die "Sed failed" + done + + # Note: find out from psm why we would need/want this. + # ( use berkdb && has_version '=sys-libs/db-1*' ) || + # find ${D} -name "*NDBM*" | xargs rm -f + + dodoc Changes* Artistic Copying README Todo* AUTHORS + + if use doc + then + # HTML Documentation + # We expect errors, warnings, and such with the following. + + dodir /usr/share/doc/${PF}/html + ./perl installhtml \ + --podroot='.' \ + --podpath='lib:ext:pod:vms' \ + --recurse \ + --htmldir="${D}/usr/share/doc/${PF}/html" \ + --libpods='perlfunc:perlguts:perlvar:perlrun:perlop' + fi +} + +pkg_postinst() { + # Make sure we do not have stale/invalid libperl.so 's ... + if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ] + then + mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old + fi + + local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`" + + # If we are installing perl, we need the /usr/lib/libperl.so symlink to + # point to the version of perl we are running, else builing something + # against libperl.so will break ... + if [ "${perllib}" != "${LIBPERL}" ] + then + # Delete stale symlinks + rm -f ${ROOT}usr/lib/libperl.so + rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT} + # Regenerate libperl.so.${PERLSLOT} + ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT} + # Create libperl.so (we use the *soname* versioned lib here ..) + ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so + fi + + INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PV}'|etc|local|perl$/; print "$line\n" }') + if [ "${ROOT}" = "/" ] + then + ebegin "Removing old .ph files" + for DIR in $INC; do + if [ -d ${ROOT}/$DIR ]; then + for file in $(find ${ROOT}/$DIR -name "*.ph" -type f); do + rm ${ROOT}/$file + einfo "<< $file" + done + fi + done + ebegin "Converting C header files to the corresponding Perl format" + cd /usr/include; + h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/* + cd /usr/include/linux; + h2ph * + fi + +# This has been moved into a function because rumor has it that a future release +# of portage will allow us to check what version was just removed - which means +# we will be able to invoke this only as needed :) + # Tried doing this via -z, but $INC is too big... + if [ "${INC}x" != "x" ]; then + cleaner_msg + epause 10 + fi +} + +cleaner_msg() { + eerror "You have changed versions of perl. It is recommended" + eerror "that you run" + eerror "${FILESDIR}/perl-cleaner " + eerror "to assist with this transition. This script is capable" + eerror "of cleaning out old .ph files, rebuilding modules for " + eerror "your new version of perl, as well as re-emerging" + eerror "applications that compiled against your old libperl.so" + eerror + eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT." + eerror "Part of the rebuilding of applications compiled against " + eerror "your old libperl involves temporarily unmerging" + eerror "them - interruptions could leave you with unmerged" + eerror "packages before they can be remerged." + eerror "" + eerror "If you have run the rebuilder and a package still gives" + eerror "you trouble, and re-emerging it fails to correct" + eerror "the problem, please check http://bugs.gentoo.org/" + eerror "for more information or to report a bug." + eerror "" + eerror "" + +} |