head	1.5;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.5
	OPENPKG_E1_MP:1.5
	OPENPKG_1_STABLE_MP:1.1;
locks; strict;
comment	@# @;


1.5
date	2004.05.09.07.06.14;	author rse;	state dead;
branches;
next	1.4;

1.4
date	2003.11.21.19.07.56;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2003.10.02.13.24.58;	author thl;	state Exp;
branches;
next	1.2;

1.2
date	2003.09.03.12.48.22;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2003.07.22.13.41.40;	author rse;	state Exp;
branches;
next	;


desc
@@


1.5
log
@finally remove the old Perl 5.6 because it is no longer compatible with the perl-openpkg stuff without investigation, is already obsolete since two years and makes build farm troubles all the time
@
text
@Index: hints/freebsd.sh
--- hints/freebsd.sh.orig	Wed Oct 15 22:26:16 2003
+++ hints/freebsd.sh	Fri Nov 21 19:57:03 2003
@@@@ -117,9 +117,10 @@@@
 *)
         objformat=`/usr/bin/objformat`
         if [ x$objformat = xelf ]; then
-            libpth="/usr/lib /usr/local/lib"
-            glibpth="/usr/lib /usr/local/lib"
-            ldflags="-Wl,-E "
+            libpth=${libpth:-/usr/lib /usr/local/lib}
+            glibpth=${glibpth:-/usr/lib /usr/local/lib}
+            ldflags=`echo $ldflags | sed -e "s;.*\(-L[ ]*[^ ][^ ]*\).*;\1;"`
+            ldflags="-Wl,-E $ldflags"
             lddlflags="-shared "
         else
             if [ -e /usr/lib/aout ]; then
Index: lib/CGI.pm
--- lib/CGI.pm.orig	Thu Jul 31 00:45:36 2003
+++ lib/CGI.pm	Fri Nov 21 19:57:03 2003
@@@@ -1498,8 +1498,11 @@@@
     $enctype = $enctype || &URL_ENCODED;
     unless (defined $action) {
        $action = $self->url(-absolute=>1,-path=>1);
-       $action .= "?$ENV{QUERY_STRING}" if $ENV{QUERY_STRING};
+       if (length($ENV{QUERY_STRING})>0) {
+           $action .= "?".$self->escapeHTML($ENV{QUERY_STRING},1);
+       }
     }
+    $action = escape($action);
     $action = qq(action="$action");
     my($other) = @@other ? " @@other" : '';
     $self->{'.parametersToAdd'}={};
Index: makedepend.SH
--- makedepend.SH.orig	Thu Jul 31 00:46:59 2003
+++ makedepend.SH	Fri Nov 21 19:57:03 2003
@@@@ -146,6 +146,8 @@@@
         $cppstdin $finc -I. $cppflags $cppminus <UU/$file.c |
         $sed \
     	    -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/#/' \
Index: perl.c
--- perl.c.orig	Thu Nov 13 22:14:56 2003
+++ perl.c	Fri Nov 21 19:57:03 2003
@@@@ -3421,39 +3421,6 @@@@
     incpush(APPLLIB_EXP, TRUE, TRUE);
 #endif
 
-#ifdef ARCHLIB_EXP
-    incpush(ARCHLIB_EXP, FALSE, FALSE);
-#endif
-#ifdef MACOS_TRADITIONAL
-    {
-	struct stat 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 */
@@@@ -3492,6 +3459,39 @@@@
 
 #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
     incpush(PERL_VENDORLIB_STEM, FALSE, TRUE);
+#endif
+
+#ifdef ARCHLIB_EXP
+    incpush(ARCHLIB_EXP, FALSE, FALSE);
+#endif
+#ifdef MACOS_TRADITIONAL
+    {
+	struct stat 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
Index: installperl
--- installperl.orig	Thu Jul 31 00:45:27 2003
+++ installperl	Fri Nov 21 19:57:03 2003
@@@@ -129,6 +129,8 @@@@
 my $installarchlib = $Config{installarchlib};
 my $installsitelib = $Config{installsitelib};
 my $installsitearch = $Config{installsitearch};
+my $installvendorlib = $Config{installvendorlib};
+my $installvendorarch = $Config{installvendorarch};
 my $installman1dir = $Config{installman1dir};
 my $man1ext = $Config{man1ext};
 my $libperl = $Config{libperl};
@@@@ -251,6 +253,8 @@@@
 mkpath($installarchlib, $verbose, 0777);
 mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
 mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
+mkpath($installvendorlib, $verbose, 0777) if ($installvendorlib);
+mkpath($installvendorarch, $verbose, 0777) if ($installvendorarch);
 
 if (chdir "lib") {
     $do_installarchlib = ! samepath($installarchlib, '.');
@


1.4
log
@upgrading package: perl56 5.6.1 -> 5.6.2
@
text
@@


1.3
log
@SA-2003.039-perl; CAN-2003-0615 (porting from perl-5.8.0)
@
text
@d1 4
a4 54
--- ext/Opcode/Safe.pm.orig
+++ ext/Opcode/Safe.pm
@@@@ -213,7 +213,7 @@@@
     # 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; }
@@@@ -227,7 +227,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);
 }

--- makedepend.SH.orig	Mon Mar 19 08:33:17 2001
+++ makedepend.SH	Sun May 19 15:17:49 2002
@@@@ -141,6 +141,8 @@@@
         $cppstdin $finc -I. $cppflags $cppminus <UU/$file.c |
         $sed \
     	    -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/#/' \
@@@@ -155,6 +157,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/#/' \
--- hints/dec_osf.sh.orig	Fri Feb 23 03:57:55 2001
+++ hints/dec_osf.sh	Wed Jun  5 16:34:54 2002
@@@@ -65,7 +65,7 @@@@
 	# reset
 	_DEC_cc_style=
 case "`$cc -v 2>&1 | grep cc`" in
-*gcc*)	_gcc_version=`$cc --version 2>&1 | tr . ' '`
+*gcc*)	_gcc_version=`$cc --version 2>&1 | head -1 | sed -e 's;^gcc (GCC) ;;' -e 's;^cc (GCC) ;;' | tr . ' '`
 	set $_gcc_version
 	if test "$1" -lt 2 -o \( "$1" -eq 2 -a \( "$2" -lt 95 -o \( "$2" -eq 95 -a "$3" -lt 2 \) \) \); then
 	    cat >&4 <<EOF
--- hints/freebsd.sh.orig	2002-08-26 16:57:58.000000000 +0200
+++ hints/freebsd.sh	2002-08-26 16:58:44.000000000 +0200
@@@@ -104,9 +104,10 @@@@
d18 32
a49 3
--- perl.c.orig	2001-03-22 06:05:02.000000000 +0100
+++ perl.c	2003-09-03 14:40:14.000000000 +0200
@@@@ -3414,39 +3414,6 @@@@
d89 3
a91 1
@@@@ -3487,6 +3454,39 @@@@
d93 2
a94 2
 #endif
 
d126 2
a127 2
+#endif
+
d129 3
a131 4
     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE);
 #endif
--- installperl.orig	2001-03-20 18:40:22.000000000 +0100
+++ installperl	2003-09-03 14:41:38.000000000 +0200
a149 30

http://stein.cshl.org/WWW/software/CGI/
    under "Revision History" find "Fixed cross-site scripting bug
    reported by obscure" note attached to Version 2.94. A quick fix was
    introduced in 2.94. It was replaced by a more careful patch in 2.99.

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0615
    Cross-site scripting (XSS) vulnerability in start_form() of CGI.pm
    allows remote attackers to insert web script via a URL that is fed
    into the form's action parameter

This is a backport of the 2.99 patch for 2.752 which is the version
embedded with perl 5.6.1

--- lib/CGI.pm.orig	2001-03-03 20:53:20.000000000 +0100
+++ lib/CGI.pm	2003-10-02 15:18:00.000000000 +0200
@@@@ -1498,8 +1498,11 @@@@
     $enctype = $enctype || &URL_ENCODED;
     unless (defined $action) {
        $action = $self->url(-absolute=>1,-path=>1);
-       $action .= "?$ENV{QUERY_STRING}" if $ENV{QUERY_STRING};
+       if (length($ENV{QUERY_STRING})>0) {
+           $action .= "?".$self->escapeHTML($ENV{QUERY_STRING},1);
+       }
     }
+    $action = escape($action);
     $action = qq(action="$action");
     my($other) = @@other ? " @@other" : '';
     $self->{'.parametersToAdd'}={};

@


1.2
log
@apply similar module search order patches to Perl 5.6.1 as we now have for Perl 5.8.0
@
text
@d170 30
@


1.1
log
@make sure patch file uses exactly the package name as prefix
@
text
@d68 102
@