OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Jul-2006 13:39:43
Branch: HEAD Handle: 2006071812394200
Modified files:
openpkg-src/perl-www perl-www.patch perl-www.spec
Log:
take over patches from THL plus many more cleanups into
CGI::GuruMeditation 1.00
Summary:
Revision Changes Path
1.17 +0 -232 openpkg-src/perl-www/perl-www.patch
1.304 +2 -2 openpkg-src/perl-www/perl-www.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-www/perl-www.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 perl-www.patch
--- openpkg-src/perl-www/perl-www.patch 6 Jul 2006 22:41:23 -0000
1.16
+++ openpkg-src/perl-www/perl-www.patch 18 Jul 2006 11:39:42 -0000
1.17
@@ -22,235 +22,3 @@
if (!$path || $path eq '.')
{
-
-Make over CGI::Gurumeditation <thl>
- 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 = "<p>Software Failure. " .
-+ ( defined($CGI::GuruMeditation::name)
-+ ? &escape_html($CGI::GuruMeditation::name)
-+ : "Press reload button to continue."
-+ ) . "\n<p>" .
-+ 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.)/<br>$1/sg;
--
-- # generate HTTP response header
-- my $O = "Content-Type: text/html; charset=ISO-8859-1\n\n";
-+ $msg = "<pre>$msg</pre>";
-
-+ # 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 .=
-- "<html>\n" .
-- " <head>\n" .
-- " <style type=\"text/css\">\n" .
-- " HTML {\n" .
-- " width: 100%;\n" .
-- " height: auto;\n" .
-- " }\n" .
-- " BODY {\n" .
-- " background: #cccccc;\n" .
-- " margin: 0 0 0 0;\n" .
-- " padding: 0 0 0 0;\n" .
-- " }\n" .
-- " DIV.canvas {\n" .
-- " background: #000000;\n" .
-- " border: 20px solid #000000;\n" .
-- " }\n" .
-- " DIV.error1 {\n" .
-- " border-top: 4px solid #cc3333;\n" .
-- " border-left: 4px solid #cc3333;\n" .
-- " border-right: 4px solid #cc3333;\n" .
-- " border-bottom: 4px solid #cc3333;\n" .
-- " padding: 10px 10px 10px 10px;\n" .
-- " font-family: sans-serif, helvetica,
arial;\n" .
-- " background: #000000;\n" .
-- " color: #cc3333;\n" .
-- " }\n" .
-- " DIV.error2 {\n" .
-- " border-top: 4px solid #000000;\n" .
-- " border-left: 4px solid #000000;\n" .
-- " border-right: 4px solid #000000;\n" .
-- " border-bottom: 4px solid #000000;\n" .
-- " padding: 10px 10px 10px 10px;\n" .
-- " font-family: sans-serif, helvetica,
arial;\n" .
-- " background: #000000;\n" .
-- " color: #cc3333;\n" .
-- " }\n" .
-- " SPAN.title {\n" .
-- " font-size: 200%;\n" .
-- " font-weight: bold;\n" .
-- " }\n" .
-- " TT.text {\n" .
-- " font-weight: bold;\n" .
-- " }\n" .
-- " </style>\n" .
-- " <script language=\"JavaScript\">\n" .
-- " var count = 0;\n" .
-- " function blinker() {\n" .
-- " var obj = document.getElementById('error');\n" .
-- " if (count++ % 2 == 0) {\n" .
-- " obj.className = 'error1';\n" .
-- " }\n" .
-- " else {\n" .
-- " obj.className = 'error2';\n" .
-- " }\n" .
-- " setTimeout('blinker()', 1000);\n" .
-- " }\n" .
-- " </script>\n" .
-- " <title>$title</title>\n" .
-- " </head>\n";
--
-- # generate HTML page body
-- $O .=
-- " <body onLoad=\"setTimeout('blinker()', 1);\">\n" .
-- " <div class=\"canvas\">\n" .
-- " <div id=\"error\" class=\"error1\">\n" .
-- " <span class=\"title\">$title</span>\n" .
-- " <p>\n" .
-- " <tt class=\"text\">\n" .
-- " $msg" .
-- " </tt><br>\n" .
-- " <pre>\n$hint</pre>\n" .
-- " </div>\n" .
-- " </div>\n" .
-- " </body>\n" .
-- "</html>\n";
-+ $O .= qq {
-+ <html>
-+ <head>
-+ <style type="text/css">
-+ HTML {
-+ width: 100%;
-+ height: auto;
-+ }
-+ BODY {
-+ background: #cccccc;
-+ margin: 0 0 0 0;
-+ padding: 0 0 0 0;
-+ }
-+ DIV.canvas {
-+ background: #000000;
-+ border: 20px solid #000000;
-+ }
-+ DIV.error1 {
-+ border-top: 6px solid #ff0000;
-+ border-left: 6px solid #ff0000;
-+ border-right: 6px solid #ff0000;
-+ border-bottom: 6px solid #ff0000;
-+ padding: 10px 10px 10px 10px;
-+ font-family: monospace;
-+ background: #000000;
-+ color: #ff0000;
-+ }
-+ DIV.error2 {
-+ border-top: 6px solid #000000;
-+ border-left: 6px solid #000000;
-+ border-right: 6px solid #000000;
-+ border-bottom: 6px solid #000000;
-+ padding: 10px 10px 10px 10px;
-+ font-family: monospace;
-+ background: #000000;
-+ color: #ff0000;
-+ }
-+ SPAN.title {
-+ font-size: 150%;
-+ font-weight: bold;
-+ text-align: center;
-+ }
-+ TT.text {
-+ font-weight: bold;
-+ }
-+ </style>
-+ <script language="JavaScript">
-+ var count = 0;
-+ function blinker() {
-+ var obj = document.getElementById('error');
-+ if (count++ % 2 == 0) {
-+ obj.className = 'error1';
-+ }
-+ else {
-+ obj.className = 'error2';
-+ }
-+ setTimeout('blinker()', 680);
-+ }
-+ </script>
-+ <title>Guru Meditation</title>
-+ </head>
-+ <body onLoad="setTimeout('blinker()', 1);">
-+ <div class="canvas">
-+ <div id="error" class="error1">
-+ <span class="title">$title</span>
-+ <p>
-+ <tt class="text">
-+ $msg
-+ </tt><br>
-+ <pre>$hint</pre>
-+ </div>
-+ </div>
-+ </body>
-+ </html>
-+ };
-+ $O =~ s/^[ ]{12}//gm; # get rid of constant indentation
-+ $O =~ s/\n(<html>)/\1/s; # get rid of leading newline
-
- # send response and die gracefully
- $|++;
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-www/perl-www.spec
============================================================================
$ cvs diff -u -r1.303 -r1.304 perl-www.spec
--- openpkg-src/perl-www/perl-www.spec 17 Jul 2006 06:39:54 -0000
1.303
+++ openpkg-src/perl-www/perl-www.spec 18 Jul 2006 11:39:42 -0000
1.304
@@ -50,7 +50,7 @@
%define V_cgi_session_sqlite 1.0
%define V_cgi_session_id_uuid 0.03
%define V_cgi_paramcomposite 0.02
-%define V_cgi_gurumeditation 0.05
+%define V_cgi_gurumeditation 1.00
%define V_cgi_builder 1.36
%define V_cgi_builder_session 1.26
%define V_cgi_builder_htmltmpl 1.21
@@ -95,7 +95,7 @@
Group: Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 20060717
+Release: 20060718
# list of sources
Source0: http://www.cpan.org/modules/by-module/URI/URI-%{V_uri}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
