head 1.36; access; symbols OPENPKG_E1_MP_HEAD:1.18 OPENPKG_E1_MP:1.18 OPENPKG_E1_MP_2_STABLE:1.14.2.1 OPENPKG_E1_FP:1.14.2.1 OPENPKG_2_STABLE_MP:1.18 OPENPKG_2_STABLE_20061018:1.14.2.1 OPENPKG_2_STABLE_20060622:1.14 OPENPKG_2_STABLE:1.14.0.2 OPENPKG_2_STABLE_BP:1.14 OPENPKG_2_5_RELEASE:1.10 OPENPKG_2_5_SOLID:1.10.0.2 OPENPKG_2_5_SOLID_BP:1.10 OPENPKG_2_4_RELEASE:1.7 OPENPKG_2_4_SOLID:1.7.0.2 OPENPKG_2_4_SOLID_BP:1.7 OPENPKG_2_3_RELEASE:1.5 OPENPKG_2_3_SOLID:1.5.0.8 OPENPKG_2_3_SOLID_BP:1.5 OPENPKG_2_2_RELEASE:1.5 OPENPKG_2_2_SOLID:1.5.0.6 OPENPKG_2_2_SOLID_BP:1.5 OPENPKG_2_1_RELEASE:1.5 OPENPKG_2_1_SOLID:1.5.0.4 OPENPKG_2_1_SOLID_BP:1.5 OPENPKG_2_0_RELEASE:1.5 OPENPKG_2_0_SOLID:1.5.0.2 OPENPKG_2_0_SOLID_BP:1.5 OPENPKG_1_2_SOLID:1.1.0.4 OPENPKG_1_3_RELEASE:1.1.2.1 OPENPKG_1_3_SOLID:1.1.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.1 OPENPKG_1_STABLE:1.1.0.2 OPENPKG_1_STABLE_MP:1.1; locks; strict; comment @# @; 1.36 date 2009.07.26.12.04.27; author rse; state Exp; branches; next 1.35; commitid zko1PjaD24w8vdXt; 1.35 date 2009.07.09.18.58.59; author rse; state Exp; branches; next 1.34; commitid ni9JwxNedmzdl4Vt; 1.34 date 2009.03.29.17.56.20; author rse; state Exp; branches; next 1.33; commitid 1nYLrl6Th9x0hXHt; 1.33 date 2009.03.26.17.57.13; author rse; state Exp; branches; next 1.32; commitid OtvII5z5rAShnzHt; 1.32 date 2009.01.17.10.42.06; author rse; state Exp; branches; next 1.31; commitid 9dMoTg1OlQ7x9Nyt; 1.31 date 2009.01.12.10.01.34; author rse; state Exp; branches; next 1.30; commitid Jatppd8B0jYx59yt; 1.30 date 2007.11.26.08.42.08; author cs; state Exp; branches; next 1.29; commitid 9qCI9PmsoQhpV3Hs; 1.29 date 2007.11.25.10.50.10; author cs; state Exp; branches; next 1.28; commitid YggXqWcaqmpjFWGs; 1.28 date 2007.10.18.15.41.07; author cs; state Exp; branches; next 1.27; commitid GviA6AbuWNlSu5Cs; 1.27 date 2007.10.04.06.08.40; author rse; state Exp; branches; next 1.26; commitid QEQ31oM9aPInMeAs; 1.26 date 2007.10.03.15.48.44; author cs; state Exp; branches; next 1.25; commitid S06k8jKY5rOm1aAs; 1.25 date 2007.09.29.14.54.10; author cs; state Exp; branches; next 1.24; commitid kBsTcgWee61DQDzs; 1.24 date 2007.09.21.16.01.33; author cs; state Exp; branches; next 1.23; commitid hZ5eoAdw5VNFtCys; 1.23 date 2007.09.20.19.34.58; author cs; state Exp; branches; next 1.22; commitid wvavQVdKmKcTGvys; 1.22 date 2007.09.19.16.31.41; author cs; state Exp; branches; next 1.21; commitid eJbpCrUWSTf0Imys; 1.21 date 2007.09.16.15.04.13; author cs; state Exp; branches; next 1.20; commitid O6OvWuNE1JjYjYxs; 1.20 date 2007.09.15.14.48.54; author cs; state Exp; branches; next 1.19; commitid 4gSAZHJEaCYHgQxs; 1.19 date 2007.09.05.09.39.38; author rse; state Exp; branches; next 1.18; commitid YXrglQNHQqJySwws; 1.18 date 2006.08.18.13.07.05; author rse; state Exp; branches; next 1.17; commitid O35J5rrKZvBZkkJr; 1.17 date 2006.07.18.11.39.42; author rse; state Exp; branches; next 1.16; commitid rBFeHdk3YBMNQkFr; 1.16 date 2006.07.06.22.41.23; author thl; state Exp; branches; next 1.15; commitid se4Ynq1MTHtITQDr; 1.15 date 2006.07.06.12.34.41; author thl; state Exp; branches; next 1.14; commitid rHjPYeV9TUJzxNDr; 1.14 date 2006.04.08.18.04.09; author rse; state Exp; branches 1.14.2.1; next 1.13; commitid MMDq4jIpKW4Ydosr; 1.13 date 2006.03.25.17.52.01; author rse; state Exp; branches; next 1.12; commitid 82UaGUTT1lAIBAqr; 1.12 date 2006.02.26.19.42.50; author rse; state Exp; branches; next 1.11; commitid nCIg4B3IIUMx58nr; 1.11 date 2005.11.15.07.59.47; author rse; state Exp; branches; next 1.10; commitid iCNVLdSkMhvCvP9r; 1.10 date 2005.10.04.14.45.08; author rse; state Exp; branches; next 1.9; 1.9 date 2005.10.04.07.41.17; author cs; state Exp; branches; next 1.8; 1.8 date 2005.08.18.07.28.47; author rse; state Exp; branches; next 1.7; 1.7 date 2005.06.13.14.16.44; author rse; state dead; branches; next 1.6; 1.6 date 2005.06.12.14.25.12; author rse; state Exp; branches; next 1.5; 1.5 date 2003.10.20.06.42.52; author rse; state dead; branches; next 1.4; 1.4 date 2003.10.16.09.33.33; author thl; state Exp; branches; next 1.3; 1.3 date 2003.10.15.09.08.57; author ms; state Exp; branches; next 1.2; 1.2 date 2003.10.14.08.44.14; author thl; state Exp; branches; next 1.1; 1.1 date 2003.05.26.11.49.38; author thl; state Exp; branches 1.1.2.1 1.1.4.1; next ; 1.14.2.1 date 2006.09.20.19.32.33; author rse; state Exp; branches; next ; commitid gLTtm2UTYxNspBNr; 1.1.2.1 date 2003.07.24.20.44.56; author rse; state Exp; branches 1.1.2.1.2.1; next ; 1.1.2.1.2.1 date 2003.08.06.15.07.14; author thl; state Exp; branches; next 1.1.2.1.2.2; 1.1.2.1.2.2 date 2003.10.21.09.12.49; author rse; state Exp; branches; next ; 1.1.4.1 date 2003.08.06.15.10.10; author thl; state Exp; branches; next 1.1.4.2; 1.1.4.2 date 2003.10.21.09.17.26; author rse; state Exp; branches; next ; desc @@ 1.36 log @modifying package: perl-www-5.10.0 20090715 -> 20090726 @ text @Index: Embperl-2.3.0/Makefile.PL --- Embperl-2.3.0/Makefile.PL.orig 2005-10-26 08:44:21 +0200 +++ Embperl-2.3.0/Makefile.PL 2007-09-05 11:30:49 +0200 @@@@ -621,7 +621,7 @@@@ $base = $ENV{'ProgramFiles'} if ($win32) ; -$apache = GetYesNo ("Build with support for Apache mod_perl?", 'y') if (!$apache) ; +$apache = 0; if ($apache && $apache_src ne '') { @@@@ -1330,7 +1330,7 @@@@ 'LIBS' => [$libs || ''], 'DEFINE' => "$d \$(DEFS)", 'INC' => $i, - 'EXE_FILES' => [ 'embpexec.pl', 'embpmsgid.pl' ], + 'EXE_FILES' => [ 'embpexec.pl', 'embpmsgid.pl', 'embpcgi.pl' ], 'clean' => { FILES => 'dirent.h test/conf/httpd.conf test/conf/httpd.stop.conf test/conf/httpd.min.conf test/tmp/* Embperl.c $(OBJECT)' }, 'realclean' => { FILES => 'embpmsgid.pl embpexec.pl embpexec.bat embpcgi.pl embpcgi.test.pl embpcgi.bat epocgi.pl epocgi.bat epocgi.test.pl embpfastcgi.pl embpfastcgi.test.pl test/conf/config.pl xs/mmargs.pl' }, 'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz'}, Index: Embperl-2.3.0/driver/epxalan.MAKEPL --- Embperl-2.3.0/driver/epxalan.MAKEPL.orig 2005-10-26 00:16:36 +0200 +++ Embperl-2.3.0/driver/epxalan.MAKEPL 2007-09-05 11:30:49 +0200 @@@@ -8,7 +8,7 @@@@ if (!$win32) { - $path = $ENV{XALANPATH} || GetString ("Enter path of XALAN base directory or single dot for not using XALAN", $XALANPATH || '.') ; + $path = "."; if (!$path || $path eq '.') { Index: Web-Scraper-0.31/Makefile.PL --- Web-Scraper-0.31/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.31/Makefile.PL 2007-09-05 11:31:08 +0200 @@@@ -9,7 +9,7 @@@@ requires 'LWP::UserAgent'; requires 'HTTP::Response::Encoding'; requires 'URI'; -requires 'YAML'; +#requires 'YAML'; build_requires 'Test::More'; install_script 'bin/scraper'; @ 1.35 log @modifying package: perl-www-5.10.0 20090708 -> 20090709 @ text @d34 3 a36 3 Index: Web-Scraper-0.30/Makefile.PL --- Web-Scraper-0.30/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.30/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.34 log @modifying package: perl-www-5.10.0 20090328 -> 20090329 @ text @d34 3 a36 3 Index: Web-Scraper-0.28/Makefile.PL --- Web-Scraper-0.28/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.28/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.33 log @modifying package: perl-www-5.10.0 20090321 -> 20090326 @ text @d34 3 a36 3 Index: Web-Scraper-0.27/Makefile.PL --- Web-Scraper-0.27/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.27/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.32 log @modifying package: perl-www-5.10.0 20090113 -> 20090117 @ text @d34 3 a36 3 Index: Web-Scraper-0.26/Makefile.PL --- Web-Scraper-0.26/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.26/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.31 log @modifying package: perl-www-5.10.0 20090104 -> 20090112 @ text @d34 3 a36 3 Index: Web-Scraper-0.25/Makefile.PL --- Web-Scraper-0.25/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.25/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.30 log @modifying package: perl-www-5.8.8 20071125 -> 20071126 @ text @d34 3 a36 3 Index: Web-Scraper-0.24/Makefile.PL --- Web-Scraper-0.24/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.24/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.29 log @modifying package: perl-www-5.8.8 20071114 -> 20071125 @ text @d34 3 a36 3 Index: Web-Scraper-0.23/Makefile.PL --- Web-Scraper-0.23/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.23/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.28 log @modifying package: perl-www-5.8.8 20071010 -> 20071018 @ text @d34 3 a36 3 Index: Web-Scraper-0.22/Makefile.PL --- Web-Scraper-0.22/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.22/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.27 log @modifying package: perl-www-5.8.8 20071003 -> 20071004 @ text @d34 3 a36 3 Index: Web-Scraper-0.21/Makefile.PL --- Web-Scraper-0.21/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.21/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.26 log @modifying package: perl-www-5.8.8 20070929 -> 20071003 @ text @d34 3 a36 3 Index: Web-Scraper-0.20/Makefile.PL --- Web-Scraper-0.20/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.20/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.25 log @modifying package: perl-www-5.8.8 20070921 -> 20070929 @ text @d34 3 a36 3 Index: Web-Scraper-0.19/Makefile.PL --- Web-Scraper-0.19/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.19/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.24 log @modifying package: perl-www-5.8.8 20070920 -> 20070921 @ text @d1 3 a3 3 Index: Embperl-2.2.0/Makefile.PL --- Embperl-2.2.0/Makefile.PL.orig 2005-10-26 08:44:21 +0200 +++ Embperl-2.2.0/Makefile.PL 2007-09-05 11:30:49 +0200 d22 3 a24 3 Index: Embperl-2.2.0/driver/epxalan.MAKEPL --- Embperl-2.2.0/driver/epxalan.MAKEPL.orig 2005-10-26 00:16:36 +0200 +++ Embperl-2.2.0/driver/epxalan.MAKEPL 2007-09-05 11:30:49 +0200 @ 1.23 log @modifying package: perl-www-5.8.8 20070919 -> 20070920 @ text @d34 3 a36 3 Index: Web-Scraper-0.17/Makefile.PL --- Web-Scraper-0.17/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.17/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.22 log @modifying package: perl-www-5.8.8 20070917 -> 20070919 @ text @d34 3 a36 3 Index: Web-Scraper-0.16/Makefile.PL --- Web-Scraper-0.16/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.16/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.21 log @modifying package: perl-www-5.8.8 20070915 -> 20070916 @ text @d34 3 a36 3 Index: Web-Scraper-0.15/Makefile.PL --- Web-Scraper-0.15/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.15/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.20 log @modifying package: perl-www-5.8.8 20070910 -> 20070915 @ text @d34 3 a36 3 Index: Web-Scraper-0.14/Makefile.PL --- Web-Scraper-0.14/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.14/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.19 log @add [WWW:]Scraper (older stuff) and Web::Scraper (newer stuff) @ text @d34 3 a36 3 Index: Web-Scraper-0.13/Makefile.PL --- Web-Scraper-0.13/Makefile.PL.orig 2007-08-30 21:26:56 +0200 +++ Web-Scraper-0.13/Makefile.PL 2007-09-05 11:31:08 +0200 @ 1.18 log @install embpcgi script and fix shebang in all embperl scripts @ text @d3 1 a3 1 +++ Embperl-2.2.0/Makefile.PL 2006-08-18 13:51:54 +0200 d24 1 a24 1 +++ Embperl-2.2.0/driver/epxalan.MAKEPL 2006-08-18 13:51:33 +0200 d34 12 @ 1.17 log @take over patches from THL plus many more cleanups into CGI::GuruMeditation 1.00 @ text @d3 1 a3 1 +++ Embperl-2.2.0/Makefile.PL 2005-11-15 08:12:18 +0100 d13 9 d24 1 a24 1 +++ Embperl-2.2.0/driver/epxalan.MAKEPL 2005-11-15 08:12:18 +0100 @ 1.16 log @support exec'd and and mod_perl CGI @ text @a24 232 Make over CGI::Gurumeditation o send proper HTTP status header and content type o make extensive attempts to expire immediately and get rid of cached data in browser and proxies o support exec'd and and mod_perl CGI o visually come closer to Amiga in terms of color, border width, font and text o http://en.wikipedia.org/wiki/Image:Guru_meditation.gif o cleanup code replacing endless concats/escapes with qq{} Index: CGI-GuruMeditation-0.05/GuruMeditation.pm --- CGI-GuruMeditation-0.05/GuruMeditation.pm.orig Tue Feb 22 21:04:08 2005 +++ CGI-GuruMeditation-0.05/GuruMeditation.pm Fri Jul 7 00:25:26 2006 @@@@ -35,6 +35,9 @@@@ # optionally remember program name $CGI::GuruMeditation::name = $name; + # no operation outside CGI environment + return unless ($ENV{GATEWAY_INTERFACE} =~ m|^CGI|); + # setup termination handler $SIG{__DIE__} = sub { my ($msg) = @@_; @@@@ -54,9 +57,15 @@@@ } # determine title - my $title = ( defined($CGI::GuruMeditation::name) - ? $CGI::GuruMeditation::name . ": " - : "") . "GURU MEDITATION"; + my @@t; + @@t = gmtime(time); + my $title; + $title = "

Software Failure.   " . + ( defined($CGI::GuruMeditation::name) + ? &escape_html($CGI::GuruMeditation::name) + : "Press reload button to continue." + ) . "\n

" . + sprintf "Guru Meditation #%04d%02d%02d.%02d%02d%02d%02x\n", @@t[5]+1900, @@t[4]+1, @@t[3,2,1,0], $$ & 255; # properly escape characters for HTML inclusion sub escape_html { @@@@ -71,91 +80,108 @@@@ $txt =~ s/([^\n])$/$1\n/s; return $txt; } - $title = &escape_html($title); $hint = &escape_html($hint); $msg = &escape_html($msg); - $msg =~ s/(\n.)/
$1/sg; - - # generate HTTP response header - my $O = "Content-Type: text/html; charset=ISO-8859-1\n\n"; + $msg = "

$msg
"; + # generate HTTP page header + my $O = ""; + if ($ENV{MOD_PERL}) { + use Apache::Constants qw(HTTP_INTERNAL_SERVER_ERROR); + my $r = Apache->request; + $r->status(HTTP_INTERNAL_SERVER_ERROR); + $r->header_out("Expires", "0"); + $r->no_cache(1); + $r->content_type("text/html; charset=ISO-8859-1"); + $r->send_http_header(); + } + else { + $O .= "Status: 500 Internal Server Error\n"; + $O .= "Cache-Control: no-cache\n"; + $O .= "Expires: 0\n"; + $O .= "Pragma: no-cache\n"; + $O .= "Content-Type: text/html; charset=ISO-8859-1\n"; + $O .= "\n"; + } + # generate HTML page header - $O .= - "\n" . - " \n" . - " \n" . - " \n" . - " $title\n" . - " \n"; - - # generate HTML page body - $O .= - " \n" . - "
\n" . - "
\n" . - " $title\n" . - "

\n" . - " \n" . - " $msg" . - "
\n" . - " 

\n$hint
\n" . - "
\n" . - "
\n" . - " \n" . - "\n"; + $O .= qq { + + + + + Guru Meditation + + +
+
+ $title +

+ + $msg +
+ 

$hint
+
+
+ + + }; + $O =~ s/^[ ]{12}//gm; # get rid of constant indentation + $O =~ s/\n()/\1/s; # get rid of leading newline # send response and die gracefully $|++; @ 1.15 log @Make over CGI::Gurumeditation @ text @d29 1 d36 12 a47 2 +++ CGI-GuruMeditation-0.05/GuruMeditation.pm Thu Jul 6 13:33:39 2006 @@@@ -54,9 +54,15 @@@@ d66 1 a66 1 @@@@ -71,91 +77,95 @@@@ d81 17 a97 5 + $O .= "HTTP/1.0 500 Internal Server Error\n"; + $O .= "Content-Type: text/html; charset=ISO-8859-1\n"; + $O .= "Expires: 0\n"; + $O .= "Cache-Control: no-cache\n"; # browser + $O .= "Pragma: no-cache\n"; # proxy d251 2 a252 1 + $O =~ s/^[ ]{12}//gm; @ 1.14 log @modifying package: perl-www-5.8.8 20060407 -> 20060408 @ text @d25 208 @ 1.14.2.1 log @MFC: all recent fixes and updates @ text @d3 1 a3 1 +++ Embperl-2.2.0/Makefile.PL 2006-08-18 13:51:54 +0200 a12 9 @@@@ -1330,7 +1330,7 @@@@ 'LIBS' => [$libs || ''], 'DEFINE' => "$d \$(DEFS)", 'INC' => $i, - 'EXE_FILES' => [ 'embpexec.pl', 'embpmsgid.pl' ], + 'EXE_FILES' => [ 'embpexec.pl', 'embpmsgid.pl', 'embpcgi.pl' ], 'clean' => { FILES => 'dirent.h test/conf/httpd.conf test/conf/httpd.stop.conf test/conf/httpd.min.conf test/tmp/* Embperl.c $(OBJECT)' }, 'realclean' => { FILES => 'embpmsgid.pl embpexec.pl embpexec.bat embpcgi.pl embpcgi.test.pl embpcgi.bat epocgi.pl epocgi.bat epocgi.test.pl embpfastcgi.pl embpfastcgi.test.pl test/conf/config.pl xs/mmargs.pl' }, 'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz'}, d15 1 a15 1 +++ Embperl-2.2.0/driver/epxalan.MAKEPL 2006-08-18 13:51:33 +0200 @ 1.13 log @ok, Class::ErrorHandler is now in perl-utils, too @ text @d1 3 a3 3 Index: Embperl-2.1.0/Makefile.PL --- Embperl-2.1.0/Makefile.PL.orig 2005-10-26 08:44:21 +0200 +++ Embperl-2.1.0/Makefile.PL 2005-11-15 08:12:18 +0100 d13 3 a15 3 Index: Embperl-2.1.0/driver/epxalan.MAKEPL --- Embperl-2.1.0/driver/epxalan.MAKEPL.orig 2005-10-26 00:16:36 +0200 +++ Embperl-2.1.0/driver/epxalan.MAKEPL 2005-11-15 08:12:18 +0100 @ 1.12 log @add OpenID client/server modules @ text @a24 43 Index: URI-Fetch-0.05/Makefile.PL --- URI-Fetch-0.05/Makefile.PL.orig 2005-05-26 00:52:11 +0200 +++ URI-Fetch-0.05/Makefile.PL 2006-02-26 20:39:07 +0100 @@@@ -12,7 +12,6 @@@@ include('ExtUtils::AutoInstall'); -requires('Class::ErrorHandler'); requires('LWP'); requires('URI'); requires('Storable'), Index: URI-Fetch-0.05/lib/URI/Fetch.pm --- URI-Fetch-0.05/lib/URI/Fetch.pm.orig 2006-02-24 22:18:38 +0100 +++ URI-Fetch-0.05/lib/URI/Fetch.pm 2006-02-26 20:39:07 +0100 @@@@ -2,7 +2,6 @@@@ package URI::Fetch; use strict; -use base qw( Class::ErrorHandler ); use LWP::UserAgent; use Carp qw( croak ); @@@@ -16,6 +15,20 @@@@ $HAS_ZLIB = eval "use Compress::Zlib (); 1;"; } +sub error { + my $msg = $_[1] || ''; + if (ref($_[0])) { + $_[0]->{_errstr} = $msg; + } else { + $ERROR = $msg; + } + return; +} + +sub errstr { + ref($_[0]) ? $_[0]->{_errstr} : $ERROR +} + use constant URI_OK => 200; use constant URI_MOVED_PERMANENTLY => 301; use constant URI_NOT_MODIFIED => 304; @ 1.11 log @modifying package: perl-www-5.8.7 20051104 -> 20051115 @ text @d25 43 @ 1.10 log @make timezone fiddling more portable @ text @d1 3 a3 3 Index: Embperl-2.0.1/Makefile.PL --- Embperl-2.0.1/Makefile.PL.orig +++ Embperl-2.0.1/Makefile.PL d13 3 a15 2 --- Embperl-2.0.1/driver/epxalan.MAKEPL.orig +++ Embperl-2.0.1/driver/epxalan.MAKEPL a24 24 --- Embperl-2.0.1/eputil.c.orig 2005-10-02 15:30:14 +0200 +++ Embperl-2.0.1/eputil.c 2005-10-04 14:09:40 +0200 @@@@ -2054,7 +2054,11 @@@@ #ifdef WIN32 extern long _timezone; #else -extern long timezone; +static long timezone_offset(void) +{ + time_t t = time(NULL); + return ((long)t - (long)mktime(gmtime(&t))); +} #endif @@@@ -2079,7 +2083,7 @@@@ tms->tm_hour, tms->tm_min, tms->tm_sec, tz > 0?"+":"", tz); #else localtime_r(&when, &tms); - tz = -timezone / 36 + (tms.tm_isdst?100:0) ; + tz = -timezone_offset() / 36 + (tms.tm_isdst?100:0) ; sprintf(sResult, "%s, %.2d%c%s%c%.2d %.2d:%.2d:%.2d %s%04d", ep_day_snames[tms.tm_wday], @ 1.9 log @modifying package: perl-www-5.8.7 20050929 -> 20051004 @ text @a12 1 Index: Embperl-2.0.1/driver/epxalan.MAKEPL d24 24 @ 1.8 log @Ops, sorry, my fault: I've forgotten to add the patch to CVS @ text @d1 4 a4 4 Index: Embperl-2.0.0/Makefile.PL --- Embperl-2.0.0/Makefile.PL.orig 2005-08-07 02:02:58 +0200 +++ Embperl-2.0.0/Makefile.PL 2005-08-15 13:21:04 +0200 @@@@ -619,7 +619,7 @@@@ d13 3 a15 3 Index: Embperl-2.0.0/driver/epxalan.MAKEPL --- Embperl-2.0.0/driver/epxalan.MAKEPL.orig 2005-08-07 01:57:37 +0200 +++ Embperl-2.0.0/driver/epxalan.MAKEPL 2005-08-15 13:20:31 +0200 @ 1.7 log @remove workaround for a problem which actually was SELinux specific (and also hit others) @ text @d1 5 a5 4 Index: WWW-Mechanize-1.12/Makefile.PL --- WWW-Mechanize-1.12/Makefile.PL.orig 2005-06-12 16:16:53 +0200 +++ WWW-Mechanize-1.12/Makefile.PL 2005-06-12 16:20:23 +0200 @@@@ -6,46 +6,7 @@@@ a6 1 use constant FLAG_SKIPMECHDUMP => File::Spec->catfile( "t", "SKIP-MECH-DUMP" ); d8 2 a9 40 -# Much logic stolen fromm libwww-perl's Makefile.PL -my $skiplive = grep /--nolive/i, @@ARGV; -my $skiplocal = grep /--nolocal/i, @@ARGV; - -if ( !$skiplive ) { - require IO::Socket; - my $s = IO::Socket::INET->new( - PeerAddr => "www.google.com:80", - Timeout => 10, - ); - if ($s) { - close($s); - $skiplive = 0; - - print <catfile( 't', '*.t' ); -push( @@tests, glob File::Spec->catfile( 't', 'local', '*.t' ) ) unless $skiplocal; -push( @@tests, glob File::Spec->catfile( 't', 'live', '*.t' ) ) unless $skiplive; d11 6 a16 5 my $parms = { 'NAME' => 'WWW::Mechanize', @@@@ -85,33 +46,4 @@@@ touch(); } d18 7 a24 30 -eval { require LWP; }; -if ($@@ or ! LWP::Protocol::implementor('https') ) { - print < 20031020 @ text @d1 84 a84 17 --- lib/LWP/Protocol/ftp.pm.orig Fri Oct 26 22:13:20 2001 +++ lib/LWP/Protocol/ftp.pm Mon May 26 11:09:01 2003 @@@@ -334,7 +334,13 @@@@ " " . $ftp->message); } } - } elsif (!length($remote_file) || $ftp->code == 550) { + } elsif (!length($remote_file) || ( $ftp->code >= 400 && $ftp->code < 600 )) { + # be open minded and treat 4xx and 5xx treated equally - the next cwd will fail anyway if we were too broadminded + # see ftp://ftp.rfc-editor.org/in-notes/std/std9.txt + # chapter "4.2. FTP REPLIES" and chapter "6. STATE DIAGRAMS", RETR + # 4yz Transient Negative Completion reply, 450 Requested file action not taken. File unavailable (e.g., file busy). + # 5yz Permanent Negative Completion reply, 550 Requested action not taken. File unavailable (e.g., file not found, no access). + # the risk applying this patch is the incompatiblity that we now return the status of the CWD and not the RETR # 550 not a plain file, try to list instead if (length($remote_file) && !$ftp->cwd($remote_file)) { LWP::Debug::debug("chdir before listing failed"); @ 1.4 log @upgrading package: perl-www 20031015 -> 20031016 @ text @@ 1.3 log @upgrading package: perl-www 20031014 -> 20031015 @ text @d1 2 a2 2 --- libwww-perl-5.71/lib/LWP/Protocol/ftp.pm.orig Fri Oct 26 22:13:20 2001 +++ libwww-perl-5.71/lib/LWP/Protocol/ftp.pm Mon May 26 11:09:01 2003 @ 1.2 log @upgrading package: perl-www 20031006 -> 20031014 @ text @d1 3 a3 3 --- libwww-perl-5.70/lib/LWP/Protocol/ftp.pm.orig Fri Oct 26 22:13:20 2001 +++ libwww-perl-5.70/lib/LWP/Protocol/ftp.pm Mon May 26 11:09:01 2003 @@@@ -323,7 +323,13 @@@@ @ 1.1 log @this patch file is needed, too @ text @d1 2 a2 2 --- libwww-perl-5.69/lib/LWP/Protocol/ftp.pm.orig Fri Oct 26 22:13:20 2001 +++ libwww-perl-5.69/lib/LWP/Protocol/ftp.pm Mon May 26 11:09:01 2003 @ 1.1.4.1 log @OpenPKG-SA-2003.036-perl-www; CAN-2003-0615 @ text @d1 17 a17 24 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 --- CGI.pm-2.89/CGI.pm.orig Wed Oct 16 19:48:37 2002 +++ CGI.pm-2.89/CGI.pm Wed Aug 6 16:22:26 2003 @@@@ -1553,9 +1553,10 @@@@ unless (defined $action) { $action = $self->url(-absolute=>1,-path=>1); if (length($ENV{QUERY_STRING})>0) { - $action .= "?$ENV{QUERY_STRING}"; + $action .= "?".$self->escapeHTML($ENV{QUERY_STRING},1); } } + $action = escape($action); $action = qq(action="$action"); my($other) = @@other ? " @@other" : ''; $self->{'.parametersToAdd'}={}; @ 1.1.4.2 log @fix CGI.pm form URL generation by backporting more correct security fix from CGI.pm 3.00 @ text @d4 1 a4 1 introduced in 2.94. It was replaced by a more careful patch in 3.00. d11 3 a13 6 Index: CGI.pm-2.89/CGI.pm --- CGI.pm-2.89/CGI.pm.orig 2002-10-16 19:48:37.000000000 +0200 +++ CGI.pm-2.89/CGI.pm 2003-10-21 11:15:55.000000000 +0200 @@@@ -1551,9 +1551,9 @@@@ $method = lc($method) || 'post'; $enctype = $enctype || &URL_ENCODED; d15 1 a15 2 - $action = $self->url(-absolute=>1,-path=>1); + $action = $self->escapeHTML($self->url(-absolute=>1,-path=>1)); d21 1 d23 2 @ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class BASE only] @ text @@ 1.1.2.1.2.1 log @OpenPKG-SA-2003.036-perl-www; CAN-2003-0615 @ text @a0 26 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 --- CGI.pm-2.98/CGI.pm.orig Wed Jun 18 21:57:21 2003 +++ CGI.pm-2.98/CGI.pm Fri Aug 1 16:39:52 2003 @@@@ -1641,10 +1641,10 @@@@ unless (defined $action) { $action = $self->url(-absolute=>1,-path=>1); if (length($ENV{QUERY_STRING})>0) { - $action .= "?$ENV{QUERY_STRING}"; + $action .= "?".$self->escapeHTML($ENV{QUERY_STRING},1); } } - $action =~ s/\"/%22/g; # fix cross-site scripting bug reported by obscure + $action = escape($action); $action = qq(action="$action"); my($other) = @@other ? " @@other" : ''; $self->{'.parametersToAdd'}={}; @ 1.1.2.1.2.2 log @fix CGI.pm form URL generation by backporting more correct security fix from CGI.pm 3.00 @ text @d4 1 a4 1 introduced in 2.94. It was replaced by a more careful patch in 3.00. d11 3 a13 6 Index: CGI.pm-2.98/CGI.pm --- CGI.pm-2.98/CGI.pm.orig 2003-06-18 21:57:21.000000000 +0200 +++ CGI.pm-2.98/CGI.pm 2003-10-21 11:10:30.000000000 +0200 @@@@ -1639,12 +1639,11 @@@@ $method = lc($method) || 'post'; $enctype = $enctype || &URL_ENCODED; d15 1 a15 2 - $action = $self->url(-absolute=>1,-path=>1); + $action = $self->escapeHTML($self->url(-absolute=>1,-path=>1)); d22 1 @