Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/multipath-tools/PKGBUILD
	community/perl-gnome2-wnck/PKGBUILD
	community/znc/PKGBUILD
	core/openldap/PKGBUILD
	extra/mod_perl/PKGBUILD
	extra/perl-digest-nilsimsa/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/vim/PKGBUILD
	extra/xcb-util-keysyms/PKGBUILD
	extra/xcb-util-wm/PKGBUILD
	extra/xournal/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	multilib/lib32-libx11/PKGBUILD
	multilib/lib32-libxft/PKGBUILD
	multilib/lib32-xcb-util/PKGBUILD

6 files changed, 43 insertions, 20 deletions

diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 951320590..580e9ba9c 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,35 +1,38 @@
-# $Id: PKGBUILD 149958 2012-02-11 23:31:05Z allan $
+# $Id: PKGBUILD 160457 2012-06-02 08:38:52Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.30
-pkgrel=3
-pkgdesc='a secure, fast, compliant and very flexible web-server'
+pkgver=1.4.31
+pkgrel=1
+pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lighttpd.net/"
 depends=('pcre' 'bzip2' 'libldap' 'util-linux')
-makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig')
+makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
 optdepends=('libxml2: mod_webdav'
             'lua: mod_cml/mod_magnet'
             'libmysqlclient: mod_mysql_vhost'
-            'sqlite3: mod_webdav')
+            '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')
-sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b'
-            '941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a'
-            'ceff3a88e876f6104c094379d507b89bc504777d0f98a0930406a70624fcf024'
-            '550aa1abaced6bc9e8d65c2b069bfc96bf4d06734b17eeb140c5d00705de1230'
-            'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa')
+        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
+sha256sums=('8a0a4f1ab782c2a3554e031c7d8ad600aac9b4c0466710a6cc9aab10659fe3f2'
+            '0ba44866f6ebdf6fefc8efba89240eacff075b5d1b80e0d7a9e0479491ff01a7'
+            '186f4bb2364f82d4076a2ba7d3e088ffb356550493d92dd9d5eb57cac2839c17'
+            '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77'
+            'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa'
+            'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
+            '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
 
 	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/lighttpd/modules \
+		--libdir=/usr/lib/lighttpd/ \
 		--sysconfdir=/etc/lighttpd \
 		--with-mysql \
 		--with-ldap \
@@ -58,6 +61,8 @@ package() {
 	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/
+	install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/lighttpd.conf
+	install -D -m644 ${srcdir}/lighttpd.service ${pkgdir}/usr/lib/systemd/system/lighttpd.service
 
 	pushd doc/config >/dev/null
 	find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \;
diff --git a/extra/lighttpd/lighttpd.install b/extra/lighttpd/lighttpd.install
new file mode 100644
index 000000000..6b471f633
--- /dev/null
+++ b/extra/lighttpd/lighttpd.install
@@ -0,0 +1,9 @@
+post_install() {
+	if [[ ! -d run/lighttpd ]]; then
+		usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/lighttpd.conf
+	fi
+}
+
+post_upgrade() {
+	post_install
+}
diff --git a/extra/lighttpd/lighttpd.logrotate.d b/extra/lighttpd/lighttpd.logrotate.d
index 5be47b863..76f98785c 100644
--- a/extra/lighttpd/lighttpd.logrotate.d
+++ b/extra/lighttpd/lighttpd.logrotate.d
@@ -4,6 +4,6 @@
 	notifempty
 	sharedscripts
 	postrotate
-	/etc/rc.d/lighttpd reload >/dev/null || true
+		/usr/bin/killall -HUP lighttpd-angel &>/dev/null || true
 	endscript
 }
diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d
index 88f0a1474..c2c41b818 100644
--- a/extra/lighttpd/lighttpd.rc.d
+++ b/extra/lighttpd/lighttpd.rc.d
@@ -4,7 +4,7 @@
 . /etc/rc.d/functions
 
 
-pid_file='/var/run/lighttpd/lighttpd-angel.pid'
+pid_file='/run/lighttpd/lighttpd-angel.pid'
 
 get_pid() {
 	if [ -r "${pid_file}" ]; then
@@ -32,11 +32,6 @@ test_config() {
 		stat_die
 	fi
 
-	local piddir=$(dirname "${pid_file}")
-	if [ ! -d "${piddir}" ]; then
-		install -d -m755 -o http -g http "${piddir}"
-	fi
-
 	stat_done
 }
 
diff --git a/extra/lighttpd/lighttpd.service b/extra/lighttpd/lighttpd.service
new file mode 100644
index 000000000..b80db7695
--- /dev/null
+++ b/extra/lighttpd/lighttpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=A secure, fast, compliant and very flexible web-server
+After=syslog.target network.target
+
+[Service]
+PrivateTmp=true
+ExecStart=/usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+KillSignal=SIGINT
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/lighttpd/lighttpd.tmpfiles b/extra/lighttpd/lighttpd.tmpfiles
new file mode 100644
index 000000000..e39cd425d
--- /dev/null
+++ b/extra/lighttpd/lighttpd.tmpfiles
@@ -0,0 +1,2 @@
+d /run/lighttpd 755 http http -
+d /var/cache/lighttpd 755 http http 10d