diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index a4e18618dd76..94f4aac98136 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -1,175 +1,175 @@ PORTNAME?= lighttpd -PORTVERSION= 1.4.69 +PORTVERSION= 1.4.70 CATEGORIES?= www MASTER_SITES?= https://download.lighttpd.net/lighttpd/releases-1.4.x/ MAINTAINER= pkubaj@FreeBSD.org COMMENT?= Secure, fast, compliant, and flexible Web Server WWW?= https://www.lighttpd.net/ .if !defined(_BUILDING_LIGHTTPD_MODULE) LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING .endif LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 USES= compiler:c11 cmake localbase:ldflags pkgconfig tar:xz .if !defined(_BUILDING_LIGHTTPD_MODULE) USES+= cpe .endif GNU_CONFIGURE= yes CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/lighttpd .if !defined(_BUILDING_LIGHTTPD_MODULE) TEST_TARGET= check PORTDOCS= AUTHORS COPYING INSTALL NEWS README USE_RC_SUBR= lighttpd REQUIRE= LOGIN OPTIONS_DEFINE= ATTR DBI DOCS KRB5 LUA MAXMINDDB NETTLE LDAP SPAWNFCGI \ WEBDAV ZSTD OPTIONS_GROUP= SSL OPTIONS_GROUP_SSL= OPENSSL GNUTLS MBEDTLS NSS WOLFSSL OPTIONS_DEFAULT= NETTLE LUA OPENSSL OPTIONS_SUB= yes ATTR_DESC= extended attributes support DBI_DESC= DBI authentication (mod_authn_dbi) KRB5_DESC= Kerberos authentication (mod_authn_gssapi) LDAP_DESC= LDAP authentication (mod_authn_ldap) LUA_DESC= lua support (mod_magnet) MAXMINDDB_DESC= IP-based geolocation lookup (mod_maxminddb) NETTLE_DESC= Crypto support from Nettle SPAWNFCGI_DESC= Depend on spawn-fcgi utility WEBDAV_DESC= WebDAV support ZSTD_DESC= mod_deflate support for zstd (Zstandard) ATTR_CMAKE_BOOL= WITH_XATTR DBI_CMAKE_BOOL= WITH_DBI DBI_LIB_DEPENDS= libdbi.so:databases/libdbi GNUTLS_CMAKE_BOOL= WITH_GNUTLS GNUTLS_LIBS= -lgnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls KRB5_CMAKE_BOOL= WITH_KRB5 KRB5_CPPFLAGS= ${GSSAPICPPFLAGS} KRB5_LDFLAGS= ${GSSAPILDFLAGS} KRB5_LIBS= ${GSSAPILIBS} KRB5_USES= gssapi:mit LDAP_CMAKE_BOOL= WITH_LDAP LDAP_USES= ldap LDAP_VARS= REQUIRE+=slapd LUA_USES= lua LUA_CMAKE_BOOL= WITH_LUA LUA_CMAKE_ON= -DWITH_LUA_VERSION:STRING="lua-${LUA_VER}" MAXMINDDB_CMAKE_BOOL= WITH_MAXMINDDB MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb MBEDTLS_CMAKE_BOOL= WITH_MBEDTLS MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls NETTLE_CMAKE_BOOL= WITH_NETTLE NETTLE_LIB_DEPENDS= libnettle.so:security/nettle NSS_CMAKE_BOOL= WITH_NSS NSS_CPPFLAGS= -I${LOCALBASE}/include/nspr NSS_LIB_DEPENDS= libnss3.so:security/nss OPENSSL_USES= ssl OPENSSL_CMAKE_BOOL= WITH_OPENSSL SPAWNFCGI_RUN_DEPENDS= spawn-fcgi:www/spawn-fcgi WEBDAV_CMAKE_BOOL= WITH_WEBDAV_LOCKS \ WITH_WEBDAV_PROPS WEBDAV_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libsqlite3.so:databases/sqlite3 WOLFSSL_CMAKE_BOOL= WITH_WOLFSSL WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl ZSTD_CMAKE_BOOL= WITH_ZSTD 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 \ debug.conf \ dirlisting.conf \ evhost.conf \ expire.conf \ fastcgi.conf \ magnet.conf \ mime.conf \ proxy.conf \ rrdtool.conf \ scgi.conf \ simple_vhost.conf \ ssi.conf \ status.conf \ userdir.conf \ webdav.conf USERS= ${WWWOWN} GROUPS= ${WWWGRP} CACHEDIR= /var/cache/${PORTNAME} LOGDIR= /var/log/${PORTNAME} HOMEDIR= /var/run/${PORTNAME} RUNDIR= /var/run PLIST_SUB+= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" PLIST_SUB+= CACHEDIR="${CACHEDIR}" HOMEDIR="${HOMEDIR}" LOGDIR="${LOGDIR}" .endif # !defined(_BUILDING_LIGHTTPD_MODULE) .include .if !defined(_BUILDING_LIGHTTPD_MODULE) SUB_LIST= REQUIRE="${REQUIRE}" post-patch: @${REINPLACE_CMD} -E -e \ 's|^(server.document-root.*=).*|\1 "${PREFIX}/www" + "/data"|' \ -e "s|/etc/lighttpd|${ETCDIR}|g" \ -e 's|^(server.event-handler.*=).*|\1 "freebsd-kqueue"|' \ -e 's|^(server.network-backend.*=).*|\1 "writev"|' \ -e "s|^(server.username.*=).*|\1 \"${WWWOWN}\"|" \ -e "s|^(server.groupname.*=).*|\1 \"${WWWGRP}\"|" \ -e "s|^(var.log_root.*=).*|\1 \"${LOGDIR}\"|" \ -e "s|^(var.server_root.*=).*|\1 \"${WWWDIR}\"|" \ -e "s|^(var.home_dir.*=).*|\1 \"${HOMEDIR}\"|" \ -e "s|^(var.state_dir.*=).*|\1 \"${RUNDIR}\"|" \ -e "s|^(var.cache_dir.*=).*|\1 \"${CACHEDIR}\"|" \ ${WRKSRC}/doc/config/lighttpd.conf @${REINPLACE_CMD} -e "s|/usr/bin/python|${LOCALBASE}/bin/python|" \ ${WRKSRC}/doc/config/conf.d/cgi.conf @${ECHO} >> ${WRKSRC}/doc/config/lighttpd.conf @${ECHO} "# IPv4 listening socket" >> \ ${WRKSRC}/doc/config/lighttpd.conf @${ECHO} "\$$SERVER[\"socket\"] == \"0.0.0.0:80\" { }" >> \ ${WRKSRC}/doc/config/lighttpd.conf post-install: @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d ${STAGEDIR}${ETCDIR}/vhosts.d .for FILE in ${LIGHTTPD_CONF_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/config/${FILE} \ ${STAGEDIR}${ETCDIR}/${FILE}.sample .endfor .for FILE in ${LIGHTTPD_CONF_D_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/${FILE} \ ${STAGEDIR}${ETCDIR}/conf.d/${FILE}.sample .endfor ${INSTALL_DATA} ${WRKSRC}/doc/config/vhosts.d/vhosts.template \ ${STAGEDIR}${ETCDIR}/vhosts.d/vhosts.template @${MKDIR} ${STAGEDIR}${WWWDIR} @${MKDIR} -m 0700 ${STAGEDIR}${CACHEDIR} @${MKDIR} -m 0700 ${STAGEDIR}${HOMEDIR}/sockets @${MKDIR} -m 0700 ${STAGEDIR}${LOGDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .endif # !defined(_BUILDING_LIGHTTPD_MODULE) .include diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo index 61cf30552d4c..0f258d7994ac 100644 --- a/www/lighttpd/distinfo +++ b/www/lighttpd/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1676068230 -SHA256 (lighttpd-1.4.69.tar.xz) = 16ac8db95e719629ba61949b99f8a26feba946a81d185215b28379bb4116b0b4 -SIZE (lighttpd-1.4.69.tar.xz) = 1045516 +TIMESTAMP = 1683728739 +SHA256 (lighttpd-1.4.70.tar.xz) = 921ebe1cf4b6b9897e03779ab7a23a31f4ba40a1abe2067525c33cd3ce61fe85 +SIZE (lighttpd-1.4.70.tar.xz) = 1070048 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 c77623806297..0f27b3412218 100644 --- a/www/lighttpd/pkg-plist +++ b/www/lighttpd/pkg-plist @@ -1,71 +1,60 @@ @sample %%ETCDIR%%/lighttpd.conf.sample @sample %%ETCDIR%%/modules.conf.sample @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/debug.conf.sample @sample %%ETCDIR%%/conf.d/dirlisting.conf.sample @sample %%ETCDIR%%/conf.d/evhost.conf.sample @sample %%ETCDIR%%/conf.d/expire.conf.sample @sample %%ETCDIR%%/conf.d/fastcgi.conf.sample @sample %%ETCDIR%%/conf.d/magnet.conf.sample @sample %%ETCDIR%%/conf.d/mime.conf.sample @sample %%ETCDIR%%/conf.d/proxy.conf.sample @sample %%ETCDIR%%/conf.d/rrdtool.conf.sample @sample %%ETCDIR%%/conf.d/scgi.conf.sample @sample %%ETCDIR%%/conf.d/simple_vhost.conf.sample @sample %%ETCDIR%%/conf.d/ssi.conf.sample @sample %%ETCDIR%%/conf.d/status.conf.sample @sample %%ETCDIR%%/conf.d/userdir.conf.sample @sample %%ETCDIR%%/conf.d/webdav.conf.sample %%ETCDIR%%/vhosts.d/vhosts.template -lib/lighttpd/mod_access.so lib/lighttpd/mod_accesslog.so -lib/lighttpd/mod_alias.so lib/lighttpd/mod_ajp13.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 lib/lighttpd/mod_cgi.so lib/lighttpd/mod_deflate.so lib/lighttpd/mod_dirlisting.so -lib/lighttpd/mod_evhost.so -lib/lighttpd/mod_expire.so lib/lighttpd/mod_extforward.so -lib/lighttpd/mod_fastcgi.so %%GNUTLS%%lib/lighttpd/mod_gnutls.so -lib/lighttpd/mod_indexfile.so +lib/lighttpd/mod_h2.so %%LUA%%lib/lighttpd/mod_magnet.so %%MAXMINDDB%%lib/lighttpd/mod_maxminddb.so %%NSS%%lib/lighttpd/mod_nss.so %%OPENSSL%%lib/lighttpd/mod_openssl.so lib/lighttpd/mod_proxy.so -lib/lighttpd/mod_redirect.so -lib/lighttpd/mod_rewrite.so lib/lighttpd/mod_rrdtool.so -lib/lighttpd/mod_scgi.so -lib/lighttpd/mod_setenv.so -lib/lighttpd/mod_simple_vhost.so 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 lib/lighttpd/mod_userdir.so lib/lighttpd/mod_vhostdb.so %%DBI%%lib/lighttpd/mod_vhostdb_dbi.so %%LDAP%%lib/lighttpd/mod_vhostdb_ldap.so lib/lighttpd/mod_webdav.so lib/lighttpd/mod_wstunnel.so %%WOLFSSL%%lib/lighttpd/mod_wolfssl.so share/man/man8/lighttpd.8.gz %%KRB5%%share/man/man8/lighttpd-angel.8.gz sbin/lighttpd sbin/lighttpd-angel @dir %%WWWDIR%% @dir(%%WWWOWN%%,%%WWWGRP%%,700) %%CACHEDIR%% @dir(%%WWWOWN%%,%%WWWGRP%%,700) %%HOMEDIR%%/sockets @dir(%%WWWOWN%%,%%WWWGRP%%,700) %%HOMEDIR%% @dir(%%WWWOWN%%,%%WWWGRP%%,700) %%LOGDIR%%