commit 17e4871f373cd3ee3f645a9faae1f55d5e0ce97a Author: Thomas Penteker <tek@serverop.de> Date: Sun Jul 26 18:20:27 2015 +0200 lighttpd: 1.4.35 -> 1.4.36, fixes CVE-2015-3200 diff --git a/lighttpd/.footprint b/lighttpd/.footprint index f7f2656..38a25a0 100644 --- a/lighttpd/.footprint +++ b/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/ diff --git a/lighttpd/.md5sum b/lighttpd/.md5sum index d61fccc..adb4f8a 100644 --- a/lighttpd/.md5sum +++ b/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 diff --git a/lighttpd/Pkgfile b/lighttpd/Pkgfile index eab8cb4..3cf0683 100644 --- a/lighttpd/Pkgfile +++ b/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 } diff --git a/lighttpd/lighttpd.rc b/lighttpd/lighttpd.rc index c9a026f..e98d75d 100755 --- a/lighttpd/lighttpd.rc +++ b/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