From a89c4d1cd84ad2708c1ecbf33f6920b5e42129c5 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Mon, 15 Oct 2018 13:52:39 +0000 Subject: [PATCH] lighttpd: PROVIDES += "lib:mod_sockproxy" (new in 1.4.50) While at it, move GLOBAL_WRITABLE_FILES*, USER_SETTINGS_FILES* and POST_INSTALL_SCRIPTS before PROVIDES. --- www-servers/lighttpd/lighttpd-1.4.50.recipe | 139 ++++++++++---------- 1 file changed, 68 insertions(+), 71 deletions(-) diff --git a/www-servers/lighttpd/lighttpd-1.4.50.recipe b/www-servers/lighttpd/lighttpd-1.4.50.recipe index 8cc831b37..aa3d86230 100644 --- a/www-servers/lighttpd/lighttpd-1.4.50.recipe +++ b/www-servers/lighttpd/lighttpd-1.4.50.recipe @@ -9,7 +9,7 @@ solution for every server that is suffering load problems." HOMEPAGE="https://www.lighttpd.net/" COPYRIGHT="2003-2018 lighttpd authors" LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="4" SOURCE_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$portVersion.tar.xz" CHECKSUM_SHA256="29378312d8887cbc14ffe8a7fadef2d5a08c7e7e1be942795142346ad95629eb" ADDITIONAL_FILES=" @@ -30,6 +30,72 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi +GLOBAL_WRITABLE_FILES=" + settings/lighttpd/lighttpd.conf keep-old + settings/lighttpd/modules.conf keep-old + settings/lighttpd/conf.d/access_log.conf keep-old + settings/lighttpd/conf.d/auth.conf keep-old + settings/lighttpd/conf.d/cgi.conf keep-old + settings/lighttpd/conf.d/cml.conf keep-old + settings/lighttpd/conf.d/compress.conf keep-old + settings/lighttpd/conf.d/debug.conf keep-old + settings/lighttpd/conf.d/dirlisting.conf keep-old + settings/lighttpd/conf.d/evhost.conf keep-old + settings/lighttpd/conf.d/expire.conf keep-old + settings/lighttpd/conf.d/fastcgi.conf keep-old + settings/lighttpd/conf.d/magnet.conf keep-old + settings/lighttpd/conf.d/mime.conf keep-old + settings/lighttpd/conf.d/mysql_vhost.conf keep-old + settings/lighttpd/conf.d/proxy.conf keep-old + settings/lighttpd/conf.d/rrdtool.conf keep-old + settings/lighttpd/conf.d/scgi.conf keep-old + settings/lighttpd/conf.d/secdownload.conf keep-old + settings/lighttpd/conf.d/simple_vhost.conf keep-old + settings/lighttpd/conf.d/ssi.conf keep-old + settings/lighttpd/conf.d/status.conf keep-old + settings/lighttpd/conf.d/trigger_b4_dl.conf keep-old + settings/lighttpd/conf.d/userdir.conf keep-old + settings/lighttpd/conf.d/webdav.conf keep-old + " +GLOBAL_WRITABLE_FILES_mod_geoip=" + settings/lighttpd/conf.d/geoip.conf keep-old + " +USER_SETTINGS_FILES=" + settings/lighttpd directory + settings/lighttpd/conf.d directory + settings/lighttpd/lighttpd.conf template data/lighttpd/template-settings/lighttpd.conf + settings/lighttpd/modules.conf template data/lighttpd/template-settings/modules.conf + settings/lighttpd/conf.d/access_log.conf template data/lighttpd/template-settings/conf.d/access_log.conf + settings/lighttpd/conf.d/auth.conf template data/lighttpd/template-settings/conf.d/auth.conf + settings/lighttpd/conf.d/cgi.conf template data/lighttpd/template-settings/conf.d/cgi.conf + settings/lighttpd/conf.d/cml.conf template data/lighttpd/template-settings/conf.d/cml.conf + settings/lighttpd/conf.d/compress.conf template data/lighttpd/template-settings/conf.d/compress.conf + settings/lighttpd/conf.d/debug.conf template data/lighttpd/template-settings/conf.d/debug.conf + settings/lighttpd/conf.d/dirlisting.conf template data/lighttpd/template-settings/conf.d/dirlisting.conf + settings/lighttpd/conf.d/evhost.conf template data/lighttpd/template-settings/conf.d/evhost.conf + settings/lighttpd/conf.d/expire.conf template data/lighttpd/template-settings/conf.d/expire.conf + settings/lighttpd/conf.d/fastcgi.conf template data/lighttpd/template-settings/conf.d/fastcgi.conf + settings/lighttpd/conf.d/magnet.conf template data/lighttpd/template-settings/conf.d/magnet.conf + settings/lighttpd/conf.d/mime.conf template data/lighttpd/template-settings/conf.d/mime.conf + settings/lighttpd/conf.d/mysql_vhost.conf template data/lighttpd/template-settings/conf.d/mysql_vhost.conf + settings/lighttpd/conf.d/proxy.conf template data/lighttpd/template-settings/conf.d/proxy.conf + settings/lighttpd/conf.d/rrdtool.conf template data/lighttpd/template-settings/conf.d/rrdtool.conf + settings/lighttpd/conf.d/scgi.conf template data/lighttpd/template-settings/conf.d/scgi.conf + settings/lighttpd/conf.d/secdownload.conf template data/lighttpd/template-settings/conf.d/secdownload.conf + settings/lighttpd/conf.d/simple_vhost.conf template data/lighttpd/template-settings/conf.d/simple_vhost.conf + settings/lighttpd/conf.d/ssi.conf template data/lighttpd/template-settings/conf.d/ssi.conf + settings/lighttpd/conf.d/status.conf template data/lighttpd/template-settings/conf.d/status.conf + settings/lighttpd/conf.d/trigger_b4_dl.conf template data/lighttpd/template-settings/conf.d/trigger_b4_dl.conf + settings/lighttpd/conf.d/userdir.conf template data/lighttpd/template-settings/conf.d/userdir.conf + settings/lighttpd/conf.d/webdav.conf template data/lighttpd/template-settings/conf.d/webdav.conf + " +USER_SETTINGS_FILES_mod_geoip=" + settings/lighttpd/conf.d/geoip.conf template data/lighttpd/template-settings/conf.d/geoip.conf + " +POST_INSTALL_SCRIPTS=" + $relativePostInstallDir/create-lighttpd-directories.sh + " + PROVIDES=" lighttpd$secondaryArchSuffix = $portVersion cmd:lighttpd @@ -65,6 +131,7 @@ PROVIDES=" lib:mod_secdownload$secondaryArchSuffix lib:mod_setenv$secondaryArchSuffix lib:mod_simple_vhost$secondaryArchSuffix + lib:mod_sockproxy$secondaryArchSuffix lib:mod_ssi$secondaryArchSuffix lib:mod_staticfile$secondaryArchSuffix lib:mod_status$secondaryArchSuffix @@ -141,76 +208,6 @@ BUILD_PREREQUIRES=" cmd:which " -GLOBAL_WRITABLE_FILES=" - settings/lighttpd/lighttpd.conf keep-old - settings/lighttpd/modules.conf keep-old - settings/lighttpd/conf.d/access_log.conf keep-old - settings/lighttpd/conf.d/auth.conf keep-old - settings/lighttpd/conf.d/cgi.conf keep-old - settings/lighttpd/conf.d/cml.conf keep-old - settings/lighttpd/conf.d/compress.conf keep-old - settings/lighttpd/conf.d/debug.conf keep-old - settings/lighttpd/conf.d/dirlisting.conf keep-old - settings/lighttpd/conf.d/evhost.conf keep-old - settings/lighttpd/conf.d/expire.conf keep-old - settings/lighttpd/conf.d/fastcgi.conf keep-old - settings/lighttpd/conf.d/magnet.conf keep-old - settings/lighttpd/conf.d/mime.conf keep-old - settings/lighttpd/conf.d/mysql_vhost.conf keep-old - settings/lighttpd/conf.d/proxy.conf keep-old - settings/lighttpd/conf.d/rrdtool.conf keep-old - settings/lighttpd/conf.d/scgi.conf keep-old - settings/lighttpd/conf.d/secdownload.conf keep-old - settings/lighttpd/conf.d/simple_vhost.conf keep-old - settings/lighttpd/conf.d/ssi.conf keep-old - settings/lighttpd/conf.d/status.conf keep-old - settings/lighttpd/conf.d/trigger_b4_dl.conf keep-old - settings/lighttpd/conf.d/userdir.conf keep-old - settings/lighttpd/conf.d/webdav.conf keep-old - " - -GLOBAL_WRITABLE_FILES_mod_geoip=" - settings/lighttpd/conf.d/geoip.conf keep-old - " - -USER_SETTINGS_FILES=" - settings/lighttpd directory - settings/lighttpd/conf.d directory - settings/lighttpd/lighttpd.conf template data/lighttpd/template-settings/lighttpd.conf - settings/lighttpd/modules.conf template data/lighttpd/template-settings/modules.conf - settings/lighttpd/conf.d/access_log.conf template data/lighttpd/template-settings/conf.d/access_log.conf - settings/lighttpd/conf.d/auth.conf template data/lighttpd/template-settings/conf.d/auth.conf - settings/lighttpd/conf.d/cgi.conf template data/lighttpd/template-settings/conf.d/cgi.conf - settings/lighttpd/conf.d/cml.conf template data/lighttpd/template-settings/conf.d/cml.conf - settings/lighttpd/conf.d/compress.conf template data/lighttpd/template-settings/conf.d/compress.conf - settings/lighttpd/conf.d/debug.conf template data/lighttpd/template-settings/conf.d/debug.conf - settings/lighttpd/conf.d/dirlisting.conf template data/lighttpd/template-settings/conf.d/dirlisting.conf - settings/lighttpd/conf.d/evhost.conf template data/lighttpd/template-settings/conf.d/evhost.conf - settings/lighttpd/conf.d/expire.conf template data/lighttpd/template-settings/conf.d/expire.conf - settings/lighttpd/conf.d/fastcgi.conf template data/lighttpd/template-settings/conf.d/fastcgi.conf - settings/lighttpd/conf.d/magnet.conf template data/lighttpd/template-settings/conf.d/magnet.conf - settings/lighttpd/conf.d/mime.conf template data/lighttpd/template-settings/conf.d/mime.conf - settings/lighttpd/conf.d/mysql_vhost.conf template data/lighttpd/template-settings/conf.d/mysql_vhost.conf - settings/lighttpd/conf.d/proxy.conf template data/lighttpd/template-settings/conf.d/proxy.conf - settings/lighttpd/conf.d/rrdtool.conf template data/lighttpd/template-settings/conf.d/rrdtool.conf - settings/lighttpd/conf.d/scgi.conf template data/lighttpd/template-settings/conf.d/scgi.conf - settings/lighttpd/conf.d/secdownload.conf template data/lighttpd/template-settings/conf.d/secdownload.conf - settings/lighttpd/conf.d/simple_vhost.conf template data/lighttpd/template-settings/conf.d/simple_vhost.conf - settings/lighttpd/conf.d/ssi.conf template data/lighttpd/template-settings/conf.d/ssi.conf - settings/lighttpd/conf.d/status.conf template data/lighttpd/template-settings/conf.d/status.conf - settings/lighttpd/conf.d/trigger_b4_dl.conf template data/lighttpd/template-settings/conf.d/trigger_b4_dl.conf - settings/lighttpd/conf.d/userdir.conf template data/lighttpd/template-settings/conf.d/userdir.conf - settings/lighttpd/conf.d/webdav.conf template data/lighttpd/template-settings/conf.d/webdav.conf - " - -USER_SETTINGS_FILES_mod_geoip=" - settings/lighttpd/conf.d/geoip.conf template data/lighttpd/template-settings/conf.d/geoip.conf - " - -POST_INSTALL_SCRIPTS=" - $relativePostInstallDir/create-lighttpd-directories.sh - " - debugList=( "$commandBinDir"/lighttpd "$commandBinDir"/lighttpd-angel