Update to 1.4.56. From the changelog: # Highlights - HTTP/2 support - must be enabled in lighttpd.conf in lighttpd 1.4.56; may be enabled by default in a future release - `server.feature-flags += ("server.h2proto" => "enable", "server.h2c" => "enable")` - TLS library options: OpenSSL, mbedTLS, wolfSSL, GnuTLS, NSS - mod_openssl (existing) - mod_mbedtls (experimental) - mod_wolfssl (experimental) - mod_gnutls (experimental) - mod_nss (experimental) - TLS OCSP stapling (except mbedTLS; not currently supported by mbedTLS) - TLS session ticket key rotation control (except NSS; API limitation in NSS) - mod_deflate brotli support - mod_proxy makes HTTP/1.1 requests to backends (change from HTTP/1.0) - RFC 8297 support for 103 Early Hints produced by backends (scripts) - graceful restart option to transfer listen fds (minimal pause) - `server.systemd-socket-activation = "enable"` - `server.feature-flags += ("server.graceful-restart-bg" => "enable", "server.graceful-shutdown-timeout" => "15")` # Behavior Changes - mod_openssl - default MinProtocol TLSv1.2 TLSv1 and TLSv1.1 are deprecated and no longer supported by major browsers. <https://news.netcraft.com/archives/2020/03/03/browsers-on-track-to-block-850000-tls-1-0-sites.html> If prior behavior is required, configure: `ssl.openssl.ssl-conf-cmd = ("MinProtocol" => "TLSv1")` If using openssl <= 1.0.2 (end-of-life) `ssl.openssl.ssl-conf-cmd = ("Protocol" => "-ALL, TLSv1, TLSv1.1, TLSv1.2")` - (internal) TLS session cache is disabled by default, replaced by lighttpd robust TLSv1.2 session ticket support If backward compatibility is needed: `server.feature-flags += ("ssl.session-cache" => "enable")` - (internal) openssl creates a session ticket encryption key per SSL_CTX. lighttpd 1.4.56 and later assigns a single session ticket encryption key for the lighttpd server (across all SSL_CTX) for consistency. - behavior change with ssl.ca-dn-file (uncommon); applies to client certificate verification and ssl.ca-dn-file (uncommon) If client certificate verification is enabled (ssl.verifyclient.activate = "enable"), all CAs used for client certificate verification must be present in ssl.ca-file. This is the typical use case when client certificate verification is enabled. Certificates in (optional) ssl.ca-dn-file are used to send issuer names to client when the server sends a client certificate request. These names are use by the client during certificate selection, and the server requires that the certificate sent by the client be issued by one of the subjects in ssl.ca-dn-file. (Prior behavior merged ssl.ca-file and ssl.ca-dn-file for trusted CAs. New behavior requires all trusted CAs be listed in ssl.ca-file, and a subset be duplicated into ssl.ca-dn-file to specify allowed client cert issuer.) - mod_deflate: support for bzip2 is now disabled by default in the build - (enable using `./configure --with-bzip2`) bzip2 Content-Encoding is not widely supported Prefer to build `--with-brotli` brotli Content-Encoding is more widely supported than bzip2 # Future Scheduled Behavior Changes - HTTP/2 support will be enabled by default in a future release - graceful restart/shutdown default timeout will change from 0 (infinite/no timeout) to 5 seconds (or some similar non-zero period) configure an alternative with: `server.feature-flags += ("server.graceful-shutdown-timeout" => 5)` - mod_compress is DEPRECATED; use mod_deflate mod_compress has been subsumed by mod_deflate Note: mod_compress config options may be removed in a future release - mod_geoip is DEPRECATED; use mod_maxminddb Note: mod_geoip will be removed from a future lighttpd release - mod_authn_mysql is DEPRECATED; use mod_authn_dbi Note: mod_authn_mysql will be removed from a future lighttpd release - mod_mysql_vhost is DEPRECATED; use mod_vhostdb_dbi or mod_vhostdb_mysql Note: mod_mysql_vhost will be removed from a future lighttpd release - mod_cml is DEPRECATED; use mod_magnet Note: mod_cml will be removed from a future lighttpd releasediff -r1.91 -r1.92 pkgsrc/www/lighttpd/Makefile
(schmonz)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.91 2020/11/05 09:09:21 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.92 2020/11/30 10:28:33 schmonz Exp $ | |
2 | 2 | |||
3 | DISTNAME= lighttpd-1.4.55 | 3 | DISTNAME= lighttpd-1.4.56 | |
4 | PKGREVISION= 4 | |||
5 | CATEGORIES= www | 4 | CATEGORIES= www | |
6 | MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/ | 5 | MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/ | |
7 | EXTRACT_SUFX= .tar.xz | 6 | EXTRACT_SUFX= .tar.xz | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://www.lighttpd.net/ | 9 | HOMEPAGE= https://www.lighttpd.net/ | |
11 | COMMENT= Fast, light-footprint HTTP server | 10 | COMMENT= Fast, light-footprint HTTP server | |
12 | LICENSE= modified-bsd | 11 | LICENSE= modified-bsd | |
13 | 12 | |||
14 | USE_LIBTOOL= yes | 13 | USE_LIBTOOL= yes | |
15 | SHLIBTOOL_OVERRIDE= # empty | 14 | SHLIBTOOL_OVERRIDE= # empty | |
16 | USE_TOOLS+= pkg-config | 15 | USE_TOOLS+= pkg-config | |
17 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes |
@@ -1,25 +1,24 @@ | @@ -1,25 +1,24 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.20 2019/05/29 11:02:22 nia Exp $ | 1 | @comment $NetBSD: PLIST,v 1.21 2020/11/30 10:28:33 schmonz Exp $ | |
2 | lib/lighttpd/mod_access.la | 2 | lib/lighttpd/mod_access.la | |
3 | lib/lighttpd/mod_accesslog.la | 3 | lib/lighttpd/mod_accesslog.la | |
4 | lib/lighttpd/mod_alias.la | 4 | lib/lighttpd/mod_alias.la | |
5 | lib/lighttpd/mod_auth.la | 5 | lib/lighttpd/mod_auth.la | |
6 | lib/lighttpd/mod_authn_file.la | 6 | lib/lighttpd/mod_authn_file.la | |
7 | ${PLIST.gssapi}lib/lighttpd/mod_authn_gssapi.la | 7 | ${PLIST.gssapi}lib/lighttpd/mod_authn_gssapi.la | |
8 | ${PLIST.ldap}lib/lighttpd/mod_authn_ldap.la | 8 | ${PLIST.ldap}lib/lighttpd/mod_authn_ldap.la | |
9 | ${PLIST.mysql}lib/lighttpd/mod_authn_mysql.la | 9 | ${PLIST.mysql}lib/lighttpd/mod_authn_mysql.la | |
10 | lib/lighttpd/mod_cgi.la | 10 | lib/lighttpd/mod_cgi.la | |
11 | ${PLIST.lua}lib/lighttpd/mod_cml.la | 11 | ${PLIST.lua}lib/lighttpd/mod_cml.la | |
12 | lib/lighttpd/mod_compress.la | |||
13 | lib/lighttpd/mod_deflate.la | 12 | lib/lighttpd/mod_deflate.la | |
14 | lib/lighttpd/mod_dirlisting.la | 13 | lib/lighttpd/mod_dirlisting.la | |
15 | lib/lighttpd/mod_evasive.la | 14 | lib/lighttpd/mod_evasive.la | |
16 | lib/lighttpd/mod_evhost.la | 15 | lib/lighttpd/mod_evhost.la | |
17 | lib/lighttpd/mod_expire.la | 16 | lib/lighttpd/mod_expire.la | |
18 | lib/lighttpd/mod_extforward.la | 17 | lib/lighttpd/mod_extforward.la | |
19 | lib/lighttpd/mod_fastcgi.la | 18 | lib/lighttpd/mod_fastcgi.la | |
20 | lib/lighttpd/mod_flv_streaming.la | 19 | lib/lighttpd/mod_flv_streaming.la | |
21 | lib/lighttpd/mod_indexfile.la | 20 | lib/lighttpd/mod_indexfile.la | |
22 | ${PLIST.lua}lib/lighttpd/mod_magnet.la | 21 | ${PLIST.lua}lib/lighttpd/mod_magnet.la | |
23 | ${PLIST.geoip}lib/lighttpd/mod_maxminddb.la | 22 | ${PLIST.geoip}lib/lighttpd/mod_maxminddb.la | |
24 | ${PLIST.mysql}lib/lighttpd/mod_mysql_vhost.la | 23 | ${PLIST.mysql}lib/lighttpd/mod_mysql_vhost.la | |
25 | ${PLIST.ssl}lib/lighttpd/mod_openssl.la | 24 | ${PLIST.ssl}lib/lighttpd/mod_openssl.la | |
@@ -82,32 +81,33 @@ share/doc/lighttpd/secdownload.txt | @@ -82,32 +81,33 @@ share/doc/lighttpd/secdownload.txt | |||
82 | share/doc/lighttpd/security.txt | 81 | share/doc/lighttpd/security.txt | |
83 | share/doc/lighttpd/setenv.txt | 82 | share/doc/lighttpd/setenv.txt | |
84 | share/doc/lighttpd/simple-vhost.txt | 83 | share/doc/lighttpd/simple-vhost.txt | |
85 | share/doc/lighttpd/skeleton.txt | 84 | share/doc/lighttpd/skeleton.txt | |
86 | share/doc/lighttpd/ssi.txt | 85 | share/doc/lighttpd/ssi.txt | |
87 | share/doc/lighttpd/ssl.txt | 86 | share/doc/lighttpd/ssl.txt | |
88 | share/doc/lighttpd/state.dot | 87 | share/doc/lighttpd/state.dot | |
89 | share/doc/lighttpd/state.txt | 88 | share/doc/lighttpd/state.txt | |
90 | share/doc/lighttpd/status.txt | 89 | share/doc/lighttpd/status.txt | |
91 | share/doc/lighttpd/traffic-shaping.txt | 90 | share/doc/lighttpd/traffic-shaping.txt | |
92 | share/doc/lighttpd/trigger_b4_dl.txt | 91 | share/doc/lighttpd/trigger_b4_dl.txt | |
93 | share/doc/lighttpd/userdir.txt | 92 | share/doc/lighttpd/userdir.txt | |
94 | share/doc/lighttpd/webdav.txt | 93 | share/doc/lighttpd/webdav.txt | |
94 | share/examples/lighttpd/cert-staple.sh | |||
95 | share/examples/lighttpd/conf.d/access_log.conf | 95 | share/examples/lighttpd/conf.d/access_log.conf | |
96 | share/examples/lighttpd/conf.d/auth.conf | 96 | share/examples/lighttpd/conf.d/auth.conf | |
97 | share/examples/lighttpd/conf.d/cgi.conf | 97 | share/examples/lighttpd/conf.d/cgi.conf | |
98 | share/examples/lighttpd/conf.d/cml.conf | 98 | share/examples/lighttpd/conf.d/cml.conf | |
99 | share/examples/lighttpd/conf.d/compress.conf | |||
100 | share/examples/lighttpd/conf.d/debug.conf | 99 | share/examples/lighttpd/conf.d/debug.conf | |
100 | share/examples/lighttpd/conf.d/deflate.conf | |||
101 | share/examples/lighttpd/conf.d/dirlisting.conf | 101 | share/examples/lighttpd/conf.d/dirlisting.conf | |
102 | share/examples/lighttpd/conf.d/evhost.conf | 102 | share/examples/lighttpd/conf.d/evhost.conf | |
103 | share/examples/lighttpd/conf.d/expire.conf | 103 | share/examples/lighttpd/conf.d/expire.conf | |
104 | share/examples/lighttpd/conf.d/fastcgi.conf | 104 | share/examples/lighttpd/conf.d/fastcgi.conf | |
105 | share/examples/lighttpd/conf.d/geoip.conf | 105 | share/examples/lighttpd/conf.d/geoip.conf | |
106 | share/examples/lighttpd/conf.d/magnet.conf | 106 | share/examples/lighttpd/conf.d/magnet.conf | |
107 | share/examples/lighttpd/conf.d/mime.conf | 107 | share/examples/lighttpd/conf.d/mime.conf | |
108 | share/examples/lighttpd/conf.d/mod.template | 108 | share/examples/lighttpd/conf.d/mod.template | |
109 | share/examples/lighttpd/conf.d/mysql_vhost.conf | 109 | share/examples/lighttpd/conf.d/mysql_vhost.conf | |
110 | share/examples/lighttpd/conf.d/proxy.conf | 110 | share/examples/lighttpd/conf.d/proxy.conf | |
111 | share/examples/lighttpd/conf.d/rrdtool.conf | 111 | share/examples/lighttpd/conf.d/rrdtool.conf | |
112 | share/examples/lighttpd/conf.d/scgi.conf | 112 | share/examples/lighttpd/conf.d/scgi.conf | |
113 | share/examples/lighttpd/conf.d/secdownload.conf | 113 | share/examples/lighttpd/conf.d/secdownload.conf |
@@ -1,9 +1,8 @@ | @@ -1,9 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.56 2020/10/25 14:59:14 schmonz Exp $ | 1 | $NetBSD: distinfo,v 1.57 2020/11/30 10:28:33 schmonz Exp $ | |
2 | 2 | |||
3 | SHA1 (lighttpd-1.4.55.tar.xz) = 05747d89467789f8ce6f86f4f3aee6260579d91c | 3 | SHA1 (lighttpd-1.4.56.tar.xz) = a7fab18c02dd1216c623cdb2638f03fbf1603d18 | |
4 | RMD160 (lighttpd-1.4.55.tar.xz) = 3ec0c81a6ee286efc998150690c9e39f9606ef28 | 4 | RMD160 (lighttpd-1.4.56.tar.xz) = 00156633a387692dce7b7853fb36bdab0cec92dd | |
5 | SHA512 (lighttpd-1.4.55.tar.xz) = 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439 | 5 | SHA512 (lighttpd-1.4.56.tar.xz) = de4a00108f007c924e9263ae9dea99a37b7f263246e0314945cdd8313205a268ef5c77f164bd62647b10baf0adea578caeb70fd713365243d4ba200ca8ccf81f | |
6 | Size (lighttpd-1.4.55.tar.xz) = 765660 bytes | 6 | Size (lighttpd-1.4.56.tar.xz) = 952200 bytes | |
7 | SHA1 (patch-doc_config_lighttpd.conf) = 9b249155aa29d7d068d48a601f314aa4b62491ef | 7 | SHA1 (patch-doc_config_lighttpd.conf) = c60a17a17551ca8e17ebbabe07be841b5867372b | |
8 | SHA1 (patch-doc_lighttpd.8) = 81b7606752312227b142975d4e781496442e9ed8 | 8 | SHA1 (patch-doc_lighttpd.8) = e08ac362784aebaca566d0f65380b70a829d6b4e | |
9 | SHA1 (patch-src_mod__webdav.c) = 70cc5b3c563fbabc1328476b4208b04bed50d427 |
@@ -1,26 +1,35 @@ | @@ -1,26 +1,35 @@ | |||
1 | # $NetBSD: options.mk,v 1.23 2020/06/30 14:45:48 nia Exp $ | 1 | # $NetBSD: options.mk,v 1.24 2020/11/30 10:28:33 schmonz Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.lighttpd | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.lighttpd | |
4 | PKG_SUPPORTED_OPTIONS= bzip2 fam gdbm inet6 ldap lua mysql ssl memcached geoip gssapi webdav | 4 | PKG_SUPPORTED_OPTIONS= brotli bzip2 fam gdbm inet6 ldap lua mysql ssl memcached geoip gssapi webdav | |
5 | PKG_OPTIONS_LEGACY_OPTS+= memcache:memcached | |||
6 | PKG_SUGGESTED_OPTIONS= inet6 ssl | 5 | PKG_SUGGESTED_OPTIONS= inet6 ssl | |
7 | 6 | |||
8 | .include "../../mk/bsd.options.mk" | 7 | .include "../../mk/bsd.options.mk" | |
9 | 8 | |||
10 | PLIST_VARS+= gdbm geoip gssapi ldap lua memcached mysql ssl | 9 | PLIST_VARS+= gdbm geoip gssapi ldap lua memcached mysql ssl | |
11 | 10 | |||
12 | ### | 11 | ### | |
13 | ### Allow using bzip2 as a compression method in the "compress" module. | 12 | ### Allow using brotli as a compression method in the "deflate" module. | |
13 | ### | |||
14 | .if !empty(PKG_OPTIONS:Mbrotli) | |||
15 | . include "../../archivers/brotli/buildlink3.mk" | |||
16 | CONFIGURE_ARGS+= --with-brotli | |||
17 | .else | |||
18 | CONFIGURE_ARGS+= --without-brotli | |||
19 | .endif | |||
20 | ||||
21 | ### | |||
22 | ### Allow using bzip2 as a compression method in the "deflate" module. | |||
14 | ### | 23 | ### | |
15 | .if !empty(PKG_OPTIONS:Mbzip2) | 24 | .if !empty(PKG_OPTIONS:Mbzip2) | |
16 | . include "../../archivers/bzip2/buildlink3.mk" | 25 | . include "../../archivers/bzip2/buildlink3.mk" | |
17 | CONFIGURE_ARGS+= --with-bzip2 | 26 | CONFIGURE_ARGS+= --with-bzip2 | |
18 | .else | 27 | .else | |
19 | CONFIGURE_ARGS+= --without-bzip2 | 28 | CONFIGURE_ARGS+= --without-bzip2 | |
20 | .endif | 29 | .endif | |
21 | 30 | |||
22 | ### | 31 | ### | |
23 | ### Use FAM to optimize number of stat() syscalls used. | 32 | ### Use FAM to optimize number of stat() syscalls used. | |
24 | ### | 33 | ### | |
25 | .if !empty(PKG_OPTIONS:Mfam) | 34 | .if !empty(PKG_OPTIONS:Mfam) | |
26 | . include "../../mk/fam.buildlink3.mk" | 35 | . include "../../mk/fam.buildlink3.mk" |
@@ -1,69 +1,60 @@ | @@ -1,69 +1,60 @@ | |||
1 | $NetBSD: patch-doc_config_lighttpd.conf,v 1.5 2019/05/29 10:01:28 nia Exp $ | 1 | $NetBSD: patch-doc_config_lighttpd.conf,v 1.6 2020/11/30 10:28:33 schmonz Exp $ | |
2 | 2 | |||
3 | Sane defaults. | 3 | Sane defaults. | |
4 | 4 | |||
5 | --- doc/config/lighttpd.conf.orig 2019-05-27 21:03:50.000000000 +0000 | 5 | --- doc/config/lighttpd.conf.orig 2020-11-29 22:32:01.000000000 +0000 | |
6 | +++ doc/config/lighttpd.conf | 6 | +++ doc/config/lighttpd.conf | |
7 | @@ -13,11 +13,11 @@ | 7 | @@ -13,11 +13,11 @@ | |
8 | ## if you add a variable here. Add the corresponding variable in the | 8 | ## if you add a variable here. Add the corresponding variable in the | |
9 | ## chroot example aswell. | 9 | ## chroot example aswell. | |
10 | ## | 10 | ## | |
11 | -var.log_root = "/var/log/lighttpd" | 11 | -var.log_root = "/var/log/lighttpd" | |
12 | +var.log_root = "@LIGHTTPD_LOGDIR@" | 12 | +var.log_root = "@LIGHTTPD_LOGDIR@" | |
13 | var.server_root = "/srv/www" | 13 | var.server_root = "/srv/www" | |
14 | -var.state_dir = "/var/run" | 14 | -var.state_dir = "/run" | |
15 | -var.home_dir = "/var/lib/lighttpd" | 15 | -var.home_dir = "/var/lib/lighttpd" | |
16 | -var.conf_dir = "/etc/lighttpd" | 16 | -var.conf_dir = "/etc/lighttpd" | |
17 | +var.state_dir = "@LIGHTTPD_STATEDIR@" | 17 | +var.state_dir = "@LIGHTTPD_STATEDIR@" | |
18 | +var.home_dir = "@LIGHTTPD_HOMEDIR@" | 18 | +var.home_dir = "@LIGHTTPD_HOMEDIR@" | |
19 | +var.conf_dir = "@PKG_SYSCONFDIR@" | 19 | +var.conf_dir = "@PKG_SYSCONFDIR@" | |
20 | 20 | |||
21 | ## | 21 | ## | |
22 | ## run the server chrooted. | 22 | ## run the server chrooted. | |
23 | @@ -58,7 +58,7 @@ var.vhosts_dir = server_root + "/vhosts | 23 | @@ -58,7 +58,7 @@ var.vhosts_dir = server_root + "/vhosts | |
24 | ## used in: | 24 | ## used in: | |
25 | ## conf.d/compress.conf | 25 | ## conf.d/deflate.conf | |
26 | ## | 26 | ## | |
27 | -var.cache_dir = "/var/cache/lighttpd" | 27 | -var.cache_dir = "/var/cache/lighttpd" | |
28 | +var.cache_dir = "@LIGHTTPD_CACHEDIR@" | 28 | +var.cache_dir = "@LIGHTTPD_CACHEDIR@" | |
29 | 29 | |||
30 | ## | 30 | ## | |
31 | ## Base directory for sockets. | 31 | ## Base directory for sockets. | |
32 | @@ -101,8 +101,8 @@ server.use-ipv6 = "enable" | 32 | @@ -101,8 +101,8 @@ server.use-ipv6 = "enable" | |
33 | ## Run as a different username/groupname. | 33 | ## Run as a different username/groupname. | |
34 | ## This requires root permissions during startup. | 34 | ## This requires root permissions during startup. | |
35 | ## | 35 | ## | |
36 | -server.username = "lighttpd" | 36 | -server.username = "lighttpd" | |
37 | -server.groupname = "lighttpd" | 37 | -server.groupname = "lighttpd" | |
38 | +server.username = "@LIGHTTPD_USER@" | 38 | +server.username = "@LIGHTTPD_USER@" | |
39 | +server.groupname = "@LIGHTTPD_GROUP@" | 39 | +server.groupname = "@LIGHTTPD_GROUP@" | |
40 | 40 | |||
41 | ## | 41 | ## | |
42 | ## Enable lighttpd to serve requests on sockets received from systemd | 42 | ## Enable lighttpd to serve requests on sockets received from systemd | |
43 | @@ -184,7 +184,7 @@ include "conf.d/debug.conf" | 43 | @@ -195,7 +195,7 @@ include "conf.d/debug.conf" | |
44 | ## | |||
45 | ## linux-sysepoll is recommended on kernel 2.6. | |||
46 | ## | |||
47 | -server.event-handler = "linux-sysepoll" | |||
48 | +#server.event-handler = "linux-sysepoll" | |||
49 | ||||
50 | ## | |||
51 | ## The basic network interface for all platforms at the syscalls read() | |||
52 | @@ -194,7 +194,7 @@ server.event-handler = "linux-sysepoll" | |||
53 | ## sendfile - is recommended for small files. | 44 | ## sendfile - is recommended for small files. | |
54 | ## writev - is recommended for sending many large files | 45 | ## writev - is recommended for sending many large files | |
55 | ## | 46 | ## | |
56 | -server.network-backend = "sendfile" | 47 | -server.network-backend = "sendfile" | |
57 | +#server.network-backend = "sendfile" | 48 | +#server.network-backend = "sendfile" | |
58 | 49 | |||
59 | ## | 50 | ## | |
60 | ## As lighttpd is a single-threaded server, its main resource limit is | 51 | ## As lighttpd is a single-threaded server, its main resource limit is | |
61 | @@ -411,7 +411,7 @@ server.follow-symlink = "enable" | 52 | @@ -413,7 +413,7 @@ include "conf.d/dirlisting.conf" | |
62 | ## | 53 | ## | |
63 | ## defaults to /var/tmp as we assume it is a local harddisk | 54 | ## defaults to /var/tmp as we assume it is a local harddisk | |
64 | ## | 55 | ## default: "/var/tmp" | |
65 | -server.upload-dirs = ( "/var/tmp" ) | 56 | -#server.upload-dirs = ( "/var/tmp" ) | |
66 | +server.upload-dirs = ( "@VARBASE@/tmp" ) | 57 | +#server.upload-dirs = ( "@VARBASE/tmp" ) | |
67 | 58 | |||
68 | ## | 59 | ## | |
69 | ####################################################################### | 60 | ####################################################################### |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: patch-doc_lighttpd.8,v 1.2 2018/04/17 20:11:15 triaxx Exp $ | 1 | $NetBSD: patch-doc_lighttpd.8,v 1.3 2020/11/30 10:28:33 schmonz Exp $ | |
2 | 2 | |||
3 | Fix hardcoded paths. | 3 | Fix hardcoded paths. | |
4 | 4 | |||
5 | --- doc/lighttpd.8.orig 2018-03-12 00:52:20.000000000 +0000 | 5 | --- doc/lighttpd.8.orig 2020-11-29 22:32:01.000000000 +0000 | |
6 | +++ doc/lighttpd.8 | 6 | +++ doc/lighttpd.8 | |
7 | @@ -56,10 +56,10 @@ Show a brief help message and exit. | 7 | @@ -56,10 +56,10 @@ Show a brief help message and exit. | |
8 | . | 8 | . | |
9 | .SH FILES | 9 | .SH FILES | |
10 | .TP 8 | 10 | .TP 8 | |
11 | -/etc/lighttpd/lighttpd.conf | 11 | -/etc/lighttpd/lighttpd.conf | |
12 | +@PKG_SYSCONFDIR@/lighttpd.conf | 12 | +@PKG_SYSCONFDIR@/lighttpd.conf | |
13 | The standard location for the configuration file. | 13 | The standard location for the configuration file. | |
14 | .TP 8 | 14 | .TP 8 | |
15 | -/var/run/lighttpd.pid | 15 | -/run/lighttpd.pid | |
16 | +@LIGHTTPD_STATEDIR@/lighttpd.pid | 16 | +@LIGHTTPD_STATEDIR@/lighttpd.pid | |
17 | The standard location for the PID of the running \fBlighttpd\fP process. | 17 | The standard location for the PID of the running \fBlighttpd\fP process. | |
18 | . | 18 | . | |
19 | .SH SEE ALSO | 19 | .SH SEE ALSO |