OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 12-Jan-2004 19:34:38
Branch: HEAD Handle: 2004011218343602
Modified files:
openpkg-src/apache apache.spec rc.apache
openpkg-web news.txt
Log:
fixed rc script
Summary:
Revision Changes Path
1.196 +1 -1 openpkg-src/apache/apache.spec
1.17 +21 -10 openpkg-src/apache/rc.apache
1.8066 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.195 -r1.196 apache.spec
--- openpkg-src/apache/apache.spec 10 Jan 2004 19:17:15 -0000 1.195
+++ openpkg-src/apache/apache.spec 12 Jan 2004 18:34:38 -0000 1.196
@@ -62,7 +62,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040110
+Release: 20040112
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/rc.apache
============================================================================
$ cvs diff -u -r1.16 -r1.17 rc.apache
--- openpkg-src/apache/rc.apache 29 Dec 2003 08:54:54 -0000 1.16
+++ openpkg-src/apache/rc.apache 12 Jan 2004 18:34:38 -0000 1.17
@@ -19,15 +19,17 @@
apache_err_complevel="9"
%common
- . @l_prefix@/etc/apache/apache.sh
+ apache_pidfile="@l_prefix@/var/apache/run/apache.pid"
+ apache_signal () {
+ [ -f $apache_pidfile ] && kill -$1 `cat $apache_pidfile`
+ }
%status -u @l_susr@ -o
apache_usable="no"
apache_active="no"
- @l_prefix@/sbin/apachectl configtest 2>/dev/null && apache_usable="yes"
- ( eval `grep "^PIDFILE=" @l_prefix@/sbin/apachectl`
- [ ".$PIDFILE" != . -a -f "$PIDFILE" ] && kill -0 `cat $PIDFILE`
- ) && apache_active="yes"
+ @l_prefix@/sbin/apache -t 2>/dev/null && apache_usable="yes"
+ rcService apache enable yes && \
+ apache_signal 0 && apache_active="yes"
echo "apache_enable=\"$apache_enable\""
echo "apache_usable=\"$apache_usable\""
echo "apache_active=\"$apache_active\""
@@ -35,18 +37,27 @@
%start -u @l_susr@
rcService apache enable yes || exit 0
rcService apache active yes && exit 0
- @l_prefix@/sbin/apachectl start
+ ( [ -e @l_prefix@/etc/apache/apache.sh ] && \
+ . @l_prefix@/etc/apache/apache.sh
+ @l_prefix@/sbin/apache
+ ) || return $?
%stop -u @l_susr@
rcService apache enable yes || exit 0
rcService apache active no && exit 0
- @l_prefix@/sbin/apachectl stop
+ apache_signal TERM
sleep 2
+ rm -f $apache_pidfile >/dev/null 2>&1 || true
%restart -u @l_susr@
rcService apache enable yes || exit 0
rcService apache active no && exit 0
- @l_prefix@/sbin/apachectl restart
+ rc apache stop start
+
+%reload -u @l_susr@
+ rcService apache enable yes || exit 0
+ rcService apache active no && exit 0
+ apache_signal HUP
%daily -u @l_susr@
rcService apache enable yes || exit 0
@@ -57,7 +68,7 @@
-n ${apache_log_numfiles} -s ${apache_log_minsize} -d \
-z ${apache_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${apache_log_prolog}" \
- -E "${apache_log_epilog} && rc apache restart" \
+ -E "${apache_log_epilog} && rc apache reload" \
$apache_log_files
fi
@@ -67,7 +78,7 @@
-n ${apache_err_numfiles} -s ${apache_err_minsize} -d \
-z ${apache_err_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${apache_err_prolog}" \
- -E "${apache_err_epilog} && rc apache restart" \
+ -E "${apache_err_epilog} && rc apache reload" \
$apache_err_files
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8065 -r1.8066 news.txt
--- openpkg-web/news.txt 12 Jan 2004 15:09:14 -0000 1.8065
+++ openpkg-web/news.txt 12 Jan 2004 18:34:36 -0000 1.8066
@@ -1,3 +1,4 @@
+12-Jan-2004: Upgraded package: P<apache-1.3.29-20040112>
12-Jan-2004: Upgraded package: P<bochs-2.1-20040112>
12-Jan-2004: Upgraded package: P<vim-6.2.180-20040112>
12-Jan-2004: Upgraded package: P<swig-1.3.21-20040112>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
