lighttpd: 1.4.35 -> 1.4.36, fixes CVE-2015-3200

lighttpd/.footprint

@@ -80,7 +80,6 @@ drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/lighttpd-angel
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/run/
--rw-r--r--	root/root	var/run/lighttpd.pid (EMPTY)
 drwxr-xr-x	root/root	var/www/
 drwxr-xr-x	root/root	var/www/htdocs/
 drwxr-xr-x	root/root	var/www/logs/

lighttpd/.md5sum

@@ -1,3 +1,3 @@
-f7a88130ee9984b421ad8aa80629750a  lighttpd-1.4.35.tar.bz2
+1843daffcb018aa528f6d15d43544654  lighttpd-1.4.36.tar.xz
 0ca699210055a3e137ffefdcd5441c09  lighttpd.conf
-db5f970cd1ebb3ab44f5e6f41fd0890c  lighttpd.rc
+7f92318505d6d1b0bacaaebd5a9d8585  lighttpd.rc

lighttpd/Pkgfile

@@ -5,9 +5,9 @@
 # Depends on: libpcre
 
 name=lighttpd
-version=1.4.35
+version=1.4.36
 release=1
-source=(http://download.$name.net/$name/releases-1.4.x/$name-$version.tar.bz2 \
+source=(http://download.$name.net/$name/releases-1.4.x/$name-$version.tar.xz \
         $name.conf \
         $name.rc)
 
@@ -23,7 +23,7 @@ build() {
     install -d $PKG/var/www/{htdocs,logs}
     install -d $PKG/var/run
     install -d $PKG/etc/ssl/certs
-    touch $PKG/var/run/lighttpd.pid
+    #touch $PKG/var/run/lighttpd.pid
     touch $PKG/etc/ssl/certs/lighttpd.pem
     chmod 0600 $PKG/etc/ssl/certs/lighttpd.pem
 }

lighttpd/lighttpd.rc

@@ -3,22 +3,34 @@
 # /etc/rc.d/lighttpd: start/stop lighttpd daemon
 #
 
+SSD=/sbin/start-stop-daemon
+PROG=/usr/sbin/lighttpd
+PID=/var/run/lighttpd.pid
+OPTS="-f /etc/lighttpd.conf"
+
 case $1 in
 start)
-  /usr/sbin/lighttpd -f /etc/lighttpd.conf
-  ;;
+        $SSD --start --pidfile $PID --exec $PROG -- $OPTS
+        ;;
 stop)
-  rm -f /var/run/lighttpd.pid
-  killall -q /usr/sbin/lighttpd
-  ;;
+        $SSD --stop --remove-pidfile --retry 10 --pidfile $PID
+        ;;
 restart)
-  $0 stop
-  sleep 2
-  $0 start
-  ;;
+        $0 stop
+        $0 start
+        ;;
+status)
+        $SSD --status --pidfile $PID
+        case $? in
+        0) echo "$PROG is running with pid $(cat $PID)" ;;
+        1) echo "$PROG is not running but the pid file $PID exists" ;;
+        3) echo "$PROG is not running" ;;
+        4) echo "Unable to determine the program status" ;;
+        esac
+        ;;
 *)
-  echo "usage: $0 [start|stop|restart]"
-  ;;
+        echo "usage: $0 [start|stop|restart|status]"
+        ;;
 esac
 
 # End of file