wok rev 21356

updated lighttpd, lighttpd-modules and lighttpd-ssl (1.4.35 -> 1.4.53)
author Hans-G?nter Theisgen
date Sun Apr 21 09:57:43 2019 +0100 (2019-04-21)
parents 84659393c7e8
children e5bb9ea7a49d
files lighttpd-modules/receipt lighttpd-ssl/receipt lighttpd/receipt
line diff
     1.1 --- a/lighttpd-modules/receipt	Sun Apr 21 08:42:08 2019 +0100
     1.2 +++ b/lighttpd-modules/receipt	Sun Apr 21 09:57:43 2019 +0100
     1.3 @@ -1,17 +1,18 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="lighttpd-modules"
     1.7 -VERSION="1.4.35"
     1.8 +VERSION="1.4.53"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Complementary modules for LightTPD Web server."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="BSD"
    1.13 +WEB_SITE="https://www.lighttpd.net/"
    1.14 +
    1.15 +DEPENDS="bzip2 lighttpd zlib"
    1.16  WANTED="lighttpd"
    1.17 -WEB_SITE="http://www.lighttpd.net/"
    1.18 +
    1.19  HOST_ARCH="i486 arm"
    1.20  
    1.21 -DEPENDS="lighttpd bzip2 zlib"
    1.22 -
    1.23  BASE_MODULES="
    1.24  access
    1.25  accesslog
     2.1 --- a/lighttpd-ssl/receipt	Sun Apr 21 08:42:08 2019 +0100
     2.2 +++ b/lighttpd-ssl/receipt	Sun Apr 21 09:57:43 2019 +0100
     2.3 @@ -1,23 +1,25 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="lighttpd-ssl"
     2.7 -VERSION="1.4.35"
     2.8 +VERSION="1.4.53"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="Fast and light HTTP Web server with SSL support."
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12  LICENSE="BSD"
    2.13 -SUGGESTED="lighttpd-modules php perl python"
    2.14 +WEB_SITE="https://www.lighttpd.net/"
    2.15 +
    2.16  SOURCE="lighttpd"
    2.17  TARBALL="$SOURCE-$VERSION.tar.xz"
    2.18 -WEB_SITE="http://www.lighttpd.net/"
    2.19 -WGET_URL="http://download.lighttpd.net/lighttpd/releases-${VERSION%.*}.x/$TARBALL"
    2.20 +WGET_URL="https://download.lighttpd.net/$SOURCE/releases-${VERSION%.*}.x/$TARBALL"
    2.21 +
    2.22 +PROVIDE="lighttpd"
    2.23 +SUGGESTED="lighttpd-modules perl php python"
    2.24 +DEPENDS="openssl pcre"
    2.25 +BUILD_DEPENDS="bzip2-dev openssl-dev pcre-dev"
    2.26  CONFIG_FILES="/etc/lighttpd/vhosts.conf /etc/lighttpd/lighttpd.conf /etc/ssl/lighttpd"
    2.27 -PROVIDE="lighttpd"
    2.28 +
    2.29  HOST_ARCH="i486 arm"
    2.30  
    2.31 -DEPENDS="pcre openssl"
    2.32 -BUILD_DEPENDS="pcre-dev bzip2-dev openssl-dev"
    2.33 -
    2.34  BASE_MODULES="
    2.35  access
    2.36  accesslog
    2.37 @@ -34,15 +36,16 @@
    2.38  compile_rules()
    2.39  {
    2.40  	sed -i '/addrs_left/d' src/mod_extforward.c
    2.41 -	./configure \
    2.42 -		--enable-shared \
    2.43 -		--disable-ipv6 \
    2.44 -		--with-openssl \
    2.45 -		--prefix=/usr \
    2.46 -		--libdir=/usr/lib/lighttpd \
    2.47 -		--mandir=/usr/share/man \
    2.48 +
    2.49 +	./configure				\
    2.50 +		--enable-shared			\
    2.51 +		--disable-ipv6			\
    2.52 +		--with-openssl			\
    2.53 +		--prefix=/usr			\
    2.54 +		--libdir=/usr/lib/lighttpd	\
    2.55 +		--mandir=/usr/share/man		\
    2.56  		$CONFIGURE_ARGS &&
    2.57 -	make &&
    2.58 +	make -j 1 &&
    2.59  	make DESTDIR=$DESTDIR install
    2.60  }
    2.61  
    2.62 @@ -57,12 +60,12 @@
    2.63  	# Modules.
    2.64  	mkdir -p $fs/usr/lib/lighttpd
    2.65  	for module in $BASE_MODULES; do
    2.66 -		action 'Copying : mod_${module}.so'
    2.67 +		action "Copying : mod_${module}.so"
    2.68  		cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd
    2.69  		status
    2.70  	done
    2.71  
    2.72 -	# Server root and config file.
    2.73 +	# Server root and configuration file.
    2.74  	cp -a $WOK/$SOURCE/stuff/etc $fs
    2.75  	chown -R 0.0 $fs/etc
    2.76  	mkdir -p $fs/etc/ssl/lighttpd
    2.77 @@ -85,20 +88,20 @@
    2.78  	chown 80.80 $fs/var/log/lighttpd
    2.79  }
    2.80  
    2.81 -# Make sur it as cross compile properly
    2.82 +# Make sure it is cross compiled properly
    2.83  testsuite()
    2.84  {
    2.85  	readelf -h $install/usr/sbin/lighttpd
    2.86  }
    2.87  
    2.88  # Pre and post install commands for Tazpkg.
    2.89 -# We stop the server by default in case of upgarde.
    2.90 +# We stop the server by default in case of upgrade.
    2.91  pre_install()
    2.92  {
    2.93  	[ -z "$1" ] && for i in httpd lighttpd ngnix apache cherokee $PACKAGE ; do
    2.94  		[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
    2.95  	done
    2.96 -	# Backup config file.
    2.97 +	# Backup configuration file.
    2.98  	if [ -d "$1/etc/lighttpd" ]; then
    2.99  		cp -a "$1/etc/lighttpd" "$1/etc/lighttpd.bak"
   2.100  	fi
     3.1 --- a/lighttpd/receipt	Sun Apr 21 08:42:08 2019 +0100
     3.2 +++ b/lighttpd/receipt	Sun Apr 21 09:57:43 2019 +0100
     3.3 @@ -1,23 +1,25 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="lighttpd"
     3.7 -VERSION="1.4.35"
     3.8 +VERSION="1.4.53"
     3.9  CATEGORY="network"
    3.10  SHORT_DESC="Fast and light HTTP Web server."
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12  LICENSE="BSD"
    3.13 -SUGGESTED="lighttpd-modules php perl python"
    3.14 +WEB_SITE="https://www.lighttpd.net/"
    3.15 +
    3.16  TARBALL="$PACKAGE-$VERSION.tar.xz"
    3.17 -WEB_SITE="http://www.lighttpd.net/"
    3.18 -WGET_URL="http://download.lighttpd.net/lighttpd/releases-${VERSION%.*}.x/$TARBALL"
    3.19 +WGET_URL="https://download.lighttpd.net/$PACKAGE/releases-${VERSION%.*}.x/$TARBALL"
    3.20 +
    3.21 +SUGGESTED="lighttpd-modules perl php python"
    3.22 +DEPENDS="pcre"
    3.23 +BUILD_DEPENDS="bzip2-dev pcre-dev"
    3.24  CONFIG_FILES="/etc/lighttpd/vhosts.conf /etc/lighttpd/lighttpd.conf"
    3.25 +
    3.26  HOST_ARCH="i486 arm"
    3.27  
    3.28 -DEPENDS="pcre"
    3.29 -BUILD_DEPENDS="pcre-dev bzip2-dev"
    3.30 -
    3.31 -# Modules include in this package. Other modules are splited in
    3.32 -# the lighttpd-modules packages.
    3.33 +# Modules to be included in this package. Other modules are split in
    3.34 +# the lighttpd-modules package.
    3.35  BASE_MODULES="
    3.36  access
    3.37  accesslog
    3.38 @@ -34,14 +36,15 @@
    3.39  compile_rules()
    3.40  {
    3.41  	sed -i '/addrs_left/d' src/mod_extforward.c
    3.42 -	./configure \
    3.43 -		--enable-shared \
    3.44 -		--disable-ipv6 \
    3.45 -		--prefix=/usr \
    3.46 -		--libdir=/usr/lib/lighttpd \
    3.47 -		--mandir=/usr/share/man \
    3.48 -	$CONFIGURE_ARGS &&
    3.49 -	make &&
    3.50 +
    3.51 +	./configure				\
    3.52 +		--enable-shared			\
    3.53 +		--disable-ipv6			\
    3.54 +		--prefix=/usr			\
    3.55 +		--libdir=/usr/lib/lighttpd	\
    3.56 +		--mandir=/usr/share/man		\
    3.57 +		$CONFIGURE_ARGS &&
    3.58 +	make -j 1 &&
    3.59  	make DESTDIR=$DESTDIR install
    3.60  }
    3.61  
    3.62 @@ -60,7 +63,7 @@
    3.63  		echo -n "Copying : mod_${module}.so" && status
    3.64  	done
    3.65  
    3.66 -	# Config file.
    3.67 +	# Configuration file.
    3.68  	cp -a $stuff/etc $fs
    3.69  	chown -R 0.0 $fs/etc
    3.70  
    3.71 @@ -69,20 +72,20 @@
    3.72  	chown 80.80 $fs/var/log/lighttpd
    3.73  }
    3.74  
    3.75 -# Make sur it as cross compile properly
    3.76 +# Make sure it is cross compiled properly
    3.77  testsuite()
    3.78  {
    3.79  	readelf -h $install/usr/sbin/$PACKAGE
    3.80  }
    3.81  
    3.82  # Pre and post install commands for Tazpkg.
    3.83 -# We stop the server by default in case of upgarde.
    3.84 +# We stop the server by default in case of upgrade.
    3.85  pre_install()
    3.86  {
    3.87  	[ -z "$1" ] && for i in httpd ngnix apache cherokee $PACKAGE ; do
    3.88  		[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
    3.89  	done
    3.90 -	# Backup config file.
    3.91 +	# Backup configuration file.
    3.92  	if [ -d "$1/etc/lighttpd" ]; then
    3.93  		cp -a "$1/etc/lighttpd" "$1/etc/lighttpd.bak"
    3.94  	fi
    3.95 @@ -90,7 +93,7 @@
    3.96  
    3.97  post_install()
    3.98  {
    3.99 -	# Restore original config.
   3.100 +	# Restore original configuration file.
   3.101  	if [ -d "$1/etc/lighttpd.bak" ]; then
   3.102  		rm -rf "$1/etc/lighttpd"
   3.103  		mv "$1/etc/lighttpd.bak" "$1/etc/lighttpd"