public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/
@ 2018-04-28 12:53 Mikle Kolyada
  0 siblings, 0 replies; 8+ messages in thread
From: Mikle Kolyada @ 2018-04-28 12:53 UTC (permalink / raw
  To: gentoo-commits

commit:     9f44646796c028e78f4572e82088bf011496a435
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 28 12:52:57 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 28 12:53:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f446467

www-servers/lighttpd: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-servers/lighttpd/Manifest                      |   1 -
 ...ighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch |  31 ---
 www-servers/lighttpd/lighttpd-1.4.47.ebuild        | 220 ---------------------
 3 files changed, 252 deletions(-)

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 47fa449231a..893e300c08d 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,3 +1,2 @@
 DIST lighttpd-1.4.45.tar.xz 660432 BLAKE2B 31ea3209b8efad32c3811d39b1c1a682d9f2d79a2ecd7d90c413ad066b6a7d5f84df9b3af2ffb2d49a701856ac496626f2a744b25f1dc4fe1c3b9af586fc437f SHA512 d030674a8c55aab12d32ac75f8df2628ba2332a5263c8bd2dd4f39342530080edc6ba2a6fee749c1301d601ab766a265d3c630b04d38bb26bba3cf045935573d
-DIST lighttpd-1.4.47.tar.xz 703012 BLAKE2B 47d8e537c08076b66cd80b35d8d368e7eef55dc0c9edb004e86c033899c13be09ba5f456395647d6c63d461183cfb0be87d36d5e8f26086e0c3ad9bd75791ef4 SHA512 9fac3acc428d9faf69fca2768578dca619f778889e8a3779c429038eec7aff6b3dd497d5437152a070df850861fe2132042fa4418e31c1aab89df23a1c544f99
 DIST lighttpd-1.4.49.tar.xz 710964 BLAKE2B 112ceb36b45f51c7d5526caba27d2b2aa57ec9d14751e1334472c9079c25317c5e37faf884788c84d61fa6cfa2efedc0b4ec02e32308beb6a0b6be28eea44fbd SHA512 de766da68b4cacfb6c322210eafe819b6423334272e9fae4688c2282a66a2e55aaf580c5fdbf02676ed6f7b32d13f2f28cefd22518f77127055ec336ec5d6784

diff --git a/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch b/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch
deleted file mode 100644
index 7916ac0b53f..00000000000
--- a/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Backport upstream fixes for Gentoo bug #636650
-
-Original upstream commit message:
-
-Author: nicorac <claudio.nicora@gmail.com>
-Date:   Wed Oct 25 16:48:24 2017 +0200
-
-    [core] fix build --disable-ipv6 (fixes #2832)
-    
-    x-ref:
-      "Build error on systems without IPV6 support (regression from 1.4.46)"
-      https://redmine.lighttpd.net/issues/2832
-    
-    github: closes #87
-
---- a/src/network.c
-+++ b/src/network.c
-@@ -77,9 +77,13 @@ static void network_host_normalize_addr_str(buffer *host, sock_addr *addr) {
-     if (addr->plain.sa_family == AF_INET6)
-         buffer_append_string_len(host, CONST_STR_LEN("]"));
-     if (addr->plain.sa_family != AF_UNIX) {
-+      #ifdef HAVE_IPV6
-         unsigned short port = (addr->plain.sa_family == AF_INET)
-           ? ntohs(addr->ipv4.sin_port)
-           : ntohs(addr->ipv6.sin6_port);
-+      #else
-+        unsigned short port = ntohs(addr->ipv4.sin_port);
-+      #endif
-         buffer_append_string_len(host, CONST_STR_LEN(":"));
-         buffer_append_int(host, (int)port);
-     }

diff --git a/www-servers/lighttpd/lighttpd-1.4.47.ebuild b/www-servers/lighttpd/lighttpd-1.4.47.ebuild
deleted file mode 100644
index 87c89b4727a..00000000000
--- a/www-servers/lighttpd/lighttpd-1.4.47.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools eutils readme.gentoo-r1 user systemd
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
-
-REQUIRED_USE="kerberos? ( ssl !libressl )"
-
-CDEPEND="
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	libev?    ( >=dev-libs/libev-4.01 )
-	lua?      ( >=dev-lang/lua-5.1:= )
-	memcached? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php:*[cgi] )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-3d257ec3-respect-HAVE_IPV6.patch"
-)
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${D}/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
-
-	# enable stat() caching
-	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
-
-	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
-	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-	use zlib    || rm -f ${libdir}/mod_compress.*
-}
-
-pkg_setup() {
-	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}"
-		ewarn "and mod_ssi."
-	fi
-	if use mmap; then
-		ewarn "You have enabled the mmap option. This option may allow"
-		ewarn "local users to trigger SIGBUG crashes. Use this option"
-		ewarn "with EXTRA care."
-	fi
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_prepare() {
-	default
-	#dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_enable mmap) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with libev) \
-		$(use_with lua) \
-		$(use_with memcached) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc || die
-		emake html
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-	use fam && has_version app-admin/fam && \
-		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.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
-	use ipv6 && readme.gentoo_create_doc
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	# 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
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
-
-	use minimal && remove_non_essential
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-}
-
-pkg_postinst () {
-	use ipv6 && readme.gentoo_print_elog
-
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in /etc/lighttpd.  Please migrate your"
-		elog "existing configuration."
-	fi
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/
@ 2019-08-02 12:04 Mikle Kolyada
  0 siblings, 0 replies; 8+ messages in thread
From: Mikle Kolyada @ 2019-08-02 12:04 UTC (permalink / raw
  To: gentoo-commits

commit:     e2e0a687a7aa18e4a5811a0e41815ce98f425cf9
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 12:04:16 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 12:04:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e0a687

www-servers/lighttpd: Drop old

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 www-servers/lighttpd/Manifest                 |   1 -
 www-servers/lighttpd/files/lighttpd.logrotate |  16 --
 www-servers/lighttpd/lighttpd-1.4.51.ebuild   | 225 --------------------------
 3 files changed, 242 deletions(-)

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index f35b0eaff44..72842d8ef55 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,2 +1 @@
-DIST lighttpd-1.4.51.tar.xz 723268 BLAKE2B 524874a5cc29b3fad23b1d2d623bcaf5b781556d7f11848047bc02fb4793480acfc5b5eb6f60304be9472a8b42c87e8c23baf85352bc9479ea156c4a03990bad SHA512 ee4f150c30322dae50760b99cddd0bd935195ee21e042809fa8d303425d12081c23c00d8ea8fcd3d023b6b414a46b9b953edc4ed25400fe39f10487f0956561f
 DIST lighttpd-1.4.53.tar.xz 732160 BLAKE2B 75848ab259226fc77b232dfb365c6c656e4605055fb5beba1aea60f54f01cb76c3260ca97e59110dc3dd3d1ba7cb3f2fad646f91f37baee69a8cdbaefcf125a4 SHA512 bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76

diff --git a/www-servers/lighttpd/files/lighttpd.logrotate b/www-servers/lighttpd/files/lighttpd.logrotate
deleted file mode 100644
index 80a8644e2c9..00000000000
--- a/www-servers/lighttpd/files/lighttpd.logrotate
+++ /dev/null
@@ -1,16 +0,0 @@
-# lighttpd logrotate script for Gentoo
-
-/var/log/lighttpd/*.log {
-        daily
-        missingok
-		copytruncate
-        rotate 7
-        compress
-        notifempty
-        sharedscripts
-        postrotate
-           if [ -f /var/run/lighttpd.pid ]; then \
-                /etc/init.d/lighttpd reload > /dev/null 2>&1 || true ; \
-           fi;
-        endscript
-}

diff --git a/www-servers/lighttpd/lighttpd-1.4.51.ebuild b/www-servers/lighttpd/lighttpd-1.4.51.ebuild
deleted file mode 100644
index 7e25904b433..00000000000
--- a/www-servers/lighttpd/lighttpd-1.4.51.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic readme.gentoo-r1 systemd user
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
-SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
-
-REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
-
-CDEPEND="
-	bzip2?    ( app-arch/bzip2 )
-	dbi?	( dev-db/libdbi )
-	fam?    ( virtual/fam )
-	gdbm?   ( sys-libs/gdbm )
-	geoip?	( dev-libs/geoip )
-	ldap?   ( >=net-nds/openldap-2.1.26 )
-	libev?  ( >=dev-libs/libev-4.01 )
-	lua?    ( >=dev-lang/lua-5.1:= )
-	memcached? ( dev-libs/libmemcached )
-	mysql?  ( dev-db/mysql-connector-c:= )
-	pcre?   ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php:*[cgi] )
-	postgres? ( dev-db/postgresql:* )
-	rrdtool?  ( net-analyzer/rrdtool )
-	sasl?     ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	sqlite?	( dev-db/sqlite:3 )
-	webdav? (
-		dev-libs/libxml2
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${D}/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
-
-	# enable stat() caching
-	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
-
-	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
-	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* || die
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-	use zlib    || rm -f ${libdir}/mod_compress.*
-}
-
-pkg_setup() {
-	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}"
-		ewarn "and mod_ssi."
-	fi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_prepare() {
-	default
-	use memcached && append-ldflags -pthread
-	#dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_enable mmap) \
-		$(use_with bzip2) \
-		$(use_with dbi) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with geoip ) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with libev) \
-		$(use_with lua) \
-		$(use_with memcached) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with postgres pgsql) \
-		$(use_with sasl) \
-		$(use_with ssl openssl) \
-		$(use_with sqlite sqlite) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc || die
-		emake html
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-	use fam && has_version app-admin/fam && \
-		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.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
-	use ipv6 && readme.gentoo_create_doc
-
-	use doc && dodoc -r doc
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	# 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
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* || die
-
-	use minimal && remove_non_essential
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-}
-
-pkg_postinst () {
-	use ipv6 && readme.gentoo_print_elog
-
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in /etc/lighttpd.  Please migrate your"
-		elog "existing configuration."
-	fi
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/
@ 2021-07-03 15:46 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2021-07-03 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     386e519bafff8c44a4b04a0f658b6bf382b0c095
Author:     Herb Miller Jr <herb <AT> hlmjr <DOT> com>
AuthorDate: Thu May 20 21:05:19 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul  3 15:42:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=386e519b

www-servers/lighttpd: Fix nspr header location

Bug: https://bugs.gentoo.org/783936
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Herb Miller Jr. <herb <AT> hlmjr.com>
Closes: https://github.com/gentoo/gentoo/pull/20900
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../lighttpd/files/lighttpd-1.4.59-nspr-header.patch     | 16 ++++++++++++++++
 www-servers/lighttpd/lighttpd-1.4.59.ebuild              |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/www-servers/lighttpd/files/lighttpd-1.4.59-nspr-header.patch b/www-servers/lighttpd/files/lighttpd-1.4.59-nspr-header.patch
new file mode 100644
index 00000000000..497ea36a167
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.59-nspr-header.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index 325a1b4b..3f32daa9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -887,7 +887,10 @@ if test "x$use_nss" = "xyes"; then
+       NSS_LIBS="-L$WITH_NSS/lib -lnss3"
+   else
+       PKG_CHECK_MODULES([NSS],[nss])
+-      CPPFLAGS="$CPPFLAGS -I/usr/include/nspr4"
++      if test "x$CRYPTO_LIB" = "x"; then
++        PKG_CHECK_MODULES([NSPR],[nspr])
++        CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS"
++      fi
+   fi
+   AC_DEFINE([HAVE_NSS_NSS_H], [1], [nss/nss.h])
+   AC_DEFINE([HAVE_NSS3_NSS_H], [1], [nss3/nss.h])

diff --git a/www-servers/lighttpd/lighttpd-1.4.59.ebuild b/www-servers/lighttpd/lighttpd-1.4.59.ebuild
index b3d8e44ff79..86b8878e842 100644
--- a/www-servers/lighttpd/lighttpd-1.4.59.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.59.ebuild
@@ -71,6 +71,8 @@ RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-apache )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-nspr-header.patch )
+
 # update certain parts of lighttpd.conf based on conditionals
 update_config() {
 	local config="${D}/etc/lighttpd/lighttpd.conf"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/
@ 2023-09-08 21:05 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-09-08 21:05 UTC (permalink / raw
  To: gentoo-commits

commit:     3357733925a63eced1fae5dfdbbf8e1d81cc772c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  8 21:04:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  8 21:04:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33577339

www-servers/lighttpd: drop 1.4.68, 1.4.69, 1.4.70

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

 www-servers/lighttpd/Manifest                      |   3 -
 .../lighttpd-1.4.68-meson-mod_evasive-remove.patch |  18 --
 www-servers/lighttpd/lighttpd-1.4.68.ebuild        | 241 ---------------------
 www-servers/lighttpd/lighttpd-1.4.69.ebuild        | 241 ---------------------
 www-servers/lighttpd/lighttpd-1.4.70.ebuild        | 241 ---------------------
 5 files changed, 744 deletions(-)

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 33ff6be17c34..7da430f1f522 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,4 +1 @@
-DIST lighttpd-1.4.68.tar.xz 1030612 BLAKE2B 5682194a9e124598daf22bca56826535ac48f1c89087238f2a455cd4cb0f12287ce79ab5a7b6ca966003772335e6a14d484658300e401c098b4e87a7207198c4 SHA512 137cf62e3c7b07d1dc4af50318f1ec67bbf60058ad1a4fef0b1c94668916e23cfcdf85fe9cd728163e55c1b21f4831b9ab922fcf6b6ba8e2a03b2f73a9694189
-DIST lighttpd-1.4.69.tar.xz 1045516 BLAKE2B 4b9c15bd69db5afcf40c3df41831d2fcecbb4149a8cfef582e7dfe80328d515a1021baa32c17e0f89d81c9726dbbe8480d9d319684d38a11961b28d2d0224e9c SHA512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f
-DIST lighttpd-1.4.70.tar.xz 1070048 BLAKE2B 3f2e56343e4bf6904babadf5b1a879e44b598f6ae3b3abe9260c47ae72bdc9424fed55104646caf5fb35b0ae8cb084b1eba694a3e18a7c9c76e08e3cd8802a19 SHA512 50a4b9e3ded2c40ad6c2f4d0dff8b89d412a839ba2e6eb0d9310c344adfa7c2067f3220f666b81fc0e1a1efafa222f5bba00f91b5925f55fddeacc2304837a21
 DIST lighttpd-1.4.71.tar.xz 1070904 BLAKE2B fa039ca7877050b4720c815c4bd164ad0fe7e367e4302b8e0a3ab92654a2169ded0b0a42209ca1a0561b5090670e8a8d71b594c65c439a8d03a49685405dae2a SHA512 c1388b563b9cf9dcab0a57bec42b09b2cb5e1932bc137ae5f957d1bf3932ddd8f5f188002a7b9a00f0a92ba3779b21ecbea2ccffa91e686b6660c9cc455d6598

diff --git a/www-servers/lighttpd/files/lighttpd-1.4.68-meson-mod_evasive-remove.patch b/www-servers/lighttpd/files/lighttpd-1.4.68-meson-mod_evasive-remove.patch
deleted file mode 100644
index 82725b2505c5..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.4.68-meson-mod_evasive-remove.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/lighttpd/lighttpd1.4/commit/d809433d6d900e899f796606b11bdc6a73413ac5
-
-From d809433d6d900e899f796606b11bdc6a73413ac5 Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Tue, 3 Jan 2023 17:50:16 -0500
-Subject: [PATCH] [meson] remove t/test_mod_evasive.c
-
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -721,7 +721,6 @@ test('test_mod', executable('test_mod',
- 		't/test_mod.c',
- 		't/test_mod_access.c',
- 		't/test_mod_alias.c',
--		't/test_mod_evasive.c',
- 		't/test_mod_evhost.c',
- 		't/test_mod_indexfile.c',
- 		't/test_mod_simple_vhost.c',
-

diff --git a/www-servers/lighttpd/lighttpd-1.4.68.ebuild b/www-servers/lighttpd/lighttpd-1.4.68.ebuild
deleted file mode 100644
index d221ec143d74..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.68.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit lua-single meson readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
-SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	mysql? ( dbi )
-	postgres? ( dbi )
-	sqlite? ( dbi )
-	webdav? ( sqlite )
-"
-
-COMMON_DEPEND="
-	acct-group/lighttpd
-	acct-user/lighttpd
-	virtual/libcrypt:=
-	brotli? ( app-arch/brotli:= )
-	dbi? (
-		dev-db/libdbi
-		mysql? ( dev-db/libdbi-drivers[mysql] )
-		postgres? ( dev-db/libdbi-drivers[postgres] )
-		sqlite? ( dev-db/libdbi-drivers[sqlite] )
-	)
-	gnutls? ( net-libs/gnutls )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2.1.26:= )
-	lua? ( ${LUA_DEPS} )
-	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls )
-	nettle? ( dev-libs/nettle:= )
-	nss? ( dev-libs/nss )
-	pcre? ( dev-libs/libpcre2 )
-	php? ( dev-lang/php:*[cgi] )
-	rrdtool? ( net-analyzer/rrdtool )
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( >=dev-libs/openssl-0.9.7:= )
-	system-xxhash? ( dev-libs/xxhash )
-	unwind? ( sys-libs/libunwind:= )
-	webdav? (
-		dev-libs/libxml2
-		sys-fs/e2fsprogs
-	)
-	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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-mod_evasive-remove.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
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dmoduledir="$(get_libdir)"/${PN}
-
-		$(meson_feature brotli with_brotli)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_bzip=disabled
-
-		$(meson_feature dbi with_dbi)
-
-		# Unpackaged in Gentoo
-		-Dwith_libdeflate=disabled
-		# Obsolete
-		-Dwith_fam=disabled
-
-		$(meson_use gnutls with_gnutls)
-		$(meson_feature kerberos with_krb5)
-		$(meson_feature ldap with_ldap)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_libev=disabled
-
-		$(meson_feature unwind with_libunwind)
-
-		$(meson_use lua with_lua)
-		-Dlua_version=${ELUA}
-
-		$(meson_feature maxminddb with_maxminddb)
-		$(meson_use mbedtls with_mbedtls)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_mysql=disabled
-
-		$(meson_use nettle with_nettle)
-		$(meson_use nss with_nss)
-
-		# Obsolete
-		-Dwith_pcre=disabled
-
-		$(meson_use pcre with_pcre2)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_pgsql=disabled
-
-		$(meson_feature sasl with_sasl)
-		$(meson_use ssl with_openssl)
-		$(meson_feature system-xxhash with_xxhash)
-		$(meson_feature webdav with_webdav_props)
-		$(meson_feature webdav with_webdav_locks)
-
-		# 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-r1 lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-
-	# Configs
-	insinto /etc/lighttpd
-	newins "${FILESDIR}"/conf/lighttpd.conf-r1 lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.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_dounit "${FILESDIR}"/${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
-
-	if use mysql ; then
-		elog
-		elog "Note that upstream has moved away from using mysql directly"
-		elog "via mod_mysql and is now accessing it through mod_dbi. You"
-		elog "may need to update your configuration"
-	fi
-
-	elog
-	elog "Upstream has deprecated a number of features. They are not missing"
-	elog "but have been migrated to other mechanisms. Please see upstream"
-	elog "changelog for details."
-	elog "https://www.lighttpd.net/2022/1/19/1.4.64/"
-}

diff --git a/www-servers/lighttpd/lighttpd-1.4.69.ebuild b/www-servers/lighttpd/lighttpd-1.4.69.ebuild
deleted file mode 100644
index e4ad710e8afe..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.69.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit lua-single meson readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
-SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	mysql? ( dbi )
-	postgres? ( dbi )
-	sqlite? ( dbi )
-	webdav? ( sqlite )
-"
-
-COMMON_DEPEND="
-	acct-group/lighttpd
-	acct-user/lighttpd
-	virtual/libcrypt:=
-	brotli? ( app-arch/brotli:= )
-	dbi? (
-		dev-db/libdbi
-		mysql? ( dev-db/libdbi-drivers[mysql] )
-		postgres? ( dev-db/libdbi-drivers[postgres] )
-		sqlite? ( dev-db/libdbi-drivers[sqlite] )
-	)
-	gnutls? ( net-libs/gnutls )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2.1.26:= )
-	lua? ( ${LUA_DEPS} )
-	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls )
-	nettle? ( dev-libs/nettle:= )
-	nss? ( dev-libs/nss )
-	pcre? ( dev-libs/libpcre2 )
-	php? ( dev-lang/php:*[cgi] )
-	rrdtool? ( net-analyzer/rrdtool )
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( >=dev-libs/openssl-0.9.7:= )
-	system-xxhash? ( dev-libs/xxhash )
-	unwind? ( sys-libs/libunwind:= )
-	webdav? (
-		dev-libs/libxml2
-		sys-fs/e2fsprogs
-	)
-	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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.69-fix-meson-typo.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
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dmoduledir="$(get_libdir)"/${PN}
-
-		$(meson_feature brotli with_brotli)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_bzip=disabled
-
-		$(meson_feature dbi with_dbi)
-
-		# Unpackaged in Gentoo
-		-Dwith_libdeflate=disabled
-		# Obsolete
-		-Dwith_fam=disabled
-
-		$(meson_use gnutls with_gnutls)
-		$(meson_feature kerberos with_krb5)
-		$(meson_feature ldap with_ldap)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_libev=disabled
-
-		$(meson_feature unwind with_libunwind)
-
-		$(meson_use lua with_lua)
-		-Dlua_version=${ELUA}
-
-		$(meson_feature maxminddb with_maxminddb)
-		$(meson_use mbedtls with_mbedtls)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_mysql=disabled
-
-		$(meson_use nettle with_nettle)
-		$(meson_use nss with_nss)
-
-		# Obsolete
-		-Dwith_pcre=disabled
-
-		$(meson_use pcre with_pcre2)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_pgsql=disabled
-
-		$(meson_feature sasl with_sasl)
-		$(meson_use ssl with_openssl)
-		$(meson_feature system-xxhash with_xxhash)
-		$(meson_feature webdav with_webdav_props)
-		$(meson_feature webdav with_webdav_locks)
-
-		# 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-r1 lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-
-	# Configs
-	insinto /etc/lighttpd
-	newins "${FILESDIR}"/conf/lighttpd.conf-r1 lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.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_dounit "${FILESDIR}"/${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
-
-	if use mysql ; then
-		elog
-		elog "Note that upstream has moved away from using mysql directly"
-		elog "via mod_mysql and is now accessing it through mod_dbi. You"
-		elog "may need to update your configuration"
-	fi
-
-	elog
-	elog "Upstream has deprecated a number of features. They are not missing"
-	elog "but have been migrated to other mechanisms. Please see upstream"
-	elog "changelog for details."
-	elog "https://www.lighttpd.net/2022/1/19/1.4.64/"
-}

diff --git a/www-servers/lighttpd/lighttpd-1.4.70.ebuild b/www-servers/lighttpd/lighttpd-1.4.70.ebuild
deleted file mode 100644
index 5aa9f6dcb73d..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.70.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit lua-single meson readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
-SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	mysql? ( dbi )
-	postgres? ( dbi )
-	sqlite? ( dbi )
-	webdav? ( sqlite )
-"
-
-COMMON_DEPEND="
-	acct-group/lighttpd
-	acct-user/lighttpd
-	virtual/libcrypt:=
-	brotli? ( app-arch/brotli:= )
-	dbi? (
-		dev-db/libdbi
-		mysql? ( dev-db/libdbi-drivers[mysql] )
-		postgres? ( dev-db/libdbi-drivers[postgres] )
-		sqlite? ( dev-db/libdbi-drivers[sqlite] )
-	)
-	gnutls? ( net-libs/gnutls )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2.1.26:= )
-	lua? ( ${LUA_DEPS} )
-	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls )
-	nettle? ( dev-libs/nettle:= )
-	nss? ( dev-libs/nss )
-	pcre? ( dev-libs/libpcre2 )
-	php? ( dev-lang/php:*[cgi] )
-	rrdtool? ( net-analyzer/rrdtool )
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( >=dev-libs/openssl-0.9.7:= )
-	system-xxhash? ( dev-libs/xxhash )
-	unwind? ( sys-libs/libunwind:= )
-	webdav? (
-		dev-libs/libxml2
-		sys-fs/e2fsprogs
-	)
-	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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.69-fix-meson-typo.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
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dmoduledir="$(get_libdir)"/${PN}
-
-		$(meson_feature brotli with_brotli)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_bzip=disabled
-
-		$(meson_feature dbi with_dbi)
-
-		# Unpackaged in Gentoo
-		-Dwith_libdeflate=disabled
-		# Obsolete
-		-Dwith_fam=disabled
-
-		$(meson_use gnutls with_gnutls)
-		$(meson_feature kerberos with_krb5)
-		$(meson_feature ldap with_ldap)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_libev=disabled
-
-		$(meson_feature unwind with_libunwind)
-
-		$(meson_use lua with_lua)
-		-Dlua_version=${ELUA}
-
-		$(meson_feature maxminddb with_maxminddb)
-		$(meson_use mbedtls with_mbedtls)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_mysql=disabled
-
-		$(meson_use nettle with_nettle)
-		$(meson_use nss with_nss)
-
-		# Obsolete
-		-Dwith_pcre=disabled
-
-		$(meson_use pcre with_pcre2)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_pgsql=disabled
-
-		$(meson_feature sasl with_sasl)
-		$(meson_use ssl with_openssl)
-		$(meson_feature system-xxhash with_xxhash)
-		$(meson_feature webdav with_webdav_props)
-		$(meson_feature webdav with_webdav_locks)
-
-		# 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-r1 lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-
-	# Configs
-	insinto /etc/lighttpd
-	newins "${FILESDIR}"/conf/lighttpd.conf-r1 lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.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_dounit "${FILESDIR}"/${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
-
-	if use mysql ; then
-		elog
-		elog "Note that upstream has moved away from using mysql directly"
-		elog "via mod_mysql and is now accessing it through mod_dbi. You"
-		elog "may need to update your configuration"
-	fi
-
-	elog
-	elog "Upstream has deprecated a number of features. They are not missing"
-	elog "but have been migrated to other mechanisms. Please see upstream"
-	elog "changelog for details."
-	elog "https://www.lighttpd.net/2022/1/19/1.4.64/"
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/
@ 2024-05-06 14:05 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-05-06 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     3fd7c14fa60fed75db7868fb3dbd57e63cd5cda4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  6 14:04:27 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  6 14:04:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd7c14f

www-servers/lighttpd: fix build on sparc

Closes: https://bugs.gentoo.org/931305
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../lighttpd/files/lighttpd-1.4.75-sparc.patch     | 74 ++++++++++++++++++++++
 www-servers/lighttpd/lighttpd-1.4.75.ebuild        |  4 ++
 2 files changed, 78 insertions(+)

diff --git a/www-servers/lighttpd/files/lighttpd-1.4.75-sparc.patch b/www-servers/lighttpd/files/lighttpd-1.4.75-sparc.patch
new file mode 100644
index 000000000000..d7bd72973b94
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.75-sparc.patch
@@ -0,0 +1,74 @@
+https://bugs.gentoo.org/931305
+https://github.com/lighttpd/lighttpd1.4/commit/524614455554163ec78b27b89ff52bbf7fe96958
+
+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
+--- 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
+--- 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.75.ebuild b/www-servers/lighttpd/lighttpd-1.4.75.ebuild
index 4def4402a70a..dc161bf17a69 100644
--- a/www-servers/lighttpd/lighttpd-1.4.75.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.75.ebuild
@@ -69,6 +69,10 @@ BDEPEND="
 	verify-sig? ( sec-keys/openpgp-keys-lighttpd )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.75-sparc.patch
+)
+
 # update certain parts of lighttpd.conf based on conditionals
 update_config() {
 	local config="${ED}/etc/lighttpd/lighttpd.conf"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/
@ 2024-05-06 16:34 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-05-06 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     c31dd78225219d808259cd4ee04d25ba8a1142de
Author:     Glenn Strauss <gstrauss <AT> gluelogic <DOT> com>
AuthorDate: Sat Mar 16 22:33:00 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  6 16:32:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31dd782

www-servers/lighttpd: update lighttpd.initd, lighttpd.service

* test configs with -tt for a better preflight config test.
* graceful restart using SIGUSR1

[sam: I've rebased this to fork the changes into a new ebuild revision
(1.4.75-r1). Any errors in rebasing are mine and not Glenn's.]

Signed-off-by: Glenn Strauss <gstrauss <AT> gluelogic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/lighttpd/files/lighttpd.initd-r2   |  76 +++++++++
 www-servers/lighttpd/files/lighttpd.service-r1 |  14 ++
 www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild | 226 +++++++++++++++++++++++++
 3 files changed, 316 insertions(+)

diff --git a/www-servers/lighttpd/files/lighttpd.initd-r2 b/www-servers/lighttpd/files/lighttpd.initd-r2
new file mode 100644
index 000000000000..24539e3e80c7
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd.initd-r2
@@ -0,0 +1,76 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload graceful"
+
+LIGHTTPD_PID="$($(which lighttpd) -pf ${LIGHTTPD_CONF} | grep server.pid-file | cut -d '=' -f 2 | tr -d \\\" | tr -d [:space:])"
+
+depend() {
+	need net
+	use mysql logger spawn-fcgi ldap slapd netmount dns
+	after famd
+	after sshd
+}
+
+checkconfig() {
+	if [ ! -f "${LIGHTTPD_CONF}" ] ; then
+		ewarn "${LIGHTTPD_CONF} does not exist."
+		return 1
+	fi
+
+	if [ -z "${LIGHTTPD_PID}" ] ; then
+		eerror "server.pid-file variable in ${LIGHTTPD_CONF}"
+		eerror "is not set. Please set this variable properly"
+		eerror "and try again"
+		return 1
+	fi
+	/usr/sbin/lighttpd -tt -f ${LIGHTTPD_CONF} >/dev/null
+}
+
+start() {
+	checkconfig || return 1
+	# Glean lighttpd's credentials from the configuration file
+	# Fixes bug 454366
+	LIGHTTPD_USER="$(awk '/^server.username/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})"
+	LIGHTTPD_GROUP="$(awk '/^server.groupname/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})"
+	checkpath -d -q -m 0750 -o "${LIGHTTPD_USER}":"${LIGHTTPD_GROUP}" /run/lighttpd/
+
+	ebegin "Starting lighttpd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/lighttpd \
+		--pidfile "${LIGHTTPD_PID}" -- -f "${LIGHTTPD_CONF}"
+	eend $?
+}
+
+stop() {
+	local rv=0
+	ebegin "Stopping lighttpd"
+	start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}"
+	eend $?
+}
+
+reload() {
+	if ! service_started "${SVCNAME}" ; then
+		eerror "${SVCNAME} isn't running"
+		return 1
+	fi
+	checkconfig || return 1
+
+	ebegin "Re-opening lighttpd log files"
+	start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \
+		--signal HUP
+	eend $?
+}
+
+graceful() {
+	if ! service_started "${SVCNAME}" ; then
+		eerror "${SVCNAME} isn't running"
+		return 1
+	fi
+	checkconfig || return 1
+
+	ebegin "Gracefully restarting lighttpd"
+	start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \
+		--signal USR1
+	eend $?
+}

diff --git a/www-servers/lighttpd/files/lighttpd.service-r1 b/www-servers/lighttpd/files/lighttpd.service-r1
new file mode 100644
index 000000000000..2a8f22474eea
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd.service-r1
@@ -0,0 +1,14 @@
+[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=/bin/kill -USR1 $MAINPID
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

diff --git a/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild
new file mode 100644
index 000000000000..7f2690ba090d
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2024 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"
+SRC_URI="
+	https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz
+	verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc )
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+brotli dbi gnutls kerberos ldap +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:= )
+	lua? ( ${LUA_DEPS} )
+	maxminddb? ( dev-libs/libmaxminddb )
+	mbedtls? ( net-libs/mbedtls )
+	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
+		sys-fs/e2fsprogs
+	)
+	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}"/${PN}-1.4.75-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://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config
+	"
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dmoduledir="$(get_libdir)"/${PN}
+
+		$(meson_feature brotli with_brotli)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_bzip=disabled
+
+		$(meson_feature dbi with_dbi)
+
+		# Unpackaged in Gentoo
+		-Dwith_libdeflate=disabled
+		# Obsolete
+		-Dwith_fam=disabled
+
+		$(meson_use gnutls with_gnutls)
+		$(meson_feature kerberos with_krb5)
+		$(meson_feature ldap with_ldap)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_libev=disabled
+
+		$(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-r1 lighttpd.conf
+	doins "${FILESDIR}"/conf/mime-types.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.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_dounit "${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
+
+	elog
+	elog "Upstream has deprecated a number of features. They are not missing"
+	elog "but have been migrated to other mechanisms. Please see upstream"
+	elog "changelog for details."
+	elog "https://www.lighttpd.net/2022/1/19/1.4.64/"
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/
@ 2024-07-12 10:29 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-07-12 10:29 UTC (permalink / raw
  To: gentoo-commits

commit:     74eff9db04a287c732e2ca62c79a8322df53092d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 10:27:59 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 10:28:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74eff9db

www-servers/lighttpd: fix build on sparc for 1.4.76

I'd previously fixed 1.4.75 and assumed the fix was in 1.4.76.

Closes: https://bugs.gentoo.org/935832
Bug: https://bugs.gentoo.org/931305
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../lighttpd/files/lighttpd-1.4.76-sparc.patch     | 111 +++++++++++++++++++++
 www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild     |   4 +
 www-servers/lighttpd/lighttpd-1.4.76.ebuild        |   4 +
 3 files changed, 119 insertions(+)

diff --git a/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch b/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch
new file mode 100644
index 000000000000..48568889a661
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch
@@ -0,0 +1,111 @@
+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-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild
index 95a95e50e4a8..c61fbf73771c 100644
--- a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild
@@ -75,6 +75,10 @@ BDEPEND="
 	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"

diff --git a/www-servers/lighttpd/lighttpd-1.4.76.ebuild b/www-servers/lighttpd/lighttpd-1.4.76.ebuild
index 48fd28333e6b..f34148cf6d04 100644
--- a/www-servers/lighttpd/lighttpd-1.4.76.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.76.ebuild
@@ -69,6 +69,10 @@ BDEPEND="
 	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"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/
@ 2025-01-14 10:47 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2025-01-14 10:47 UTC (permalink / raw
  To: gentoo-commits

commit:     53bae56e81b4ced69862dd975a4a38c8b1908d51
Author:     Glenn Strauss <gstrauss <AT> gluelogic <DOT> com>
AuthorDate: Sun Jan 12 05:20:59 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 10:46:02 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53bae56e

www-servers/lighttpd: add 1.4.77

add lighttpd 1.4.77
add lighttpd.service-r2 to add config check before reload
update lighttpd-9999

[sam: ~arch and -r1 -> -r0]

Signed-off-by: Glenn Strauss <gstrauss <AT> gluelogic.com>
Closes: https://github.com/gentoo/gentoo/pull/40100
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/lighttpd/Manifest                             |  2 ++
 www-servers/lighttpd/files/lighttpd.service-r2            | 15 +++++++++++++++
 .../{lighttpd-9999.ebuild => lighttpd-1.4.77.ebuild}      |  6 +++---
 www-servers/lighttpd/lighttpd-9999.ebuild                 |  6 +++---
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 654a8e6c4062..936972098e07 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -2,3 +2,5 @@ DIST lighttpd-1.4.75.tar.xz 1102080 BLAKE2B 3cf89678922e319fa140beb56a95b11eb85c
 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

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-9999.ebuild b/www-servers/lighttpd/lighttpd-1.4.77.ebuild
similarity index 97%
copy from www-servers/lighttpd/lighttpd-9999.ebuild
copy to www-servers/lighttpd/lighttpd-1.4.77.ebuild
index ffd773ed1c59..54f788708629 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.77.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
 }
 

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
 }
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-01-14 10:47 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-12 10:29 [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2025-01-14 10:47 Sam James
2024-05-06 16:34 Sam James
2024-05-06 14:05 Sam James
2023-09-08 21:05 Sam James
2021-07-03 15:46 Joonas Niilola
2019-08-02 12:04 Mikle Kolyada
2018-04-28 12:53 Mikle Kolyada

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox