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: 24-Feb-2005 10:48:15
Branch: OPENPKG_2_3_SOLID Handle: 2005022409481400
Modified files: (Branch: OPENPKG_2_3_SOLID)
openpkg-src/boa boa.patch boa.spec rc.boa
Log:
MFC: merge latest changes from CURRENT
Summary:
Revision Changes Path
1.2.2.1 +10 -25 openpkg-src/boa/boa.patch
1.9.2.2 +1 -1 openpkg-src/boa/boa.spec
1.2.2.1 +12 -7 openpkg-src/boa/rc.boa
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/boa/boa.patch
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 boa.patch
--- openpkg-src/boa/boa.patch 17 Feb 2005 16:46:58 -0000 1.2
+++ openpkg-src/boa/boa.patch 24 Feb 2005 09:48:14 -0000 1.2.2.1
@@ -1,22 +1,7 @@
-Index: src/boa.c
---- src/boa.c.orig 2004-06-04 04:36:33 +0200
-+++ src/boa.c 2005-02-17 17:37:18 +0100
-@@ -55,10 +55,7 @@
- pid_t pid;
-
- /* set umask to u+rw, u-x, go-rwx */
-- if (umask(077) < 0) {
-- perror("umask");
-- exit(EXIT_FAILURE);
-- }
-+ umask(077);
-
- /* but first, update timestamp, because log_error_time uses it */
- (void) time(¤t_time);
Index: src/config.c
---- src/config.c.orig 2004-06-04 04:49:13 +0200
-+++ src/config.c 2005-02-17 17:34:28 +0100
-@@ -428,8 +428,11 @@
+--- src/config.c.orig 2005-02-22 15:11:29 +0100
++++ src/config.c 2005-02-24 09:10:21 +0100
+@@ -429,8 +429,11 @@
static void trim(char *s)
{
@@ -29,7 +14,7 @@
while (isspace(*c) && c > s) {
*c = '\0';
--c;
-@@ -463,8 +466,9 @@
+@@ -464,8 +467,9 @@
c = NULL;
} else {
/* one or more args */
@@ -42,8 +27,8 @@
p = lookup_keyword(buf);
Index: src/get.c
---- src/get.c.orig 2004-06-10 03:55:39 +0200
-+++ src/get.c 2005-02-17 17:40:25 +0100
+--- src/get.c.orig 2005-02-22 15:11:29 +0100
++++ src/get.c 2005-02-24 09:10:21 +0100
@@ -625,7 +625,7 @@
*/
snprintf(pathname_with_index, sizeof(pathname_with_index),
@@ -54,8 +39,8 @@
if (data_fd != -1) { /* index cache */
Index: src/globals.h
---- src/globals.h.orig 2004-03-05 04:41:33 +0100
-+++ src/globals.h 2005-02-17 17:40:03 +0100
+--- src/globals.h.orig 2005-02-22 15:11:29 +0100
++++ src/globals.h 2005-02-24 09:10:21 +0100
@@ -279,7 +279,7 @@
extern unsigned total_connections;
extern unsigned int system_bufsize; /* Default size of SNDBUF given by
system */
@@ -66,8 +51,8 @@
extern unsigned int cgi_umask;
Index: src/signals.c
---- src/signals.c.orig 2004-06-04 04:49:13 +0200
-+++ src/signals.c 2005-02-17 17:40:48 +0100
+--- src/signals.c.orig 2005-02-22 15:11:29 +0100
++++ src/signals.c 2005-02-24 09:10:21 +0100
@@ -29,7 +29,7 @@
#endif
#include <signal.h> /* signal */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/boa/boa.spec
============================================================================
$ cvs diff -u -r1.9.2.1 -r1.9.2.2 boa.spec
--- openpkg-src/boa/boa.spec 21 Feb 2005 17:06:20 -0000 1.9.2.1
+++ openpkg-src/boa/boa.spec 24 Feb 2005 09:48:14 -0000 1.9.2.2
@@ -33,7 +33,7 @@
Class: PLUS
Group: Web
License: GPL
-Version: 0.94.14rc20
+Version: 0.94.14rc21
Release: 2.3.0
# list of sources
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/boa/rc.boa
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 rc.boa
--- openpkg-src/boa/rc.boa 7 Dec 2004 19:57:27 -0000 1.2
+++ openpkg-src/boa/rc.boa 24 Feb 2005 09:48:14 -0000 1.2.2.1
@@ -19,7 +19,7 @@
}
%status -u @l_susr@ -o
- boa_usable="no"
+ boa_usable="unknown"
boa_active="no"
rcService boa enable yes && \
boa_signal 0 && boa_active="yes"
@@ -44,23 +44,28 @@
rcService boa active no && exit 0
rc boa stop start
+%reload -u @l_susr@
+ rcService boa enable yes || exit 0
+ rcService boa active no && exit 0
+ boa_signal HUP
+
%daily -u @l_susr@
rcService boa enable yes || exit 0
shtool rotate -f \
- -n ${boa_log_numfiles} -s ${boa_log_minsize} -d \
- -z ${boa_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -n ${boa_log_numfiles} -s ${boa_log_minsize} -d -c \
+ -z ${boa_log_complevel} -m 644 -o @l_susr@ -g @l_sgrp@ \
-P "${boa_log_prolog}" \
-E "${boa_log_epilog}" \
@l_prefix@/var/boa/boa.access.log
shtool rotate -f \
- -n ${boa_log_numfiles} -s ${boa_log_minsize} -d \
- -z ${boa_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -n ${boa_log_numfiles} -s ${boa_log_minsize} -d -c \
+ -z ${boa_log_complevel} -m 644 -o @l_susr@ -g @l_sgrp@ \
-P "${boa_log_prolog}" \
-E "${boa_log_epilog}" \
@l_prefix@/var/boa/boa.error.log
shtool rotate -f \
- -n ${boa_log_numfiles} -s ${boa_log_minsize} -d \
- -z ${boa_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -n ${boa_log_numfiles} -s ${boa_log_minsize} -d -c \
+ -z ${boa_log_complevel} -m 644 -o @l_susr@ -g @l_sgrp@ \
-P "${boa_log_prolog}" \
-E "${boa_log_epilog}" \
@l_prefix@/var/boa/boa.cgi.log
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
