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

[William Hubbs]

commit:     d853297bef8a0f8b816863f7584b9a5d243bc188
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 17:08:59 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 17:11:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d853297b

www-servers/boa: revision bump to fix OpenRC script

https://bugs.gentoo.org/show_bug.cgi?id=571448

 www-servers/boa/boa-0.94.14_rc21-r2.ebuild | 63 ++++++++++++++++++++++++++++++
 www-servers/boa/files/boa.conf             |  6 +++
 www-servers/boa/files/boa.initd            | 29 ++++++++++++++
 3 files changed, 98 insertions(+)

diff --git a/www-servers/boa/boa-0.94.14_rc21-r2.ebuild b/www-servers/boa/boa-0.94.14_rc21-r2.ebuild
new file mode 100644
index 0000000..9c9a390
--- /dev/null
+++ b/www-servers/boa/boa-0.94.14_rc21-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd
+
+MY_P=${P/_/}
+DESCRIPTION="A very small and very fast http daemon"
+SRC_URI="http://www.boa.org/${MY_P}.tar.gz"
+HOMEPAGE="http://www.boa.org/"
+
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="sys-devel/bison
+	sys-devel/flex
+	doc? ( virtual/latex-base )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-texi.patch
+	epatch "${FILESDIR}"/${P}-ENOSYS.patch
+}
+
+src_compile() {
+	default
+
+	use doc || sed -i -e '/^all:/s/boa.dvi //' docs/Makefile
+	emake docs
+}
+
+src_install() {
+	dosbin src/boa
+	doman docs/boa.8
+	doinfo docs/boa.info
+	if use doc; then
+		dodoc docs/boa.html
+		dodoc docs/boa_banner.png
+		dodoc docs/boa.dvi
+	fi
+
+	keepdir /var/log/boa
+	keepdir /var/www/localhost/htdocs
+	keepdir /var/www/localhost/cgi-bin
+	keepdir /var/www/localhost/icons
+
+	newinitd "${FILESDIR}"/boa.initd boa
+	newconfd "${FILESDIR}"/boa.conf.d boa
+
+	systemd_dounit "${FILESDIR}"/boa.service
+
+	exeinto /usr/lib/boa
+	doexe src/boa_indexer
+
+	insinto /etc/boa
+	doins "${FILESDIR}"/boa.conf
+	doins "${FILESDIR}"/mime.types
+}

diff --git a/www-servers/boa/files/boa.conf b/www-servers/boa/files/boa.conf
index 186fcfa..7402deb 100644
--- a/www-servers/boa/files/boa.conf
+++ b/www-servers/boa/files/boa.conf
@@ -185,3 +185,9 @@ Alias /icons /var/www/localhost/icons
 
 ScriptAlias /cgi-bin/ /var/www/localhost/cgi-bin/
 
+# Do not remove this line if you are using sys-apps/OpenRC to manage the
+# boa server.
+# A PidFile setting is needed in order for OpenRC to stop boa, and it
+# must match the setting in the service script.
+
+PidFile /run/boa.pid

diff --git a/www-servers/boa/files/boa.initd b/www-servers/boa/files/boa.initd
new file mode 100644
index 0000000..dd0242a
--- /dev/null
+++ b/www-servers/boa/files/boa.initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# NB: Standard config is in /etc/boa/boa.conf
+# NB: Arguments to pass to boa are in /etc/conf.d/boa
+
+command=/usr/sbin/boa
+command_args="${BOA_OPTS}"
+pidfile="/run/boa.pid"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	if [ -e /etc/conf.d/boa ] && [ -n "${BOA_OPTS}" ]; then
+		SR="$(echo ${BOA_OPTS} | awk '{ FS = " " } { print $2 }')"
+	else
+		SR=/etc/boa
+	fi
+
+	if [ ! -e ${SR}/boa.conf ] ; then
+		eerror "You need a ${SR}/boa.conf to run Boa"
+		eerror "There is a sample file in /usr/share/docs/boa"
+		return 1
+	fi
+}