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 openpkg$ Date: 28-Oct-2003 11:47:24
Branch: HEAD Handle: 2003102810472202
Modified files:
openpkg-re/vcheck vc.apache
openpkg-src/apache apache.patch apache.spec
openpkg-web news.txt
Log:
upgrading package: apache 1.3.28 -> 1.3.29
Summary:
Revision Changes Path
1.39 +1 -1 openpkg-re/vcheck/vc.apache
1.9 +6 -27 openpkg-src/apache/apache.patch
1.176 +2 -2 openpkg-src/apache/apache.spec
1.7200 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.apache
============================================================================
$ cvs diff -u -r1.38 -r1.39 vc.apache
--- openpkg-re/vcheck/vc.apache 8 Oct 2003 07:16:58 -0000 1.38
+++ openpkg-re/vcheck/vc.apache 28 Oct 2003 10:47:22 -0000 1.39
@@ -2,7 +2,7 @@
}
prog apache = {
- version = 1.3.28
+ version = 1.3.29
url = http://www.apache.org/dist/httpd/
regex = apache_(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 apache.patch
--- openpkg-src/apache/apache.patch 29 Jul 2003 14:17:17 -0000 1.8
+++ openpkg-src/apache/apache.patch 28 Oct 2003 10:47:24 -0000 1.9
@@ -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 @@
}
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.175 -r1.176 apache.spec
--- openpkg-src/apache/apache.spec 9 Oct 2003 08:31:23 -0000 1.175
+++ openpkg-src/apache/apache.spec 28 Oct 2003 10:47:24 -0000 1.176
@@ -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 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20031009
+Release: 20031028
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7199 -r1.7200 news.txt
--- openpkg-web/news.txt 28 Oct 2003 10:42:14 -0000 1.7199
+++ openpkg-web/news.txt 28 Oct 2003 10:47:22 -0000 1.7200
@@ -1,3 +1,4 @@
+28-Oct-2003: Upgraded package: P<apache-1.3.29-20031028>
28-Oct-2003: Upgraded package: P<postfix-2.0.16-20031028>
28-Oct-2003: Upgraded package: P<fsl-1.3.0-1.3.2>
28-Oct-2003: Upgraded package: P<openpkg-20031028-20031028>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
