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

[Jan de Groot]

    Date: Wednesday, June 23, 2010 @ 06:09:19
  Author: jgc
Revision: 83847

Fix FS#18767

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/httpd

----------+
 PKGBUILD |   46 +++++++++++++++++++++++-----------------------
 httpd    |    8 ++++----
 2 files changed, 27 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-23 08:48:35 UTC (rev 83846)
+++ PKGBUILD	2010-06-23 10:09:19 UTC (rev 83847)
@@ -4,7 +4,7 @@
 
 pkgname=apache
 pkgver=2.2.15
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -46,38 +46,38 @@
          '4ac64df6e019edbe137017cba1ff2f51'
          '08b3c875f6260644f2f52b4056d656b0'
          'f4d627c64024c1b7b95efb5ffbaa625e'
-         '9e001fbb082a08113e7f4bc431085c11'
+         'c7e300a287ef7e2e066ac7639536f87e'
          '3d659d41276ba3bfcb20c231eb254e0c')
 
 build() {
 	cd "${srcdir}/httpd-${pkgver}"
 
-	patch -Np0 -i "${srcdir}/apachectl-confd.patch" || return 1
+	patch -Np0 -i "${srcdir}/apachectl-confd.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
 
 	for mpm in prefork worker itk; do
 		if [ "${mpm}" = "itk" ]; then
 			mkdir -p server/mpm/experimental/itk
-			cp -r server/mpm/prefork/* server/mpm/experimental/itk/ || return 1
-			mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c || return 1
+			cp -r server/mpm/prefork/* server/mpm/experimental/itk/
+			mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c
 
-			patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch" || return 1
-			patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch" || return 1
-			patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch" || return 1
-			patch -Np1 -i "${srcdir}/05-add-copyright.patch" || return 1
-			patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch" || return 1
-			patch -Np1 -i "${srcdir}/07-base-functionality.patch" || return 1
-			patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" || return 1
-			patch -Np1 -i "${srcdir}/09-capabilities.patch" || return 1
-			patch -Np1 -i "${srcdir}/10-nice.patch" || return 1
+			patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch"
+			patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch"
+			patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch"
+			patch -Np1 -i "${srcdir}/05-add-copyright.patch"
+			patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch"
+			patch -Np1 -i "${srcdir}/07-base-functionality.patch"
+			patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch"
+			patch -Np1 -i "${srcdir}/09-capabilities.patch"
+			patch -Np1 -i "${srcdir}/10-nice.patch"
 
-			autoconf || return 1
+			autoconf
 		fi
 		mkdir build-${mpm}
 		pushd build-${mpm}
@@ -101,19 +101,19 @@
 			--with-apr=/usr/bin/apr-1-config \
 			--with-apr-util=/usr/bin/apu-1-config \
 			--with-pcre=/usr \
-			--with-mpm=${mpm} || return 1
-		make || return 1
+			--with-mpm=${mpm}
+		make
 		if [ "${mpm}" = "prefork" ]; then
-			make DESTDIR="${pkgdir}" install || return 1
+			make DESTDIR="${pkgdir}" install
 		else
 			install -m755 httpd "${pkgdir}/usr/sbin/httpd.${mpm}"
 		fi
 		popd
 	done
 
-	install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd" || return 1
-	install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" || return 1
-	install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache" || return 1
+	install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd"
+	install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
+	install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache"
 
 	# symlinks for /etc/httpd
 	ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
@@ -128,7 +128,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	2010-06-23 08:48:35 UTC (rev 83846)
+++ httpd	2010-06-23 10:09:19 UTC (rev 83847)
@@ -11,7 +11,7 @@
   start)
     stat_busy "Starting Apache Web Server"
     [ ! -d /var/run/httpd ] && install -d /var/run/httpd
-    if $APACHECTL start &>/dev/null ; then
+    if $APACHECTL start >/dev/null ; then
       add_daemon $daemon_name
       stat_done
     else
@@ -22,7 +22,7 @@
 
   stop)
     stat_busy "Stopping Apache Web Server"
-    if $APACHECTL stop &>/dev/null ; then
+    if $APACHECTL stop >/dev/null ; then
       rm_daemon $daemon_name
       stat_done
     else
@@ -33,7 +33,7 @@
 
   reload)
     stat_busy "Reloading Apache Web Server"
-    if $APACHECTL graceful &>/dev/null ; then
+    if $APACHECTL graceful >/dev/null ; then
       add_daemon $daemon_name
       stat_done
     else
@@ -44,7 +44,7 @@
 
   restart)
     stat_busy "Restarting Apache Web Server"
-    if $APACHECTL restart &>/dev/null ; then
+    if $APACHECTL restart >/dev/null ; then
       add_daemon $daemon_name
       stat_done
     else