www/lighttpd: update to 1.4.61

Changelog:	https://www.lighttpd.net/2021/10/28/1.4.61/

3 files changed, 8 insertions, 22 deletions

diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 0787fb915951..1893b74cacbb 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,8 +1,7 @@
 # Created by: k@123.org
 
 PORTNAME?=	lighttpd
-PORTVERSION=	1.4.60
-PORTREVISION=	1
+PORTVERSION=	1.4.61
 CATEGORIES?=	www
 MASTER_SITES?=	https://download.lighttpd.net/lighttpd/releases-1.4.x/
 
@@ -36,8 +35,8 @@ PORTDOCS=	AUTHORS COPYING INSTALL NEWS README
 USE_RC_SUBR=	lighttpd
 REQUIRE=	LOGIN
 
-OPTIONS_DEFINE=	ATTR DBI DOCS GDBM IPV6 KRB5 LIBEV LUA MAXMINDDB MEMCACHED \
-		MYSQL NETTLE LDAP SPAWNFCGI VALGRIND WEBDAV ZSTD
+OPTIONS_DEFINE=	ATTR DBI DOCS GDBM IPV6 KRB5 LUA MAXMINDDB MEMCACHED NETTLE \
+		LDAP SPAWNFCGI VALGRIND WEBDAV ZSTD
 OPTIONS_GROUP=	SSL
 OPTIONS_GROUP_SSL=	OPENSSL GNUTLS MBEDTLS NSS WOLFSSL
 
@@ -49,11 +48,9 @@ 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)
+LUA_DESC=	lua support (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
@@ -77,8 +74,6 @@ KRB5_USES=		gssapi:mit
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		openldap=yes
 LDAP_VARS=		REQUIRE+=slapd
-LIBEV_CONFIGURE_WITH=	libev=${LOCALBASE}
-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}"
@@ -88,9 +83,6 @@ 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}
@@ -116,7 +108,7 @@ ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 LIGHTTPD_CONF_FILES=	lighttpd.conf modules.conf
 
 LIGHTTPD_CONF_D_FILES=	access_log.conf \
-	auth.conf cgi.conf cml.conf \
+	auth.conf cgi.conf \
 	debug.conf dirlisting.conf \
 	evhost.conf expire.conf fastcgi.conf \
 	magnet.conf mime.conf mysql_vhost.conf proxy.conf \
@@ -142,8 +134,6 @@ PLIST_SUB+=	CACHEDIR="${CACHEDIR}" HOMEDIR="${HOMEDIR}" LOGDIR="${LOGDIR}"
 SUB_LIST=	REQUIRE="${REQUIRE}"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-std=gnu99||' \
-		${WRKSRC}/configure ${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -E -e \
 		's|^(server.document-root.*=).*|\1 "${PREFIX}/www" + "/data"|' \
 		-e "s|/etc/lighttpd|${ETCDIR}|g" \
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index fd930e0fd3e8..1794632db9c1 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1633386189
-SHA256 (lighttpd-1.4.60.tar.xz) = 4bb1dd859e541a3131e5be101557d2e1195b4129d3a849a3a6fbd21fe1c946f0
-SIZE (lighttpd-1.4.60.tar.xz) = 1008548
+TIMESTAMP = 1635514716
+SHA256 (lighttpd-1.4.61.tar.xz) = 43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432
+SIZE (lighttpd-1.4.61.tar.xz) = 1010624
 SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = dc9bd6e26755cc2e3ccf6eaf8cc89e5d697f5a876f71318be67b28225368fd4e
 SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242037
diff --git a/www/lighttpd/pkg-plist b/www/lighttpd/pkg-plist
index 1c1d6baea98b..5d59a1cc1f48 100644
--- a/www/lighttpd/pkg-plist
+++ b/www/lighttpd/pkg-plist
@@ -3,7 +3,6 @@
 @sample %%ETCDIR%%/conf.d/access_log.conf.sample
 @sample %%ETCDIR%%/conf.d/auth.conf.sample
 @sample %%ETCDIR%%/conf.d/cgi.conf.sample
-@sample %%ETCDIR%%/conf.d/cml.conf.sample
 @sample %%ETCDIR%%/conf.d/debug.conf.sample
 @sample %%ETCDIR%%/conf.d/dirlisting.conf.sample
 @sample %%ETCDIR%%/conf.d/evhost.conf.sample
@@ -32,7 +31,6 @@ 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
 lib/lighttpd/mod_cgi.so
 %%LUA%%lib/lighttpd/mod_cml.so
 lib/lighttpd/mod_deflate.so
@@ -47,7 +45,6 @@ lib/lighttpd/mod_flv_streaming.so
 lib/lighttpd/mod_indexfile.so
 %%LUA%%lib/lighttpd/mod_magnet.so
 %%MAXMINDDB%%lib/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
@@ -70,7 +67,6 @@ lib/lighttpd/mod_usertrack.so
 lib/lighttpd/mod_vhostdb.so
 %%DBI%%lib/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