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

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

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
 }