lighttpd: update to 1.4.37

5 files changed, 29 insertions, 59 deletions

diff --git a/abs/core/lighttpd/PKGBUILD b/abs/core/lighttpd/PKGBUILD
index 8ae5054..6d9c699 100644
--- a/abs/core/lighttpd/PKGBUILD
+++ b/abs/core/lighttpd/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.35
-pkgrel=2
+pkgver=1.4.37
+pkgrel=1
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -17,9 +17,10 @@ optdepends=('libxml2: mod_webdav' \
             'gdbm: mod_trigger_b4_dl')
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd' 'etc/lighttpd/auth-inc.conf' 'etc/lighttpd/conf.include' 'etc/lighttpd/html.include')
 options=('!libtool' 'emptydirs')
-source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" \
-        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'auth-inc.conf' 'ssl-inc.conf')
-#install='lighttpd.install'
+source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.gz"
+        'lighttpd.logrotate.d' 'lighttpd.conf' 'auth-inc.conf' 'ssl-inc.conf'
+        'lighttpd.tmpfiles')
+install='lighttpd.install'
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 
@@ -49,21 +50,21 @@ package() {
     cd ${srcdir}/${pkgname}-${pkgver}
 	make DESTDIR=${pkgdir} install || return 1
 
-	install -D -m755 ../lighttpd.rc.d ${pkgdir}/etc/rc.d/lighttpd
-	install -D -m644 ../lighttpd.logrotate.d ${pkgdir}/etc/logrotate.d/lighttpd
-	install -d -m755 -o http -g http ${pkgdir}/var/run/lighttpd/
-	install -d -m755 -o http -g http ${pkgdir}/var/log/lighttpd/
+	install -d -m700 -o http -g http ${pkgdir}/run/lighttpd/
+    install -d -m700 -o http -g http ${pkgdir}/var/{log,cache}/lighttpd/
 
-	install -D -m644 ../lighttpd.conf ${pkgdir}/etc/lighttpd/lighttpd.conf
-	install -D -m644 ../auth-inc.conf ${pkgdir}/etc/lighttpd/auth-inc.conf
-	install -D -m644 ../ssl-inc.conf ${pkgdir}/etc/lighttpd/ssl-inc.conf
+	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 -m644 ${srcdir}/auth-inc.conf ${pkgdir}/etc/lighttpd/auth-inc.conf
+	install -D -m644 ${srcdir}/ssl-inc.conf ${pkgdir}/etc/lighttpd/ssl-inc.conf
+    install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/lighttpd.conf
 
 	# set sane defaults
 	sed -e 's|/srv/www/htdocs/|/srv/http/|' \
 	    -e 's|/srv/www/|/srv/http/|' \
 	    -e 's|#server.username            = "wwwrun"|server.username            = "http"|' \
 	    -e 's|#server.groupname           = "wwwrun"|server.groupname           = "http"|' \
-	    -e 's|#server.pid-file            = "/var/run/lighttpd.pid"|server.pid-file            = "/var/run/lighttpd/lighttpd.pid"|' \
+	    -e 's|#server.pid-file            = "/run/lighttpd.pid"|server.pid-file            = "/run/lighttpd/lighttpd.pid"|' \
 	    -e 's|/usr/local/bin/php-cgi|/usr/bin/php-cgi|' \
             -e 's|"^/mythweb|"^/{1,2}mythweb|' \
             -e 's|#                               "mod_proxy",|                               "mod_proxy",|' \
@@ -77,9 +78,9 @@ package() {
 
 	install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }
-md5sums=('f7a88130ee9984b421ad8aa80629750a'
-         'bd690eee0d9e51857448770a151023b0'
-         'e17a29ebcdac82a853389c3df468c980'
+md5sums=('f2b33c161df9be9b12b6a13b33a66ea5'
+         '42d106b101d21ffd76ed9f3f1621e164'
          '7945bd60801295010e9e2cac1dba78b7'
          '62779511e3f1127c3cc9b94c49f99c29'
-         'ef64c496602b182a551416a8ba6b3d43')
+         'ef64c496602b182a551416a8ba6b3d43'
+         '1aeda5526e2cf1ca99d6e1571a6d9cf5')
diff --git a/abs/core/lighttpd/lighttpd.install b/abs/core/lighttpd/lighttpd.install
index a921b0f..55915f9 100755
--- a/abs/core/lighttpd/lighttpd.install
+++ b/abs/core/lighttpd/lighttpd.install
@@ -1,7 +1,9 @@
-pre_upgrade() {
-    mv /etc/lighttpd/lighttpd.conf  /etc/lighttpd/lighttpd.conf.old
+post_install() {
+    if [[ ! -d run/lighttpd ]]; then
+        usr/bin/systemd-tmpfiles --create lighttpd.conf
+    fi
 }
+
 post_upgrade() {
-    sed -i 's|"^/mythweb|"^/{1,2}mythweb|g' /etc/lighttpd/lighttpd.conf
-    touch /etc/lighttpd/lighttpd.user
+    post_install
 }
diff --git a/abs/core/lighttpd/lighttpd.logrotate.d b/abs/core/lighttpd/lighttpd.logrotate.d
index 71c5191..068f252 100644
--- a/abs/core/lighttpd/lighttpd.logrotate.d
+++ b/abs/core/lighttpd/lighttpd.logrotate.d
@@ -1,5 +1,8 @@
 /var/log/lighttpd/*log {
    missingok
+   copytruncate
+   notifempty
+   sharedscripts
    postrotate
       /bin/kill -HUP `cat /var/run/lighttpd/lighttpd.pid 2>/dev/null` 2> /dev/null || true
    endscript
diff --git a/abs/core/lighttpd/lighttpd.rc.d b/abs/core/lighttpd/lighttpd.rc.d
deleted file mode 100644
index 97c315f..0000000
--- a/abs/core/lighttpd/lighttpd.rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/lighttpd`
-
-case "$1" in
-  start)
-    stat_busy "Starting lighttpd Daemon"
-    [ -z "$PID" ] && /usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lighttpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping lighttpd Daemon"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lighttpd
-      rm -f /var/run/lighttpd/lighttpd.pid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/abs/core/lighttpd/lighttpd.tmpfiles b/abs/core/lighttpd/lighttpd.tmpfiles
new file mode 100644
index 0000000..e39cd42
--- /dev/null
+++ b/abs/core/lighttpd/lighttpd.tmpfiles
@@ -0,0 +1,2 @@
+d /run/lighttpd 755 http http -
+d /var/cache/lighttpd 755 http http 10d