[arch-commits] Commit in apache/trunk (PKGBUILD httpd httpd.install)

[Pierre Schmitz]

    Date: Saturday, March 21, 2009 @ 08:04:00
  Author: pierre
Revision: 30695

upgpkg: apache 2.2.11-3

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/httpd
Deleted:
  apache/trunk/httpd.install

---------------+
 PKGBUILD      |   20 +++++++++---------
 httpd         |   59 ++++++++++++++++++++++++++++++++++++++++++--------------
 httpd.install |   16 ---------------
 3 files changed, 55 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-21 11:34:06 UTC (rev 30694)
+++ PKGBUILD	2009-03-21 12:04:00 UTC (rev 30695)
@@ -3,8 +3,8 @@
 
 pkgname=apache
 pkgver=2.2.11
-pkgrel=2
-pkgdesc="A high performance Unix-based HTTP server"
+pkgrel=3
+pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
 url='http://www.apache.org/dist/httpd'
@@ -14,12 +14,12 @@
         etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
         etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf)
 depends=('openssl' 'zlib' 'apr-util' 'db' 'pcre')
-install='httpd.install'
+optdepends=('lynx: apachectl status')
 source=("http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2"
         'httpd.logrotate' 'httpd' 'arch.layout' 'prefork.c.patch')
 md5sums=('3e98bcb14a7122c274d62419566431bb'
          'f4d627c64024c1b7b95efb5ffbaa625e'
-         'fb6baeced65b7cf5b80083f278adebba'
+         'bddd84dafa770d74df1dc1f96bd71823'
          '3d659d41276ba3bfcb20c231eb254e0c'
          '171df0cf9b6b8d68c7a0cb392b68d0ec')
 
@@ -27,12 +27,12 @@
 	cd ${srcdir}/httpd-${pkgver}
 
 	# see https://issues.apache.org/bugzilla/show_bug.cgi?id=46467
-	patch -p0 -i $srcdir/prefork.c.patch || return 1
+	patch -p0 -i $srcdir/prefork.c.patch
 
 	# set default user
 	sed -e 's#User daemon#User http#' \
 	    -e 's#Group daemon#Group http#' \
-	    -i docs/conf/httpd.conf.in || return 1
+	    -i docs/conf/httpd.conf.in
 
 	cat ${srcdir}/arch.layout >> config.layout
 	./configure --enable-layout=Arch \
@@ -54,11 +54,11 @@
 		--enable-dbd \
 		--with-apr=/usr/bin/apr-1-config \
 		--with-apr-util=/usr/bin/apu-1-config \
-		--with-pcre=/usr || return 1
+		--with-pcre=/usr
 
-	make || return 1
+	make
 
-	make DESTDIR=${pkgdir} install || return 1
+	make DESTDIR=${pkgdir} install
 	install -D -m755 ${srcdir}/httpd ${pkgdir}/etc/rc.d/httpd
 	install -D -m644 ${srcdir}/httpd.logrotate ${pkgdir}/etc/logrotate.d/httpd
 
@@ -75,7 +75,7 @@
 	    -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
 	    -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
 	    -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
-	    -i ${pkgdir}/etc/httpd/conf/httpd.conf || return 1
+	    -i ${pkgdir}/etc/httpd/conf/httpd.conf
 
 	# cleanup
 	rm -rf ${pkgdir}/usr/share/httpd/manual

Modified: httpd
===================================================================
--- httpd	2009-03-21 11:34:06 UTC (rev 30694)
+++ httpd	2009-03-21 12:04:00 UTC (rev 30695)
@@ -1,40 +1,71 @@
 #!/bin/bash
 
-# general config
+daemon_name=httpd
+
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+
 case "$1" in
   start)
-    stat_busy "Starting HTTP Daemon"
-      /usr/sbin/apachectl start &>/dev/null
+    stat_busy "Starting $daemon_name daemon"
+    # RUN
+    /usr/sbin/apachectl start &>/dev/null
+    #
     if [ $? -gt 0 ]; then
       stat_fail
+      exit 1
     else
-      add_daemon httpd
+      add_daemon $daemon_name
       stat_done
     fi
     ;;
+
   stop)
-    stat_busy "Stopping HTTP Daemon"
+    stat_busy "Stopping $daemon_name daemon"
+    # KILL
     /usr/sbin/apachectl stop &>/dev/null
+    #
     if [ $? -gt 0 ]; then
       stat_fail
+      exit 1
     else
-      rm_daemon httpd
+      rm_daemon $daemon_name
       stat_done
     fi
     ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
+
   reload)
-    if [ -f /var/run/httpd/httpd.pid ]; then
-      status "Reloading HTTP Configuration" kill -HUP `cat /var/run/httpd/httpd.pid`
+    stat_busy "Reloading $daemon_name daemon"
+    /usr/sbin/apachectl graceful &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      add_daemon $daemon_name
+      stat_done
     fi
     ;;
+
+  restart)
+    stat_busy "Restarting $daemon_name daemon"
+    /usr/sbin/apachectl restart &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      add_daemon $daemon_name
+      stat_done
+    fi
+    ;;
+
+  status)
+    stat_busy "Checking $daemon_name status";
+    ck_status $daemon_name
+    ;;
+
   *)
-    echo "usage: $0 {start|stop|restart|reload}"
+    echo "usage: $0 {start|stop|reload|restart|status}"
 esac
+
+exit 0

Deleted: httpd.install
===================================================================
--- httpd.install	2009-03-21 11:34:06 UTC (rev 30694)
+++ httpd.install	2009-03-21 12:04:00 UTC (rev 30695)
@@ -1,16 +0,0 @@
-post_upgrade() {
-	if [ $(vercmp '2.2.8' $2) -ge 0 ]; then
-	echo '
-	==> New default DocumentRoot
-
-	Apache httpd uses /srv/http as default DocumentRoot.
-	You can still use your current DocumentRoot
-
-	==> New default user and group
-
-	Instead of "nobody" apache runs as user/group "http" by default now. You might
-	want to adjust your httpd.conf according to this change. But you can still
-	run httpd as nobody.
-	'
-	fi
-}
\ No newline at end of file