Browse Source

upgrading package: apache 1.3.28 -> 1.3.29

Ralf S. Engelschall 22 years ago
parent
commit
2949266100
2 changed files with 8 additions and 29 deletions
  1. 6 27
      apache/apache.patch
  2. 2 2
      apache/apache.spec

+ 6 - 27
apache/apache.patch

@@ -1,5 +1,5 @@
---- apache_1.3.28/configure.orig	Tue May 21 14:24:59 2002
-+++ apache_1.3.28/configure	Mon Feb 10 11:08:40 2003
+--- apache_1.3.29/configure.orig	Tue May 21 14:24:59 2002
++++ apache_1.3.29/configure	Mon Feb 10 11:08:40 2003
 @@ -1216,10 +1216,10 @@
  ##   or we cannot support the case where the relative
  ##   path is just the emtpy one, i.e. ""]
@@ -15,8 +15,8 @@
  
  ##
  ##  check and debug
---- apache_1.3.28/src/Configure.dist	2003-06-11 11:59:51.000000000 +0200
-+++ apache_1.3.28/src/Configure	2003-06-11 12:46:14.000000000 +0200
+--- apache_1.3.29/src/Configure.dist	2003-06-11 11:59:51.000000000 +0200
++++ apache_1.3.29/src/Configure	2003-06-11 12:46:14.000000000 +0200
 @@ -1190,14 +1190,20 @@
  	    SHLIB_SUFFIX_DEPTH=0
  	    ;;
@@ -44,29 +44,8 @@
  	    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
+--- apache_1.3.29/src/main/util_script.c.orig	Mon Jul 28 17:13:56 2003
++++ apache_1.3.29/src/main/util_script.c	Tue Jul 29 15:55:27 2003
 @@ -246,6 +246,7 @@
  	}
      }

+ 2 - 2
apache/apache.spec

@@ -33,7 +33,7 @@
 ##  go with the macro mechanism. But do not try to repeat this!
 
 #   package component versions
-%define       V_apache             1.3.28
+%define       V_apache             1.3.29
 %define       V_mod_ssl            2.8.15-1.3.28
 %define       V_mod_perl           1.29
 %define       V_mod_php            4.3.3
@@ -60,7 +60,7 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20031009
+Release:      20031028
 
 #   package options (suexec related)
 %option       with_suexec               yes