commit:     fbed65cb012aaff7314ceb8025a2982d7f6742d7
Author:     Glenn Strauss <gstrauss <AT> gluelogic <DOT> com>
AuthorDate: Sat Mar 16 23:04:10 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  6 16:32:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbed65cb

www-servers/lighttpd: use builtin mimetype.assign

* use lighttpd builtin mimetype.assign by default (can be overridden)

[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.]

Bug: https://bugs.gentoo.org/399401
Bug: https://github.com/gentoo/gentoo/pull/19507
Signed-off-by: Glenn Strauss <gstrauss <AT> gluelogic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/lighttpd/files/conf/lighttpd.conf-r2 | 5 -----
 www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/www-servers/lighttpd/files/conf/lighttpd.conf-r2 
b/www-servers/lighttpd/files/conf/lighttpd.conf-r2
index 88ba867b0d3f..ca67355ecc5c 100644
--- a/www-servers/lighttpd/files/conf/lighttpd.conf-r2
+++ b/www-servers/lighttpd/files/conf/lighttpd.conf-r2
@@ -34,11 +34,6 @@ server.modules = (
 )
 # }}}
 
-# {{{ includes
-include "mime-types.conf"
-# fcgi and cgi are included below
-# }}}
-
 # {{{ server settings
 server.username      = "lighttpd"
 server.groupname     = "lighttpd"

diff --git a/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild 
b/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild
index a5edd4c9dce0..4ff76649b004 100644
--- a/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild
@@ -167,7 +167,6 @@ src_install() {
        # Configs
        insinto /etc/lighttpd
        newins "${FILESDIR}"/conf/lighttpd.conf-r2 lighttpd.conf
-       doins "${FILESDIR}"/conf/mime-types.conf
        doins "${FILESDIR}"/conf/mod_cgi.conf
        doins "${FILESDIR}"/conf/mod_fastcgi.conf
 

Reply via email to