Tue Jun 4 00:27:56 PDT 2013

5 files changed, 55 insertions, 110 deletions

diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index abc33e580..d66921dba 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 180169 2013-03-18 14:04:21Z jgc $
+# $Id: PKGBUILD 187049 2013-06-03 11:16:09Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apache
 pkgver=2.2.24
-pkgrel=1
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
 url='http://www.apache.org/dist/httpd'
 license=('APACHE')
-backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf
+backup=(etc/httpd/conf/httpd.conf
         etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
         etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
         etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
@@ -36,11 +36,10 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         apache.conf.d
         apache.tmpfiles.conf
         httpd.logrotate
-        httpd
         httpd.service
         arch.layout)
 md5sums=('91bd1484aca13a7095d6432be37fc7ae'
-         'f8f0d879b5fda028aad7ac9f329e057b'
+         'SKIP'
          'f1d9d41360908ceb2374da55ae99197a'
          'cdfa04985a0efa850976aef01c2a0c40'
          '0930d2d0612eb0a53a0d00aea7e8687f'
@@ -54,10 +53,9 @@ md5sums=('91bd1484aca13a7095d6432be37fc7ae'
          '4ac64df6e019edbe137017cba1ff2f51'
          '08b3c875f6260644f2f52b4056d656b0'
          '82068753dab92fe86312b1010a2904d7'
-         '6382331e9700ed9e8cc78ea51887b537'
-         'c7e300a287ef7e2e066ac7639536f87e'
-         'ed219c8228d4d5ae9b7a55107cf79706'
-         '3d659d41276ba3bfcb20c231eb254e0c')
+         '13dbaaf949c5bc36cfcf5718b95cb020'
+         'a823bb355c136fd0e2b3fb820e2d903c'
+         '6b7122245a67597230a3b3f317eaf34e')
 
 build() {
 	cd "${srcdir}/httpd-${pkgver}"
@@ -71,31 +69,41 @@ build() {
 
 	cat "${srcdir}/arch.layout" >> config.layout
 
+	cd ..
+	cp -r httpd-${pkgver} httpd-itk-${pkgver}
+
+	cd httpd-itk-${pkgver}
+	
+	# Fix patch to apply with latest Apache version
+	sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch"
+
+	mkdir -p server/mpm/experimental/itk
+	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"
+	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"
+	patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch"
+
+	autoconf
+	cd ..
 	for mpm in prefork worker itk; do
 		if [ "${mpm}" = "itk" ]; then
-                        # Fix patch to apply with latest Apache version
-                        sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch"
-
-			mkdir -p server/mpm/experimental/itk
-			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"
-			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"
-                        patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch"
-
-			autoconf
+			CONFIGURE=../httpd-itk-${pkgver}/configure
+		else
+			CONFIGURE=../httpd-${pkgver}/configure
 		fi
+
 		mkdir build-${mpm}
 		pushd build-${mpm}
-		../configure --enable-layout=Arch \
+		$CONFIGURE --enable-layout=Arch \
 			--enable-modules=all \
 			--enable-mods-shared=all \
 			--enable-so \
@@ -103,7 +111,7 @@ build() {
 			--with-suexec-caller=http \
 			--with-suexec-docroot=/srv/http \
 			--with-suexec-logfile=/var/log/httpd/suexec.log \
-			--with-suexec-bin=/usr/sbin/suexec \
+			--with-suexec-bin=/usr/bin/suexec \
 			--with-suexec-uidmin=99 --with-suexec-gidmin=99 \
 			--enable-ldap --enable-authnz-ldap \
 			--enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
@@ -117,15 +125,19 @@ build() {
 			--with-pcre=/usr \
 			--with-mpm=${mpm}
 		make
-		if [ "${mpm}" = "prefork" ]; then
-			make DESTDIR="${pkgdir}" install
-		else
-			install -m755 httpd "${pkgdir}/usr/sbin/httpd.${mpm}"
-		fi
 		popd
 	done
+}
+
+package() {
+	cd "${srcdir}"
+	cd build-prefork
+	make DESTDIR="${pkgdir}" install
+	cd ..
+	
+	install -m755 build-worker/httpd "${pkgdir}/usr/bin/httpd.worker"
+	install -m755 build-itk/httpd "${pkgdir}/usr/bin/httpd.itk"
 
-	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"
 	install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
@@ -149,9 +161,7 @@ build() {
 	rm -rf "${pkgdir}/usr/share/httpd/manual"
 	rm -rf "${pkgdir}/etc/httpd/conf/original"
 	rm -rf "${pkgdir}/srv/"
-	rm -rf "${pkgdir}/usr/bin"
-	rm -rf "${pkgdir}/var/run"
-
+	rm -rf "${pkgdir}/run"
 
         install -m755 -d "${pkgdir}/usr/lib/systemd/system"
         install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/"
diff --git a/extra/apache/arch.layout b/extra/apache/arch.layout
index ab59db84b..d5d2e8a08 100644
--- a/extra/apache/arch.layout
+++ b/extra/apache/arch.layout
@@ -2,7 +2,7 @@
 	prefix:          /etc/httpd
 	exec_prefix:     /usr
 	bindir:          /usr/bin
-	sbindir:         /usr/sbin
+	sbindir:         /usr/bin
 	libdir:          /usr/lib/httpd
 	libexecdir:      /usr/lib/httpd/modules
 	mandir:          /usr/share/man
@@ -16,7 +16,7 @@
 	cgidir:          /srv/http/cgi-bin
 	includedir:      /usr/include/httpd
 	localstatedir:   /var
-	runtimedir:      /var/run/httpd
+	runtimedir:      /run/httpd
 	logfiledir:      /var/log/httpd
 	proxycachedir:   /var/cache/httpd
 </Layout>
\ No newline at end of file
diff --git a/extra/apache/httpd b/extra/apache/httpd
deleted file mode 100755
index 6fa9c3cc7..000000000
--- a/extra/apache/httpd
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name=httpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-APACHECTL=/usr/sbin/apachectl
-
-case "$1" in
-  start)
-    stat_busy "Starting Apache Web Server"
-    [ ! -d /var/run/httpd ] && install -d /var/run/httpd
-    if $APACHECTL start >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    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 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 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 Apache Web Server status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/extra/apache/httpd.logrotate b/extra/apache/httpd.logrotate
index a723d20d2..c9755de14 100644
--- a/extra/apache/httpd.logrotate
+++ b/extra/apache/httpd.logrotate
@@ -1,6 +1,6 @@
 /var/log/httpd/*log {
    missingok
    postrotate
-      /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
+      /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
    endscript
 }
diff --git a/extra/apache/httpd.service b/extra/apache/httpd.service
index bb02b5992..247e28fba 100644
--- a/extra/apache/httpd.service
+++ b/extra/apache/httpd.service
@@ -5,9 +5,9 @@ After=network.target remote-fs.target nss-lookup.target
 [Service]
 Type=forking
 PIDFile=/run/httpd/httpd.pid
-ExecStart=/usr/sbin/apachectl start
-ExecStop=/usr/sbin/apachectl graceful-stop
-ExecReload=/usr/sbin/apachectl graceful
+ExecStart=/usr/bin/apachectl start
+ExecStop=/usr/bin/apachectl graceful-stop
+ExecReload=/usr/bin/apachectl graceful
 PrivateTmp=true
 LimitNOFILE=infinity