pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/lighttpd lighttpd: improve options support
details: https://anonhg.NetBSD.org/pkgsrc/rev/1fb4f0d15735
branches: trunk
changeset: 452650:1fb4f0d15735
user: nia <nia%pkgsrc.org@localhost>
date: Fri May 14 11:11:00 2021 +0000
description:
lighttpd: improve options support
as well as adding options for other SSL libraries, disabling options
explicitly should cause less problems when the OS contains libraries used
by the options.
diffstat:
www/lighttpd/Makefile | 6 +-
www/lighttpd/PLIST | 10 +++-
www/lighttpd/options.mk | 103 +++++++++++++++++++++++++++++++++++++++--------
3 files changed, 96 insertions(+), 23 deletions(-)
diffs (268 lines):
diff -r 351b32fb772e -r 1fb4f0d15735 www/lighttpd/Makefile
--- a/www/lighttpd/Makefile Fri May 14 11:10:07 2021 +0000
+++ b/www/lighttpd/Makefile Fri May 14 11:11:00 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2021/04/21 11:42:54 adam Exp $
+# $NetBSD: Makefile,v 1.98 2021/05/14 11:11:00 nia Exp $
DISTNAME= lighttpd-1.4.59
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/
EXTRACT_SUFX= .tar.xz
@@ -17,6 +17,8 @@
GNU_CONFIGURE= yes
GNU_CONFIGURE_LIBSUBDIR= ${PKGBASE}
CONFIGURE_ARGS+= --with-pcre
+# used for digest auth when no SSL library is available
+CONFIGURE_ARGS+= --without-nettle
TEST_TARGET= check
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
diff -r 351b32fb772e -r 1fb4f0d15735 www/lighttpd/PLIST
--- a/www/lighttpd/PLIST Fri May 14 11:10:07 2021 +0000
+++ b/www/lighttpd/PLIST Fri May 14 11:11:00 2021 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.23 2021/02/03 08:49:49 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.24 2021/05/14 11:11:00 nia Exp $
lib/lighttpd/mod_access.la
lib/lighttpd/mod_accesslog.la
+lib/lighttpd/mod_ajp13.la
lib/lighttpd/mod_alias.la
lib/lighttpd/mod_auth.la
${PLIST.libdbi}lib/lighttpd/mod_authn_dbi.la
@@ -8,7 +9,6 @@
${PLIST.gssapi}lib/lighttpd/mod_authn_gssapi.la
${PLIST.ldap}lib/lighttpd/mod_authn_ldap.la
${PLIST.mysql}lib/lighttpd/mod_authn_mysql.la
-lib/lighttpd/mod_ajp13.la
lib/lighttpd/mod_cgi.la
${PLIST.lua}lib/lighttpd/mod_cml.la
lib/lighttpd/mod_deflate.la
@@ -19,11 +19,14 @@
lib/lighttpd/mod_extforward.la
lib/lighttpd/mod_fastcgi.la
lib/lighttpd/mod_flv_streaming.la
+${PLIST.gnutls}lib/lighttpd/mod_gnutls.la
lib/lighttpd/mod_indexfile.la
${PLIST.lua}lib/lighttpd/mod_magnet.la
${PLIST.geoip}lib/lighttpd/mod_maxminddb.la
+${PLIST.mbedtls}lib/lighttpd/mod_mbedtls.la
${PLIST.mysql}lib/lighttpd/mod_mysql_vhost.la
-${PLIST.ssl}lib/lighttpd/mod_openssl.la
+${PLIST.nss}lib/lighttpd/mod_nss.la
+${PLIST.openssl}lib/lighttpd/mod_openssl.la
lib/lighttpd/mod_proxy.la
lib/lighttpd/mod_redirect.la
lib/lighttpd/mod_rewrite.la
@@ -46,6 +49,7 @@
${PLIST.ldap}lib/lighttpd/mod_vhostdb_ldap.la
${PLIST.mysql}lib/lighttpd/mod_vhostdb_mysql.la
lib/lighttpd/mod_webdav.la
+${PLIST.wolfssl}lib/lighttpd/mod_wolfssl.la
lib/lighttpd/mod_wstunnel.la
man/man8/lighttpd-angel.8
man/man8/lighttpd.8
diff -r 351b32fb772e -r 1fb4f0d15735 www/lighttpd/options.mk
--- a/www/lighttpd/options.mk Fri May 14 11:10:07 2021 +0000
+++ b/www/lighttpd/options.mk Fri May 14 11:11:00 2021 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: options.mk,v 1.25 2020/12/01 09:44:12 schmonz Exp $
+# $NetBSD: options.mk,v 1.26 2021/05/14 11:11:00 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.lighttpd
-PKG_SUPPORTED_OPTIONS= brotli bzip2 fam gdbm inet6 ldap libdbi lua mysql ssl memcached geoip gssapi webdav
-PKG_SUGGESTED_OPTIONS= inet6 ssl
+PKG_OPTIONS_OPTIONAL_GROUPS= ssl
+PKG_OPTIONS_GROUP.ssl= gnutls mbedtls nss openssl wolfssl
+PKG_SUPPORTED_OPTIONS+= brotli bzip2 fam gdbm inet6 ldap libdbi lua
+PKG_SUPPORTED_OPTIONS+= mysql memcached geoip gssapi webdav
+PKG_SUGGESTED_OPTIONS= inet6 openssl
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= gdbm geoip gssapi ldap libdbi lua memcached mysql ssl
-
###
### Allow using brotli as a compression method in the "deflate" module.
###
@@ -34,15 +35,20 @@
.if !empty(PKG_OPTIONS:Mfam)
. include "../../mk/fam.buildlink3.mk"
CONFIGURE_ARGS+= --with-fam
+.else
+CONFIGURE_ARGS+= --without-fam
.endif
###
### Support using GDBM for storage in the "trigger before download" module.
###
+PLIST_VARS+= gdbm
.if !empty(PKG_OPTIONS:Mgdbm)
. include "../../databases/gdbm/buildlink3.mk"
CONFIGURE_ARGS+= --with-gdbm
PLIST.gdbm= yes
+.else
+CONFIGURE_ARGS+= --without-gdbm
.endif
###
@@ -57,15 +63,19 @@
###
### Allow using LDAP for "basic" authentication.
###
+PLIST_VARS+= ldap
.if !empty(PKG_OPTIONS:Mldap)
. include "../../databases/openldap-client/buildlink3.mk"
CONFIGURE_ARGS+= --with-ldap
PLIST.ldap= yes
+.else
+CONFIGURE_ARGS+= --without-ldap
.endif
###
### libdbi
###
+PLIST_VARS+= libdbi
.if !empty(PKG_OPTIONS:Mlibdbi)
. include "../../databases/libdbi/buildlink3.mk"
CONFIGURE_ARGS+= --with-dbi
@@ -77,67 +87,124 @@
###
### Support enabling the Cache Meta Language module with the Lua engine.
###
+PLIST_VARS+= lua
.if !empty(PKG_OPTIONS:Mlua)
. include "../../lang/lua/buildlink3.mk"
USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --with-lua
+PLIST.lua= yes
+.else
+CONFIGURE_ARGS+= --without-lua
.endif
###
### Support using memcached as an in-memory caching system for the
### "trigger before download" and CML modules.
###
+PLIST_VARS+= memcached
.if !empty(PKG_OPTIONS:Mmemcached)
. include "../../devel/libmemcached/buildlink3.mk"
CONFIGURE_ARGS+= --with-memcached
PLIST.memcached= yes
+.else
+CONFIGURE_ARGS+= --without-memcached
.endif
###
### Allow using MySQL for virtual host configuration.
###
+PLIST_VARS+= mysql
.if !empty(PKG_OPTIONS:Mmysql)
. include "../../mk/mysql.buildlink3.mk"
MYSQL_CONFIG?= ${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config
CONFIGURE_ARGS+= --with-mysql=${MYSQL_CONFIG:Q}
PLIST.mysql= yes
+.else
+CONFIGURE_ARGS+= --without-mysql
+.endif
+
+###
+### HTTPS support via GnuTLS
+###
+PLIST_VARS+= gnutls
+.if !empty(PKG_OPTIONS:Mgnutls)
+. include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+= --with-gnutls=${BUILDLINK_PREFIX.gnutls}
+PLIST.gnutls= yes
+.else
+CONFIGURE_ARGS+= --without-gnutls
+.endif
+
+###
+### HTTPS support via mbedTLS
+###
+PLIST_VARS+= mbedtls
+.if !empty(PKG_OPTIONS:Mmbedtls)
+. include "../../security/mbedtls/buildlink3.mk"
+CONFIGURE_ARGS+= --with-mbedtls=${BUILDLINK_PREFIX.mbedtls}
+PLIST.mbedtls= yes
+.else
+CONFIGURE_ARGS+= --without-mbedtls
.endif
###
-### HTTPS support
+### HTTPS support via nss
###
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/nettle/buildlink3.mk"
-CONFIGURE_ARGS+= --with-nettle
+PLIST_VARS+= nss
+.if !empty(PKG_OPTIONS:Mnss)
+. include "../../devel/nss/buildlink3.mk"
+CONFIGURE_ARGS+= --with-nss=${BUILDLINK_PREFIX.nss}
+PLIST.nss= yes
+.else
+CONFIGURE_ARGS+= --without-nss
+.endif
+
+###
+### HTTPS support via OpenSSL
+###
+PLIST_VARS+= openssl
+.if !empty(PKG_OPTIONS:Mopenssl)
. include "../../security/openssl/buildlink3.mk"
CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
-PLIST.ssl= yes
+PLIST.openssl= yes
+.else
+CONFIGURE_ARGS+= --without-openssl
+.endif
+
+###
+### HTTPS support via WolfSSL
+###
+PLIST_VARS+= wolfssl
+.if !empty(PKG_OPTIONS:Mwolfssl)
+. include "../../security/wolfssl/buildlink3.mk"
+CONFIGURE_ARGS+= --with-wolfssl=${BUILDLINK_PREFIX.wolfssl}
+PLIST.wolfssl= yes
+.else
+CONFIGURE_ARGS+= --without-wolfssl
.endif
###
### GeoIP support
###
+PLIST_VARS+= geoip
.if !empty(PKG_OPTIONS:Mgeoip)
. include "../../geography/libmaxminddb/buildlink3.mk"
CONFIGURE_ARGS+= --with-maxminddb
PLIST.geoip= yes
+.else
+CONFIGURE_ARGS+= --without-maxminddb
.endif
###
### gssapi
###
+PLIST_VARS+= gssapi
.if !empty(PKG_OPTIONS:Mgssapi)
.include "../../security/mit-krb5/buildlink3.mk"
CONFIGURE_ARGS+= --with-krb5
PLIST.gssapi= yes
-.endif
-
-###
-### lua
-###
-.if !empty(PKG_OPTIONS:Mlua)
-. include "../../lang/lua/buildlink3.mk"
-PLIST.lua= yes
+.else
+CONFIGURE_ARGS+= --without-krb5
.endif
###
Home |
Main Index |
Thread Index |
Old Index