Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Feb 2002 18:29:14 +0100 (CET)
From:      Alex Dupre <sysadmin@alexdupre.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/35279: Update port: Boa Webserver [0.94.8.3 to 0.94.12rc2] (take maintainership)
Message-ID:  <200202241729.g1OHTE800487@vaio.alexdupre.com>

next in thread | raw e-mail | index | archive | help

>Number:         35279
>Category:       ports
>Synopsis:       Update port: Boa Webserver [0.94.8.3 to 0.94.12rc2] (take maintainership)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 24 09:20:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD vaio.alexdupre.com 4.5-STABLE FreeBSD 4.5-STABLE #0: Sun Feb 3 15:53:42 CET 2002 alex@vaio.alexdupre.com:/usr/obj/usr/src/sys/VAIO2002 i386


	
>Description:
Upgrade Boa to the latest version and assume maintainership.
	
>How-To-Repeat:
	
>Fix:

	

--- boa.diff begins here ---
diff -ruN boa.old/Makefile boa/Makefile
--- boa.old/Makefile	Sun Feb 24 16:39:34 2002
+++ boa/Makefile	Sun Feb 24 17:58:43 2002
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	boa
-PORTVERSION=	0.94.8.3
+PORTVERSION=	0.94.12rc2
 CATEGORIES=	www
 MASTER_SITES=	http://www.boa.org/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sysadmin@alexdupre.com
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
+INSTALL_WRKSRC=	${WRKDIR}/${DISTNAME}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
@@ -22,15 +23,17 @@
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/defines.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/boa ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/../docs/boa.8 ${PREFIX}/man/man8
-	${INSTALL_DATA} ${WRKSRC}/../boa.conf ${PREFIX}/etc/boa.conf.sample
-	@${MKDIR} ${PREFIX}/share/examples/boa
-	${INSTALL_DATA} ${WRKSRC}/../examples/* ${PREFIX}/share/examples/boa
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/boa
-	${INSTALL_DATA} ${WRKSRC}/../docs/boa.sgml ${PREFIX}/share/doc/boa
-	${INSTALL_DATA} ${WRKSRC}/../docs/boa_banner.png ${PREFIX}/share/doc/boa
-.endif
+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/src/boa ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/src/boa_indexer ${PREFIX}/sbin
+	${INSTALL_MAN} ${INSTALL_WRKSRC}/docs/boa.8 ${PREFIX}/man/man8
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/boa.conf ${PREFIX}/etc/boa.conf.sample
+	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/examples/* ${EXAMPLESDIR}
+
+post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/boa.sh ]; then \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/boa.sh.sample startup file."; \
+		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/boa.sh.sample ${PREFIX}/etc/rc.d/boa.sh.sample; \
+	fi
 
 .include <bsd.port.mk>
diff -ruN boa.old/distinfo boa/distinfo
--- boa.old/distinfo	Sun Feb 24 16:39:34 2002
+++ boa/distinfo	Sun Feb 24 17:49:10 2002
@@ -1 +1 @@
-MD5 (boa-0.94.8.3.tar.gz) = 492b474bf0adf9e00e6289fe70b104ef
+MD5 (boa-0.94.12rc2.tar.gz) = db9c924b542dc44fe9cae459bbbb4faa
diff -ruN boa.old/files/boa.sh.sample boa/files/boa.sh.sample
--- boa.old/files/boa.sh.sample	Thu Jan  1 01:00:00 1970
+++ boa/files/boa.sh.sample	Sun Feb 24 17:35:51 2002
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+case "$1" in
+start)
+	[ -x ${PREFIX}/sbin/boa ] && ${PREFIX}/sbin/boa & && echo -n ' boa'
+	;;
+stop)
+	killall boa && echo -n ' boa'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff -ruN boa.old/files/patch-aa boa/files/patch-aa
--- boa.old/files/patch-aa	Sun Feb 24 16:39:34 2002
+++ boa/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Sun Feb 13 06:52:45 2000
-+++ Makefile.in	Thu Mar 30 20:22:55 2000
-@@ -12,8 +12,8 @@
- # Add -lefence to LDFLAGS to link with ElectricFence
- # Add -pg to CFLAGS and LDFLAGS to get profiling output with gcc/gprof
- 
--LDFLAGS = @LIBS@ -g 
--CFLAGS = -O -Wall -g
-+LDFLAGS = @LIBS@
-+CFLAGS = @CFLAGS@
- 
- # Change these if necessary
- 
diff -ruN boa.old/files/patch-ab boa/files/patch-ab
--- boa.old/files/patch-ab	Sun Feb 24 16:39:34 2002
+++ boa/files/patch-ab	Thu Jan  1 01:00:00 1970
@@ -1,20 +0,0 @@
---- defines.h.orig	Fri Feb 18 13:18:42 2000
-+++ defines.h	Thu Mar 30 20:31:43 2000
-@@ -27,7 +27,7 @@
- /***** Change this, or use -c on the command line to specify it *****/
- 
- #ifndef SERVER_ROOT
--#define SERVER_ROOT "/etc/boa"
-+#define SERVER_ROOT "%%PREFIX%%/etc"
- #endif
- 
- /***** Various stuff that you may want to tweak, but probably shouldn't *****/
-@@ -44,7 +44,7 @@
- #define REQUEST_TIMEOUT				60
- 
- #define CGI_MIME_TYPE    "application/x-httpd-cgi"
--#define DEFAULT_PATH     "/bin:/usr/bin:/usr/local/bin"
-+#define DEFAULT_PATH     "/bin:/usr/bin:%%PREFIX%%/bin"
- 
- /***** CHANGE ANYTHING BELOW THIS LINE AT YOUR OWN PERIL *****/
- /***** You will probably introduce buffer overruns unless you know
diff -ruN boa.old/files/patch-src-defines.h boa/files/patch-src-defines.h
--- boa.old/files/patch-src-defines.h	Thu Jan  1 01:00:00 1970
+++ boa/files/patch-src-defines.h	Sun Feb 24 16:57:31 2002
@@ -0,0 +1,20 @@
+--- defines.h.orig	Sun Feb 24 16:50:44 2002
++++ defines.h	Sun Feb 24 16:51:46 2002
+@@ -27,7 +27,7 @@
+ /***** Change this, or use -c on the command line to specify it *****/
+ 
+ #ifndef SERVER_ROOT
+-#define SERVER_ROOT "/etc/boa"
++#define SERVER_ROOT "%%PREFIX%%/etc/boa"
+ #endif
+ 
+ /***** Various stuff that you may want to tweak, but probably shouldn't *****/
+@@ -44,7 +44,7 @@
+ #define REQUEST_TIMEOUT				60
+ 
+ #define CGI_MIME_TYPE    "application/x-httpd-cgi"
+-#define DEFAULT_PATH     "/bin:/usr/bin:/usr/local/bin"
++#define DEFAULT_PATH     "/bin:/usr/bin:%%PREFIX%%/bin"
+ 
+ /***** CHANGE ANYTHING BELOW THIS LINE AT YOUR OWN PERIL *****/
+ /***** You will probably introduce buffer overruns unless you know
diff -ruN boa.old/pkg-descr boa/pkg-descr
--- boa.old/pkg-descr	Sun Feb 24 16:39:34 2002
+++ boa/pkg-descr	Sun Feb 24 17:30:31 2002
@@ -5,14 +5,11 @@
 connections, and forks only for CGI programs (which must be separate
 processes.) Preliminary tests show boa is about twice as fast as
 Apache, and is capable of handling 50 hits per second on a 66 MHz '486.
-   
 The primary design goals of Boa are speed and security. Security, in
 the sense of "can't be subverted by a malicious user", not "fine
-grained access control and encrypted communications". Boa is not
-intended as a feature-packed server; if you want one of those, check
-out WN from John Franks. Modifications to Boa that improve its speed,
-security, robustness, and portability, are eagerly sought. Other
-features may be added if they can be achieved without hurting the
-primary goals.
-   
-WWW:  http://www.boa.org
+grained access control and encrypted communications".
+
+WWW: http://www.boa.org/
+
+- Alex Dupre
+sysadmin@alexdupre.com
diff -ruN boa.old/pkg-plist boa/pkg-plist
--- boa.old/pkg-plist	Sun Feb 24 16:39:34 2002
+++ boa/pkg-plist	Sun Feb 24 17:39:18 2002
@@ -1,9 +1,8 @@
 etc/boa.conf.sample
+etc/rc.d/boa.sh.sample
 sbin/boa
-%%PORTDOCS%%share/doc/boa/boa.sgml
-%%PORTDOCS%%share/doc/boa/boa_banner.png
+sbin/boa_indexer
 share/examples/boa/cgi-test.cgi
 share/examples/boa/nph-test.cgi
 share/examples/boa/resolver.pl
 @dirrm share/examples/boa
-%%PORTDOCS%%@dirrm share/doc/boa
--- boa.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202241729.g1OHTE800487>