+++ /dev/null
-diff -urN perl-5.6.1.orig/lib/CGI.pm perl-5.6.1/lib/CGI.pm
---- perl-5.6.1.orig/lib/CGI.pm Sat Mar 3 20:53:20 2001
-+++ perl-5.6.1/lib/CGI.pm Thu Apr 12 20:54:36 2001
-@@ -23,7 +23,7 @@
-
- # HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
- # UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
--# $TempFile::TMPDIRECTORY = '/usr/tmp';
-+$TempFile::TMPDIRECTORY = '/tmp';
- use CGI::Util qw(rearrange make_attributes unescape escape expires);
-
- use constant XHTML_DTD => ['-//W3C//DTD XHTML Basic 1.0//EN',
+++ /dev/null
---- perl-5.6.0/lib/ExtUtils/MM_Unix.pm.pius Thu Mar 2 18:52:52 2000
-+++ perl-5.6.0/lib/ExtUtils/MM_Unix.pm Sun Jul 2 11:13:32 2000
-@@ -552,8 +552,7 @@
- AR_STATIC_ARGS NAME DISTNAME NAME_SYM VERSION
- VERSION_SYM XS_VERSION INST_BIN INST_EXE INST_LIB
- INST_ARCHLIB INST_SCRIPT PREFIX INSTALLDIRS
-- INSTALLPRIVLIB INSTALLARCHLIB INSTALLSITELIB
-- INSTALLSITEARCH INSTALLBIN INSTALLSCRIPT PERL_LIB
-+ PERL_LIB
- PERL_ARCHLIB SITELIBEXP SITEARCHEXP LIBPERL_A MYEXTLIB
- FIRST_MAKEFILE MAKE_APERL_FILE PERLMAINCC PERL_SRC
- PERL_INC PERL FULLPERL FULL_AR
-@@ -563,6 +562,16 @@
- push @m, "$tmp = $self->{$tmp}\n";
- }
-
-+ for $tmp (qw/
-+
-+ INSTALLPRIVLIB INSTALLARCHLIB INSTALLSITELIB
-+ INSTALLSITEARCH INSTALLBIN INSTALLSCRIPT
-+
-+ / ) {
-+ next unless defined $self->{$tmp};
-+ push @m, "$tmp = \$\(DESTDIR\)$self->{$tmp}\n";
-+ }
-+
- push @m, qq{
- VERSION_MACRO = VERSION
- DEFINE_VERSION = -D\$(VERSION_MACRO)=\\\"\$(VERSION)\\\"
-@@ -609,12 +618,19 @@
- INST_HTMLSITELIBDIR INSTALLHTMLSITELIBDIR
- INST_HTMLSCRIPTDIR INSTALLHTMLSCRIPTDIR
- INST_HTMLLIBDIR HTMLEXT
-- INST_MAN1DIR INSTALLMAN1DIR MAN1EXT
-- INST_MAN3DIR INSTALLMAN3DIR MAN3EXT
-+ INST_MAN1DIR MAN1EXT
-+ INST_MAN3DIR MAN3EXT
- /) {
- next unless defined $self->{$tmp};
- push @m, "$tmp = $self->{$tmp}\n";
- }
-+
-+ for $tmp (qw/
-+ INSTALLMAN1DIR INSTALLMAN3DIR
-+ /) {
-+ next unless defined $self->{$tmp};
-+ push @m, "$tmp = \$\(DESTDIR\)$self->{$tmp}\n";
-+ }
-
- for $tmp (qw(
- PERM_RW PERM_RWX
+++ /dev/null
-diff -urN perl5.005_03.old/lib/File/Spec/Functions.pm perl5.005_03/lib/File/Spec/Functions.pm
---- perl5.005_03.old/lib/File/Spec/Functions.pm Thu Jan 1 01:00:00 1970
-+++ perl5.005_03/lib/File/Spec/Functions.pm Sun Dec 6 05:22:30 1998
-@@ -0,0 +1,37 @@
-+package File::Spec::Functions;
-+
-+use File::Spec;
-+use strict;
-+
-+use vars qw(@ISA @EXPORT);
-+
-+require Exporter;
-+
-+@ISA = qw(Exporter);
-+
-+@EXPORT = qw(
-+ canonpath
-+ catdir
-+ catfile
-+ curdir
-+ rootdir
-+ updir
-+ no_upwards
-+ file_name_is_absolute
-+ path
-+ nativename
-+);
-+
-+sub canonpath { File::Spec->canonpath(@_); }
-+sub catdir { File::Spec->catdir(@_); }
-+sub catfile { File::Spec->catfile(@_); }
-+sub curdir { File::Spec->curdir(@_); }
-+sub rootdir { File::Spec->rootdir(@_); }
-+sub updir { File::Spec->updir(@_); }
-+sub no_upwards { File::Spec->no_upwards(@_); }
-+sub file_name_is_absolute { File::Spec->file_name_is_absolute(@_); }
-+sub path { File::Spec->path(@_); }
-+sub nativename { File::Spec->nativename(@_); }
-+
-+1;
-+
-diff -urN perl5.005_03.old/lib/File/Spec/Mac.pm perl5.005_03/lib/File/Spec/Mac.pm
---- perl5.005_03.old/lib/File/Spec/Mac.pm Thu Jan 7 05:41:53 1999
-+++ perl5.005_03/lib/File/Spec/Mac.pm Sun Feb 22 16:31:58 1998
-@@ -52,7 +52,7 @@
- File::Spec->catdir(split(":",$path)) eq $path
-
- But because of the nature of Macintosh paths, some additional
--possibilities are allowed to make using this routine give reasonable results
-+possibilities are allowed to make using this routine give resonable results
- for some common situations. Here are the rules that are used. Each
- argument has its trailing ":" removed. Each argument, except the first,
- has its leading ":" removed. They are then joined together by a ":".
-@@ -78,7 +78,7 @@
- File::Spec->catfile("LWP","Protocol","http.pm")
-
- be relative or absolute? There's no way of telling except by checking for the
--existence of LWP: or :LWP, and even there he may mean a dismounted volume or
-+existance of LWP: or :LWP, and even there he may mean a dismounted volume or
- a relative path in a different directory (like in @INC). So those checks
- aren't done here. This routine will treat this as absolute.
-
-diff -urN perl5.005_03.old/lib/File/Spec.pm perl5.005_03/lib/File/Spec.pm
---- perl5.005_03.old/lib/File/Spec.pm Thu Jan 7 05:41:53 1999
-+++ perl5.005_03/lib/File/Spec.pm Sun Dec 6 05:48:23 1998
-@@ -14,7 +14,7 @@
- use strict;
- use vars qw(@ISA $VERSION $Verbose);
-
--$VERSION = '0.6';
-+$VERSION = '0.7';
-
- $Verbose = 0;
-
-@@ -52,11 +52,15 @@
-
- =head1 SYNOPSIS
-
--C<use File::Spec;>
-+ use File::Spec;
-
--C<$x=File::Spec-E<gt>catfile('a','b','c');>
-+ $x=File::Spec->catfile('a', 'b', 'c');
-
--which returns 'a/b/c' under Unix.
-+which returns 'a/b/c' under Unix. Or:
-+
-+ use File::Spec::Functions;
-+
-+ $x = catfile('a', 'b', 'c');
-
- =head1 DESCRIPTION
-
-@@ -78,8 +82,8 @@
- File::Spec::VMS
-
- The module appropriate for the current OS is automatically loaded by
--File::Spec. Since some modules (like VMS) make use of OS specific
--facilities, it may not be possible to load all modules under all operating
-+File::Spec. Since some modules (like VMS) make use of facilities only under
-+that OS, it may not be possible to load all modules under all operating
- systems.
-
- Since File::Spec is object oriented, subroutines should not called directly,
-@@ -91,9 +95,17 @@
-
- File::Spec->catfile('a','b');
-
--For a reference of available functions, please consult L<File::Spec::Unix>,
--which contains the entire set, and inherited by the modules for other
--platforms. For further information, please see L<File::Spec::Mac>,
-+Alternatively, File::Spec::Functions can be used instead, which exports
-+functions for all of the class methods provided by File::Spec, including
-+catfile, so you may say:
-+
-+ use File::Spec::Functions;
-+
-+ catfile('a','b');
-+
-+For a reference of available functions, pleaes consult L<File::Spec::Unix>,
-+which contains the entire set, and which is inherited by the modules for
-+other platforms. For further information, please see L<File::Spec::Mac>,
- L<File::Spec::OS2>, L<File::Spec::Win32>, or L<File::Spec::VMS>.
-
- =head1 SEE ALSO
+++ /dev/null
-diff -urN perl-5.6.1.orig/lib/ExtUtils/Liblist.pm perl-5.6.1/lib/ExtUtils/Liblist.pm
---- perl-5.6.1.orig/lib/ExtUtils/Liblist.pm Fri Feb 23 03:57:55 2001
-+++ perl-5.6.1/lib/ExtUtils/Liblist.pm Thu Apr 12 20:57:10 2001
-@@ -60,6 +60,7 @@
- my(@searchpath); # from "-L/path" entries in $potential_libs
- my(@libpath) = split " ", $Config{'libpth'};
- my(@ldloadlibs, @bsloadlibs, @extralibs, @ld_run_path, %ld_run_path_seen);
-+ $ld_run_path_seen{$_} = 1 foreach qw(/usr/X11R6/lib /usr/lib /lib);
- my(@libs, %libs_seen);
- my($fullname, $thislib, $thispth, @fullname);
- my($pwd) = cwd(); # from Cwd.pm
-diff -urN perl-5.6.1.orig/lib/ExtUtils/MM_Unix.pm perl-5.6.1/lib/ExtUtils/MM_Unix.pm
---- perl-5.6.1.orig/lib/ExtUtils/MM_Unix.pm Thu Apr 12 20:29:35 2001
-+++ perl-5.6.1/lib/ExtUtils/MM_Unix.pm Thu Apr 12 20:56:30 2001
-@@ -524,9 +524,16 @@
- };
- my($tmp);
- for $tmp (qw/
-- EXTRALIBS LDLOADLIBS BSLOADLIBS LD_RUN_PATH
-+ EXTRALIBS LDLOADLIBS BSLOADLIBS
- /) {
- next unless defined $self->{$tmp};
-+ push @m, "$tmp = $self->{$tmp}\n";
-+ }
-+ # don't set LD_RUN_PATH if empty
-+ for $tmp (qw/
-+ LD_RUN_PATH
-+ /) {
-+ next unless $self->{$tmp};
- push @m, "$tmp = $self->{$tmp}\n";
- }
- return join "", @m;
+++ /dev/null
---- perl-5.6.1.orig/ext/Opcode/Safe.pm
-+++ perl-5.6.1/ext/Opcode/Safe.pm
-@@ -3,7 +3,7 @@
- use 5.003_11;
- use strict;
-
--our $VERSION = "2.06";
-+$Safe::VERSION = "2.09";
-
- use Carp;
-
-@@ -47,6 +47,7 @@
- # the whole glob *_ rather than $_ and @_ separately, otherwise
- # @_ in non default packages within the compartment don't work.
- $obj->share_from('main', $default_share);
-+ Opcode::_safe_pkg_prep($obj->{Root}) if($Opcode::VERSION > 1.04);
- return $obj;
- }
-
-@@ -154,7 +155,7 @@
- my $no_record = shift || 0;
- my $root = $obj->root();
- croak("vars not an array ref") unless ref $vars eq 'ARRAY';
-- no strict 'refs';
-+ no strict 'refs';
- # Check that 'from' package actually exists
- croak("Package \"$pkg\" does not exist")
- unless keys %{"$pkg\::"};
-@@ -189,7 +190,7 @@
- sub share_redo {
- my $obj = shift;
- my $shares = \%{$obj->{Shares} ||= {}};
-- my($var, $pkg);
-+ my($var, $pkg);
- while(($var, $pkg) = each %$shares) {
- # warn "share_redo $pkg\:: $var";
- $obj->share_from($pkg, [ $var ], 1);
-@@ -213,11 +214,11 @@
- # Create anon sub ref in root of compartment.
- # Uses a closure (on $expr) to pass in the code to be executed.
- # (eval on one line to keep line numbers as expected by caller)
-- my $evalcode = sprintf('package %s; sub { eval $expr; }', $root);
-+ my $evalcode = sprintf('package %s; sub { @_ = (); eval $expr; }', $root);
- my $evalsub;
-
-- if ($strict) { use strict; $evalsub = eval $evalcode; }
-- else { no strict; $evalsub = eval $evalcode; }
-+ if ($strict) { use strict; $evalsub = eval $evalcode; }
-+ else { no strict; $evalsub = eval $evalcode; }
-
- return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
- }
-@@ -227,7 +228,7 @@
- my $root = $obj->{Root};
-
- my $evalsub = eval
-- sprintf('package %s; sub { do $file }', $root);
-+ sprintf('package %s; sub { @_ = (); do $file }', $root);
- return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
- }
-
-@@ -379,11 +380,12 @@
- =item share (NAME, ...)
-
- This shares the variable(s) in the argument list with the compartment.
--This is almost identical to exporting variables using the L<Exporter(3)>
-+This is almost identical to exporting variables using the L<Exporter>
- module.
-
--Each NAME must be the B<name> of a variable, typically with the leading
--type identifier included. A bareword is treated as a function name.
-+Each NAME must be the B<name> of a non-lexical variable, typically
-+with the leading type identifier included. A bareword is treated as a
-+function name.
-
- Examples of legal names are '$foo' for a scalar, '@foo' for an
- array, '%foo' for a hash, '&foo' or 'foo' for a subroutine and '*foo'
-@@ -425,7 +427,7 @@
- Any attempt by the code in STRING to use an operator which is not permitted
- by the compartment will cause an error (at run-time of the main program
- but at compile-time for the code in STRING). The error is of the form
--"%s trapped by operation mask operation...".
-+"'%s' trapped by operation mask...".
-
- If an operation is trapped in this way, then the code in STRING will
- not be executed. If such a trapped operation occurs or any other
+++ /dev/null
---- perl-5.6.1/ext/NDBM_File/NDBM_File.xs~ Sat Mar 3 20:53:20 2001
-+++ perl-5.6.1/ext/NDBM_File/NDBM_File.xs Fri Apr 20 18:23:37 2001
-@@ -6,7 +6,8 @@
- * See also INSTALL section on DB3.
- * -- Stanislav Brabec <utx@penguin.cz> */
- #undef ENTER
--#include <ndbm.h>
-+#define DB_DBM_HSEARCH 1
-+#include <db.h>
-
- typedef struct {
- DBM * dbp ;
---- perl-5.6.1/ext/NDBM_File/Makefile.PL~ Fri Apr 20 18:16:55 2001
-+++ perl-5.6.1/ext/NDBM_File/Makefile.PL Fri Apr 20 18:33:48 2001
-@@ -1,8 +1,8 @@
- use ExtUtils::MakeMaker;
- WriteMakefile(
- NAME => 'NDBM_File',
-- LIBS => ["-L/usr/local/lib -lndbm", "-ldbm -lucb"],
-- CCFLAGS => '-I/usr/include/db1 -Dbool=char -DHAS_BOOL',
-+ LIBS => ["-L/usr/local/lib -ldb"],
-+ CCFLAGS => '-Dbool=char -DHAS_BOOL',
- MAN3PODS => {}, # Pods will be built by installman.
- XSPROTOARG => '-noprototypes', # XXX remove later?
- VERSION_FROM => 'NDBM_File.pm',
+++ /dev/null
---- perl-5.6.1/ext/NDBM_File/NDBM_File.xs~ Sat Mar 3 20:53:20 2001
-+++ perl-5.6.1/ext/NDBM_File/NDBM_File.xs Fri Apr 20 18:23:37 2001
-@@ -6,7 +6,8 @@
- * See also INSTALL section on DB3.
- * -- Stanislav Brabec <utx@penguin.cz> */
- #undef ENTER
--#include <ndbm.h>
-+#define DB_DBM_HSEARCH 1
-+#include <db.h>
-
- typedef struct {
- DBM * dbp ;
---- perl-5.6.1/ext/NDBM_File/Makefile.PL~ Fri Apr 20 18:16:55 2001
-+++ perl-5.6.1/ext/NDBM_File/Makefile.PL Fri Apr 20 18:33:48 2001
-@@ -1,8 +1,8 @@
- use ExtUtils::MakeMaker;
- WriteMakefile(
- NAME => 'NDBM_File',
-- LIBS => ["-L/usr/local/lib -lndbm", "-ldbm -lucb"],
-- CCFLAGS => '-I/usr/include/db1 -Dbool=char -DHAS_BOOL',
-+ LIBS => ["-L/usr/local/lib -ldb-4.1"],
-+ CCFLAGS => '-Dbool=char -DHAS_BOOL',
- MAN3PODS => {}, # Pods will be built by installman.
- XSPROTOARG => '-noprototypes', # XXX remove later?
- VERSION_FROM => 'NDBM_File.pm',
---- perl-5.6.1/ext/DB_File/DB_File.xs~ Fri Feb 23 02:57:54 2001
-+++ perl-5.6.1/ext/DB_File/DB_File.xs Thu Oct 17 18:55:01 2002
-@@ -1318,6 +1318,7 @@
- {
- int Flags = 0 ;
- int status ;
-+ DB_TXN * txnid = NULL;
-
- /* Map 1.x flags to 3.x flags */
- if ((flags & O_CREAT) == O_CREAT)
-@@ -1335,7 +1336,7 @@
- Flags |= DB_TRUNCATE ;
- #endif
-
-- status = (RETVAL->dbp->open)(RETVAL->dbp, name, NULL, RETVAL->type,
-+ status = (RETVAL->dbp->open)(RETVAL->dbp, txnid, name, NULL, RETVAL->type,
- Flags, mode) ;
- /* printf("open returned %d %s\n", status, db_strerror(status)) ; */
-
+++ /dev/null
-diff -urN perl-5.6.1.orig/ext/Errno/Errno_pm.PL perl-5.6.1/ext/Errno/Errno_pm.PL
---- perl-5.6.1.orig/ext/Errno/Errno_pm.PL Sun Apr 8 08:09:16 2001
-+++ perl-5.6.1/ext/Errno/Errno_pm.PL Thu Apr 12 20:58:53 2001
-@@ -37,6 +37,13 @@
- warn "Cannot open '$file'";
- return;
- }
-+ } elsif ($^O eq 'linux') {
-+ # With the -dM option option, gcc outputs every #define's it finds
-+ my $cpp = default_cpp();
-+ unless(open(FH, "$cpp -dM < $file |")) {
-+ warn "Cannot open '$file'";
-+ return;
-+ }
- } else {
- unless(open(FH,"< $file")) {
- # This file could be a temporary file created by cppstdin
+++ /dev/null
-diff -urN perl-5.6.1/find-perl-provides perl-5.6.1-grabba/find-perl-provides
---- perl-5.6.1/find-perl-provides Thu Jan 1 00:00:00 1970
-+++ perl-5.6.1-grabba/find-perl-provides Sun Mar 3 14:41:39 2002
-@@ -0,0 +1,23 @@
-+#!/bin/sh
-+ulimit -c 0
-+
-+export LD_LIBRARY_PATH="FPPATH"
-+
-+filelist=`sed "s/['\"]/\\\&/g"`
-+if [ -f __rpm_noautoprovfiles ] ; then
-+ for i in `cat __rpm_noautoprovfiles`; do
-+ filelist=`echo $filelist | sed "s![[:space:]]*$i[[:space:]]*!!g"`
-+ done
-+fi
-+
-+
-+echo $filelist|/usr/lib/rpm/find-provides
-+provides_perl=`FPPATH/find-perl.prov $filelist`
-+if [ -f __rpm_noautoprov ] ; then
-+ for i in `cat __rpm_noautoprov`; do
-+ provides_perl=`echo $provides_perl | sed "s!\<$i[[:space:]]*!!g"`
-+ done
-+fi
-+
-+echo "$provides_perl" | grep -v '^perl(DynaLoader)$'
-+
-diff -urN perl-5.6.1/find-perl.prov perl-5.6.1-grabba/find-perl.prov
---- perl-5.6.1/find-perl.prov Thu Jan 1 00:00:00 1970
-+++ perl-5.6.1-grabba/find-perl.prov Sun Mar 3 14:37:16 2002
-@@ -0,0 +1,177 @@
-+#!FPPATH/perl
-+
-+# RPM (and it's source code) is covered under two separate licenses.
-+
-+# The entire code base may be distributed under the terms of the GNU
-+# General Public License (GPL), which appears immediately below.
-+# Alternatively, all of the source code in the lib subdirectory of the
-+# RPM source code distribution as well as any code derived from that
-+# code may instead be distributed under the GNU Library General Public
-+# License (LGPL), at the choice of the distributor. The complete text
-+# of the LGPL appears at the bottom of this file.
-+
-+# This alternative is allowed to enable applications to be linked
-+# against the RPM library (commonly called librpm) without forcing
-+# such applications to be distributed under the GPL.
-+
-+# Any questions regarding the licensing of RPM should be addressed to
-+# Erik Troan <ewt@redhat.com>.
-+
-+# a simple script to print the proper name for perl libraries.
-+
-+# To save development time I do not parse the perl grammmar but
-+# instead just lex it looking for what I want. I take special care to
-+# ignore comments and pod's.
-+
-+# it would be much better if perl could tell us the proper name of a
-+# given script.
-+
-+# The filenames to scan are either passed on the command line or if
-+# that is empty they are passed via stdin.
-+
-+# If there are lines in the file which match the pattern
-+# (m/^\s*\$VERSION\s*=\s+/)
-+# then these are taken to be the version numbers of the modules.
-+# Special care is taken with a few known idioms for specifying version
-+# numbers of files under rcs/cvs control.
-+
-+# If there are strings in the file which match the pattern
-+# m/^\s*\$RPM_Provides\s*=\s*["'](.*)['"]/i
-+# then these are treated as additional names which are provided by the
-+# file and are printed as well.
-+
-+# I plan to rewrite this in C so that perl is not required by RPM at
-+# build time.
-+
-+# by Ken Estes Mail.com kestes@staff.mail.com
-+
-+if ("@ARGV") {
-+ foreach (@ARGV) {
-+ if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html|al|ix)$)=) {
-+ process_file($_) if -f "$_";
-+ }
-+ }
-+} else {
-+
-+ # notice we are passed a list of filenames NOT as common in unix the
-+ # contents of the file.
-+
-+ foreach (<>) {
-+ if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html|al|ix)$)=) {
-+ process_file($_) if -f "$_";
-+ }
-+ }
-+}
-+
-+
-+foreach $module (sort keys %require) {
-+ if (length($require{$module}) == 0) {
-+ print "perl($module)\n";
-+ } else {
-+
-+ # I am not using rpm3.0 so I do not want spaces arround my
-+ # operators. Also I will need to change the processing of the
-+ # $RPM_* vairable when I upgrade.
-+
-+ print "perl($module) = $require{$module}\n";
-+ }
-+}
-+
-+exit 0;
-+
-+
-+
-+sub process_file {
-+
-+ my ($file) = @_;
-+ chomp $file;
-+
-+ open(FILE, "<$file")||
-+ die("$0: Could not open file: '$file' : $!\n");
-+
-+ my ($package, $version) = ();
-+
-+ while (<FILE>) {
-+
-+ # skip the documentation
-+
-+ # we should not need to have item in this if statement (it
-+ # properly belongs in the over/back section) but people do not
-+ # read the perldoc.
-+
-+ if ( (m/^=(head1|head2|pod|item)/) .. (m/^=(cut)/ || eof) ) {
-+ next;
-+ }
-+
-+ if ( (m/^=(over)/) .. (m/^=(back)/ || eof) ) {
-+ next;
-+ }
-+
-+ # skip the data section
-+ if (m/^__(DATA|END)__$/) {
-+ last;
-+ }
-+
-+ # not everyone puts the package name of the file as the first
-+ # package name so we report all namespaces as if they were
-+ # provided packages (really ugly).
-+
-+ if (m/^\s*package\s+([_:a-zA-Z0-9]+)\s*;/ && !$require{$1}) {
-+ $package=$1;
-+ undef $version;
-+ $require{$package}=undef;
-+ }
-+
-+ # after we found the package name take the first assignment to
-+ # $VERSION as the version number. Exporter requires that the
-+ # variable be called VERSION so we are safe.
-+
-+ # here are examples of VERSION lines from the perl distribution
-+
-+ #FindBin.pm:$VERSION = $VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
-+ #ExtUtils/Install.pm:$VERSION = substr q$Revision$, 10;
-+ #CGI/Apache.pm:$VERSION = (qw$Revision$)[1];
-+ #DynaLoader.pm:$VERSION = $VERSION = "1.03"; # avoid typo warning
-+ #Cwd.pm:our $VERSION = '2.04';
-+
-+ # here is example of VERSION line from RPC::PlClient module
-+
-+ # RPC/PlClient.pm:$RPC::PlClient::VERSION = '0.2016';
-+
-+ if (
-+ ($package) &&
-+ (m/^\s*(our)?\s*\$(${package}::)?VERSION\s*=/)
-+ ) {
-+
-+ # first see if the version string contains the string
-+ # '$Revision' this often causes bizzare strings and is the most
-+ # common method of non static numbering.
-+
-+ if (m/(\$Revision: (\d+[.0-9]+))/) {
-+ $version= $2;
-+ } elsif (m/[\'\"]?(\d+[.0-9]+)[\'\"]?/) {
-+
-+ # look for a static number hard coded in the script
-+
-+ $version= $1;
-+ }
-+ $require{$package}=$version;
-+ }
-+
-+ # Each keyword can appear multiple times. Don't
-+ # bother with datastructures to store these strings,
-+ # if we need to print it print it now.
-+
-+ if ( m/^\s*\$RPM_Provides\s*=\s*["'](.*)['"]/i) {
-+ foreach $_ (spit(/\s+/, $1)) {
-+ print "$_\n";
-+ }
-+ }
-+
-+ }
-+
-+ close(FILE)||
-+ die("$0: Could not close file: '$file' : $!\n");
-+
-+ return ;
-+}
+++ /dev/null
---- perl-5.6.1/makedepend.SH.orig Mon Mar 19 08:33:17 2001
-+++ perl-5.6.1/makedepend.SH Tue Sep 10 20:35:55 2002
-@@ -155,6 +155,8 @@
- $sed \
- -e '1d' \
- -e '/^#.*<stdin>/d' \
-+ -e '/^#.*<built-in>/d' \
-+ -e '/^#.*<command line>/d' \
- -e '/^#.*"-"/d' \
- -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
- -e 's/^[ ]*#[ ]*line/#/' \
---- perl-5.6.1/Configure.orig Tue Sep 10 20:37:00 2002
-+++ perl-5.6.1/Configure Tue Sep 10 21:14:10 2002
-@@ -990,7 +990,7 @@
- archname=''
- : Possible local include directories to search.
- : Set locincpth to "" in a hint file to defeat local include searches.
--locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
-+locincpth="/opt/local/include /usr/gnu/include"
- locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
- :
- : no include file wanted by default
+++ /dev/null
---- perl-5.6.0/lib/ExtUtils/MM_Unix.pm.instman Thu Mar 2 18:52:52 2000
-+++ perl-5.6.0/lib/ExtUtils/MM_Unix.pm Thu Mar 23 17:32:54 2000
-@@ -1757,6 +1757,12 @@
- # you to build directly into, say $Config::Config{privlibexp}.
- unless ($self->{INST_LIB}){
-
-+ for $install_variable (qw/
-+ INSTALLMAN1DIR
-+ INSTALLMAN3DIR
-+ /) {
-+ $self->prefixify($install_variable,$configure_prefix,qq[\$\(PREFIX\)]);
-+ }
-
- ##### XXXXX We have to change this nonsense
-
+++ /dev/null
---- perl-5.6.1/Configure.orig Mon Mar 19 04:03:33 2001
-+++ perl-5.6.1/Configure Tue Dec 24 20:12:56 2002
-@@ -1030,10 +1030,9 @@
-
- : List of libraries we want.
- : If anyone needs -lnet, put it in a hint file.
--libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl'
--libswanted="$libswanted dld ld sun m c cposix posix"
--libswanted="$libswanted ndir dir crypt sec"
--libswanted="$libswanted ucb bsd BSD PW x iconv util"
-+libswanted='ndbm gdbm db dl'
-+libswanted="$libswanted m c"
-+libswanted="$libswanted crypt"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
- glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
+++ /dev/null
---- ./lib/CGI/Cookie.pm.org 2004-03-09 16:13:48.000000000 +0100
-+++ ./lib/CGI/Cookie.pm 2005-06-07 12:55:01.546120072 +0200
-@@ -27,7 +27,7 @@
- if (defined $mod_perl::VERSION) {
- if ($mod_perl::VERSION >= 1.99) {
- $MOD_PERL = 2;
-- require Apache::RequestUtil;
-+ require Apache2::RequestUtil;
- } else {
- $MOD_PERL = 1;
- require Apache;
---- ./lib/CGI/Carp.pm.org 2004-06-09 10:25:42.000000000 +0200
-+++ ./lib/CGI/Carp.pm 2005-06-07 12:53:39.541586656 +0200
-@@ -468,14 +468,14 @@
- require mod_perl;
- if ($mod_perl::VERSION >= 1.99) {
- $mod_perl = 2;
-- require Apache::RequestRec;
-- require Apache::RequestIO;
-- require Apache::RequestUtil;
-+ require Apache2::RequestRec;
-+ require Apache2::RequestIO;
-+ require Apache2::RequestUtil;
- require APR::Pool;
- require ModPerl::Util;
-- require Apache::Response;
-+ require Apache2::Response;
- }
-- my $r = Apache->request;
-+ my $r = Apache2::RequestUtil->request;
- # If bytes have already been sent, then
- # we print the message out directly.
- # Otherwise we make a custom error
+++ /dev/null
---- perl-5.6.0/ext/NDBM_File/Makefile.PL.nodb Tue Jul 20 19:17:56 1999
-+++ perl-5.6.0/ext/NDBM_File/Makefile.PL Thu Mar 23 17:54:21 2000
-@@ -2,6 +2,7 @@
- WriteMakefile(
- NAME => 'NDBM_File',
- LIBS => ["-L/usr/local/lib -lndbm", "-ldbm -lucb"],
-+ CCFLAGS => '-I/usr/include/db1 -Dbool=char -DHAS_BOOL',
- MAN3PODS => {}, # Pods will be built by installman.
- XSPROTOARG => '-noprototypes', # XXX remove later?
- VERSION_FROM => 'NDBM_File.pm',
---- perl-5.6.0/hints/linux.sh.nodb Sun Mar 19 08:37:24 2000
-+++ perl-5.6.0/hints/linux.sh Thu Mar 23 17:54:21 2000
-@@ -70,7 +70,12 @@
-
- # BSD compatability library no longer needed
- # 'kaffe' has a /usr/lib/libnet.so which is not at all relevent for perl.
--set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /'`
-+set `echo X "$libswanted "| \
-+ sed -e 's/ bsd / /' \
-+ -e 's/ net / /' \
-+ -e 's/ db / /' \
-+ -e 's/ gdbm / /' \
-+ -e 's/ ndbm / /'`
- shift
- libswanted="$*"
-
---- perl-5.6.0/t/lib/ndbm.t.nodb Tue Jul 20 19:18:13 1999
-+++ perl-5.6.0/t/lib/ndbm.t Thu Mar 23 17:54:21 2000
-@@ -103,7 +103,9 @@
- if ($#keys == 31) {print "ok 7\n";} else {print "not ok 7\n";}
-
- $h{'foo'} = '';
--$h{''} = 'bar';
-+# stupid DB library does not support empty string as keys, so there
-+# is nothing for perl to test here...
-+$h{' '} = 'bar';
-
- # check cache overflow and numeric keys and contents
- $ok = 1;
-@@ -120,7 +122,8 @@
- print join(':',200..400) eq join(':',@foo) ? "ok 10\n" : "not ok 10\n";
-
- print ($h{'foo'} eq '' ? "ok 11\n" : "not ok 11\n");
--print ($h{''} eq 'bar' ? "ok 12\n" : "not ok 12\n");
-+# same thing ... we used to test for $h{''}, but DB does not allow it
-+print ($h{' '} eq 'bar' ? "ok 12\n" : "not ok 12\n");
-
- untie %h;
- unlink 'Op.dbmx.dir', $Dfile;
---- perl-5.6.0/t/lib/anydbm.t.nodb Fri Mar 3 03:34:21 2000
-+++ perl-5.6.0/t/lib/anydbm.t Thu Mar 23 17:58:01 2000
-@@ -101,7 +101,9 @@
- if ($#keys == 31) {print "ok 7\n";} else {print "not ok 7\n";}
-
- $h{'foo'} = '';
--$h{''} = 'bar';
-+# stupid DB does not allow zero-length keys. Not perl's fault, really
-+# so we test for $h{' '} instead of $h{''}
-+$h{' '} = 'bar';
-
- # check cache overflow and numeric keys and contents
- $ok = 1;
-@@ -118,7 +120,9 @@
- print join(':',200..400) eq join(':',@foo) ? "ok 10\n" : "not ok 10\n";
-
- print ($h{'foo'} eq '' ? "ok 11\n" : "not ok 11\n");
--if ($h{''} eq 'bar') {
-+# stupid DB does not allow zero-length keys. Not perl's fault, really
-+# so we test for $h{' '} instead of $h{''}
-+if ($h{' '} eq 'bar') {
- print "ok 12\n" ;
- }
- else {
---- perl-5.6.0/Configure.nodb Thu Mar 23 17:54:21 2000
-+++ perl-5.6.0/Configure Thu Mar 23 17:56:07 2000
-@@ -12053,10 +12053,16 @@
- }
- EOCP
- set try
-+ # this is really stupid, but we have to link in the -ldb to have
-+ # the above program succeed
-+ _old_libs=$libs
-+ libs="$libs -ldb"
- if eval $compile_ok && ./try; then
- echo 'Looks OK.' >&4
-+ libs=$_old_libs
- else
- echo "I can't use Berkeley DB with your <db.h>. I'll disable Berkeley DB." >&4
-+ libs=$_old_libs
- i_db=$undef
- case " $libs " in
- *"-ldb "*)
-@@ -12099,7 +12105,7 @@
- }
- #endif
- EOCP
-- if $cc $ccflags -c try.c >try.out 2>&1 ; then
-+ if $cc $ccflags -c try.c -ldb >try.out 2>&1 ; then
- if $contains warning try.out >>/dev/null 2>&1 ; then
- db_hashtype='int'
- else
-@@ -12144,7 +12150,7 @@
- }
- #endif
- EOCP
-- if $cc $ccflags -c try.c >try.out 2>&1 ; then
-+ if $cc $ccflags -c try.c -ldb >try.out 2>&1 ; then
- if $contains warning try.out >>/dev/null 2>&1 ; then
- db_prefixtype='int'
- else
+++ /dev/null
---- perl-5.6.0/installperl.pius Wed Mar 8 13:22:41 2000
-+++ perl-5.6.0/installperl Sun Jul 2 13:36:20 2000
-@@ -143,8 +143,6 @@
-
- # Do some quick sanity checks.
-
--if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
--
- $installbin || die "No installbin directory in config.sh\n";
- -d $installbin || mkpath($installbin, 1, 0777);
- -d $installbin || $nonono || die "$installbin is not a directory\n";
-@@ -224,7 +222,7 @@
- safe_unlink("$installbin/s$perl_verbase$ver$exe_ext");
- if ($d_dosuid) {
- copy("suidperl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext");
-- chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext");
-+ chmod(0755, "$installbin/s$perl_verbase$ver$exe_ext");
- }
-
- # Install library files.
+++ /dev/null
-diff -urN perl-5.6.1.orig/lib/ExtUtils/MakeMaker.pm perl-5.6.1/lib/ExtUtils/MakeMaker.pm
---- perl-5.6.1.orig/lib/ExtUtils/MakeMaker.pm Fri Feb 23 03:57:55 2001
-+++ perl-5.6.1/lib/ExtUtils/MakeMaker.pm Thu Apr 12 20:43:14 2001
-@@ -202,6 +202,7 @@
- PERL_ARCHLIB PERL_LIB PERL_SRC PERM_RW PERM_RWX
- PL_FILES PM PM_FILTER PMLIBDIRS POLLUTE PPM_INSTALL_EXEC
- PPM_INSTALL_SCRIPT PREFIX
-+ PRINT_PREREQ
- PREREQ_PM SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG
- XS_VERSION clean depend dist dynamic_lib linkext macro realclean
- tool_autosplit
-@@ -319,6 +320,14 @@
- sub ExtUtils::MakeMaker::new {
- my($class,$self) = @_;
- my($key);
-+
-+ if ("@ARGV" =~ "PRINT_PREREQ") {
-+ foreach $prereq (sort keys %{$self->{PREREQ_PM}}) {
-+ print "perl($prereq)>=$self->{PREREQ_PM}->{$prereq} ";
-+ }
-+ print "\n";
-+ exit 0;
-+ }
-
- print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose;
- if (-f "MANIFEST" && ! -f "Makefile"){
+++ /dev/null
---- perl-5.6.1/Configure~ Sat Apr 14 15:38:22 2001
-+++ perl-5.6.1/Configure Sat Apr 14 15:52:43 2001
-@@ -6035,7 +6035,7 @@
- : sitelib may have an optional trailing /share.
- case "$sitearch" in
- '') dflt=`echo $sitelib | $sed 's,/share$,,'`
-- dflt="$dflt/$archname"
-+ dflt="$dflt/$archname/$version"
- ;;
- *) dflt="$sitearch"
- ;;
+++ /dev/null
---- perl-5.6.1/Makefile.SH~ Sun Apr 15 18:20:15 2001
-+++ perl-5.6.1/Makefile.SH Sun Apr 15 18:36:49 2001
-@@ -429,7 +429,8 @@
- case "$useshrplib" in
- true)
-- $spitshell >>Makefile <<'!NO!SUBS!'
-- $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj)
--!NO!SUBS!
-+ $spitshell >>Makefile <<!GROK!THIS!
-+ \$(LD) -o \$(LIBPERL).$version \$(SHRPLDFLAGS) -Wl,-soname,\$(LIBPERL).$version perl\$(OBJ_EXT) \$(obj)
-+ ln -sf \$(LIBPERL).$version \$@
-+!GROK!THIS!
- case "$osname" in
- aix)
+++ /dev/null
-diff -urN perl-5.6.1.orig/perl.c perl-5.6.1/perl.c
---- perl-5.6.1.orig/perl.c Thu Mar 22 06:05:02 2001
-+++ perl-5.6.1/perl.c Thu Apr 12 20:52:12 2001
-@@ -21,6 +21,9 @@
- #include <unistd.h>
- #endif
-
-+#include <syslog.h>
-+#define I_SYSLOG
-+
- #if !defined(STANDARD_C) && !defined(HAS_GETENV_PROTOTYPE)
- char *getenv (char *); /* Usually in <stdlib.h> */
- #endif
-@@ -2880,6 +2883,16 @@
- if (tmpstatbuf.st_dev != PL_statbuf.st_dev ||
- tmpstatbuf.st_ino != PL_statbuf.st_ino) {
- (void)PerlIO_close(PL_rsfp);
-+#ifdef I_SYSLOG
-+ openlog("suidperl", LOG_CONS | LOG_PID | LOG_NDELAY, LOG_AUTHPRIV);
-+ syslog(LOG_ALERT, "User %ld tried to run dev %ld ino %ld in "
-+ "place of dev %ld ino %ld!", PL_uid,
-+ (long)tmpstatbuf.st_dev, (long)tmpstatbuf.st_ino,
-+ (long)PL_statbuf.st_dev, (long)PL_statbuf.st_ino);
-+ syslog(LOG_ALERT, "Filename of setuid script was %s, uid %ld"
-+ " gid %ld.", SvPVX(GvSV(CopFILEGV(PL_curcop))),
-+ PL_statbuf.st_uid, PL_statbuf.st_gid);
-+#endif
- Perl_croak(aTHX_ "Permission denied\n");
- }
- if (
+++ /dev/null
---- perl-5.6.1/lib/ExtUtils/typemap.orig Fri Apr 6 06:38:46 2001
-+++ perl-5.6.1/lib/ExtUtils/typemap Wed Dec 25 01:37:07 2002
-@@ -38,6 +38,7 @@
- U8 T_UV
- Result T_U_CHAR
- Boolean T_IV
-+float T_FLOAT
- double T_DOUBLE
- SysRet T_SYSRET
- SysRetLong T_SYSRET
+++ /dev/null
---- perl-5.6.0/Makefile.SH.pix Sat Mar 11 11:05:24 2000
-+++ perl-5.6.0/Makefile.SH Fri Dec 15 07:29:42 2000
-@@ -30,12 +30,7 @@
- true)
- # Prefix all runs of 'miniperl' and 'perl' with
- # $ldlibpth so that ./perl finds *this* shared libperl.
-- case "$LD_LIBRARY_PATH" in
-- '')
-- ldlibpth="LD_LIBRARY_PATH=`pwd`";;
-- *)
-- ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
-- esac
-+ ldlibpth="LD_PRELOAD=`pwd`/libperl.so"
-
- pldlflags="$cccdlflags"
- case "${osname}${osvers}" in
+++ /dev/null
-#
-# WARNING: this patch is devoted to a specific configuration
-#
---- perl.c~ Tue Jul 9 19:41:43 2002
-+++ perl.c Fri Mar 14 22:54:52 2003
-@@ -3679,39 +3679,6 @@
- incpush(APPLLIB_EXP, TRUE, TRUE);
- #endif
-
--#ifdef ARCHLIB_EXP
-- incpush(ARCHLIB_EXP, FALSE, FALSE);
--#endif
--#ifdef MACOS_TRADITIONAL
-- {
-- Stat_t tmpstatbuf;
-- SV * privdir = NEWSV(55, 0);
-- char * macperl = PerlEnv_getenv("MACPERL");
--
-- if (!macperl)
-- macperl = "";
--
-- Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
-- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-- incpush(SvPVX(privdir), TRUE, FALSE);
-- Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
-- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-- incpush(SvPVX(privdir), TRUE, FALSE);
--
-- SvREFCNT_dec(privdir);
-- }
-- if (!PL_tainting)
-- incpush(":", FALSE, FALSE);
--#else
--#ifndef PRIVLIB_EXP
--# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
--#endif
--#if defined(WIN32)
-- incpush(PRIVLIB_EXP, TRUE, FALSE);
--#else
-- incpush(PRIVLIB_EXP, FALSE, FALSE);
--#endif
--
- #ifdef SITEARCH_EXP
- /* sitearch is always relative to sitelib on Windows for
- * DLL-based path intuition to work correctly */
-@@ -3729,7 +3696,7 @@
- #endif
-
- #ifdef SITELIB_STEM /* Search for version-specific dirs below here */
-- incpush(SITELIB_STEM, FALSE, TRUE);
-+/* incpush(SITELIB_STEM, FALSE, TRUE); */
- #endif
-
- #ifdef PERL_VENDORARCH_EXP
-@@ -3749,7 +3716,40 @@
- #endif
-
- #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
-- incpush(PERL_VENDORLIB_STEM, FALSE, TRUE);
-+/* incpush(PERL_VENDORLIB_STEM, FALSE, TRUE); */
-+#endif
-+
-+#ifdef ARCHLIB_EXP
-+ incpush(ARCHLIB_EXP, FALSE, FALSE);
-+#endif
-+#ifdef MACOS_TRADITIONAL
-+ {
-+ Stat_t tmpstatbuf;
-+ SV * privdir = NEWSV(55, 0);
-+ char * macperl = PerlEnv_getenv("MACPERL");
-+
-+ if (!macperl)
-+ macperl = "";
-+
-+ Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
-+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-+ incpush(SvPVX(privdir), TRUE, FALSE);
-+ Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
-+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-+ incpush(SvPVX(privdir), TRUE, FALSE);
-+
-+ SvREFCNT_dec(privdir);
-+ }
-+ if (!PL_tainting)
-+ incpush(":", FALSE, FALSE);
-+#else
-+#ifndef PRIVLIB_EXP
-+# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
-+#endif
-+#if defined(WIN32)
-+ incpush(PRIVLIB_EXP, TRUE, FALSE);
-+#else
-+ incpush(PRIVLIB_EXP, FALSE, FALSE);
- #endif
-
- #ifdef PERL_OTHERLIBDIRS
+++ /dev/null
---- lib/ExtUtils/MM_Unix.pm.orig Tue Feb 25 16:03:41 2003
-+++ lib/ExtUtils/MM_Unix.pm Tue Feb 25 16:19:23 2003
-@@ -499,7 +499,7 @@
- # pathnames can have sharp signs in them; escape them so
- # make doesn't think it is a comment-start character.
- $self->{$tmp} =~ s/#/\\#/g;
-- push @m, "$tmp = $self->{$tmp}\n";
-+ push @m, "$tmp = " . ($tmp =~ /^INSTALL(?!DIRS\b)/ ? '$(DESTDIR)' : '') . "$self->{$tmp}\n";
- }
-
- push @m, qq{
-@@ -549,7 +549,7 @@
- /)
- {
- next unless defined $self->{$tmp};
-- push @m, "$tmp = $self->{$tmp}\n";
-+ push @m, "$tmp = " . ($tmp =~ /^INSTALL/ ? '$(DESTDIR)' : '') . "$self->{$tmp}\n";
- }
-
- for $tmp (qw(
-@@ -1884,9 +1884,9 @@
-
- if( $Config{usevendorprefix} ) {
- $Config_Override{installvendorman1dir} =
-- File::Spec->catdir($Config{vendorprefixexp}, 'man', 'man$(MAN1EXT)');
-+ File::Spec->catdir($Config{vendorprefixexp}, 'share', 'man', 'man1');
- $Config_Override{installvendorman3dir} =
-- File::Spec->catdir($Config{vendorprefixexp}, 'man', 'man$(MAN3EXT)');
-+ File::Spec->catdir($Config{vendorprefixexp}, 'share', 'man', 'man3');
- }
- else {
- $Config_Override{installvendorman1dir} = '';
-@@ -1905,12 +1905,12 @@
- # it up.
- unless( $Config{installsiteman1dir} ) {
- $Config_Override{installsiteman1dir} =
-- File::Spec->catdir($sprefix, 'man', 'man$(MAN1EXT)');
-+ File::Spec->catdir($sprefix, 'share', 'man', 'man1');
- }
-
- unless( $Config{installsiteman3dir} ) {
- $Config_Override{installsiteman3dir} =
-- File::Spec->catdir($sprefix, 'man', 'man$(MAN3EXT)');
-+ File::Spec->catdir($sprefix, 'share', 'man', 'man3');
- }
-
- unless( $Config{installsitebin} ) {
+++ /dev/null
---- perl-5.8.0/ext/Opcode/Safe.pm Sat Jun 1 17:03:08 2002
-+++ Safe-2.09/Safe.pm Sun Oct 6 12:09:03 2002
-@@ -3,7 +3,7 @@
- use 5.003_11;
- use strict;
-
--our $VERSION = "2.07";
-+$Safe::VERSION = "2.09";
-
- use Carp;
-
-@@ -47,7 +47,7 @@
- # the whole glob *_ rather than $_ and @_ separately, otherwise
- # @_ in non default packages within the compartment don't work.
- $obj->share_from('main', $default_share);
-- Opcode::_safe_pkg_prep($obj->{Root});
-+ Opcode::_safe_pkg_prep($obj->{Root}) if($Opcode::VERSION > 1.04);
- return $obj;
- }
-
-@@ -155,7 +155,7 @@
- my $no_record = shift || 0;
- my $root = $obj->root();
- croak("vars not an array ref") unless ref $vars eq 'ARRAY';
-- no strict 'refs';
-+ no strict 'refs';
- # Check that 'from' package actually exists
- croak("Package \"$pkg\" does not exist")
- unless keys %{"$pkg\::"};
-@@ -190,7 +190,7 @@
- sub share_redo {
- my $obj = shift;
- my $shares = \%{$obj->{Shares} ||= {}};
-- my($var, $pkg);
-+ my($var, $pkg);
- while(($var, $pkg) = each %$shares) {
- # warn "share_redo $pkg\:: $var";
- $obj->share_from($pkg, [ $var ], 1);
-@@ -214,11 +214,11 @@
- # Create anon sub ref in root of compartment.
- # Uses a closure (on $expr) to pass in the code to be executed.
- # (eval on one line to keep line numbers as expected by caller)
-- my $evalcode = sprintf('package %s; sub { eval $expr; }', $root);
-+ my $evalcode = sprintf('package %s; sub { @_ = (); eval $expr; }', $root);
- my $evalsub;
-
-- if ($strict) { use strict; $evalsub = eval $evalcode; }
-- else { no strict; $evalsub = eval $evalcode; }
-+ if ($strict) { use strict; $evalsub = eval $evalcode; }
-+ else { no strict; $evalsub = eval $evalcode; }
-
- return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
- }
-@@ -228,7 +228,7 @@
- my $root = $obj->{Root};
-
- my $evalsub = eval
-- sprintf('package %s; sub { do $file }', $root);
-+ sprintf('package %s; sub { @_ = (); do $file }', $root);
- return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
- }
-
-@@ -383,8 +383,9 @@
- This is almost identical to exporting variables using the L<Exporter>
- module.
-
--Each NAME must be the B<name> of a variable, typically with the leading
--type identifier included. A bareword is treated as a function name.
-+Each NAME must be the B<name> of a non-lexical variable, typically
-+with the leading type identifier included. A bareword is treated as a
-+function name.
-
- Examples of legal names are '$foo' for a scalar, '@foo' for an
- array, '%foo' for a hash, '&foo' or 'foo' for a subroutine and '*foo'
-@@ -426,7 +427,7 @@
- Any attempt by the code in STRING to use an operator which is not permitted
- by the compartment will cause an error (at run-time of the main program
- but at compile-time for the code in STRING). The error is of the form
--"%s trapped by operation mask operation...".
-+"'%s' trapped by operation mask...".
-
- If an operation is trapped in this way, then the code in STRING will
- not be executed. If such a trapped operation occurs or any other
+++ /dev/null
-diff -urN perl-5.6.1/find-perl-provides perl-5.6.1-grabba/find-perl-provides
---- perl-5.6.1/find-perl-provides Thu Jan 1 00:00:00 1970
-+++ perl-5.6.1-grabba/find-perl-provides Sun Mar 3 14:41:39 2002
-@@ -0,0 +1,23 @@
-+#!/bin/sh
-+ulimit -c 0
-+
-+export LD_LIBRARY_PATH="FPPATH"
-+
-+filelist=`sed "s/['\"]/\\\&/g"`
-+if [ -f __rpm_noautoprovfiles ] ; then
-+ for i in `cat __rpm_noautoprovfiles`; do
-+ filelist=`echo $filelist | sed "s![[:space:]]*$i[[:space:]]*!!g"`
-+ done
-+fi
-+
-+
-+echo $filelist|/usr/lib/rpm/find-provides
-+provides_perl=`FPPATH/find-perl.prov $filelist`
-+if [ -f __rpm_noautoprov ] ; then
-+ for i in `cat __rpm_noautoprov`; do
-+ provides_perl=`echo $provides_perl | sed "s!\<$i[[:space:]]*!!g"`
-+ done
-+fi
-+
-+echo "$provides_perl"
-+
+++ /dev/null
---- perl-5.8.0.orig/uconfig.sh Sat Jun 1 17:03:51 2002
-+++ perl-5.8.0/uconfig.sh Fri Mar 14 23:54:47 2003
-@@ -5,11 +5,7 @@
- afsroot='/afs'
- alignbytes='4'
- apiversion='5.005'
--archlib='/usr/local/lib/perl5/5.7/unknown'
--archlibexp='/usr/local/lib/perl5/5.7/unknown'
--archname='unknown'
- asctime_r_proto='0'
--bin='/usr/local/bin'
- byteorder='1234'
- castflags='0'
- charsize='1'
-@@ -32,7 +32,7 @@
- d_access='undef'
- d_accessx='undef'
- d_alarm='undef'
--d_archlib='undef'
-+d_archlib='define'
- d_asctime_r='undef'
- d_atolf='undef'
- d_atoll='undef'
-@@ -588,12 +584,9 @@
- obj_ext='.o'
- optimize='-O2'
- orderlib='false'
--osname='unknown'
- phostname='hostname'
- pidtype=int
- pm_apiversion='5.005'
--privlib='/usr/local/lib/perl5/5.7'
--privlibexp='/usr/local/lib/perl5/5.7'
- procselfexe=''
- prototype='undef'
- ptrsize='4'
-@@ -620,8 +613,6 @@
- sPRIx64='"Lx"'
- sSCNfldbl='"llf"'
- sched_yield='sched_yield()'
--scriptdir='/usr/local/bin'
--scriptdirexp='/usr/local/bin'
- seedfunc='srand'
- selectminbits='32'
- selecttype=int
---- perl-5.8.0.orig/Makefile.micro Sat Jun 1 17:02:47 2002
-+++ perl-5.8.0/Makefile.micro Sat Mar 15 00:11:33 2003
-@@ -34,10 +34,16 @@
- distclean: clean
- -rm -f uconfig.h
-
-+# not really autoconfigured variables (PLD hack, requires patched uconfig.sh)
-+NRACV = archlib=$(archlib) archlibexp=$(archlibexp) privlib=$(privlib) \
-+ privlibexp=$(privlibexp) archname=$(archname) osname=$(osname) \
-+ bin=$(bin) scriptdir=$(scriptdir) scriptdirexp=$(scriptdirexp)
-+
-+
- # The microconfiguration.
-
- uconfig.h: uconfig.sh config_h.SH
-- CONFIG_SH=uconfig.sh CONFIG_H=uconfig.h sh ./config_h.SH
-+ CONFIG_SH=uconfig.sh CONFIG_H=uconfig.h $(NRACV) sh ./config_h.SH
-
- # Do not regenerate perly.c and perly.h.
-
+++ /dev/null
---- perl-5.6.0/installperl.pius Wed Mar 8 13:22:41 2000
-+++ perl-5.6.0/installperl Sun Jul 2 13:36:20 2000
-@@ -143,8 +143,6 @@
-
- # Do some quick sanity checks.
-
--if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
--
- $installbin || die "No installbin directory in config.sh\n";
- -d $installbin || mkpath($installbin, 1, 0777);
- -d $installbin || $nonono || die "$installbin is not a directory\n";
-@@ -224,7 +222,7 @@
- safe_unlink("$installbin/s$perl_verbase$ver$exe_ext");
- if ($d_dosuid) {
- copy("suidperl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext");
-- chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext");
-+ chmod(0755, "$installbin/s$perl_verbase$ver$exe_ext");
- }
-
- # Install library files.
+++ /dev/null
---- pod/perluniintro.pod.orig Thu Feb 6 12:45:57 2003
-+++ pod/perluniintro.pod Thu Feb 6 12:46:10 2003
-@@ -363,7 +363,7 @@
-
- With the C<open> pragma you can use the C<:locale> layer
-
-- $ENV{LC_ALL} = $ENV{LANG} = 'ru_RU.KOI8-R';
-+ BEGIN { $ENV{LC_ALL} = $ENV{LANG} = 'ru_RU.KOI8-R'; }
- # the :locale will probe the locale environment variables like LC_ALL
- use open OUT => ':locale'; # russki parusski
- open(O, ">koi8");
+++ /dev/null
---- perl-5.6.1/Makefile.SH~ Sun Apr 15 18:20:15 2001
-+++ perl-5.6.1/Makefile.SH Sun Apr 15 18:36:49 2001
-@@ -429,7 +429,8 @@
- case "$useshrplib" in
- true)
-- $spitshell >>Makefile <<'!NO!SUBS!'
-- $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj)
--!NO!SUBS!
-+ $spitshell >>Makefile <<!GROK!THIS!
-+ \$(LD) -o \$(LIBPERL).$version \$(SHRPLDFLAGS) -Wl,-soname,\$(LIBPERL).$version perl\$(OBJ_EXT) \$(obj)
-+ ln -sf \$(LIBPERL).$version \$@
-+!GROK!THIS!
- case "$osname" in
- aix)
+++ /dev/null
---- perl-5.8.4/uconfig.sh.orig 2004-04-26 17:55:48.615159968 +0200
-+++ perl-5.8.4/uconfig.sh 2004-04-26 18:17:25.435013384 +0200
-@@ -5,11 +5,7 @@
- afsroot='/afs'
- alignbytes='4'
- apiversion='5.005'
--archlib='/usr/local/lib/perl5/5.7/unknown'
--archlibexp='/usr/local/lib/perl5/5.7/unknown'
--archname='unknown'
- asctime_r_proto='0'
--bin='/usr/local/bin'
- byteorder='1234'
- castflags='0'
- charsize='1'
-@@ -37,7 +33,7 @@
- d_accessx='undef'
- d_aintl='undef'
- d_alarm='undef'
--d_archlib='undef'
-+d_archlib='define'
- d_asctime_r='undef'
- d_atolf='undef'
- d_atoll='undef'
-@@ -595,11 +591,8 @@
- obj_ext='.o'
- optimize='-O2'
- orderlib='false'
--osname='unknown'
- phostname='hostname'
- pidtype=int
--privlib='/usr/local/lib/perl5/5.7'
--privlibexp='/usr/local/lib/perl5/5.7'
- procselfexe=''
- prototype='undef'
- ptrsize='4'
-@@ -626,8 +619,6 @@
- sPRIx64='"Lx"'
- sSCNfldbl='"llf"'
- sched_yield='sched_yield()'
--scriptdir='/usr/local/bin'
--scriptdirexp='/usr/local/bin'
- seedfunc='srand'
- selectminbits='32'
- selecttype=int
---- perl-5.8.4/Makefile.micro.orig 2003-08-12 14:58:29.000000000 +0200
-+++ perl-5.8.4/Makefile.micro 2004-04-26 18:03:04.242934480 +0200
-@@ -35,10 +35,16 @@
- distclean: clean
- -rm -f uconfig.h
-
-+# not really autoconfigured variables (PLD hack, requires patched uconfig.sh)
-+NRACV = archlib=$(archlib) archlibexp=$(archlibexp) privlib=$(privlib) \
-+ privlibexp=$(privlibexp) archname=$(archname) osname=$(osname) \
-+ bin=$(bin) scriptdir=$(scriptdir) scriptdirexp=$(scriptdirexp) \
-+ usemallocwrap=$(usemallocwrap)
-+
- # The microconfiguration.
-
- uconfig.h: uconfig.sh config_h.SH
-- $(ENV) CONFIG_SH=uconfig.sh CONFIG_H=uconfig.h sh ./config_h.SH
-+ $(ENV) CONFIG_SH=uconfig.sh CONFIG_H=uconfig.h $(NRACV) sh ./config_h.SH
-
- # Do not regenerate perly.c and perly.h.
-
+++ /dev/null
-Index: perlio.c
-===================================================================
---- perlio.c (revision 4342)
-+++ perlio.c (revision 4346)
-@@ -454,7 +454,7 @@
- va_list ap;
- dSYS;
- va_start(ap, fmt);
-- if (!dbg) {
-+ if (!dbg && !PL_tainting && PL_uid == PL_euid && PL_gid == PL_egid) {
- char *s = PerlEnv_getenv("PERLIO_DEBUG");
- if (s && *s)
- dbg = PerlLIO_open3(s, O_WRONLY | O_CREAT | O_APPEND, 0666);
-@@ -471,7 +471,7 @@
- s = CopFILE(PL_curcop);
- if (!s)
- s = "(none)";
-- sprintf(buffer, "%s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
-+ sprintf(buffer, "%.40s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
- len = strlen(buffer);
- vsprintf(buffer+len, fmt, ap);
- PerlLIO_write(dbg, buffer, strlen(buffer));
projects / packages / perl.git / commitdiff