gentoo resync : 11.05.2018

6 files changed, 14 insertions, 240 deletions

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 01156ddd421e..16074142be90 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -10,8 +10,7 @@ AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469a
 AUX lighttpd.tmpfiles.conf 44 BLAKE2B 00550d523dc350184ef0d681e9e8da5ad1909dd6226698c79d88c7cab7d35c8e20a0c308b5342f94872442aeac240e202ea6055f4666759f9ec853debac18730 SHA512 795448ad726ebfe7688236a23cb21bf06bbf8edd7e243924e3d1c21d33fffba1e04501734b189eb2081f6737b74af7c978eed802fb5e540dcc5c5aea69544936
 DIST lighttpd-1.4.45.tar.xz 660432 BLAKE2B 31ea3209b8efad32c3811d39b1c1a682d9f2d79a2ecd7d90c413ad066b6a7d5f84df9b3af2ffb2d49a701856ac496626f2a744b25f1dc4fe1c3b9af586fc437f SHA512 d030674a8c55aab12d32ac75f8df2628ba2332a5263c8bd2dd4f39342530080edc6ba2a6fee749c1301d601ab766a265d3c630b04d38bb26bba3cf045935573d
 DIST lighttpd-1.4.49.tar.xz 710964 BLAKE2B 112ceb36b45f51c7d5526caba27d2b2aa57ec9d14751e1334472c9079c25317c5e37faf884788c84d61fa6cfa2efedc0b4ec02e32308beb6a0b6be28eea44fbd SHA512 de766da68b4cacfb6c322210eafe819b6423334272e9fae4688c2282a66a2e55aaf580c5fdbf02676ed6f7b32d13f2f28cefd22518f77127055ec336ec5d6784
-EBUILD lighttpd-1.4.45-r1.ebuild 6093 BLAKE2B 427d34a215d4c740e209c1f559dde12995f50a611cde0bb4d3cb91f2de44ba6abe87938c392627dcc79e1d2129949b33d4189349f1ae9f0f4ee0b7cb08e6dda3 SHA512 0d010af52425208f566aa8b350d5f98acf5957603afe256497089643995a541b494ec19a9e848fd983511af9ab40f6b453b529e92902a0c210dfb44f88ee475f
-EBUILD lighttpd-1.4.45.ebuild 6063 BLAKE2B 942870141dd2adbd548f64336d3836bba9c8d74366a7a727bb146b2d2099a6000f9863133d1828658590f47b6768726f7a45ead3ffe96b75e6d46f2890685aed SHA512 9f6730c0a3e23ee0bf22a5e8ef6ca20dc801ccedc3c3a4bececa1db728a0d4ff90c4f03e3ee131f9804af287f9452682e5bdf2494fc655fd3852f2e933bf0d14
-EBUILD lighttpd-1.4.49.ebuild 6473 BLAKE2B e7d6350f1da2cfe4057fb20eb738e8229e82dbdc63e7948c2ef24bd9a6cb060fd643c8ecdefb87c94f478f2714b929aac49ea06ea880929fd14fc3c6a4e0adbb SHA512 863efd3675de773aaf1443023c686e4bbc75de21cd1caf7caf1b4b5be823f71eca8068c421878288519a22a2ca63cad59463b19ab02bcef8a14175efca63539b
-EBUILD lighttpd-9999.ebuild 6099 BLAKE2B d87603bcad95aa7a64874ec363cd581757af5be5ac49aa90cc1c21b3ebec3548515b521aaed6bf5e8e87aa42fdb0d20d471b36d06b1b9d73764420e747b83b25 SHA512 f9b9208c90ceca9eefe93b5da39c8a7bc39671a03fad782d05c14cea1bd1ee54cbc2515fb0cbaa27432e4b20c7dde98ea9d14903e5d179bde519bf5034097366
-MISC metadata.xml 1162 BLAKE2B 1c22a68843890ac45b6a9f446ea8494f0768c13d20c77daf512988f18e764921c6f098afdf8a5bde09a3d8600153f30e1232c28f73188c49e83b02777be0150a SHA512 b796cfcd6c4f0340db88f24acd2cc3c11315b35e37f2bd0aea0b8608ad8ce67f8df7a64658628527179db65324ff8a8db441d5991309f70a13c855ab58afcea4
+EBUILD lighttpd-1.4.45-r1.ebuild 5944 BLAKE2B 629426653d2552bcf32d9e8f003b847d30c6692e81625eb1d772929bc4353db4995e8a82241ce645ebb9d9ca3be1482a1d789db4d296e90af0ee771548334966 SHA512 33632d1ab6fd7bb019b1fe8613a931b12e21a7ca79ea486e96c55cbd9529f2c551efcd91f6dc48c663b25087d557a765b729a1bfb93ccbf0ec4d32d4933732b6
+EBUILD lighttpd-1.4.49.ebuild 6324 BLAKE2B be7447a25ce7653d34b744bd5c21aaa653847591ea06616996c7703c22f50481102edd9f0f7b0e6bff42019832efc99c9345760f2cd8b8e50399eba02f64c0ae SHA512 d25bf67fcaf6c28009d45aedf338f93a9848da443c70b745d6e4aa000b547b0d9b53f80d2a430c8b99742dc4988505537916905276d3cfc583f995b0f3e751b3
+EBUILD lighttpd-9999.ebuild 5950 BLAKE2B f32cb4e5ddf22af2b698aaf17fb33f16862d13e28025984d0468e769af84acff9f2981e69526c139d9192964d57b8b95200edcfb756725855481fc31fbbf73be SHA512 50d096574b0f05c207eca9c18b7b70324c923bbbafe7d42c56770cae8eea3793f46e39c1a9be497fd35dba4844c83a8342c38afcfa4aa4c60ea7f0eb72856e69
+MISC metadata.xml 1165 BLAKE2B c30ad1b686464b6fe7a03b8974b5e74a3ce83644b9509d8c22df81a2b4b8894f7499c0923c11fabeb3124bff27393c5b20fae8014d93e19fe0191f365001d9aa SHA512 c4561396821150f7637246e17680e3c1ae7f3522206c731af66885950c1b2c90405b31d1a066b9c017ea003d37decc647a4676802f7684eae9a62e958d74e32d
diff --git a/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild
index 492f35263c47..517cf66fb0de 100644
--- a/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild
@@ -6,7 +6,8 @@ EAPI=6
 inherit autotools readme.gentoo-r1 systemd user
 
 DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net/"
+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"
@@ -94,11 +95,7 @@ pkg_setup() {
 		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
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.45.ebuild b/www-servers/lighttpd/lighttpd-1.4.45.ebuild
deleted file mode 100644
index 8a2378ddd723..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.45.ebuild
+++ /dev/null
@@ -1,216 +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="https://www.lighttpd.net/"
-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 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 )
-"
-
-# 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
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.49.ebuild b/www-servers/lighttpd/lighttpd-1.4.49.ebuild
index 902e56f4bb6f..efcb7010d961 100644
--- a/www-servers/lighttpd/lighttpd-1.4.49.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.49.ebuild
@@ -6,7 +6,8 @@ EAPI=6
 inherit autotools flag-o-matic readme.gentoo-r1 systemd user
 
 DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net/"
+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"
@@ -99,11 +100,7 @@ pkg_setup() {
 		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
 
diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild
index 4c0d54541a2c..72943866311b 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-9999.ebuild
@@ -5,7 +5,8 @@ EAPI="6"
 inherit autotools eutils readme.gentoo-r1 user systemd git-r3
 
 DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net/"
+HOMEPAGE="https://www.lighttpd.net
+		  https://github.com/lighttpd"
 EGIT_REPO_URI="https://git.lighttpd.net/lighttpd1.4.git git+ssh://git@lighttpd.net/lighttpd/lighttpd1.4.git git://git.lighttpd.net/lighttpd/lighttpd1.4.git"
 
 LICENSE="BSD GPL-2"
@@ -93,11 +94,7 @@ pkg_setup() {
 		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
 
diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml
index 6131a5ff7f83..592c03d4a050 100644
--- a/www-servers/lighttpd/metadata.xml
+++ b/www-servers/lighttpd/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Mikle Kolyada</name>
 	</maintainer>
 	<longdescription lang="en">
-		lighttpd a secure, fast, compliant and very flexible web-server
+		lighttpd is a secure, fast, compliant and very flexible web-server
 		which has been optimized for high-performance environments. It has a very
 		low memory footprint compared to other webservers and takes care of cpu-load.
 		Its advanced feature-set (FastCGI, CGI, Auth, Output-Compression,