commit: 2d72582f81cc71ce54f892ea80c71414b203b478 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jan 17 05:25:56 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 17 05:25:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d72582f
www-servers/lighttpd: drop 1.4.71 Signed-off-by: Sam James <sam <AT> gentoo.org> www-servers/lighttpd/Manifest | 1 - .../files/lighttpd-1.4.69-fix-meson-typo.patch | 29 --- www-servers/lighttpd/lighttpd-1.4.71.ebuild | 241 --------------------- 3 files changed, 271 deletions(-) diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 3fc5bed88908..b3ad7ba2e16b 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -1,4 +1,3 @@ -DIST lighttpd-1.4.71.tar.xz 1070904 BLAKE2B fa039ca7877050b4720c815c4bd164ad0fe7e367e4302b8e0a3ab92654a2169ded0b0a42209ca1a0561b5090670e8a8d71b594c65c439a8d03a49685405dae2a SHA512 c1388b563b9cf9dcab0a57bec42b09b2cb5e1932bc137ae5f957d1bf3932ddd8f5f188002a7b9a00f0a92ba3779b21ecbea2ccffa91e686b6660c9cc455d6598 DIST lighttpd-1.4.72.tar.xz 1083676 BLAKE2B 5cc50d9ff1988b1ec7b6332850ba6fed66cf894c81b1a670f7d78136b4761290e0402c962f31f20aa795582a42cac74a851ba67bda57412136861b0ff7b76b33 SHA512 5becb57915e3548a1b9b980014be22b3c08dcf0e9be524f9cd0093886aaf6d00b20986e8b1fb10ecdbdffd8e42dd18e4a227b03d562c91bef9490ea6d5c480e3 DIST lighttpd-1.4.72.tar.xz.asc 833 BLAKE2B 3ee4dc249dc7ca4d0a4880728da971e687a9f5ed29246d1b57d6fc98b894a075376f77ffd9fd4a74d5108e05718a12907db0b72d5edd6a1c1b0f6bedd1394964 SHA512 9ae5fda1c1c14cae97b9564a8558d6cfce64100839067372ae034c30a2f50290cb540602ac82d59b1d68363c47e48ec9778edfe6ace258b121798ad1f904d88e DIST lighttpd-1.4.73.tar.xz 1086680 BLAKE2B 2c7e8f9a9445b7986320e28dca82c59003b3438d8d9c5d67d299353f34f4eb4b1dd10c99752548eef9786ae67ee32c7a50b2dcfad2ecc3ca3d17e9e0b8d47f4b SHA512 ee41a72b09614d630174ef832b08c050708f62c0b6299e82b0a5f91a63d62702d31237ae5bb1850f0160b94e36a66af38a2d7abdaa920235265d416d2b0b4015 diff --git a/www-servers/lighttpd/files/lighttpd-1.4.69-fix-meson-typo.patch b/www-servers/lighttpd/files/lighttpd-1.4.69-fix-meson-typo.patch deleted file mode 100644 index 07e65091a08c..000000000000 --- a/www-servers/lighttpd/files/lighttpd-1.4.69-fix-meson-typo.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/lighttpd/lighttpd1.4/pull/127 - -From 7445f72eb441052f7051f029b25d39855dc75e1c Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Sun, 25 Jun 2023 06:18:40 +0100 -Subject: [PATCH] src: Fix 'getoption' meson typo - -Bug: https://bugs.gentoo.org/905219 ---- a/src/meson.build -+++ b/src/meson.build -@@ -381,7 +381,7 @@ if get_option('with_gnutls') - # function: gnutls_check_version (-lgnutls) - libgnutls = [ dependency('gnutls') ] - conf_data.set('HAVE_GNUTLS_CRYPTO_H', true) -- if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(getoption('with_nettle')) -+ if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(get_option('with_nettle')) - libcrypto = [ dependency('gnutls') ] - endif - endif -@@ -402,7 +402,7 @@ if get_option('with_nss') - #libnss3 = [ compiler.find_library('nss3') ] - #libnssutil3 = [ compiler.find_library('nssutil3') ] - conf_data.set('HAVE_NSS3_NSS_H', true) -- if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(getoption('with_nettle')) and not(getoption('with_gnutls')) -+ if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(get_option('with_nettle')) and not(get_option('with_gnutls')) - libcrypto = [ dependency('nss') ] - endif - endif - diff --git a/www-servers/lighttpd/lighttpd-1.4.71.ebuild b/www-servers/lighttpd/lighttpd-1.4.71.ebuild deleted file mode 100644 index aa1d2b30b102..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.71.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 ~loong ~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/"; -}
