network/lighttpd2: Updated for version 20151204_3a4698d.

Fixed php.ini location in README.SLACKWARE and hardcoded
lighttpd user (thanks to Andrzej Telszewski)

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

4 files changed, 14 insertions, 9 deletions

diff --git a/network/lighttpd2/README.SLACKWARE b/network/lighttpd2/README.SLACKWARE
index c456dfe7c135c..710dbaadc47a1 100644
--- a/network/lighttpd2/README.SLACKWARE
+++ b/network/lighttpd2/README.SLACKWARE
@@ -30,6 +30,8 @@ You have to make two changes to /etc/php-fpm.conf, namely
 
   user = lighttpd
   listen = /var/run/lighttpd2/php-fpm.sock
+  listen.owner = lighttpd
+  listen.mode = 0660
 
 Then make /etc/rc.d/rc.php-fpm executable and start it (for an
 automatic start/stop, do as for the rc.lighttpd2 script).
@@ -37,8 +39,8 @@ automatic start/stop, do as for the rc.lighttpd2 script).
 Enable php uncommenting the last line of /etc/lighttpd2/lighttpd.conf
 (you might want to have a look at the "index" directive too).
 
-The php.ini used will be /etc/httpd/php.ini: you can also override
-options set in this file adding them at the end of /etc/php-fpm.conf
+The php.ini used will be /etc/php.ini: you can also override options
+set in this file adding them at the end of /etc/php-fpm.conf
 (you will find some examples there).
 
 Note: Slackware's default php package is meant to work with httpd
diff --git a/network/lighttpd2/conf/lighttpd2.logrotate b/network/lighttpd2/conf/lighttpd2.logrotate
index 04d448ac6b9b2..a85c1efc239f5 100644
--- a/network/lighttpd2/conf/lighttpd2.logrotate
+++ b/network/lighttpd2/conf/lighttpd2.logrotate
@@ -3,7 +3,7 @@
 	missingok
 	copytruncate
 	rotate 30
-	create 0644 lighttpd root
+	create 0644 @LIGHTTPD_USER@ root
 	compress
 	notifempty
 	su lighttpd root
diff --git a/network/lighttpd2/lighttpd2.SlackBuild b/network/lighttpd2/lighttpd2.SlackBuild
index 26a1b7331d70a..7461c69547487 100644
--- a/network/lighttpd2/lighttpd2.SlackBuild
+++ b/network/lighttpd2/lighttpd2.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for lighttpd2
 
 # Copyright (c) 2007 Daniel de Kok <moc.mikciat@leinad>
-# Copyright (c) 2012-2015 Matteo Bernardini <ponce@slackbuilds.org>
+# Copyright (c) 2012-2016 Matteo Bernardini <ponce@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 # Twisted for lighttpd2 by Matteo Bernardini <ponce@slackbuilds.org>
 
 PRGNAM=lighttpd2
-VERSION=${VERSION:-20150810_d2c6a28}
+VERSION=${VERSION:-20151204_3a4698d}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -123,8 +123,11 @@ install -D -m 0644 $CWD/conf/lighttpd.conf $PKG/etc/$PRGNAM/lighttpd.conf.new
 install -m 0644 $CWD/conf/angel.conf $PKG/etc/$PRGNAM/angel.conf.new
 install -m 0644 contrib/mimetypes.conf $PKG/etc/$PRGNAM/mimetypes.conf.new
 install -m 0644 $CWD/conf/php-fpm.lua $PKG/etc/$PRGNAM/php-fpm.lua.new
-install -D -m 0644 $CWD/conf/$PRGNAM.logrotate $PKG/etc/logrotate.d/$PRGNAM.new
 install -D -m 0644 contrib/default.html $PKG/var/www/htdocs-lighttpd/index.html
+install -D -m 0644 $CWD/conf/$PRGNAM.logrotate $PKG/etc/logrotate.d/$PRGNAM.new
+mkdir -p $PKG/etc/logrotate.d
+sed "s|@LIGHTTPD_USER@|$LIGHTTPD_USER|" \
+  $CWD/conf/$PRGNAM.logrotate > $PKG/etc/logrotate.d/$PRGNAM.new
 
 sed -i \
   -e "s|user \"lighttpd|user \"$LIGHTTPD_USER|" \
diff --git a/network/lighttpd2/lighttpd2.info b/network/lighttpd2/lighttpd2.info
index 390e31595b712..a0c897ed1ce25 100644
--- a/network/lighttpd2/lighttpd2.info
+++ b/network/lighttpd2/lighttpd2.info
@@ -1,8 +1,8 @@
 PRGNAM="lighttpd2"
-VERSION="20150810_d2c6a28"
+VERSION="20151204_3a4698d"
 HOMEPAGE="http://www.lighttpd.net/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lighttpd2-20150810_d2c6a28.tar.xz"
-MD5SUM="722b4e11230381c1fb4c89ea66dd2eed"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lighttpd2-20151204_3a4698d.tar.xz"
+MD5SUM="abda13a5e541dc9525e3a2712a2608ec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libev lua ragel"