wok diff lighttpd/receipt @ rev 22669

Up firefox-official (72.0.1, CVE-2019-17026)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Jan 17 11:02:35 2020 +0100 (2020-01-17)
parents 3630f18392bd
children fc1aa8675fab
line diff
     1.1 --- a/lighttpd/receipt	Mon May 23 11:34:06 2016 +0200
     1.2 +++ b/lighttpd/receipt	Fri Jan 17 11:02:35 2020 +0100
     1.3 @@ -1,23 +1,25 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="lighttpd"
     1.7 -VERSION="1.4.35"
     1.8 +VERSION="1.4.53"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Fast and light HTTP Web server."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="BSD"
    1.13 -SUGGESTED="lighttpd-modules php perl python"
    1.14 +WEB_SITE="https://www.lighttpd.net/"
    1.15 +
    1.16  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.17 -WEB_SITE="http://www.lighttpd.net/"
    1.18 -WGET_URL="http://download.lighttpd.net/lighttpd/releases-${VERSION%.*}.x/$TARBALL"
    1.19 +WGET_URL="https://download.lighttpd.net/$PACKAGE/releases-${VERSION%.*}.x/$TARBALL"
    1.20 +
    1.21 +SUGGESTED="lighttpd-modules perl php python"
    1.22 +DEPENDS="pcre"
    1.23 +BUILD_DEPENDS="bzip2-dev pcre-dev"
    1.24  CONFIG_FILES="/etc/lighttpd/vhosts.conf /etc/lighttpd/lighttpd.conf"
    1.25 +
    1.26  HOST_ARCH="i486 arm"
    1.27  
    1.28 -DEPENDS="pcre"
    1.29 -BUILD_DEPENDS="pcre-dev bzip2-dev"
    1.30 -
    1.31 -# Modules include in this package. Other modules are splited in
    1.32 -# the lighttpd-modules packages.
    1.33 +# Modules to be included in this package. Other modules are split in
    1.34 +# the lighttpd-modules package.
    1.35  BASE_MODULES="
    1.36  access
    1.37  accesslog
    1.38 @@ -34,14 +36,15 @@
    1.39  compile_rules()
    1.40  {
    1.41  	sed -i '/addrs_left/d' src/mod_extforward.c
    1.42 -	./configure \
    1.43 -		--enable-shared \
    1.44 -		--disable-ipv6 \
    1.45 -		--prefix=/usr \
    1.46 -		--libdir=/usr/lib/lighttpd \
    1.47 -		--mandir=/usr/share/man \
    1.48 -	$CONFIGURE_ARGS &&
    1.49 -	make &&
    1.50 +
    1.51 +	./configure				\
    1.52 +		--enable-shared			\
    1.53 +		--disable-ipv6			\
    1.54 +		--prefix=/usr			\
    1.55 +		--libdir=/usr/lib/lighttpd	\
    1.56 +		--mandir=/usr/share/man		\
    1.57 +		$CONFIGURE_ARGS &&
    1.58 +	make -j 1 &&
    1.59  	make DESTDIR=$DESTDIR install
    1.60  }
    1.61  
    1.62 @@ -60,7 +63,7 @@
    1.63  		echo -n "Copying : mod_${module}.so" && status
    1.64  	done
    1.65  
    1.66 -	# Config file.
    1.67 +	# Configuration file.
    1.68  	cp -a $stuff/etc $fs
    1.69  	chown -R 0.0 $fs/etc
    1.70  
    1.71 @@ -69,20 +72,20 @@
    1.72  	chown 80.80 $fs/var/log/lighttpd
    1.73  }
    1.74  
    1.75 -# Make sur it as cross compile properly
    1.76 +# Make sure it is cross compiled properly
    1.77  testsuite()
    1.78  {
    1.79  	readelf -h $install/usr/sbin/$PACKAGE
    1.80  }
    1.81  
    1.82  # Pre and post install commands for Tazpkg.
    1.83 -# We stop the server by default in case of upgarde.
    1.84 +# We stop the server by default in case of upgrade.
    1.85  pre_install()
    1.86  {
    1.87  	[ -z "$1" ] && for i in httpd ngnix apache cherokee $PACKAGE ; do
    1.88  		[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
    1.89  	done
    1.90 -	# Backup config file.
    1.91 +	# Backup configuration file.
    1.92  	if [ -d "$1/etc/lighttpd" ]; then
    1.93  		cp -a "$1/etc/lighttpd" "$1/etc/lighttpd.bak"
    1.94  	fi
    1.95 @@ -90,7 +93,7 @@
    1.96  
    1.97  post_install()
    1.98  {
    1.99 -	# Restore original config.
   1.100 +	# Restore original configuration file.
   1.101  	if [ -d "$1/etc/lighttpd.bak" ]; then
   1.102  		rm -rf "$1/etc/lighttpd"
   1.103  		mv "$1/etc/lighttpd.bak" "$1/etc/lighttpd"