OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 29-Jul-2003 16:32:19
Branch: OPENPKG_1_STABLE HEAD Handle: 2003072915321702
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_STABLE)
openpkg-src/apache apache.patch apache.spec
Log:
MFC: all changes since last merge
Summary:
Revision Changes Path
1.1.6.2 +31 -0 openpkg-src/apache/apache.patch
1.106.2.6 +2 -1 openpkg-src/apache/apache.spec
1.5901 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.1.6.1 -r1.1.6.2 apache.patch
--- openpkg-src/apache/apache.patch 24 Jul 2003 20:43:50 -0000 1.1.6.1
+++ openpkg-src/apache/apache.patch 29 Jul 2003 14:32:19 -0000 1.1.6.2
@@ -44,3 +44,34 @@
SHLIB_SUFFIX_DEPTH=1
;;
*-sunos4*)
+--- apache_1.3.28/src/main/alloc.c.dist 2003-07-29 15:23:08.000000000 +0200
++++ apache_1.3.28/src/main/alloc.c 2003-07-29 15:25:08.000000000 +0200
+@@ -2858,13 +2858,11 @@
+ for (p = procs; p; p = p->next) {
+ if ((p->kill_how == kill_after_timeout)
+ || (p->kill_how == kill_only_once)) {
+- /* Subprocess may be dead already. Only need the timeout if not. */
+- if (ap_os_kill(p->pid, SIGTERM) == -1) {
+- p->kill_how = kill_never;
+- }
+- else {
+- need_timeout = 1;
+- }
++ /* Dead subprocesses still need a waitpid to remove the zombie
++ * so we have to ignore errors returned by ap_os_kill()
++ */
++ ap_os_kill(p->pid, SIGTERM);
++ need_timeout = 1;
+ }
+ else if (p->kill_how == kill_always) {
+ kill(p->pid, SIGKILL);
+--- apache_1.3.28/src/main/util_script.c.orig Mon Jul 28 17:13:56 2003
++++ apache_1.3.28/src/main/util_script.c Tue Jul 29 15:55:27 2003
+@@ -246,6 +246,7 @@
+ }
+ }
+
++ if (!(env_path = ap_pstrdup(r->pool, ap_table_get(r->subprocess_env, "PATH"))))
+ if (!(env_path = ap_pstrdup(r->pool, getenv("PATH")))) {
+ env_path = DEFAULT_PATH;
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.106.2.5 -r1.106.2.6 apache.spec
--- openpkg-src/apache/apache.spec 24 Jul 2003 20:43:50 -0000 1.106.2.5
+++ openpkg-src/apache/apache.spec 29 Jul 2003 14:32:19 -0000 1.106.2.6
@@ -60,7 +60,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 1.20030724
+Release: 1.20030729
# package options (suexec related)
%option with_suexec yes
@@ -798,6 +798,7 @@
--enable-suexec \
--suexec-caller=%{with_suexec_caller} \
--suexec-userdir=%{with_suexec_userdir} \
+ --suexec-logfile=%{l_prefix}/var/apache/log/suexec.log \
%endif
--enable-module=most \
--with-perl=%{l_prefix}/bin/perl \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5900 -r1.5901 news.txt
--- openpkg-web/news.txt 29 Jul 2003 14:21:01 -0000 1.5900
+++ openpkg-web/news.txt 29 Jul 2003 14:32:17 -0000 1.5901
@@ -1,3 +1,4 @@
+29-Jul-2003: Upgraded package: P<apache-1.3.28-1.20030729>
29-Jul-2003: Upgraded package: P<rsync-2.5.6-20030729>
29-Jul-2003: Upgraded package: P<apache-1.3.28-20030729>
29-Jul-2003: Upgraded package: P<qt-3.2.0-20030729>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
