gentoo auto-resync : 15:01:2025 - 06:41:45

5 files changed, 246 insertions, 4 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 84b8a5c97ab7..6f15b697b80a 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 26ce3952f5f3..c454f4c5f652 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -12,14 +12,18 @@ AUX lighttpd.initd-r2 1949 BLAKE2B aafc91df917057db7cc271fd2b4b2bd5b1ccf3070f11e
 AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc7a3078464cf2cb7eec982f626201cc0d0aea7dd7de81cacf603f6d064c8ec6f8dcff09f78dfd48b656aa93 SHA512 8cae2d3acb2f4d9a9043e492c4b15024f85f92d93616d5e92e08d51e2295fde6160c750be08244703f999208c4b43ecfb9a2fcb8e223e52992551a0668302ffe
 AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469ab074469ba0b670f56b147c8088ad9211f97a4f314fe4eaebac89cd9cddee34edbf3652b7ea0712c94 SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f
 AUX lighttpd.service-r1 349 BLAKE2B 89db06cef70a9c0c875cf9c6a82cdc9b36a1c576f4d3088f7fedb9cae4216295b94d4d610c52190d3651e576126c7c66fa1f1dbaf230216ad50284cc5a38c176 SHA512 315f8b06905642daa8d1d295c282143b97c342170586cc8d42de572b20f313a90701ec4fba3b8320ee8882a355bef53c0581970517181bfcbb0ac3c9c02771a1
+AUX lighttpd.service-r2 414 BLAKE2B 24e1f3e41304ee6865b33ed847b8dc7c41a24e02acfbd3436b25fc69c10531b2a8f6ac751fd4a5bde73eba45c7f66867dcf2efcaba4e08905b8364d30dcb8386 SHA512 670e11aba26282087c46d063d6d64f2b3da91d06fc12d60300e96a7fbab1eaa5d397dd6f11eeda6eb1bffa1fb82304cd9a6909b14102e4d482c3720341c56e57
 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
 DIST lighttpd-1.4.75.tar.xz 1102080 BLAKE2B 3cf89678922e319fa140beb56a95b11eb85ca1b833c9d21195d0ad0b8ea8679c71764558d03eafda0ff3aab994212375b433e56ff54349da739cd7c5384b61ae SHA512 2066ad3e9eeaed4179bd6d3a2becc4ed57d6b00cbdd729a3c0d9a7276ee9c7906c9f1274f4def696d5ef0e662158ea13eb7ecb8e107cac5519ac98a83cf9d7ef
 DIST lighttpd-1.4.75.tar.xz.asc 833 BLAKE2B c632a3ab7e97c981c0930129a430ee4b3776f34611831c7a8f484de4f2915be31f24df15ee517bcb0271c96c6217429333cbd67bc6f1a4c71936736246d8357c SHA512 791aab9bfb21c3c54b157e4348adbca83fae9186cc3ba27b9f0badc0af6bd74d2e70d6bb565317393b6dafb0e0b5da6e4442c77eac8d9ce597ccdb8b9176f3f9
 DIST lighttpd-1.4.76.tar.xz 847132 BLAKE2B 497e2dd802718dac10fdcd49bc917f44ddc1eebd4fa244a047ffba2a0ac92d89900e6285f385126a29100a5fd024868908fd5028ac1b947ca648305199661976 SHA512 940f00f2d84e3424c389108d09756a0af41db3559474135b6c502deccd08ad051b5184f3f7907436384964d2b05045e27dca463af98c889cee69b0ae6e202782
 DIST lighttpd-1.4.76.tar.xz.asc 833 BLAKE2B b46b3543e694c132d6e49ee239ef2d71718b5257cfc33506208b0b28bb318ffaf04fcf6282e3b54b08eedf4a3ef6da2ef2c4fd84da89316ce02d70b8f9f26faf SHA512 5a9bc460584479212ac2adddbc4dd5d4374cb08f703fdebd60471cee9c93f6cf4c7bf431a183d615aa9d1a25e237b8dd0f4f06e7249d6bb61a341565a29e2bb9
+DIST lighttpd-1.4.77.tar.xz 857872 BLAKE2B 52775633d494d502b76ec200efefadb99996d32e5127ac858d11712f683ffd8233855c8dcd30b3e5f285389ba2fbfbddc1090752d38e4ec0c0f267fc7d4afe80 SHA512 696fd4fd8486a6c3fd1131c7e8a935a02b5384882b74ddc19bf79d085e2a0abed9184a30f97e3a7aafb816d3589e110e8d70115daa15cdc52cf61aa4129e3565
+DIST lighttpd-1.4.77.tar.xz.asc 833 BLAKE2B 5d3bdccd5788fce50d908eb028760290bd8033d27c0f15f414d2c5fe7d07b31ecd05aa2028d3a6b37ebdaaf2aafebb37c685834af6c502b80de185740c52de3a SHA512 5068f871244929054cc63c0381ec99f43cea573bd1d303ce3ad8a46df09e4358a96679fcb0a689d49ee2ab0228f11a95270b4e8418b7d69b7cddce425f1b14b1
 EBUILD lighttpd-1.4.75-r2.ebuild 5684 BLAKE2B e3a76bad8cbfca7d9ab8e9480ae1201f7edd24028e7ab95c366456b224d4839a125f828e753bdc591d697ca6bd1e0997ae3df3d63c18cfdb65bd5b8d7e3554b4 SHA512 ce3098c0eff88fc5008dba35af1bdb91490258e3638da5a5d85cb1e91c8c46bb7221338bb32d03a8e86e969cbd7ba8501fba01b57ceac83599a38d995427e040
 EBUILD lighttpd-1.4.75-r3.ebuild 5328 BLAKE2B 83d2eb4c2f447c1016c26ec7d4849318a15cd3fe407f0e68a502247dac9642f436266d3b1460ab082e132cbd867439a096f010247c82742d2e9695037e030bc9 SHA512 8b56444961d0f9bc5796f4d1755285b3f2ac66340adf824111a9144b1423c7e8eb157a0075154bc77080df6855cd500e549db08c7a2c14b9c6988d509b31be8c
 EBUILD lighttpd-1.4.76-r2.ebuild 5314 BLAKE2B 14af13aef98b322e677f5b8d89e2eb81ec1f69c07ee8134f9a2f4f3901317cdd7739be37b71658f773a8a66795acbc430b28ecd22a69996967c0ea154af9f398 SHA512 1ac59250c521493b2e3b5e8034f95a4940c5fb7eb4131f7b37328f62f0ad0f30a7039c64b586cf256b052bb2bafb6d70be301947ca521cb1a45659b24a481743
 EBUILD lighttpd-1.4.76-r3.ebuild 5634 BLAKE2B 7622bc4110c0cfeeb2420f161408cb312079a57d3659387d74e98da576630927422b93541700c01108854e81c4d568ec8edeba2730581e8df58654aa30afe5a5 SHA512 04bcc37758a37f8cde2fb9d34519f09576972b114466e003f919ff245182b5b48342c6b2b9b7c771476627699a822111303acd67bf69c2929152dfef1cd0be9e
-EBUILD lighttpd-9999.ebuild 5590 BLAKE2B 41ceb9ea6dab6ae07448de87c2292233c0ce476a51e94ec91e45423178b4d06089c16d326fd4829ea8f87ff7e762eac0ca117f13257c30e69798b0520a6086ce SHA512 fca7cdc684cf0e427435b87fee88a7253d658fdb7490af721ce91f0b3575f62ca54aefbec31cf6a6f886505601fac385e5a7d1ed033ce76bc24afc8b734cc6fe
+EBUILD lighttpd-1.4.77.ebuild 5596 BLAKE2B 2886161ea52ea6c45e3e8ab3600e4015ff844d3401946797f4c3bbd4796eaeeb023a04f5afd71cb12241226b628d56a5f8a87b8e4cfc77ed2c8e693d98fecbb6 SHA512 7a0432a1336aaddf9f22a6a30c4fbae95f6134547981da8fe4cb35f52e90ddf2b4c7c9891b620bce0ecdd9170e5191868f77eb051d40b14af348d8520c77f021
+EBUILD lighttpd-9999.ebuild 5596 BLAKE2B 2886161ea52ea6c45e3e8ab3600e4015ff844d3401946797f4c3bbd4796eaeeb023a04f5afd71cb12241226b628d56a5f8a87b8e4cfc77ed2c8e693d98fecbb6 SHA512 7a0432a1336aaddf9f22a6a30c4fbae95f6134547981da8fe4cb35f52e90ddf2b4c7c9891b620bce0ecdd9170e5191868f77eb051d40b14af348d8520c77f021
 MISC metadata.xml 1839 BLAKE2B 1d3bb5474c1bf9f16d84013bec3c0b43d2e2c5d44535e80b2a225bc64345155ba812d0ed9826f8f4072b9a9a113ede7ab5de05b0442bd8968fcad0916edba9fb SHA512 bb491fac80fd3e92b38f35fdd75e09ca6574819eba0d9fd8bed7256be603a113a3127d2ca32c42b9dc4e3a3359f55f62d44650768844cae374d7aa81432a7983
diff --git a/www-servers/lighttpd/files/lighttpd.service-r2 b/www-servers/lighttpd/files/lighttpd.service-r2
new file mode 100644
index 000000000000..09fd87d2dfda
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd.service-r2
@@ -0,0 +1,15 @@
+[Unit]
+Description=Lighttpd Daemon
+After=syslog.target network-online.target
+
+[Service]
+Type=simple
+PIDFile=/run/lighttpd.pid
+ExecStartPre=/usr/sbin/lighttpd -tt -f /etc/lighttpd/lighttpd.conf
+ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf
+ExecReload=/usr/sbin/lighttpd -tt -f /etc/lighttpd/lighttpd.conf
+ExecReload=/bin/kill -USR1 $MAINPID
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-servers/lighttpd/lighttpd-1.4.77.ebuild b/www-servers/lighttpd/lighttpd-1.4.77.ebuild
new file mode 100644
index 000000000000..54f788708629
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.77.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lighttpd.asc
+inherit lua-single meson readme.gentoo-r1 systemd tmpfiles verify-sig
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://git.lighttpd.net/lighttpd/lighttpd1.4.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz
+		verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="+brotli dbi gnutls kerberos ldap libdeflate +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
+# Match the bundled xxhash version for the minimum version
+COMMON_DEPEND="
+	acct-group/lighttpd
+	acct-user/lighttpd
+	>=dev-libs/xxhash-0.8.2
+	virtual/libcrypt:=
+	brotli? ( app-arch/brotli:= )
+	dbi? (
+		dev-db/libdbi
+	)
+	gnutls? ( net-libs/gnutls )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2.1.26:= )
+	libdeflate? ( app-arch/libdeflate )
+	lua? ( ${LUA_DEPS} )
+	maxminddb? ( dev-libs/libmaxminddb )
+	mbedtls? ( net-libs/mbedtls:0= )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss )
+	pcre? ( dev-libs/libpcre2 )
+	php? ( dev-lang/php:*[cgi] )
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( >=dev-libs/openssl-0.9.7:= )
+	unwind? ( sys-libs/libunwind:= )
+	webdav? (
+		dev-libs/libxml2
+		dev-db/sqlite
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( virtual/perl-Test-Harness )
+	verify-sig? ( sec-keys/openpgp-keys-lighttpd )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${ED}/etc/lighttpd/lighttpd.conf"
+
+	# Enable php/mod_fastcgi settings
+	if use php; then
+		sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die
+	fi
+
+	# Automatically listen on IPv6 if built with USE=ipv6 (which we now always do)
+	# bug #234987
+	sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die
+}
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}."
+	fi
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		https://wiki.lighttpd.net/IPv6-Config
+	"
+}
+
+src_configure() {
+	# (One specific library might be preferred on embedded systems via
+	#  MYMESONARGS with e.g. -DFORCE_blah_CRYPTO)
+	local emesonargs=(
+		-Dmoduledir="$(get_libdir)"/${PN}
+
+		${c_args}
+
+		$(meson_feature brotli with_brotli)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_bzip=disabled
+
+		$(meson_feature dbi with_dbi)
+
+		# Obsolete
+		-Dwith_fam=disabled
+
+		$(meson_use gnutls with_gnutls)
+		$(meson_feature kerberos with_krb5)
+		$(meson_feature ldap with_ldap)
+
+		$(meson_feature libdeflate with_libdeflate)
+
+		$(meson_feature unwind with_libunwind)
+
+		$(meson_use lua with_lua)
+		-Dlua_version=${ELUA}
+
+		$(meson_feature maxminddb with_maxminddb)
+		$(meson_use mbedtls with_mbedtls)
+
+		$(meson_use nettle with_nettle)
+		$(meson_use nss with_nss)
+
+		# Obsolete
+		-Dwith_pcre=disabled
+
+		$(meson_use pcre with_pcre2)
+
+		$(meson_feature sasl with_sasl)
+		$(meson_use ssl with_openssl)
+
+		-Dwith_xxhash=enabled
+		$(meson_feature webdav with_webdav_props)
+
+		# Unpackaged in Gentoo
+		-Dwith_wolfssl=false
+
+		$(meson_use xattr with_xattr)
+		$(meson_feature zlib with_zlib)
+		$(meson_feature zstd with_zstd)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd-r2 lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+
+	# Configs
+	insinto /etc/lighttpd
+	newins "${FILESDIR}"/conf/lighttpd.conf-r3 lighttpd.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+	doins doc/config/conf.d/mime.conf
+
+	# Update lighttpd.conf directives based on conditionals
+	update_config
+
+	# Docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
+	readme.gentoo_create_doc
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	doman doc/*.8
+
+	# Logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r2 ${PN}.service
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	readme.gentoo_print_elog
+
+	if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then
+		elog
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
+		elog "existing configuration."
+	fi
+
+	if use brotli || use zstd || use zlib ; then
+		elog
+		elog "Remember to clean your cache directory when using"
+		elog "output compression!"
+		elog "https://wiki.lighttpd.net/Docs_ModDeflate"
+	fi
+}
diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild
index ffd773ed1c59..54f788708629 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ else
 		https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz
 		verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="BSD GPL-2"
@@ -198,7 +198,7 @@ src_install() {
 	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
 	fperms 0750 /var/l{ib,og}/lighttpd
 
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}.service-r2 ${PN}.service
 	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
 }