Small tidy ups. 64bit fixes. Don't stop the boa service when installing.

(Portage version: 2.0.51.22-r2)

5 files changed, 141 insertions, 20 deletions

diff --git a/www-servers/boa/ChangeLog b/www-servers/boa/ChangeLog
index 4d52b76da893..686b8a43a773 100644
--- a/www-servers/boa/ChangeLog
+++ b/www-servers/boa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/boa
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/boa/ChangeLog,v 1.4 2004/10/22 14:51:00 solar Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/boa/ChangeLog,v 1.5 2005/07/28 14:07:17 tigger Exp $
+
+*boa-0.94.14_alpha20-r1 (28 Jul 2005)
+
+  28 Jul 2005; Rob Holland <tigger@gentoo.org>
+  +files/boa-0.94.14_alpha20-64bit.patch, +boa-0.94.14_alpha20-r1.ebuild:
+  Small tidy ups. 64bit fixes. Don't stop the boa service when installing.
 
 *boa-0.94.14_alpha20 (22 Oct 2004)
 
diff --git a/www-servers/boa/Manifest b/www-servers/boa/Manifest
index 05df85544f2f..5e5278e11047 100644
--- a/www-servers/boa/Manifest
+++ b/www-servers/boa/Manifest
@@ -1,26 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6c233d3d5334145f11bd322e6efb9efe boa-0.94.12.ebuild 1580
-MD5 1345fdd7c6a8aa649aaaacb39a350da1 boa-0.94.14_alpha20.ebuild 2012
-MD5 880b03cd0e6ad1ace068dda3e1c37007 boa-0.94.13-r1.ebuild 1950
 MD5 7bb73a6779e6d73c6944a7435e6c1c85 boa-0.94.13.ebuild 1684
+MD5 f1ee0491ba486ea65ea104f81fc6bcb9 boa-0.94.14_alpha20-r1.ebuild 1572
 MD5 39270478a106c5ef381d81f823543bbe ChangeLog 4116
+MD5 1345fdd7c6a8aa649aaaacb39a350da1 boa-0.94.14_alpha20.ebuild 2012
+MD5 880b03cd0e6ad1ace068dda3e1c37007 boa-0.94.13-r1.ebuild 1950
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
-MD5 bbe2d6d519c762b0fdf3046f655fea02 files/boa.conf.d 121
+MD5 6c233d3d5334145f11bd322e6efb9efe boa-0.94.12.ebuild 1580
+MD5 3e9e1f39e91126bfb472bf3fcdc7fae4 files/mime.types 5488
 MD5 83939d3f288cd3f4fddfea9bc01e5027 files/digest-boa-0.94.14_alpha20 67
 MD5 90c0c0ec7d80f10caafd016c5c9ecb49 files/boa-0.94.13-gcc3.patch 547
-MD5 98776c2beacab938c843c24830ed81ab files/digest-boa-0.94.13-r1 63
-MD5 8d078a074821ed86301936cdf0bf556b files/boa-0.94.13-server_uid.patch 435
-MD5 559c4f77a9175ed60e18d816921b40c6 files/boa.conf 7168
+MD5 83939d3f288cd3f4fddfea9bc01e5027 files/digest-boa-0.94.14_alpha20-r1 67
 MD5 3f6d2bad0652220e834c786c6cb2b0ea files/digest-boa-0.94.12 63
 MD5 98776c2beacab938c843c24830ed81ab files/digest-boa-0.94.13 63
+MD5 98776c2beacab938c843c24830ed81ab files/digest-boa-0.94.13-r1 63
+MD5 bbe2d6d519c762b0fdf3046f655fea02 files/boa.conf.d 121
+MD5 689cf25a28e83fe31a31e58b0166a3b8 files/boa-0.94.14_alpha20-64bit.patch 1820
+MD5 8d078a074821ed86301936cdf0bf556b files/boa-0.94.13-server_uid.patch 435
 MD5 de7b84b21c6715dad6eb56ebbd87258b files/boa.rc6 895
-MD5 3e9e1f39e91126bfb472bf3fcdc7fae4 files/mime.types 5488
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCE1fLEZCkKN40op4RAjU2AJ40+tnWq4haVEQcf6GuTogH1hRr2gCgohef
-5nkgPzjWi0jxpQgfhGfWjZM=
-=sTVy
------END PGP SIGNATURE-----
+MD5 559c4f77a9175ed60e18d816921b40c6 files/boa.conf 7168
diff --git a/www-servers/boa/boa-0.94.14_alpha20-r1.ebuild b/www-servers/boa/boa-0.94.14_alpha20-r1.ebuild
new file mode 100644
index 000000000000..716d841826d6
--- /dev/null
+++ b/www-servers/boa/boa-0.94.14_alpha20-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/boa/boa-0.94.14_alpha20-r1.ebuild,v 1.1 2005/07/28 14:07:17 tigger Exp $
+
+inherit eutils
+
+MY_PV=${PV/_alpha/rc}
+DESCRIPTION="Boa - A very small and very fast http daemon"
+SRC_URI="http://www.boa.org/${PN}-${MY_PV}.tar.gz"
+HOMEPAGE="http://www.boa.org/"
+
+KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tetex"
+S=${WORKDIR}/${PN}-${MY_PV}
+DEPEND="virtual/libc
+	sys-devel/flex
+	sys-devel/bison
+	sys-apps/texinfo
+	tetex? ( virtual/tetex )"
+
+
+RDEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-64bit.patch
+}
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+	use tetex || sed -i -e '/^all:/s/boa.dvi //' docs/Makefile
+	emake docs || die "emake docs failed"
+	# SLH - 2004/04/23
+	# commented out - this doesn't appear to work, and I'm not tetex
+	# expert, so I don't know how to fix it
+	#
+	# use tetex && make boa.dvi
+}
+
+src_install() {
+	dosbin src/boa
+	doman docs/boa.8
+	dodoc docs/boa.html
+	dodoc docs/boa_banner.png
+	doinfo docs/boa.info
+#	if use tetex; then
+#		dodoc docs/boa.dvi || die
+#	fi
+
+	dodir /var/log/boa
+	dodir /var/www/localhost/htdocs
+	dodir /var/www/localhost/cgi-bin
+	dodir /var/www/localhost/icons
+
+	newconfd ${FILESDIR}/boa.conf.d boa
+
+	exeinto /usr/lib/boa
+	doexe src/boa_indexer
+
+	newinitd ${FILESDIR}/boa.rc6 boa
+
+	dodir /etc/boa
+	insinto /etc/boa
+	insopts -m700
+	doins ${FILESDIR}/boa.conf
+	doins ${FILESDIR}/mime.types
+}
diff --git a/www-servers/boa/files/boa-0.94.14_alpha20-64bit.patch b/www-servers/boa/files/boa-0.94.14_alpha20-64bit.patch
new file mode 100644
index 000000000000..ff44da366884
--- /dev/null
+++ b/www-servers/boa/files/boa-0.94.14_alpha20-64bit.patch
@@ -0,0 +1,50 @@
+diff -urN src/mmap_cache.c /tmp/src/mmap_cache.c
+--- src/mmap_cache.c	2004-06-04 03:44:59.000000000 +0100
++++ /tmp/src/mmap_cache.c	2005-07-28 14:40:50.320610000 +0100
+@@ -79,7 +79,7 @@
+ 
+     m = mmap(0, s->st_size, PROT_READ, MAP_OPTIONS, data_fd, 0);
+ 
+-    if ((int) m == -1) {
++    if (m == MAP_FAILED) {
+         int saved_errno = errno;
+         log_error_time();
+         fprintf(stderr, "Unable to mmap file: ");
+diff -urN src/read.c /tmp/src/read.c
+--- src/read.c	2004-06-10 03:00:32.000000000 +0100
++++ /tmp/src/read.c	2005-07-28 14:40:50.320610000 +0100
+@@ -40,6 +40,7 @@
+ {
+     int bytes;
+     unsigned char *check, *buffer;
++    size_t len;
+ 
+     check = req->client_stream + req->parse_pos;
+     buffer = req->client_stream;
+@@ -115,10 +116,11 @@
+         if (req->status == ONE_LF) {
+             *req->header_end = '\0';
+ 
+-            if (req->header_end - req->header_line >= MAX_HEADER_LENGTH) {
++	    len = req->header_end - req->header_line;
++            if (len >= MAX_HEADER_LENGTH) {
+                 log_error_doc(req);
+-                fprintf(stderr, "Header too long at %d bytes: \"%s\"\n",
+-                        req->header_end - req->header_line,
++                fprintf(stderr, "Header too long at %lu bytes: \"%s\"\n",
++                        len,
+                         req->header_line);
+                 send_r_bad_request(req);
+                 return 0;
+diff -urN src/request.c /tmp/src/request.c
+--- src/request.c	2004-06-10 02:45:13.000000000 +0100
++++ /tmp/src/request.c	2005-07-28 14:40:50.320610000 +0100
+@@ -85,7 +85,7 @@
+     struct SOCKADDR salocal;
+     unsigned int remote_addrlen = sizeof (struct SOCKADDR);
+     request *conn;              /* connection */
+-    size_t len;
++    socklen_t len;
+ 
+ #ifndef INET6
+     remote_addr.S_FAMILY = (sa_family_t) 0xdead;
diff --git a/www-servers/boa/files/digest-boa-0.94.14_alpha20-r1 b/www-servers/boa/files/digest-boa-0.94.14_alpha20-r1
new file mode 100644
index 000000000000..e9b0a2bf2d22
--- /dev/null
+++ b/www-servers/boa/files/digest-boa-0.94.14_alpha20-r1
@@ -0,0 +1 @@
+MD5 046d1764cd8f325109da9c80c993b2ef boa-0.94.14rc20.tar.gz 200395