Tue Mar 26 00:06:15 PDT 2013

4 files changed, 9 insertions, 138 deletions

diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 22395da3c..daee6ab4a 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 173176 2012-12-12 00:31:57Z eric $
+# $Id: PKGBUILD 180683 2013-03-25 19:15:34Z bpiotrowski $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.32
-pkgrel=2
+pkgrel=4
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
 url="http://www.lighttpd.net/"
-depends=('pcre' 'bzip2' 'libldap' 'util-linux')
-makedepends=('fcgi' 'libmysqlclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
+depends=('pcre' 'bzip2' 'libldap' 'util-linux' 'systemd')
+makedepends=('fcgi' 'libmariadbclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
 optdepends=('libxml2: mod_webdav'
             'lua51: mod_cml/mod_magnet'
-            'libmysqlclient: mod_mysql_vhost'
+            'libmariadbclient: mod_mysql_vhost'
             'sqlite: mod_webdav')
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
 options=('!libtool' 'emptydirs')
 install='lighttpd.install'
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
         "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
-        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
+        'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
 sha256sums=('1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1'
             '5456a90967df6774386010baa3fa67dba1c80c3b7058c70c80931d8dea5093e7'
-            '186f4bb2364f82d4076a2ba7d3e088ffb356550493d92dd9d5eb57cac2839c17'
-            '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77'
+            '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
             'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa'
             'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
             '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696')
@@ -57,7 +56,6 @@ package() {
 	cd $srcdir/$pkgname-$pkgver
 	make DESTDIR=$pkgdir install
 
-	install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd
 	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
 	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
 	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
diff --git a/extra/lighttpd/lighttpd.install b/extra/lighttpd/lighttpd.install
index 6b471f633..817bd5746 100644
--- a/extra/lighttpd/lighttpd.install
+++ b/extra/lighttpd/lighttpd.install
@@ -1,6 +1,6 @@
 post_install() {
 	if [[ ! -d run/lighttpd ]]; then
-		usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/lighttpd.conf
+		usr/bin/systemd-tmpfiles --create lighttpd.conf
 	fi
 }
 
diff --git a/extra/lighttpd/lighttpd.logrotate.d b/extra/lighttpd/lighttpd.logrotate.d
index 76f98785c..b424c692d 100644
--- a/extra/lighttpd/lighttpd.logrotate.d
+++ b/extra/lighttpd/lighttpd.logrotate.d
@@ -4,6 +4,6 @@
 	notifempty
 	sharedscripts
 	postrotate
-		/usr/bin/killall -HUP lighttpd-angel &>/dev/null || true
+		systemctl reload lighttpd.service || true
 	endscript
 }
diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d
deleted file mode 100644
index c2c41b818..000000000
--- a/extra/lighttpd/lighttpd.rc.d
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-pid_file='/run/lighttpd/lighttpd-angel.pid'
-
-get_pid() {
-	if [ -r "${pid_file}" ]; then
-		cat "${pid_file}"
-	else
-		pgrep -f /usr/sbin/lighttpd-angel
-	fi
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/lighttpd/lighttpd.conf ]; then
-		stat_append '(/etc/lighttpd/lighttpd.conf not found)'
-		stat_die
-	fi
-
-	/usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/lighttpd/lighttpd.conf)'
-		stat_die
-	fi
-
-	stat_done
-}
-
-start() {
-	stat_busy 'Starting lighttpd'
-
-	local PID=$(get_pid)
-	if [ -z "$PID" ]; then
-		nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 &
-		if [ $? -gt 0 ]; then
-			stat_die
-		else
-			echo $! > "${pid_file}"
-			add_daemon lighttpd
-			stat_done
-		fi
-	else
-		stat_die
-	fi
-}
-
-stop() {
-	stat_busy 'Stopping lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-gracefull-stop() {
-	stat_busy 'Stopping lighttpd gracefully'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -INT $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-reload() {
-	stat_busy 'Reloading lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -HUP $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_die
-	else
-		stat_done
-	fi
-}
-
-
-case "$1" in
-	start)
-		test_config
-		start
-		;;
-	stop)
-		test_config
-		stop
-		;;
-	gracefull-stop)
-		test_config
-		stop
-		;;
-	reload)
-		test_config
-		reload
-		;;
-	restart)
-		test_config
-		stop
-		while [ -n "$(get_pid)" ]; do
-			sleep 1
-		done
-		start
-		;;
-	status)
-		stat_busy 'Checking lighttpd status'
-		ck_status lighttpd
-		;;
-	*)
-	echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}"
-esac
-
-exit 0