diff options
| -rw-r--r-- | www/lighttpd/Makefile | 5 | ||||
| -rw-r--r-- | www/lighttpd/PLIST | 6 | ||||
| -rw-r--r-- | www/lighttpd/distinfo | 12 | ||||
| -rw-r--r-- | www/lighttpd/options.mk | 6 | ||||
| -rw-r--r-- | www/lighttpd/patches/patch-doc_config_lighttpd.conf | 14 |
5 files changed, 22 insertions, 21 deletions
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index 76186ab6d59..707f28a6c2a 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.82 2019/04/03 00:33:12 ryoon Exp $ +# $NetBSD: Makefile,v 1.83 2019/05/29 10:01:28 nia Exp $ -DISTNAME= lighttpd-1.4.53 -PKGREVISION= 1 +DISTNAME= lighttpd-1.4.54 CATEGORIES= www MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/ EXTRACT_SUFX= .tar.xz diff --git a/www/lighttpd/PLIST b/www/lighttpd/PLIST index e9211d6c84f..bfd42ee56dd 100644 --- a/www/lighttpd/PLIST +++ b/www/lighttpd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2018/08/14 06:24:54 wiz Exp $ +@comment $NetBSD: PLIST,v 1.19 2019/05/29 10:01:28 nia Exp $ lib/lighttpd/mod_access.la lib/lighttpd/mod_accesslog.la lib/lighttpd/mod_alias.la @@ -18,9 +18,9 @@ lib/lighttpd/mod_expire.la lib/lighttpd/mod_extforward.la lib/lighttpd/mod_fastcgi.la lib/lighttpd/mod_flv_streaming.la -${PLIST.geoip}lib/lighttpd/mod_geoip.la lib/lighttpd/mod_indexfile.la ${PLIST.lua}lib/lighttpd/mod_magnet.la +${PLIST.geoip}lib/lighttpd/mod_maxminddb.la ${PLIST.mysql}lib/lighttpd/mod_mysql_vhost.la ${PLIST.ssl}lib/lighttpd/mod_openssl.la lib/lighttpd/mod_proxy.la @@ -44,6 +44,8 @@ lib/lighttpd/mod_usertrack.la lib/lighttpd/mod_vhostdb.la ${PLIST.ldap}lib/lighttpd/mod_vhostdb_ldap.la ${PLIST.ldap}lib/lighttpd/mod_vhostdb_ldap.so +${PLIST.mysql}lib/lighttpd/mod_vhostdb_mysql.la +${PLIST.mysql}lib/lighttpd/mod_vhostdb_mysql.la lib/lighttpd/mod_webdav.la lib/lighttpd/mod_wstunnel.la man/man8/lighttpd-angel.8 diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo index 3f92b1b1f2d..22be8bc2a7e 100644 --- a/www/lighttpd/distinfo +++ b/www/lighttpd/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.52 2019/01/28 22:39:52 schmonz Exp $ +$NetBSD: distinfo,v 1.53 2019/05/29 10:01:28 nia Exp $ -SHA1 (lighttpd-1.4.53.tar.xz) = 3e3fef1742b3fe5a7ff5f0428620c76d37c075a4 -RMD160 (lighttpd-1.4.53.tar.xz) = f55640884f6767b41143070c40995ae333b5016a -SHA512 (lighttpd-1.4.53.tar.xz) = bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76 -Size (lighttpd-1.4.53.tar.xz) = 732160 bytes -SHA1 (patch-doc_config_lighttpd.conf) = aa1ee77f3fdce7ffd6968c4b09e6977f671495d3 +SHA1 (lighttpd-1.4.54.tar.xz) = 31c6df437d90f4bceb41f6d758e0fbcd0f854a37 +RMD160 (lighttpd-1.4.54.tar.xz) = 24ac7d816918e1c87aaaa1e6ae8f775a464527fc +SHA512 (lighttpd-1.4.54.tar.xz) = aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37 +Size (lighttpd-1.4.54.tar.xz) = 763248 bytes +SHA1 (patch-doc_config_lighttpd.conf) = 9b249155aa29d7d068d48a601f314aa4b62491ef SHA1 (patch-doc_lighttpd.8) = 81b7606752312227b142975d4e781496442e9ed8 diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk index 0f123637696..eb7b6c7952b 100644 --- a/www/lighttpd/options.mk +++ b/www/lighttpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.20 2019/01/29 12:31:46 wiz Exp $ +# $NetBSD: options.mk,v 1.21 2019/05/29 10:01:28 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lighttpd PKG_SUPPORTED_OPTIONS= bzip2 fam gdbm inet6 ldap lua mysql ssl memcached geoip gssapi webdav @@ -97,8 +97,8 @@ PLIST.ssl= yes ### GeoIP support ### .if !empty(PKG_OPTIONS:Mgeoip) -. include "../../net/GeoIP/buildlink3.mk" -CONFIGURE_ARGS+= --with-geoip +. include "../../geography/libmaxminddb/buildlink3.mk" +CONFIGURE_ARGS+= --with-maxminddb PLIST.geoip= yes .endif diff --git a/www/lighttpd/patches/patch-doc_config_lighttpd.conf b/www/lighttpd/patches/patch-doc_config_lighttpd.conf index b0b3a2283a3..ee0010ffae4 100644 --- a/www/lighttpd/patches/patch-doc_config_lighttpd.conf +++ b/www/lighttpd/patches/patch-doc_config_lighttpd.conf @@ -1,8 +1,8 @@ -$NetBSD: patch-doc_config_lighttpd.conf,v 1.4 2018/04/17 10:22:00 triaxx Exp $ +$NetBSD: patch-doc_config_lighttpd.conf,v 1.5 2019/05/29 10:01:28 nia Exp $ Sane defaults. ---- doc/config/lighttpd.conf.orig 2018-03-12 00:52:20.000000000 +0000 +--- doc/config/lighttpd.conf.orig 2019-05-27 21:03:50.000000000 +0000 +++ doc/config/lighttpd.conf @@ -13,11 +13,11 @@ ## if you add a variable here. Add the corresponding variable in the @@ -38,9 +38,9 @@ Sane defaults. +server.username = "@LIGHTTPD_USER@" +server.groupname = "@LIGHTTPD_GROUP@" - ## - ## enable core files. -@@ -178,7 +178,7 @@ include "conf.d/debug.conf" + ## + ## Enable lighttpd to serve requests on sockets received from systemd +@@ -184,7 +184,7 @@ include "conf.d/debug.conf" ## ## linux-sysepoll is recommended on kernel 2.6. ## @@ -49,7 +49,7 @@ Sane defaults. ## ## The basic network interface for all platforms at the syscalls read() -@@ -188,7 +188,7 @@ server.event-handler = "linux-sysepoll" +@@ -194,7 +194,7 @@ server.event-handler = "linux-sysepoll" ## sendfile - is recommended for small files. ## writev - is recommended for sending many large files ## @@ -58,7 +58,7 @@ Sane defaults. ## ## As lighttpd is a single-threaded server, its main resource limit is -@@ -405,7 +405,7 @@ server.follow-symlink = "enable" +@@ -411,7 +411,7 @@ server.follow-symlink = "enable" ## ## defaults to /var/tmp as we assume it is a local harddisk ## |