CVS commit: pkgsrc/www/lighttpd

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Dec  1 09:44:12 UTC 2020

Modified Files:
        pkgsrc/www/lighttpd: Makefile PLIST options.mk

Log Message:
Enable --with-nettle as recommended in the release announcement; we'll
add options for other SSL libraries later. Add 'libdbi' option to enable
mod_vhostdb_dbi and the new mod_authn_dbi module, off by default. Bump
PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/www/lighttpd/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/lighttpd/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/lighttpd/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/lighttpd/Makefile
diff -u pkgsrc/www/lighttpd/Makefile:1.92 pkgsrc/www/lighttpd/Makefile:1.93
--- pkgsrc/www/lighttpd/Makefile:1.92   Mon Nov 30 10:28:33 2020
+++ pkgsrc/www/lighttpd/Makefile        Tue Dec  1 09:44:12 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2020/11/30 10:28:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.93 2020/12/01 09:44:12 schmonz Exp $
 
 DISTNAME=      lighttpd-1.4.56
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://download.lighttpd.net/lighttpd/releases-1.4.x/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/lighttpd/PLIST
diff -u pkgsrc/www/lighttpd/PLIST:1.21 pkgsrc/www/lighttpd/PLIST:1.22
--- pkgsrc/www/lighttpd/PLIST:1.21      Mon Nov 30 10:28:33 2020
+++ pkgsrc/www/lighttpd/PLIST   Tue Dec  1 09:44:12 2020
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.21 2020/11/30 10:28:33 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.22 2020/12/01 09:44:12 schmonz Exp $
 lib/lighttpd/mod_access.la
 lib/lighttpd/mod_accesslog.la
 lib/lighttpd/mod_alias.la
 lib/lighttpd/mod_auth.la
+${PLIST.libdbi}lib/lighttpd/mod_authn_dbi.la
 lib/lighttpd/mod_authn_file.la
 ${PLIST.gssapi}lib/lighttpd/mod_authn_gssapi.la
 ${PLIST.ldap}lib/lighttpd/mod_authn_ldap.la
@@ -36,13 +37,12 @@ lib/lighttpd/mod_staticfile.la
 lib/lighttpd/mod_status.la
 ${PLIST.gdbm}lib/lighttpd/mod_trigger_b4_dl.la
 ${PLIST.memcached}lib/lighttpd/mod_trigger_b4_dl.la
-${PLIST.memcached}lib/lighttpd/mod_trigger_b4_dl.so
 lib/lighttpd/mod_uploadprogress.la
 lib/lighttpd/mod_userdir.la
 lib/lighttpd/mod_usertrack.la
 lib/lighttpd/mod_vhostdb.la
+${PLIST.libdbi}lib/lighttpd/mod_vhostdb_dbi.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
 lib/lighttpd/mod_webdav.la
 lib/lighttpd/mod_wstunnel.la

Index: pkgsrc/www/lighttpd/options.mk
diff -u pkgsrc/www/lighttpd/options.mk:1.24 pkgsrc/www/lighttpd/options.mk:1.25
--- pkgsrc/www/lighttpd/options.mk:1.24 Mon Nov 30 10:28:33 2020
+++ pkgsrc/www/lighttpd/options.mk      Tue Dec  1 09:44:12 2020
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.24 2020/11/30 10:28:33 schmonz Exp $
+# $NetBSD: options.mk,v 1.25 2020/12/01 09:44:12 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.lighttpd
-PKG_SUPPORTED_OPTIONS=         brotli bzip2 fam gdbm inet6 ldap lua mysql ssl memcached geoip gssapi webdav
+PKG_SUPPORTED_OPTIONS=         brotli bzip2 fam gdbm inet6 ldap libdbi lua mysql ssl memcached geoip gssapi webdav
 PKG_SUGGESTED_OPTIONS=         inet6 ssl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           gdbm geoip gssapi ldap lua memcached mysql ssl
+PLIST_VARS+=           gdbm geoip gssapi ldap libdbi lua memcached mysql ssl
 
 ###
 ### Allow using brotli as a compression method in the "deflate" module.
@@ -64,6 +64,17 @@ PLIST.ldap=          yes
 .endif
 
 ###
+### libdbi
+###
+.if !empty(PKG_OPTIONS:Mlibdbi)
+.  include "../../databases/libdbi/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-dbi
+PLIST.libdbi=          yes
+.else
+CONFIGURE_ARGS+=       --without-dbi
+.endif
+
+###
 ### Support enabling the Cache Meta Language module with the Lua engine.
 ###
 .if !empty(PKG_OPTIONS:Mlua)
@@ -96,6 +107,8 @@ PLIST.mysql=         yes
 ### HTTPS support
 ###
 .if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/nettle/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-nettle
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-openssl=${SSLBASE:Q}
 PLIST.ssl=             yes