You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

149 lines
4.8 KiB

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, '.');