[gentoo-commits] gentoo-x86 commit in dev-perl/SpeedyCGI/files: SpeedyCGI-2.22-apache-docs.patch SpeedyCGI-2.22-speedy_unsafe_putenv.patch SpeedyCGI-2.22-uninit-crash.patch SpeedyCGI-2.22-strip-backend-libs.patch SpeedyCGI-2.22-perl5.10.patch SpeedyCGI-2.22-apache2.2.patch SpeedyCGI-2.22-perl_sys_init.patch SpeedyCGI-2.22-test-timeout.patch SpeedyCGI-2.22-strerror.patch SpeedyCGI-2.22-makefile-manpage.patch SpeedyCGI-2.22-empty-param.patch

[Peter Volkov (pva)]

pva         10/03/29 14:59:14

  Added:                SpeedyCGI-2.22-apache-docs.patch
                        SpeedyCGI-2.22-speedy_unsafe_putenv.patch
                        SpeedyCGI-2.22-uninit-crash.patch
                        SpeedyCGI-2.22-strip-backend-libs.patch
                        SpeedyCGI-2.22-perl5.10.patch
                        SpeedyCGI-2.22-apache2.2.patch
                        SpeedyCGI-2.22-perl_sys_init.patch
                        SpeedyCGI-2.22-test-timeout.patch
                        SpeedyCGI-2.22-strerror.patch
                        SpeedyCGI-2.22-makefile-manpage.patch
                        SpeedyCGI-2.22-empty-param.patch
  Log:
  Added debian patchset, fixes #299978 thank Diego E. 'Flameeyes' Pettenò for report.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache-docs.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache-docs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache-docs.patch?rev=1.1&content-type=text/plain

Index: SpeedyCGI-2.22-apache-docs.patch
===================================================================
Author: Niko Tyni <ntyni@×××.fi>
Description: Documentation for bug #204461.
--- a/src/SpeedyCGI.src
+++ b/src/SpeedyCGI.src
@@ -250,6 +250,13 @@
 be Speedy followed by the option name.  For example to set the
 Timeout option, use the apache directive SpeedyTimeout.
 
+Note that these variables are global. There is currently no way to run
+different scripts with different SpeedyCGI options when they are run
+from the Apache module. Any <Directory> or <Location> contexts
+have no effect on the scope of the SpeedyCGI options. When the
+same SpeedyCGI option is set several times, the last one overrides
+the others.
+
 =back
 
 =head2 Context



1.1                  dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-speedy_unsafe_putenv.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-speedy_unsafe_putenv.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-speedy_unsafe_putenv.patch?rev=1.1&content-type=text/plain

Index: SpeedyCGI-2.22-speedy_unsafe_putenv.patch
===================================================================
Author: banb@××××××××.jp
Description: Debian #418447, CPAN #13521
http://rt.cpan.org/Public/Bug/Display.html?id=13521
--- a/src/speedy_backend_main.c
+++ b/src/speedy_backend_main.c
@@ -176,6 +176,10 @@
         DIE_QUIET("Cannot allocate perl");
     perl_construct(my_perl);
 
+#if defined(PL_use_safe_putenv) || defined(PL_Guse_safe_putenv)
+    PL_use_safe_putenv = 0;
+#endif
+
 #ifdef SPEEDY_DEBUG
     dont_fork = getenv("SPEEDY_NOPARENT") != NULL;
 #endif



1.1                  dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-uninit-crash.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-uninit-crash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-uninit-crash.patch?rev=1.1&content-type=text/plain

Index: SpeedyCGI-2.22-uninit-crash.patch
===================================================================
Author: Niko Tyni <ntyni@××××××.org>
Description: Closes: #537996
The SvIV call crashes in on Perl 5.10.0 when warnings are
enabled and the value is undef.
--- a/src/speedy_perl.c
+++ b/src/speedy_perl.c
@@ -818,7 +818,7 @@
     my_call_sv(get_perlvar(&PERLVAR_RESET_GLOBALS));
 
     /* Copy option values in from the perl vars */
-    if (SvIV(PERLVAL_OPTS_CHANGED)) {
+    if (SvTRUE(PERLVAL_OPTS_CHANGED)) {
 	int i;
 	for (i = 0; i < SPEEDY_NUMOPTS; ++i) {
 	    OptRec *o = speedy_optdefs + i;



1.1                  dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strip-backend-libs.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strip-backend-libs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strip-backend-libs.patch?rev=1.1&content-type=text/plain

Index: SpeedyCGI-2.22-strip-backend-libs.patch
===================================================================
Author: Niko Tyni <ntyni@×××.fi>
Description: Use the automatic 'remove extra libs' feature with speedy_backend too.
These unnecessary linking flags get removed: -lm -lcrypt -lpthread
--- a/speedy_backend/Makefile.PL
+++ b/speedy_backend/Makefile.PL
@@ -29,6 +29,10 @@
 sub am_frontend {0}
 sub my_name {'backend'}
 
+sub remove_libs { my $class = shift;
+    'BIN=speedy_backend ../util/remove_libs';
+}
+
 use ExtUtils::Embed;
 
 my $tmp = "xsinit.tmp$$";
--- a/util/remove_libs
+++ b/util/remove_libs
@@ -3,7 +3,11 @@
 # Remove extranaeous libs from the linking command.  Reduces shared-library
 # overhead at exec time.
 
-BIN=speedy
+# allow testing other binaries too
+if [ "x$BIN" = "x" ]
+then
+	BIN=speedy
+fi
 TMP1=/tmp/remove_libs$$
 TMP2="${TMP1}2"
 



1.1                  dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl5.10.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl5.10.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl5.10.patch?rev=1.1&content-type=text/plain

Index: SpeedyCGI-2.22-perl5.10.patch
===================================================================
Author: Niko Tyni <ntyni@××××××.org>
Description: Fix build failures with Perl 5.10.
Pod::Text::pod2text() calling conventions changed
use Newx() instead of New()
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -71,7 +71,7 @@
 	chmod -R u+w,go-w,go+r .
 
 README: src/SpeedyCGI.pm
-	cd src && $(PERL) -e "use Pod::Text; pod2text(-80)" <SpeedyCGI.pm >../README
+	cd src && pod2text -80 <SpeedyCGI.pm >../README
 
 README.html: src/SpeedyCGI.pm
 	cd src && pod2html SpeedyCGI.pm >../README.html && $(RM_F) pod2h*
--- a/src/speedy_backend_main.h
+++ b/src/speedy_backend_main.h
@@ -38,7 +38,7 @@
 
 #else
 
-#define speedy_new(s,n,t)	New(123,s,n,t)
+#define speedy_new(s,n,t)	Newx(s,n,t)
 #define speedy_renew		Renew
 #define speedy_free		Safefree
 



1.1                  dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache2.2.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache2.2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache2.2.patch?rev=1.1&content-type=text/plain

Index: SpeedyCGI-2.22-apache2.2.patch
===================================================================
Author: Niko Tyni <ntyni@×××.fi>
Description: Apache 2.2 compatibility fixes (#393017):
* APR_BRIGADE_FOREACH macro removal
* apr_filename_of_pathname() rename
--- a/src/mod_speedycgi2.c
+++ b/src/mod_speedycgi2.c
@@ -340,7 +340,10 @@
     const char *buf;
     apr_size_t len;
     apr_status_t rv;
-    APR_BRIGADE_FOREACH(e, bb) {
+    for (e = APR_BRIGADE_FIRST(bb);
+        e != APR_BRIGADE_SENTINEL(bb);
+        e  = APR_BUCKET_NEXT(e)) {
+
         if (APR_BUCKET_IS_EOS(e)) {
             break;
         }
@@ -380,7 +383,7 @@
         return DECLINED;
     }
 
-    argv0 = apr_filename_of_pathname(r->filename);
+    argv0 = apr_filepath_name_get(r->filename);
     nph = !(strncmp(argv0, "nph-", 4));
 
     if (!(ap_allow_options(r) & OPT_EXECCGI) && !is_scriptaliased(r))
@@ -436,7 +439,7 @@
     if ((rv = default_build_command(&command, &argv, r, p)) != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rv, r,
                       "don't know how to spawn child process: %s", 
-                      apr_filename_of_pathname(r->filename));
+                      apr_filepath_name_get(r->filename));
         return HTTP_INTERNAL_SERVER_ERROR;
     }
 
@@ -445,7 +448,7 @@
                             command, argv, r, p)) != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rv, r,
                       "couldn't spawn child process: %s",
-		      apr_filename_of_pathname(r->filename));
+		      apr_filepath_name_get(r->filename));
         return HTTP_INTERNAL_SERVER_ERROR;
     }
 
@@ -465,7 +468,9 @@
             return rv;
         }
 
-        APR_BRIGADE_FOREACH(bucket, bb) {
+        for (bucket = APR_BRIGADE_FIRST(bb);
+            bucket != APR_BRIGADE_SENTINEL(bb);
+            bucket  = APR_BUCKET_NEXT(bucket)) {
             const char *data;
             apr_size_t len;
 



1.1                  dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl_sys_init.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl_sys_init.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl_sys_init.patch?rev=1.1&content-type=text/plain

Index: SpeedyCGI-2.22-perl_sys_init.patch
===================================================================
Author: Niko Tyni <ntyni@××××××.org>
Description: Properly call PERL_SYS_INIT3() to fix lockups on hppa with perl 5.10.0. (Closes: #486070)

This was always buggy but didn't bite until now. From 'perldoc perlembed':

The macros PERL_SYS_INIT3() and PERL_SYS_TERM() provide system-specific
tune up of the C runtime environment necessary to run Perl interpreters
--- a/src/speedy_backend_main.c
+++ b/src/speedy_backend_main.c
@@ -170,6 +170,8 @@
     int i;
     SigList sl;
 
+    PERL_SYS_INIT3(&argc, &argv, &_junk);
+
     speedy_util_unlimit_core();
 
     if (!(my_perl = perl_alloc()))
--- a/src/speedy_perl.c
+++ b/src/speedy_perl.c
@@ -405,6 +405,7 @@
 
 	perl_destruct(my_perl);
     }
+    PERL_SYS_TERM();
     speedy_util_exit(0,0);
 }
 



1.1                  dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-test-timeout.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-test-timeout.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-test-timeout.patch?rev=1.1&content-type=text/plain

Index: SpeedyCGI-2.22-test-timeout.patch
===================================================================
Author: Niko Tyni <ntyni@×××.fi>
Description: Increase the time for the backend to start so slower buildds
have a chance. (#418717)
--- a/speedy/t/killfe.t
+++ b/speedy/t/killfe.t
@@ -9,7 +9,7 @@
 my $cmd = "exec $ENV{SPEEDY} -- -M1 $scr </dev/null |";
 
 my $pid = open (RUN1, $cmd);
-sleep(1);
+sleep(3);
 kill(9, $pid);
 wait;
 open (RUN2, $cmd);



1.1                  dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strerror.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strerror.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strerror.patch?rev=1.1&content-type=text/plain

Index: SpeedyCGI-2.22-strerror.patch
===================================================================
Author: Niko Tyni <ntyni@×××.fi>
Description: Don't crash while printing a fatal error.
--- a/src/speedy_util.c
+++ b/src/speedy_util.c
@@ -96,13 +96,42 @@
 }
 
 static void just_die(const char *fmt, va_list ap) {
+    /*
+     * All this strerror_r() stuff is here because
+     * including perl.h in some cases (Perl 5.8?) replaces
+     * strerr() with a wrapper that needs an embedded perl
+     * interpreter running. Otherwise we get SIGSEGV when
+     * accessing interpreter-specific global variables for the
+     * strerror buffer
+     *
+     * Furthermore, there are two implementations of
+     * strerror_r() out there, with different prototypes.
+     */
+
     char buf[2048];
+#ifdef HAS_STRERROR_R
+    char errbuf[256];
+    int errsv;
+#endif
 
     sprintf(buf, "%s[%u]: ", SPEEDY_PROGNAME, (int)getpid());
     vsprintf(buf + strlen(buf), fmt, ap);
     if (errno) {
 	strcat(buf, ": ");
+#ifdef HAS_STRERROR_R
+#ifdef _GNU_SOURCE
+	strcat(buf, strerror_r(errno, errbuf, sizeof(errbuf)));
+#else /* ! _GNU_SOURCE */
+	errsv = errno;
+	if (strerror_r(errsv, errbuf, sizeof(errbuf))
+	    sprintf(buf + strlen(buf), "(errno = %d)", errsv);
+	else
+	    strcat(buf, errbuf);
+    }
+#endif
+#else /* ! HAS_STRERROR_R */
 	strcat(buf, strerror(errno));
+#endif /* HAS_STRERROR_R */
     }
     strcat(buf, "\n");
 #   ifdef SPEEDY_DEBUG



1.1                  dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-makefile-manpage.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-makefile-manpage.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-makefile-manpage.patch?rev=1.1&content-type=text/plain

Index: SpeedyCGI-2.22-makefile-manpage.patch
===================================================================
Author: Niko Tyni <ntyni@×××.fi>
Description: Makefile.PL tries to be too smart, make it generate a manpage.
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -34,9 +34,9 @@
     VERSION_FROM	=> 'src/SpeedyCGI.src',
     EXE_FILES		=> [qw(speedy/speedy speedy_backend/speedy_backend)],
     CONFIGURE		=> sub { return {DIR=>\@dirs} },
-    PM			=> {'src/SpeedyCGI.pm'=>'$(INST_LIBDIR)/SpeedyCGI.pm'},
+    # PM			=> {'src/SpeedyCGI.pm'=>'$(INST_LIBDIR)/SpeedyCGI.pm'},
     MAN1PODS		=> {},
-    MAN3PODS		=> {},
+    # MAN3PODS		=> {},
     dist		=> {DIST_DEFAULT => 'mydist'},
     realclean		=> {FILES => 'README README.html lib'},
     %write_makefile_common



1.1                  dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-empty-param.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-empty-param.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-empty-param.patch?rev=1.1&content-type=text/plain

Index: SpeedyCGI-2.22-empty-param.patch
===================================================================
Author: Niko Tyni <ntyni@×××.fi>
Description: Allow empty strings as command-line parameters
--- a/src/speedy_frontend.c
+++ b/src/speedy_frontend.c
@@ -535,7 +535,26 @@
 	    ADD_STRING(b, s, l);
 	}
     }
+    /* Terminate with zero-length string */
+    ADDCHAR(b, 0);
+}
+
+/* Copy a block of strings into the buffer, including empty strings */
+static void add_strings_with_empty(register SpeedyBuf *b, register const char * const * p)
+{
+    int l;
+    register const char *s;
 
+    /* Add strings in p array */
+    for (; (s = *p); ++p) {
+	if ((l = strlen(s))) {
+	    ADD_STRING(b, s, l);
+	} else {
+	    /* add a 1-byte long string containing just '\0' */
+	    l = 1;
+	    ADD_STRING(b, s, l);
+	}
+    }
     /* Terminate with zero-length string */
     ADDCHAR(b, 0);
 }
@@ -560,7 +579,7 @@
 
     /* Add env and argv */
     add_strings(sb, envp);
-    add_strings(sb, scr_argv+1);
+    add_strings_with_empty(sb, scr_argv+1);
 
     /* Put script filename into buffer */
     add_string(sb, script_fname, strlen(script_fname));