[arch-commits] Commit in apache/repos (3 files)
Andrea Scarpino
andrea at archlinux.org
Sat Nov 7 12:23:33 UTC 2009
Date: Saturday, November 7, 2009 @ 07:23:32
Author: andrea
Revision: 58372
Merged revisions 56846,58370-58371 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/apache/trunk
........
r56846 | andrea | 2009-10-28 18:51:05 +0100 (Wed, 28 Oct 2009) | 1 line
FS#16883
........
r58370 | andrea | 2009-11-07 13:17:38 +0100 (Sat, 07 Nov 2009) | 1 line
rewritten rc.d script, the previous restart gave DONE with a wrong http.conf (FS#16994)
........
r58371 | andrea | 2009-11-07 13:22:43 +0100 (Sat, 07 Nov 2009) | 2 lines
upgpkg: apache 2.2.14-2
rewritten rc.d script, the previous restart gave DONE with a wrong http.conf (FS#16994)
........
Modified:
apache/repos/extra-i686/ (properties)
apache/repos/extra-i686/PKGBUILD
apache/repos/extra-i686/httpd
----------+
PKGBUILD | 4 ++--
httpd | 51 ++++++++++++++++++++++-----------------------------
2 files changed, 24 insertions(+), 31 deletions(-)
Property changes on: apache/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /apache/trunk:1-53935
+ /apache/trunk:1-58371
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-11-07 12:22:43 UTC (rev 58371)
+++ extra-i686/PKGBUILD 2009-11-07 12:23:32 UTC (rev 58372)
@@ -4,7 +4,7 @@
pkgname=apache
pkgver=2.2.14
-pkgrel=1
+pkgrel=2
pkgdesc='A high performance Unix-based HTTP server'
arch=('i686' 'x86_64')
options=('!libtool')
@@ -21,7 +21,7 @@
'httpd.logrotate' 'httpd' 'arch.layout')
md5sums=('a5226203aaf97e5b941c41a71c112704'
'f4d627c64024c1b7b95efb5ffbaa625e'
- 'bddd84dafa770d74df1dc1f96bd71823'
+ '3fb8b616e0b5f0118420edd26d8536bb'
'3d659d41276ba3bfcb20c231eb254e0c')
build() {
Modified: extra-i686/httpd
===================================================================
--- extra-i686/httpd 2009-11-07 12:22:43 UTC (rev 58371)
+++ extra-i686/httpd 2009-11-07 12:23:32 UTC (rev 58372)
@@ -5,62 +5,55 @@
. /etc/rc.conf
. /etc/rc.d/functions
+APACHECTL=/usr/sbin/apachectl
case "$1" in
start)
- stat_busy "Starting $daemon_name daemon"
- # RUN
- /usr/sbin/apachectl start &>/dev/null
- #
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
+ stat_busy "Starting Apache Web Server"
+ if $APACHECTL start &>/dev/null ; then
add_daemon $daemon_name
stat_done
+ else
+ stat_fail
+ exit 1
fi
;;
stop)
- stat_busy "Stopping $daemon_name daemon"
- # KILL
- /usr/sbin/apachectl stop &>/dev/null
- #
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
+ stat_busy "Stopping Apache Web Server"
+ if $APACHECTL stop &>/dev/null ; then
rm_daemon $daemon_name
stat_done
+ else
+ stat_fail
+ exit 1
fi
;;
reload)
- stat_busy "Reloading $daemon_name daemon"
- /usr/sbin/apachectl graceful &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
+ stat_busy "Reloading Apache Web Server"
+ if $APACHECTL graceful &>/dev/null ; then
add_daemon $daemon_name
stat_done
+ else
+ stat_fail
+ exit 1
fi
;;
restart)
- stat_busy "Restarting $daemon_name daemon"
- /usr/sbin/apachectl restart &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
+ stat_busy "Restarting Apache Web Server"
+ if $APACHECTL restart &>/dev/null ; then
add_daemon $daemon_name
stat_done
+ else
+ stat_fail
+ exit 1
fi
;;
status)
- stat_busy "Checking $daemon_name status";
+ stat_busy "Checking Apache Web Server status";
ck_status $daemon_name
;;
More information about the arch-commits
mailing list