Merge branch 'master' of ssh://karif/~flo/git/aur

4 files changed, 181 insertions, 0 deletions

diff --git a/apache/PKGBUILD b/apache/PKGBUILD
new file mode 100644
index 0000000..8527db2
--- /dev/null
+++ b/apache/PKGBUILD
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=apache
+pkgver=2.2.13
+pkgrel=1
+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/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)
+depends=('openssl' 'zlib' 'apr-util' 'pcre')
+optdepends=('lynx: apachectl status')
+source=("http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2"
+        'httpd.logrotate' 'httpd' 'arch.layout')
+md5sums=('8d8d904e7342125825ec70f03c5745ef'
+         'f4d627c64024c1b7b95efb5ffbaa625e'
+         'bddd84dafa770d74df1dc1f96bd71823'
+         '3d659d41276ba3bfcb20c231eb254e0c')
+
+build() {
+	cd ${srcdir}/httpd-${pkgver}
+
+	# set default user
+	sed -e 's#User daemon#User http#' \
+	    -e 's#Group daemon#Group http#' \
+	    -i docs/conf/httpd.conf.in
+
+	cat ${srcdir}/arch.layout >> config.layout
+	./configure --enable-layout=Arch \
+		--enable-modules=all \
+		--enable-mods-shared=all \
+		--enable-so \
+		--enable-suexec \
+		--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-uidmin=99 --with-suexec-gidmin=99 \
+		--enable-ldap --enable-authnz-ldap \
+		--enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
+		--enable-ssl --with-ssl \
+		--enable-deflate --enable-cgid \
+		--enable-proxy --enable-proxy-connect \
+		--enable-proxy-http --enable-proxy-ftp \
+		--enable-dbd \
+		--with-apr=/usr/bin/apr-1-config \
+		--with-apr-util=/usr/bin/apu-1-config \
+		--with-pcre=/usr \
+    --with-mpm=worker
+
+	make || 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
+
+	# symlinks for /etc/httpd
+	ln -fs /var/log/httpd ${pkgdir}/etc/httpd/logs
+	ln -fs /var/run/httpd ${pkgdir}/etc/httpd/run
+	ln -fs /usr/lib/httpd/modules ${pkgdir}/etc/httpd/modules
+	ln -fs /usr/lib/httpd/build ${pkgdir}/etc/httpd/build
+
+	# set sane defaults
+	sed -e 's#/usr/lib/httpd/modules/#modules/#' \
+	    -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \
+	    -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
+	    -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
+
+	# cleanup
+	rm -rf ${pkgdir}/usr/share/httpd/manual
+	rm -rf ${pkgdir}/etc/httpd/conf/original
+	rm -rf ${pkgdir}/srv/http
+	rmdir ${pkgdir}/usr/bin
+}
diff --git a/apache/arch.layout b/apache/arch.layout
new file mode 100644
index 0000000..ab59db8
--- /dev/null
+++ b/apache/arch.layout
@@ -0,0 +1,22 @@
+<Layout Arch>
+	prefix:          /etc/httpd
+	exec_prefix:     /usr
+	bindir:          /usr/bin
+	sbindir:         /usr/sbin
+	libdir:          /usr/lib/httpd
+	libexecdir:      /usr/lib/httpd/modules
+	mandir:          /usr/share/man
+	sysconfdir:      /etc/httpd/conf
+	datadir:         /usr/share/httpd
+	installbuilddir: /usr/lib/httpd/build
+	errordir:        /usr/share/httpd/error
+	iconsdir:        /usr/share/httpd/icons
+	htdocsdir:       /srv/http
+	manualdir:       /usr/share/httpd/manual
+	cgidir:          /srv/http/cgi-bin
+	includedir:      /usr/include/httpd
+	localstatedir:   /var
+	runtimedir:      /var/run/httpd
+	logfiledir:      /var/log/httpd
+	proxycachedir:   /var/cache/httpd
+</Layout>
\ No newline at end of file
diff --git a/apache/httpd b/apache/httpd
new file mode 100644
index 0000000..fa84eff
--- /dev/null
+++ b/apache/httpd
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+daemon_name=httpd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+
+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
+      add_daemon $daemon_name
+      stat_done
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping $daemon_name daemon"
+    # KILL
+    /usr/sbin/apachectl stop &>/dev/null
+    #
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm_daemon $daemon_name
+      stat_done
+    fi
+    ;;
+
+  reload)
+    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|reload|restart|status}"
+esac
+
+exit 0
diff --git a/apache/httpd.logrotate b/apache/httpd.logrotate
new file mode 100644
index 0000000..3f9298c
--- /dev/null
+++ b/apache/httpd.logrotate
@@ -0,0 +1,5 @@
+/var/log/httpd/*log {
+   postrotate
+      /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
+   endscript
+}