wok diff lighttpd-ssl/receipt @ rev 23131

updated lighttpd, lighttpd-modules and lighttpd-ssl (1.4.53 -> 1.4.55)
author Hans-G?nter Theisgen
date Sat Mar 14 13:38:52 2020 +0100 (2020-03-14)
parents ea835222df2a
children ede1d184d5c5
line diff
     1.1 --- a/lighttpd-ssl/receipt	Sun Apr 21 09:57:43 2019 +0100
     1.2 +++ b/lighttpd-ssl/receipt	Sat Mar 14 13:38:52 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="lighttpd-ssl"
     1.7 -VERSION="1.4.53"
     1.8 +VERSION="1.4.55"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Fast and light HTTP Web server with SSL support."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -16,6 +16,7 @@
    1.13  SUGGESTED="lighttpd-modules perl php python"
    1.14  DEPENDS="openssl pcre"
    1.15  BUILD_DEPENDS="bzip2-dev openssl-dev pcre-dev"
    1.16 +
    1.17  CONFIG_FILES="/etc/lighttpd/vhosts.conf /etc/lighttpd/lighttpd.conf /etc/ssl/lighttpd"
    1.18  
    1.19  HOST_ARCH="i486 arm"
    1.20 @@ -38,12 +39,12 @@
    1.21  	sed -i '/addrs_left/d' src/mod_extforward.c
    1.22  
    1.23  	./configure				\
    1.24 -		--enable-shared			\
    1.25 -		--disable-ipv6			\
    1.26 -		--with-openssl			\
    1.27  		--prefix=/usr			\
    1.28  		--libdir=/usr/lib/lighttpd	\
    1.29  		--mandir=/usr/share/man		\
    1.30 +		--disable-ipv6			\
    1.31 +		   --with-openssl		\
    1.32 +		 --enable-shared		\
    1.33  		$CONFIGURE_ARGS &&
    1.34  	make -j 1 &&
    1.35  	make DESTDIR=$DESTDIR install
    1.36 @@ -59,15 +60,17 @@
    1.37  
    1.38  	# Modules.
    1.39  	mkdir -p $fs/usr/lib/lighttpd
    1.40 -	for module in $BASE_MODULES; do
    1.41 +	for module in $BASE_MODULES
    1.42 +	  do
    1.43  		action "Copying : mod_${module}.so"
    1.44 -		cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd
    1.45 +		cp $install/usr/lib/lighttpd/mod_${module}.so \
    1.46 +			$fs/usr/lib/lighttpd
    1.47  		status
    1.48 -	done
    1.49 +	  done
    1.50  
    1.51  	# Server root and configuration file.
    1.52 -	cp -a $WOK/$SOURCE/stuff/etc $fs
    1.53 -	chown -R 0.0 $fs/etc
    1.54 +	cp -a $WOK/$SOURCE/stuff/etc	$fs
    1.55 +	chown -R 0.0			$fs/etc
    1.56  	mkdir -p $fs/etc/ssl/lighttpd
    1.57  	cat >> $fs/etc/lighttpd/lighttpd.conf <<EOT
    1.58  
    1.59 @@ -85,7 +88,7 @@
    1.60  
    1.61  	# Logs directory.
    1.62  	mkdir -p $fs/var/log/lighttpd
    1.63 -	chown 80.80 $fs/var/log/lighttpd
    1.64 +	chown 80.80	$fs/var/log/lighttpd
    1.65  }
    1.66  
    1.67  # Make sure it is cross compiled properly
    1.68 @@ -98,18 +101,23 @@
    1.69  # We stop the server by default in case of upgrade.
    1.70  pre_install()
    1.71  {
    1.72 -	[ -z "$1" ] && for i in httpd lighttpd ngnix apache cherokee $PACKAGE ; do
    1.73 +	[ -z "$1" ] &&
    1.74 +	for i in httpd lighttpd ngnix apache cherokee $PACKAGE
    1.75 +	  do
    1.76  		[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
    1.77 -	done
    1.78 +	  done
    1.79 +
    1.80  	# Backup configuration file.
    1.81 -	if [ -d "$1/etc/lighttpd" ]; then
    1.82 +	if [ -d "$1/etc/lighttpd" ]
    1.83 +	  then
    1.84  		cp -a "$1/etc/lighttpd" "$1/etc/lighttpd.bak"
    1.85  	fi
    1.86  }
    1.87  
    1.88  post_install()
    1.89  {
    1.90 -	if [ ! -f "$1/etc/ssl/lighttpd/lighttpd.pem" ]; then
    1.91 +	if [ ! -f "$1/etc/ssl/lighttpd/lighttpd.pem" ]
    1.92 +	  then
    1.93  		openssl req -new -x509 \
    1.94  			-keyout "$1/etc/ssl/lighttpd/lighttpd.pem" \
    1.95  			-out "$1/etc/ssl/lighttpd/lighttpd.pem" \
    1.96 @@ -123,12 +131,15 @@
    1.97  
    1.98  EOT
    1.99  	fi
   1.100 +
   1.101  	# Just in case.
   1.102  	chown www.www "$1/var/log/lighttpd"
   1.103 -	if [ -z "$1" ]; then
   1.104 -		for i in apache ; do
   1.105 +	if [ -z "$1" ]
   1.106 +	  then
   1.107 +		for i in apache
   1.108 +		  do
   1.109  			[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
   1.110 -		done
   1.111 +		  done
   1.112  		/etc/init.d/lighttpd start
   1.113  	fi
   1.114  }