wok-6.x 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 | 9fb157256b44 |
| children | b9b707621001 |
| files | lighttpd-modules/receipt lighttpd-ssl/receipt lighttpd/receipt |
line diff
1.1 --- a/lighttpd-modules/receipt Fri Mar 13 21:12:31 2020 +0100 1.2 +++ b/lighttpd-modules/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-modules" 1.7 -VERSION="1.4.53" 1.8 +VERSION="1.4.55" 1.9 CATEGORY="network" 1.10 SHORT_DESC="Complementary modules for LightTPD Web server." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 @@ -31,10 +31,10 @@ 1.13 { 1.14 # Modules. 1.15 mkdir -p $fs/usr/ 1.16 - cp -a $install/usr/lib $fs/usr 1.17 + cp -a $install/usr/lib $fs/usr 1.18 for module in $BASE_MODULES 1.19 - do 1.20 + do 1.21 rm -f $fs/usr/lib/lighttpd/mod_${module}.so 1.22 - done 1.23 + done 1.24 rm -f $fs/usr/lib/lighttpd/*.la 1.25 }
2.1 --- a/lighttpd-ssl/receipt Fri Mar 13 21:12:31 2020 +0100 2.2 +++ b/lighttpd-ssl/receipt Sat Mar 14 13:38:52 2020 +0100 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="lighttpd-ssl" 2.7 -VERSION="1.4.53" 2.8 +VERSION="1.4.55" 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 @@ -16,6 +16,7 @@ 2.13 SUGGESTED="lighttpd-modules perl php python" 2.14 DEPENDS="openssl pcre" 2.15 BUILD_DEPENDS="bzip2-dev openssl-dev pcre-dev" 2.16 + 2.17 CONFIG_FILES="/etc/lighttpd/vhosts.conf /etc/lighttpd/lighttpd.conf /etc/ssl/lighttpd" 2.18 2.19 HOST_ARCH="i486 arm" 2.20 @@ -38,12 +39,12 @@ 2.21 sed -i '/addrs_left/d' src/mod_extforward.c 2.22 2.23 ./configure \ 2.24 - --enable-shared \ 2.25 - --disable-ipv6 \ 2.26 - --with-openssl \ 2.27 --prefix=/usr \ 2.28 --libdir=/usr/lib/lighttpd \ 2.29 --mandir=/usr/share/man \ 2.30 + --disable-ipv6 \ 2.31 + --with-openssl \ 2.32 + --enable-shared \ 2.33 $CONFIGURE_ARGS && 2.34 make -j 1 && 2.35 make DESTDIR=$DESTDIR install 2.36 @@ -59,15 +60,17 @@ 2.37 2.38 # Modules. 2.39 mkdir -p $fs/usr/lib/lighttpd 2.40 - for module in $BASE_MODULES; do 2.41 + for module in $BASE_MODULES 2.42 + do 2.43 action "Copying : mod_${module}.so" 2.44 - cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd 2.45 + cp $install/usr/lib/lighttpd/mod_${module}.so \ 2.46 + $fs/usr/lib/lighttpd 2.47 status 2.48 - done 2.49 + done 2.50 2.51 # Server root and configuration file. 2.52 - cp -a $WOK/$SOURCE/stuff/etc $fs 2.53 - chown -R 0.0 $fs/etc 2.54 + cp -a $WOK/$SOURCE/stuff/etc $fs 2.55 + chown -R 0.0 $fs/etc 2.56 mkdir -p $fs/etc/ssl/lighttpd 2.57 cat >> $fs/etc/lighttpd/lighttpd.conf <<EOT 2.58 2.59 @@ -85,7 +88,7 @@ 2.60 2.61 # Logs directory. 2.62 mkdir -p $fs/var/log/lighttpd 2.63 - chown 80.80 $fs/var/log/lighttpd 2.64 + chown 80.80 $fs/var/log/lighttpd 2.65 } 2.66 2.67 # Make sure it is cross compiled properly 2.68 @@ -98,18 +101,23 @@ 2.69 # We stop the server by default in case of upgrade. 2.70 pre_install() 2.71 { 2.72 - [ -z "$1" ] && for i in httpd lighttpd ngnix apache cherokee $PACKAGE ; do 2.73 + [ -z "$1" ] && 2.74 + for i in httpd lighttpd ngnix apache cherokee $PACKAGE 2.75 + do 2.76 [ -f /etc/init.d/$i ] && /etc/init.d/$i stop 2.77 - done 2.78 + done 2.79 + 2.80 # Backup configuration file. 2.81 - if [ -d "$1/etc/lighttpd" ]; then 2.82 + if [ -d "$1/etc/lighttpd" ] 2.83 + then 2.84 cp -a "$1/etc/lighttpd" "$1/etc/lighttpd.bak" 2.85 fi 2.86 } 2.87 2.88 post_install() 2.89 { 2.90 - if [ ! -f "$1/etc/ssl/lighttpd/lighttpd.pem" ]; then 2.91 + if [ ! -f "$1/etc/ssl/lighttpd/lighttpd.pem" ] 2.92 + then 2.93 openssl req -new -x509 \ 2.94 -keyout "$1/etc/ssl/lighttpd/lighttpd.pem" \ 2.95 -out "$1/etc/ssl/lighttpd/lighttpd.pem" \ 2.96 @@ -123,12 +131,15 @@ 2.97 2.98 EOT 2.99 fi 2.100 + 2.101 # Just in case. 2.102 chown www.www "$1/var/log/lighttpd" 2.103 - if [ -z "$1" ]; then 2.104 - for i in apache ; do 2.105 + if [ -z "$1" ] 2.106 + then 2.107 + for i in apache 2.108 + do 2.109 [ -f /etc/init.d/$i ] && /etc/init.d/$i stop 2.110 - done 2.111 + done 2.112 /etc/init.d/lighttpd start 2.113 fi 2.114 }
3.1 --- a/lighttpd/receipt Fri Mar 13 21:12:31 2020 +0100 3.2 +++ b/lighttpd/receipt Sat Mar 14 13:38:52 2020 +0100 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="lighttpd" 3.7 -VERSION="1.4.53" 3.8 +VERSION="1.4.55" 3.9 CATEGORY="network" 3.10 SHORT_DESC="Fast and light HTTP Web server." 3.11 MAINTAINER="pankso@slitaz.org" 3.12 @@ -14,6 +14,7 @@ 3.13 SUGGESTED="lighttpd-modules perl php python" 3.14 DEPENDS="pcre" 3.15 BUILD_DEPENDS="bzip2-dev pcre-dev" 3.16 + 3.17 CONFIG_FILES="/etc/lighttpd/vhosts.conf /etc/lighttpd/lighttpd.conf" 3.18 3.19 HOST_ARCH="i486 arm" 3.20 @@ -38,11 +39,11 @@ 3.21 sed -i '/addrs_left/d' src/mod_extforward.c 3.22 3.23 ./configure \ 3.24 - --enable-shared \ 3.25 - --disable-ipv6 \ 3.26 --prefix=/usr \ 3.27 --libdir=/usr/lib/lighttpd \ 3.28 --mandir=/usr/share/man \ 3.29 + --disable-ipv6 \ 3.30 + --enable-shared \ 3.31 $CONFIGURE_ARGS && 3.32 make -j 1 && 3.33 make DESTDIR=$DESTDIR install 3.34 @@ -53,19 +54,21 @@ 3.35 genpkg_rules() 3.36 { 3.37 mkdir -p $fs/usr 3.38 - #cp -a $install/usr/bin $fs/usr 3.39 - cp -a $install/usr/sbin $fs/usr 3.40 + #cp -a $install/usr/bin $fs/usr 3.41 + cp -a $install/usr/sbin $fs/usr 3.42 3.43 # Modules. 3.44 mkdir -p $fs/usr/lib/lighttpd 3.45 - for module in $BASE_MODULES; do 3.46 - cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd 3.47 + for module in $BASE_MODULES 3.48 + do 3.49 + cp $install/usr/lib/lighttpd/mod_${module}.so \ 3.50 + $fs/usr/lib/lighttpd 3.51 echo -n "Copying : mod_${module}.so" && status 3.52 - done 3.53 + done 3.54 3.55 # Configuration file. 3.56 - cp -a $stuff/etc $fs 3.57 - chown -R 0.0 $fs/etc 3.58 + cp -a $stuff/etc $fs 3.59 + chown -R 0.0 $fs/etc 3.60 3.61 # Logs directory. 3.62 mkdir -p $fs/var/log/lighttpd 3.63 @@ -82,11 +85,15 @@ 3.64 # We stop the server by default in case of upgrade. 3.65 pre_install() 3.66 { 3.67 - [ -z "$1" ] && for i in httpd ngnix apache cherokee $PACKAGE ; do 3.68 + [ -z "$1" ] && 3.69 + for i in httpd ngnix apache cherokee $PACKAGE 3.70 + do 3.71 [ -f /etc/init.d/$i ] && /etc/init.d/$i stop 3.72 - done 3.73 + done 3.74 + 3.75 # Backup configuration file. 3.76 - if [ -d "$1/etc/lighttpd" ]; then 3.77 + if [ -d "$1/etc/lighttpd" ] 3.78 + then 3.79 cp -a "$1/etc/lighttpd" "$1/etc/lighttpd.bak" 3.80 fi 3.81 } 3.82 @@ -94,7 +101,8 @@ 3.83 post_install() 3.84 { 3.85 # Restore original configuration file. 3.86 - if [ -d "$1/etc/lighttpd.bak" ]; then 3.87 + if [ -d "$1/etc/lighttpd.bak" ] 3.88 + then 3.89 rm -rf "$1/etc/lighttpd" 3.90 mv "$1/etc/lighttpd.bak" "$1/etc/lighttpd" 3.91 fi