[gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/

["Sam James" <sam@gentoo.org>]

commit:     3a872b1211ae91fab757ba5afc63e047e7b51111
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 14 05:36:08 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 14 05:36:08 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a872b12

www-servers/lighttpd: drop 1.4.76-r3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/lighttpd/Manifest                      |   2 -
 .../lighttpd/files/lighttpd-1.4.76-sparc.patch     | 111 ----------
 www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild     | 227 ---------------------
 3 files changed, 340 deletions(-)

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 9d4bb8106bd2..c7e1aff6a8d1 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,4 +1,2 @@
-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

diff --git a/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch b/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch
deleted file mode 100644
index 48568889a661..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-https://github.com/lighttpd/lighttpd1.4/commit/88ff3763dae65371eab9f8a22ac1c95c96fe4490
-https://github.com/lighttpd/lighttpd1.4/commit/524614455554163ec78b27b89ff52bbf7fe96958
-
-From 88ff3763dae65371eab9f8a22ac1c95c96fe4490 Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Tue, 23 Apr 2024 00:16:29 -0400
-Subject: [PATCH] Revert "[core] special value for Linux POLLRDHUP on SPARC"
- (fixes #3251)
-
-This reverts commit f14f9142f4487704e2ce0f196263c091accdb12c.
-
-x-ref:
-  "[1.4.76] buildroot compile error with bootlin-sparc{64-g,-uc}libc"
-  https://redmine.lighttpd.net/issues/3251
----
- src/fdevent.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/fdevent.h b/src/fdevent.h
-index e9c380b0f..1b0a062fc 100644
---- a/src/fdevent.h
-+++ b/src/fdevent.h
-@@ -40,8 +40,6 @@ struct fdnode_st {
- #if (defined(__sun) && defined(__SVR4)) /* Solaris */ \
-  || defined(__FreeBSD__)
- #define FDEVENT_RDHUP  0x4000
--#elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
--#define FDEVENT_RDHUP  0x0800
- #else
- #define FDEVENT_RDHUP  0x2000
- #endif
-
-From 524614455554163ec78b27b89ff52bbf7fe96958 Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Wed, 24 Apr 2024 03:07:37 -0400
-Subject: [PATCH] [core] special value for Linux POLLRDHUP on SPARC (fixes
- #3251)
-
-x-ref:
-  "[1.4.76] buildroot compile error with bootlin-sparc{64-g,-uc}libc"
-  https://redmine.lighttpd.net/issues/3251
----
- src/fdevent.h      |  2 ++
- src/fdevent_impl.c | 18 ++++++++++++++++++
- 2 files changed, 20 insertions(+)
-
-diff --git a/src/fdevent.h b/src/fdevent.h
-index 1b0a062fc..556a14455 100644
---- a/src/fdevent.h
-+++ b/src/fdevent.h
-@@ -40,6 +40,8 @@ struct fdnode_st {
- #if (defined(__sun) && defined(__SVR4)) /* Solaris */ \
-  || defined(__FreeBSD__)
- #define FDEVENT_RDHUP  0x4000
-+#elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
-+#define FDEVENT_RDHUP  0x2800 /*(0x2000 EPOLLRDHUP | 0x0800 POLLRDHUP)*/
- #else
- #define FDEVENT_RDHUP  0x2000
- #endif
-diff --git a/src/fdevent_impl.c b/src/fdevent_impl.c
-index 8bfc1cc68..c84c8df57 100644
---- a/src/fdevent_impl.c
-+++ b/src/fdevent_impl.c
-@@ -338,6 +338,11 @@ fdevent_linux_sysepoll_event_set (fdevents *ev, fdnode *fdn, int events)
-     struct epoll_event ep;
-   #ifndef EPOLLRDHUP
-     events &= ~FDEVENT_RDHUP;
-+  #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
-+    if (events & FDEVENT_RDHUP) {
-+        events &= ~FDEVENT_RDHUP;
-+        events |= EPOLLRDHUP;
-+    }
-   #endif
-     ep.events = events | EPOLLERR | EPOLLHUP;
-     ep.data.ptr = fdn;
-@@ -376,7 +381,11 @@ fdevent_linux_sysepoll_init (fdevents *ev)
-     ck_static_assert(EPOLLERR   == FDEVENT_ERR);
-     ck_static_assert(EPOLLHUP   == FDEVENT_HUP);
-   #ifdef EPOLLRDHUP
-+   #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
-+    ck_static_assert(EPOLLRDHUP  & FDEVENT_RDHUP);
-+   #else
-     ck_static_assert(EPOLLRDHUP == FDEVENT_RDHUP);
-+   #endif
-   #endif
- 
-     ev->type      = FDEVENT_HANDLER_LINUX_SYSEPOLL;
-@@ -770,6 +779,11 @@ fdevent_poll_event_set (fdevents *ev, fdnode *fdn, int events)
- 
-   #ifndef POLLRDHUP
-     events &= ~FDEVENT_RDHUP;
-+  #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
-+    if (events & FDEVENT_RDHUP) {
-+        events &= ~FDEVENT_RDHUP;
-+        events |= POLLRDHUP;
-+    }
-   #endif
- 
-     if (k >= 0) {
-@@ -854,7 +868,11 @@ fdevent_poll_init (fdevents *ev)
-     ck_static_assert(POLLHUP   == FDEVENT_HUP);
-     ck_static_assert(POLLNVAL  == FDEVENT_NVAL);
-   #ifdef POLLRDHUP
-+   #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
-+    ck_static_assert(POLLRDHUP  & FDEVENT_RDHUP);
-+   #else
-     ck_static_assert(POLLRDHUP == FDEVENT_RDHUP);
-+   #endif
-   #endif
- 
-     ev->type      = FDEVENT_HANDLER_POLL;

diff --git a/www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild
deleted file mode 100644
index a2ca309dcecd..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# 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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sparc.patch
-)
-
-# 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-r1 ${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
-}