commit: 2f561442e589e60f79873b3f4db5e9935970ac46 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jul 24 01:48:23 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jul 24 01:48:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f561442
www-servers/lighttpd: drop 1.4.55-r102, 1.4.58-r2, 1.4.59-r2 Bug: https://bugs.gentoo.org/851234 Bug: https://bugs.gentoo.org/830691 Bug: https://bugs.gentoo.org/803821 Signed-off-by: Sam James <sam <AT> gentoo.org> www-servers/lighttpd/Manifest | 3 - www-servers/lighttpd/files/conf/lighttpd.conf | 279 --------------------- .../files/lighttpd-1.4.59-nspr-header.patch | 16 -- www-servers/lighttpd/files/lighttpd.initd | 79 ------ www-servers/lighttpd/lighttpd-1.4.55-r102.ebuild | 247 ------------------ www-servers/lighttpd/lighttpd-1.4.58-r2.ebuild | 268 -------------------- www-servers/lighttpd/lighttpd-1.4.59-r2.ebuild | 242 ------------------ www-servers/lighttpd/metadata.xml | 2 - 8 files changed, 1136 deletions(-) diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index ec36ebba44a4..2bf9e6cdba06 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -1,4 +1 @@ -DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402 SHA512 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439 -DIST lighttpd-1.4.58.tar.xz 956828 BLAKE2B b8b0a111db64a8af429dd9922503991e55276808b58143ffce3268bc8b20a39cfec9d8c1e2917b34326ac5502801a6ca3b9bae26874f86b6749c363a09225ca3 SHA512 b7f18223e46bf78f866eb22f44a7702df07424271e085da9f0d03e626198c30e87a3959536d02e3588aa47ba4bc7db7c432307175fb3b25a2984f9cf692c0ca4 -DIST lighttpd-1.4.59.tar.xz 968352 BLAKE2B 8997386be24d9d84fa8012aedd8ac97b3ad4fd19bb756163d3e9b8c6984c740475c6db2810817db9d1a246320bcd81f7ab35847707316454523c614a4485299f SHA512 94d312f6ac65c32057018b749c4865220b43b3e4b7fe9396848aa403ea7fdc2ccbf3f4f91daf281b754cf272a52a8bcdc689502773ea33cae36eead2785daa0f DIST lighttpd-1.4.64.tar.xz 1011436 BLAKE2B 7eea665f20a07ced23e7372515b5e44852ea14e4ac83297ed9f764106b69e7931d84bf5d1c6d5f542ef810021ef94398a89bc3161213f8bdfaba3676e0a687ca SHA512 8e2ad0830ff80fcebf0c33600caafb5ab4e9ff6b5073c12572f88a44fdfe85f777fa8b22b2fc2964fecbeb556997ad660867dcee80efb224d63329c8b18ea936 diff --git a/www-servers/lighttpd/files/conf/lighttpd.conf b/www-servers/lighttpd/files/conf/lighttpd.conf deleted file mode 100644 index 13d5e772ac1b..000000000000 --- a/www-servers/lighttpd/files/conf/lighttpd.conf +++ /dev/null @@ -1,279 +0,0 @@ -############################################################################### -# Default lighttpd.conf for Gentoo. -############################################################################### - -# Variables -var.basedir = "/var/www/localhost" -var.logdir = "/var/log/lighttpd" -var.statedir = "/var/lib/lighttpd" - - -# Modules -# At the very least, mod_access and mod_accesslog should be enabled. -# All other modules should only be loaded if necessary. -# NOTE: the order of modules is important. -server.modules = ( -# "mod_rewrite", -# "mod_redirect", -# "mod_alias", - "mod_access", -# "mod_cml", -# "mod_trigger_b4_dl", -# "mod_auth", -# "mod_status", -# "mod_setenv", -# "mod_proxy", -# "mod_simple_vhost", -# "mod_evhost", -# "mod_userdir", -# "mod_compress", -# "mod_ssi", -# "mod_usertrack", -# "mod_expire", -# "mod_secdownload", -# "mod_rrdtool", -# "mod_webdav", - "mod_accesslog" -) - - -# Includes -include "mime-types.conf" -# include "mod_cgi.conf" -# include "mod_fastcgi.conf" - - -# Server Settings -server.username = "lighttpd" -server.groupname = "lighttpd" -server.document-root = var.basedir + "/htdocs" -server.pid-file = "/run/lighttpd.pid" -server.errorlog = var.logdir + "/error.log" -# log errors to syslog instead -# server.errorlog-use-syslog = "enable" -server.indexfiles = ( - "index.php", - "index.html", - "index.htm", - "default.htm" -) -# server.tag = "lighttpd" -server.follow-symlink = "enable" - -# event handler (defaults to "poll") -# see performance.txt - -# for >= linux-2.4 -# server.event-handler = "linux-rtsig" -# for >= linux-2.6 -# server.event-handler = "linux-sysepoll" -# for FreeBSD -# server.event-handler = "freebsd-kqueue" - -# chroot to directory (defaults to no chroot) -# server.chroot = "/" - -# bind to port (defaults to 80) -# server.port = 81 - -# bind to name (defaults to all interfaces) -# server.bind = "grisu.home.kneschke.de" - -# error-handler for status 404 -# server.error-handler-404 = "/error-handler.html" -# server.error-handler-404 = "/error-handler.php" - -# Format: <errorfile-prefix><status-code>.html -# -> ..../status-404.html for 'File not found' -# server.errorfile-prefix = var.basedir + "/error/status-" - -# FAM support for caching stat() calls -# requires that lighttpd be built with USE=fam -# server.stat-cache-engine = "fam" - -# If lighttpd was build with IPv6 support, and you would like to listen on IPv6, -# uncomment the following: -# server.use-ipv6 = "enable" - - -# mod_staticfile -# which extensions should not be handled via static-file transfer -# (extensions that are usually handled by mod_cgi, mod_fastcgi, etc). -static-file.exclude-extensions = (".php", ".pl", ".cgi", ".fcgi") - - -# mod_accesslog -accesslog.filename = var.logdir + "/access.log" - - -# mod_dirlisting -# enable directory listings -# dir-listing.activate = "enable" - -# don't list hidden files/directories -# dir-listing.hide-dotfiles = "enable" - -# use a different css for directory listings -# dir-listing.external-css= "/path/to/dir-listing.css" - -# list of regular expressions. Files that match any of the -# specified regular expressions will be excluded from directory -# listings. -# dir-listing.exclude = ("^\.", "~$") - - -# mod_access -url.access-deny = ("~", ".inc") - - -# mod_userdir -# userdir.path = "public_html" -# userdir.exclude-user = ("root") - - -# mod_ssi -# ssi.extension = (".shtml") - - -# mod_ssl -# ssl.engine = "enable" -# ssl.pemfile = "server.pem" - - -# mod_status -# status.status-url = "/server-status" -# status.config-url = "/server-config" - - -# mod_simple_vhost -# If you want name-based virtual hosting add the next three settings -# and load mod_simple_vhost -# document-root = -# virtual-server-root + virtual-server-default-host + virtual-server-docroot -# or -# virtual-server-root + http-host + virtual-server-docroot -# simple-vhost.server-root = "/home/user/webroot/servers/" -# simple-vhost.default-host = "www.example.org" -# simple-vhost.document-root = "/pages/" - - -# mod_compress -# compress.cache-dir = var.statedir + "/cache/compress" -# compress.filetype = ("text/plain", "text/html") - - -# mod_proxy -# proxy.server = ( -# ".php" => ( -# "localhost" => ( -# "host" => "192.168.0.101", -# "port" => 80 -# ) -# ) -# ) - - -# mod_auth -# auth.backend = "plain" -# auth.backend.plain.userfile = "lighttpd.user" -# auth.backend.plain.groupfile = "lighttpd.group" - -# auth.backend.ldap.hostname = "localhost" -# auth.backend.ldap.base-dn = "dc=my-domain,dc=com" -# auth.backend.ldap.filter = "(uid=$)" - -#auth.require = ( -# "/server-status" => ( -# "method" => "digest", -# "realm" => "download archiv", -# "require" => "user=jan" -# ), -# "/server-info" => ( -# "method" => "digest", -# "realm" => "download archiv", -# "require" => "valid-user" -# ) -#) - - -# mod_rewrite -# url.rewrite = ( -# "^/$" => "/server-status" -# ) - - -# mod_redirect -# url.redirect = ( -# "^/wishlist/(.+)" => "http://www.123.org/$1"; -# ) - - -# mod_evhost -# define a pattern for the host url finding -# %% => % sign -# %0 => domain name + tld -# %1 => tld -# %2 => domain name without tld -# %3 => subdomain 1 name -# %4 => subdomain 2 name -# evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/" - - -# mod_expire -# expire.url = ( -# "/buggy/" => "access 2 hours", -# "/asdhas/" => "access plus 1 seconds 2 minutes" -# ) - - -# mod_rrdtool -# rrdtool.binary = "/usr/bin/rrdtool" -# rrdtool.db-name = var.statedir + "/lighttpd.rrd" - - -# mod_setenv -# setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" ) -# setenv.add-response-header = ( "X-Secret-Message" => "42" ) - - -# mod_trigger_b4_dl -# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db" -# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" ) -# trigger-before-download.trigger-url = "^/trigger/" -# trigger-before-download.download-url = "^/download/" -# trigger-before-download.deny-url = "http://127.0.0.1/index.html"; -# trigger-before-download.trigger-timeout = 10 - - -# mod_cml -# don't forget to add index.cml to server.indexfiles -# cml.extension = ".cml" -# cml.memcache-hosts = ( "127.0.0.1:11211" ) - - -# mod_webdav -# $HTTP["url"] =~ "^/dav($|/)" { -# webdav.activate = "enable" -# webdav.is-readonly = "enable" -# } - - -# Extra Rules -# set Content-Encoding and reset Content-Type for browsers that -# support decompressing on-thy-fly (requires mod_setenv) -# $HTTP["url"] =~ "\.gz$" { -# setenv.add-response-header = ("Content-Encoding" => "x-gzip") -# mimetype.assign = (".gz" => "text/plain") -# } - -# $HTTP["url"] =~ "\.bz2$" { -# setenv.add-response-header = ("Content-Encoding" => "x-bzip2") -# mimetype.assign = (".bz2" => "text/plain") -# } - - -# Debug -# debug.log-request-header = "enable" -# debug.log-response-header = "enable" -# debug.log-request-handling = "enable" -# debug.log-file-not-found = "enable" 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 deleted file mode 100644 index 497ea36a1675..000000000000 --- a/www-servers/lighttpd/files/lighttpd-1.4.59-nspr-header.patch +++ /dev/null @@ -1,16 +0,0 @@ -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/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd deleted file mode 100644 index 190cd140e95e..000000000000 --- a/www-servers/lighttpd/files/lighttpd.initd +++ /dev/null @@ -1,79 +0,0 @@ -#!/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="$(grep pid ${LIGHTTPD_CONF} | 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 -t -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 stopping lighttpd" - start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \ - --signal INT - if eend $? ; then - rm -f "${LIGHTTPD_PID}" - start - fi -} diff --git a/www-servers/lighttpd/lighttpd-1.4.55-r102.ebuild b/www-servers/lighttpd/lighttpd-1.4.55-r102.ebuild deleted file mode 100644 index 28846dbdf248..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.55-r102.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools flag-o-matic lua-single readme.gentoo-r1 systemd toolchain-funcs 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 ~s390 sparc x86" -IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib" -RESTRICT="!test? ( test )" - -REQUIRED_USE="kerberos? ( ssl ) - lua? ( ${LUA_REQUIRED_USE} ) - webdav? ( sqlite )" - -BDEPEND="dev-libs/libgamin - virtual/pkgconfig" - -COMMON_DEPEND=" - virtual/libcrypt:= - 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? ( ${LUA_DEPS} ) - 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? ( - >=dev-libs/openssl-0.9.7:0= - ) - sqlite? ( dev-db/sqlite:3 ) - webdav? ( - dev-libs/libxml2 - sys-fs/e2fsprogs - ) - xattr? ( kernel_linux? ( sys-apps/attr ) ) - zlib? ( >=sys-libs/zlib-1.1 ) - acct-group/lighttpd - acct-user/lighttpd" - -DEPEND="${COMMON_DEPEND} - doc? ( dev-python/docutils ) - test? ( - virtual/perl-Test-Harness - dev-libs/fcgi - )" - -RDEPEND="${COMMON_DEPEND} - 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 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}" - ewarn "and mod_ssi." - fi - - 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() { - # The lua bit requires a bit of explanation. The lighttpd autoconf script - # handles the value passed to --with-lua as follows: - # - "no" - do nothing - # - "yes" - query pkgconfig for VERSIONED lua packages, starting with 5.3 - # and going down; only if lua5.1 cannot be found plain "lua" is tried - # - any other value is passed to pkgconfig as the exact package name to use. - # We want a specific implementation to be used even if a newer one is present - # in the system so we use the latter mode. - econf \ - CC_FOR_BUILD=$(tc-getBUILD_CC) \ - --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 lua ${ELUA}) \ - $(use_with memcached) \ - $(use_with mysql) \ - $(use_with pcre) \ - $(use_with postgres pgsql) \ - $(use_with sasl) \ - $(use_with ssl openssl) \ - $(use_with 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" - dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf" -} - -pkg_postinst() { - tmpfiles_process ${PN}.tmpfiles.conf - - 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 -} diff --git a/www-servers/lighttpd/lighttpd-1.4.58-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.58-r2.ebuild deleted file mode 100644 index 39fc0994fbb0..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.58-r2.ebuild +++ /dev/null @@ -1,268 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} ) - -inherit autotools flag-o-matic lua-single readme.gentoo-r1 systemd tmpfiles toolchain-funcs - -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 ~s390 sparc x86" -IUSE="brotli bzip2 dbi doc gdbm gnutls ipv6 kerberos ldap libev lua maxminddb minimal mbedtls mmap memcached mysql nss pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib" -RESTRICT="!test? ( test )" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - mysql? ( dbi ) - postgres? ( dbi ) - sqlite? ( dbi ) - webdav? ( sqlite ) -" - -BDEPEND="virtual/pkgconfig" - -COMMON_DEPEND=" - virtual/libcrypt:= - brotli? ( app-arch/brotli ) - bzip2? ( app-arch/bzip2 ) - dbi? ( - dev-db/libdbi - mysql? ( dev-db/libdbi-drivers[mysql] ) - postgres? ( dev-db/libdbi-drivers[postgres] ) - sqlite? ( dev-db/libdbi-drivers[sqlite] ) - ) - gdbm? ( sys-libs/gdbm:= ) - gnutls? ( net-libs/gnutls:= ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-2.1.26:= ) - libev? ( >=dev-libs/libev-4.01 ) - lua? ( ${LUA_DEPS} ) - maxminddb? ( dev-libs/libmaxminddb:= ) - mbedtls? ( net-libs/mbedtls:= ) - memcached? ( dev-libs/libmemcached ) - nss? ( dev-libs/nss ) - pcre? ( >=dev-libs/libpcre-3.1:= ) - php? ( dev-lang/php:*[cgi] ) - rrdtool? ( net-analyzer/rrdtool ) - sasl? ( dev-libs/cyrus-sasl ) - ssl? ( >=dev-libs/openssl-0.9.7:0= ) - webdav? ( - dev-libs/libxml2 - sys-fs/e2fsprogs - ) - xattr? ( kernel_linux? ( sys-apps/attr ) ) - zlib? ( >=sys-libs/zlib-1.1 ) - acct-group/lighttpd - acct-user/lighttpd" - -DEPEND="${COMMON_DEPEND} - doc? ( dev-python/docutils ) - test? ( - virtual/perl-Test-Harness - dev-libs/fcgi - )" - -RDEPEND="${COMMON_DEPEND} - 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; } - - # 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_{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 lua || rm -f ${libdir}/mod_{cml,magnet}.* - use rrdtool || rm -f ${libdir}/mod_rrdtool.* - use zlib || use bzip2 || use brotli || rm -f ${libdir}/mod_deflate.* -} - -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}" - ewarn "and mod_ssi." - fi - - 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() { - # The lua bit requires a bit of explanation. The lighttpd autoconf script - # handles the value passed to --with-lua as follows: - # - "no" - do nothing - # - "yes" - query pkgconfig for VERSIONED lua packages, starting with 5.3 - # and going down; only if lua5.1 cannot be found plain "lua" is tried - # - any other value is passed to pkgconfig as the exact package name to use. - # We want a specific implementation to be used even if a newer one is present - # in the system so we use the latter mode. - econf \ - CC_FOR_BUILD=$(tc-getBUILD_CC) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --enable-lfs \ - $(use_enable ipv6) \ - $(use_enable mmap) \ - $(use_with brotli) \ - $(use_with bzip2) \ - $(use_with dbi) \ - $(use_with gdbm) \ - $(use_with gnutls ) \ - $(use_with kerberos krb5) \ - $(use_with ldap) \ - $(use_with libev) \ - $(use_with lua lua ${ELUA}) \ - $(use_with maxminddb) \ - $(use_with mbedtls) \ - $(use_with memcached) \ - $(use_with nss) \ - $(use_with pcre) \ - $(use_with sasl) \ - $(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() { - default - - find "${D}" -name '*.la' -delete || die - - # init script stuff - newinitd "${FILESDIR}"/lighttpd.initd lighttpd - newconfd "${FILESDIR}"/lighttpd.confd lighttpd - - # 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" - newtmpfiles "${FILESDIR}/${PN}.tmpfiles.conf" "${PN}.conf" -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf - - 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 - elog "Gentoo has a customized configuration," - elog "which is now located in /etc/lighttpd. Please migrate your" - elog "existing configuration." - fi - - if use brotli || use bzip2 || use zlib; then - elog - elog "Remember to clean your cache directory when using" - elog "output compression!" - elog "https://redmine.lighttpd.net/projects/lighttpd/wiki/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/2020/12/17/1.4.57/"; -} diff --git a/www-servers/lighttpd/lighttpd-1.4.59-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.59-r2.ebuild deleted file mode 100644 index 0af8832f9cad..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.59-r2.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} ) - -inherit autotools flag-o-matic lua-single readme.gentoo-r1 systemd tmpfiles toolchain-funcs - -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 ~s390 sparc x86" -IUSE="brotli bzip2 dbi doc gdbm gnutls ipv6 kerberos ldap libev lua maxminddb mbedtls mmap memcached mysql nss pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib zstd" -RESTRICT="!test? ( test )" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - mysql? ( dbi ) - postgres? ( dbi ) - sqlite? ( dbi ) - webdav? ( sqlite ) -" - -BDEPEND="virtual/pkgconfig" - -COMMON_DEPEND=" - acct-group/lighttpd - acct-user/lighttpd - virtual/libcrypt:= - brotli? ( app-arch/brotli ) - bzip2? ( app-arch/bzip2 ) - dbi? ( - dev-db/libdbi - mysql? ( dev-db/libdbi-drivers[mysql] ) - postgres? ( dev-db/libdbi-drivers[postgres] ) - sqlite? ( dev-db/libdbi-drivers[sqlite] ) - ) - gdbm? ( sys-libs/gdbm:= ) - gnutls? ( net-libs/gnutls ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-2.1.26:= ) - libev? ( >=dev-libs/libev-4.01 ) - lua? ( ${LUA_DEPS} ) - maxminddb? ( dev-libs/libmaxminddb ) - mbedtls? ( net-libs/mbedtls ) - memcached? ( dev-libs/libmemcached ) - nss? ( dev-libs/nss ) - pcre? ( >=dev-libs/libpcre-3.1 ) - php? ( dev-lang/php:*[cgi] ) - rrdtool? ( net-analyzer/rrdtool ) - sasl? ( dev-libs/cyrus-sasl ) - ssl? ( >=dev-libs/openssl-0.9.7:0= ) - 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} - doc? ( dev-python/docutils ) - test? ( - virtual/perl-Test-Harness - dev-libs/fcgi - )" - -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" - - # 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. Bug #234987 - if use ipv6; then sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; fi -} - -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}" - ewarn "and mod_ssi." - fi - - DOC_CONTENTS="IPv6 migration guide:\n - http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"; -} - -src_prepare() { - default - if use memcached; then append-ldflags -pthread; fi - # 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() { - # The lua bit requires a bit of explanation. The lighttpd autoconf script - # handles the value passed to --with-lua as follows: - # - "no" - do nothing - # - "yes" - query pkgconfig for VERSIONED lua packages, starting with 5.3 - # and going down; only if lua5.1 cannot be found plain "lua" is tried - # - any other value is passed to pkgconfig as the exact package name to use. - # We want a specific implementation to be used even if a newer one is present - # in the system so we use the latter mode. - econf \ - CC_FOR_BUILD=$(tc-getBUILD_CC) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --enable-lfs \ - $(use_enable ipv6) \ - $(use_enable mmap) \ - $(use_with brotli) \ - $(use_with bzip2) \ - $(use_with dbi) \ - $(use_with gdbm) \ - $(use_with gnutls ) \ - $(use_with kerberos krb5) \ - $(use_with ldap) \ - $(use_with libev) \ - $(use_with lua lua ${ELUA}) \ - $(use_with maxminddb) \ - $(use_with mbedtls) \ - $(use_with memcached) \ - $(use_with nss) \ - $(use_with pcre) \ - $(use_with sasl) \ - $(use_with ssl openssl) \ - $(use_with webdav webdav-props) \ - $(use_with webdav webdav-locks) \ - $(use_with xattr attr) \ - $(use_with zlib) \ - $(use_with zstd) -} - -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 - - # 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 - if use ipv6; then readme.gentoo_create_doc; fi - - if use doc; then dodoc -r doc; fi - - 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 - - systemd_dounit "${FILESDIR}/${PN}.service" - newtmpfiles "${FILESDIR}/${PN}.tmpfiles.conf" "${PN}.conf" -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf - - if use ipv6; then readme.gentoo_print_elog; fi - - if [[ -f ${ROOT}/etc/lighttpd.conf ]] ; then - elog - elog "Gentoo has a customized configuration," - elog "which is now located in /etc/lighttpd. Please migrate your" - elog "existing configuration." - fi - - if use brotli || use bzip2 || use zlib; then - elog - elog "Remember to clean your cache directory when using" - elog "output compression!" - elog "https://redmine.lighttpd.net/projects/lighttpd/wiki/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/2021/2/2/1.4.59/"; -} diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml index df57890b0f75..1bdc085483bb 100644 --- a/www-servers/lighttpd/metadata.xml +++ b/www-servers/lighttpd/metadata.xml @@ -19,8 +19,6 @@ </longdescription> <use> <flag name="brotli">Enable output compression via <pkg>app-arch/brotli</pkg> (recommended)</flag> - <flag name="bzip2">Enable output compression via bzip2</flag> - <flag name="libev">Enable fdevent handler</flag> <flag name="gnutls">Build module for TLS via <pkg>net-libs/gnutls</pkg></flag> <flag name="maxminddb">Add support for geolocation using <pkg>dev-libs/libmaxminddb</pkg></flag> <flag name="mbedtls">Build module for TLS via <pkg>net-libs/mbedtls</pkg></flag>
