From owner-svn-ports-head@freebsd.org Mon Dec 14 16:50:06 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9E9A44BE73C; Mon, 14 Dec 2020 16:50:06 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CvnSG45Ssz3Knf; Mon, 14 Dec 2020 16:50:06 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B39124BEC; Mon, 14 Dec 2020 16:50:06 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BEGo6Ib051885; Mon, 14 Dec 2020 16:50:06 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BEGo6fp051884; Mon, 14 Dec 2020 16:50:06 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202012141650.0BEGo6fp051884@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 14 Dec 2020 16:50:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558096 - head/www/lighttpd X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/www/lighttpd X-SVN-Commit-Revision: 558096 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2020 16:50:06 -0000 Author: pkubaj Date: Mon Dec 14 16:50:05 2020 New Revision: 558096 URL: https://svnweb.freebsd.org/changeset/ports/558096 Log: www/lighttpd: add options 1.4.56 added options for DBI, WOLFSSL, NETTLE (enabled by default), NSS, GNUTLS. Also add MAXMINDDB option. Modified: head/www/lighttpd/Makefile head/www/lighttpd/pkg-plist Modified: head/www/lighttpd/Makefile ============================================================================== --- head/www/lighttpd/Makefile Mon Dec 14 16:29:12 2020 (r558095) +++ head/www/lighttpd/Makefile Mon Dec 14 16:50:05 2020 (r558096) @@ -3,6 +3,7 @@ PORTNAME?= lighttpd PORTVERSION= 1.4.56 +PORTREVISION= 1 CATEGORIES?= www MASTER_SITES?= https://download.lighttpd.net/lighttpd/releases-1.4.x/ @@ -36,30 +37,37 @@ PORTDOCS= AUTHORS COPYING INSTALL NEWS README USE_RC_SUBR= lighttpd REQUIRE= LOGIN -OPTIONS_DEFINE= ATTR DOCS FAM GDBM IPV6 KRB5 LIBEV LUA MEMCACHED \ - MYSQL LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV +OPTIONS_DEFINE= ATTR DBI DOCS GDBM IPV6 KRB5 LIBEV LUA MAXMINDDB MEMCACHED \ + MYSQL NETTLE LDAP SPAWNFCGI VALGRIND WEBDAV +OPTIONS_GROUP= SSL +OPTIONS_GROUP_SSL= OPENSSL GNUTLS MBEDTLS NSS WOLFSSL -OPTIONS_DEFAULT= LUA OPENSSL +OPTIONS_DEFAULT= NETTLE LUA OPENSSL OPTIONS_SUB= yes ATTR_DESC= extended attributes support +DBI_DESC= DBI authentication (mod_authn_dbi) GDBM_DESC= gdbm storage (mod_trigger_b4_dl) KRB5_DESC= Kerberos authentication (mod_authn_gssapi) LDAP_DESC= LDAP authentication (mod_authn_ldap) LIBEV_DESC= Fast events support via libev (disables kqueue) LUA_DESC= lua support (mod_cml, mod_magnet) +MAXMINDDB_DESC= IP-based geolocation lookup (mod_maxminddb) MEMCACHED_DESC= memcached storage (mod_trigger_b4_dl) MYSQL_DESC= MySQL support (mod_authn_mysql, mod_mysql_vhost) +NETTLE_DESC= Crypto support from Nettle SPAWNFCGI_DESC= Depend on spawn-fcgi utility VALGRIND_DESC= valgrind support WEBDAV_DESC= WebDAV support ATTR_CONFIGURE_WITH= attr -FAM_USES= fam -FAM_CONFIGURE_ON= --with-fam -FAM_CONFIGURE_ENV= FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib" +DBI_CONFIGURE_WITH= dbi=${LOCALBASE} +DBI_LIB_DEPENDS= libdbi.so:databases/libdbi GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= gdbm +GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE} +GNUTLS_LIBS= -lgnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls IPV6_CONFIGURE_OFF= --disable-ipv6 KRB5_CONFIGURE_WITH= krb5 KRB5_CPPFLAGS= ${GSSAPICPPFLAGS} @@ -74,11 +82,20 @@ LIBEV_LIB_DEPENDS= libev.so:devel/libev LUA_USES= lua LUA_CONFIGURE_WITH= lua LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" +MAXMINDDB_CONFIGURE_WITH= maxminddb=${LOCALBASE} +MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb +MBEDTLS_CONFIGURE_WITH= mbedtls=${LOCALBASE} +MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached MEMCACHED_CONFIGURE_WITH=memcached MYSQL_CONFIGURE_WITH= mysql MYSQL_USES= mysql MYSQL_VARS= REQUIRE+=mysql +NETTLE_CONFIGURE_WITH= nettle=${LOCALBASE} +NETTLE_LIB_DEPENDS= libnettle.so:security/nettle +NSS_CONFIGURE_WITH= nss=${LOCALBASE} +NSS_CPPFLAGS= -I${LOCALBASE}/include/nspr +NSS_LIB_DEPENDS= libnss3.so:security/nss OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl OPENSSL_CONFIGURE_ON= --with-openssl-includes=${OPENSSLINC} --with-openssl-libs=${OPENSSLLIB} @@ -91,6 +108,8 @@ WEBDAV_USE= GNOME=libxml2 WEBDAV_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libsqlite3.so:databases/sqlite3 WEBDAV_CONFIGURE_WITH= webdav-props webdav-locks +WOLFSSL_CONFIGURE_WITH= wolfssl=${LOCALBASE} +WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl LIGHTTPD_CONF_FILES= lighttpd.conf modules.conf Modified: head/www/lighttpd/pkg-plist ============================================================================== --- head/www/lighttpd/pkg-plist Mon Dec 14 16:29:12 2020 (r558095) +++ head/www/lighttpd/pkg-plist Mon Dec 14 16:50:05 2020 (r558096) @@ -28,6 +28,7 @@ lib/lighttpd/mod_accesslog.so lib/lighttpd/mod_alias.so lib/lighttpd/mod_auth.so lib/lighttpd/mod_authn_file.so +%%DBI%%lib/lighttpd/mod_authn_dbi.so %%KRB5%%lib/lighttpd/mod_authn_gssapi.so %%LDAP%%lib/lighttpd/mod_authn_ldap.so %%MYSQL%%lib/lighttpd/mod_authn_mysql.so @@ -41,9 +42,12 @@ lib/lighttpd/mod_expire.so lib/lighttpd/mod_extforward.so lib/lighttpd/mod_fastcgi.so lib/lighttpd/mod_flv_streaming.so +%%GNUTLS%%lib/lighttpd/mod_gnutls.so lib/lighttpd/mod_indexfile.so %%LUA%%lib/lighttpd/mod_magnet.so +%%MAXMINDDB%%%%LUA_LIBDIR%%/lighttpd/mod_maxminddb.so %%MYSQL%%lib/lighttpd/mod_mysql_vhost.so +%%NSS%%lib/lighttpd/mod_nss.so %%OPENSSL%%lib/lighttpd/mod_openssl.so lib/lighttpd/mod_proxy.so lib/lighttpd/mod_redirect.so @@ -57,15 +61,18 @@ lib/lighttpd/mod_sockproxy.so lib/lighttpd/mod_ssi.so lib/lighttpd/mod_staticfile.so lib/lighttpd/mod_status.so +%%MBEDTLS%%lib/lighttpd/mod_mbedtls.so %%MEMCACHED%%lib/lighttpd/mod_trigger_b4_dl.so lib/lighttpd/mod_uploadprogress.so lib/lighttpd/mod_userdir.so lib/lighttpd/mod_usertrack.so lib/lighttpd/mod_vhostdb.so +%%DBI%%%%LUA_LIBDIR%%/lighttpd/mod_vhostdb_dbi.so %%LDAP%%lib/lighttpd/mod_vhostdb_ldap.so %%MYSQL%%lib/lighttpd/mod_vhostdb_mysql.so lib/lighttpd/mod_webdav.so lib/lighttpd/mod_wstunnel.so +%%WOLFSSL%%lib/lighttpd/mod_wolfssl.so man/man8/lighttpd.8.gz %%KRB5%%man/man8/lighttpd-angel.8.gz sbin/lighttpd