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

[Mikle Kolyada]

commit:     9f44646796c028e78f4572e82088bf011496a435
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 28 12:52:57 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 28 12:53:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f446467

www-servers/lighttpd: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-servers/lighttpd/Manifest                      |   1 -
 ...ighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch |  31 ---
 www-servers/lighttpd/lighttpd-1.4.47.ebuild        | 220 ---------------------
 3 files changed, 252 deletions(-)

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 47fa449231a..893e300c08d 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,3 +1,2 @@
 DIST lighttpd-1.4.45.tar.xz 660432 BLAKE2B 31ea3209b8efad32c3811d39b1c1a682d9f2d79a2ecd7d90c413ad066b6a7d5f84df9b3af2ffb2d49a701856ac496626f2a744b25f1dc4fe1c3b9af586fc437f SHA512 d030674a8c55aab12d32ac75f8df2628ba2332a5263c8bd2dd4f39342530080edc6ba2a6fee749c1301d601ab766a265d3c630b04d38bb26bba3cf045935573d
-DIST lighttpd-1.4.47.tar.xz 703012 BLAKE2B 47d8e537c08076b66cd80b35d8d368e7eef55dc0c9edb004e86c033899c13be09ba5f456395647d6c63d461183cfb0be87d36d5e8f26086e0c3ad9bd75791ef4 SHA512 9fac3acc428d9faf69fca2768578dca619f778889e8a3779c429038eec7aff6b3dd497d5437152a070df850861fe2132042fa4418e31c1aab89df23a1c544f99
 DIST lighttpd-1.4.49.tar.xz 710964 BLAKE2B 112ceb36b45f51c7d5526caba27d2b2aa57ec9d14751e1334472c9079c25317c5e37faf884788c84d61fa6cfa2efedc0b4ec02e32308beb6a0b6be28eea44fbd SHA512 de766da68b4cacfb6c322210eafe819b6423334272e9fae4688c2282a66a2e55aaf580c5fdbf02676ed6f7b32d13f2f28cefd22518f77127055ec336ec5d6784

diff --git a/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch b/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch
deleted file mode 100644
index 7916ac0b53f..00000000000
--- a/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Backport upstream fixes for Gentoo bug #636650
-
-Original upstream commit message:
-
-Author: nicorac <claudio.nicora@×××××.com>
-Date:   Wed Oct 25 16:48:24 2017 +0200
-
-    [core] fix build --disable-ipv6 (fixes #2832)
-    
-    x-ref:
-      "Build error on systems without IPV6 support (regression from 1.4.46)"
-      https://redmine.lighttpd.net/issues/2832
-    
-    github: closes #87
-
---- a/src/network.c
-+++ b/src/network.c
-@@ -77,9 +77,13 @@ static void network_host_normalize_addr_str(buffer *host, sock_addr *addr) {
-     if (addr->plain.sa_family == AF_INET6)
-         buffer_append_string_len(host, CONST_STR_LEN("]"));
-     if (addr->plain.sa_family != AF_UNIX) {
-+      #ifdef HAVE_IPV6
-         unsigned short port = (addr->plain.sa_family == AF_INET)
-           ? ntohs(addr->ipv4.sin_port)
-           : ntohs(addr->ipv6.sin6_port);
-+      #else
-+        unsigned short port = ntohs(addr->ipv4.sin_port);
-+      #endif
-         buffer_append_string_len(host, CONST_STR_LEN(":"));
-         buffer_append_int(host, (int)port);
-     }

diff --git a/www-servers/lighttpd/lighttpd-1.4.47.ebuild b/www-servers/lighttpd/lighttpd-1.4.47.ebuild
deleted file mode 100644
index 87c89b4727a..00000000000
--- a/www-servers/lighttpd/lighttpd-1.4.47.ebuild
+++ /dev/null
@@ -1,220 +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="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-3d257ec3-respect-HAVE_IPV6.patch"
-)
-
-# 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
-}