From jdc@pentarou.parodius.com  Mon Oct  4 09:19:47 2004
Return-Path: <jdc@pentarou.parodius.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A879816A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Oct 2004 09:19:47 +0000 (GMT)
Received: from mail.parodius.com (mail.parodius.com [64.62.145.229])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7DD2143D39
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Oct 2004 09:19:47 +0000 (GMT)
	(envelope-from jdc@pentarou.parodius.com)
Received: from pentarou.parodius.com (jdc@localhost [127.0.0.1])
	by mail.parodius.com (8.13.1/8.13.1) with ESMTP id i949JlVW094325
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 4 Oct 2004 02:19:47 -0700 (PDT)
	(envelope-from jdc@pentarou.parodius.com)
Received: (from jdc@localhost)
	by pentarou.parodius.com (8.13.1/8.13.1/Submit) id i949JljH094324;
	Mon, 4 Oct 2004 02:19:47 -0700 (PDT)
	(envelope-from jdc)
Message-Id: <200410040919.i949JljH094324@pentarou.parodius.com>
Date: Mon, 4 Oct 2004 02:19:47 -0700 (PDT)
From: Jeremy Chadwick <freebsd@jdc.parodius.com>
Reply-To: Jeremy Chadwick <freebsd@jdc.parodius.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: thttpd update (move to rc_subr)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         72298
>Category:       ports
>Synopsis:       thttpd update (move to rc_subr)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    anders
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 04 09:20:21 GMT 2004
>Closed-Date:    Mon May 30 20:33:08 GMT 2005
>Last-Modified:  Mon May 30 20:33:08 GMT 2005
>Originator:     Jeremy Chadwick
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
Parodius Networking
>Environment:
System: FreeBSD pentarou.parodius.com 4.10-STABLE FreeBSD 4.10-STABLE #0: Sat Sep 18 21:49:46 PDT 2004 root@pentarou.parodius.com:/usr/obj/usr/src/sys/PENTAROU i386
>Description:
	A few changes to the thttpd port:

	* Switch to rc_subr/rc.subr
	* Remove USE_REINPLACE -- no longer needed
	* Removal of thttpd_wrapper -- rc.subr takes care of this cleanly, and allow
	  people to use thttpd_flags too
	* Removal of %%PREFIX%%/www/logs -- use /var/log instead.  This is entirely
	  configurable in the thttpd.conf
	* Install bin/syslogtocern via ${INSTALL_SCRIPT} since that's what it is
	* Removal of tons of realtime ${ECHO}s to create conf files and other things
	* Use of the ${WWWOWN} user; no longer runs as nobody
	* Pass pkg-message through ${SED}, so we can use %%PREFIX%% there

	Tested on 5.3-BETA6, but also tested a build (but not install) on 4.10-STABLE.

	Please have the port maintainer review this before committing.  Also,
	committer, please ensure that a $FreeBSD$ CVS tag gets stuck on
	thttpd/files/thttpd.sh !
>How-To-Repeat:
	n/a
>Fix:
	Apply below patch:


diff -ruN thttpd.orig/Makefile thttpd/Makefile
--- thttpd.orig/Makefile	Fri May 28 05:48:38 2004
+++ thttpd/Makefile	Mon Oct  4 02:07:48 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	thttpd
 PORTVERSION=	2.25b
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.acme.com/software/thttpd/ \
 		http://atreides.freenix.no/~anders/
@@ -20,11 +21,17 @@
 IGNOREFILES=	notes.html
 
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
+
+USE_RC_SUBR=	yes
+SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
+		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
+		-e 's,%%WWWOWN%%,${WWWOWN},g'
 
 MAN1=		makeweb.1 htpasswd.1
 MAN8=		thttpd.8 redirect.8 ssi.8 syslogtocern.8
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 .include <bsd.port.pre.mk>
 
 do-install:
@@ -32,7 +39,6 @@
 	@${INSTALL_MAN} ${WRKSRC}/thttpd.8 ${PREFIX}/man/man8
 	@${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/www
 	@${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/www/data
-	@${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/www/logs
 	@${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/www/cgi-bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/redirect ${PREFIX}/www/cgi-bin/
 	@${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/ssi ${PREFIX}/www/cgi-bin/
@@ -40,53 +46,29 @@
 	@${INSTALL_MAN} ${WRKSRC}/cgi-src/redirect.8 ${PREFIX}/man/man8
 	@${INSTALL_MAN} ${WRKSRC}/cgi-src/ssi.8 ${PREFIX}/man/man8
 	@${INSTALL_PROGRAM} ${WRKSRC}/extras/makeweb ${PREFIX}/bin/
-	@${INSTALL} -c -m 755 -o root -g wheel ${WRKSRC}/extras/syslogtocern ${PREFIX}/bin/
 	@${INSTALL_PROGRAM} ${WRKSRC}/extras/htpasswd ${PREFIX}/bin/
+	@${INSTALL_SCRIPT} ${WRKSRC}/extras/syslogtocern ${PREFIX}/bin/
 	@${INSTALL_MAN} ${WRKSRC}/extras/makeweb.1 ${PREFIX}/man/man1
 	@${INSTALL_MAN} ${WRKSRC}/extras/htpasswd.1 ${PREFIX}/man/man1
 	@${INSTALL_MAN} ${WRKSRC}/extras/syslogtocern.8 ${PREFIX}/man/man8
-	@if [ ! -f ${PREFIX}/sbin/thttpd_wrapper ]; then \
-		${ECHO} "Installing ${PREFIX}/sbin/thttpd_wrapper file."; \
-		${ECHO_CMD} "#!/bin/sh" > ${PREFIX}/sbin/thttpd_wrapper; \
-		${ECHO_CMD} "${ECHO_CMD} \$$\$$ > /var/run/thttpd_wrapper.pid" >> ${PREFIX}/sbin/thttpd_wrapper; \
-		${ECHO_CMD} "while true ; do" >> ${PREFIX}/sbin/thttpd_wrapper; \
-		${ECHO_CMD} "	${PREFIX}/sbin/thttpd -D -C ${PREFIX}/etc/thttpd.conf" >> ${PREFIX}/sbin/thttpd_wrapper; \
-		${ECHO_CMD} "	sleep 10" >> ${PREFIX}/sbin/thttpd_wrapper; \
-		${ECHO_CMD} "done" >> ${PREFIX}/sbin/thttpd_wrapper; \
-		${CHMOD} 751 ${PREFIX}/sbin/thttpd_wrapper; \
-	fi
-	@${ECHO} "Installing ${PREFIX}/etc/thttpd.conf.sample configuration file."
-	@${ECHO_CMD} "dir=${PREFIX}/www/data" > ${PREFIX}/etc/thttpd.conf.sample
-	@${ECHO_CMD} "chroot" >> ${PREFIX}/etc/thttpd.conf.sample
-	@${ECHO_CMD} "cgipat=*.cgi" >> ${PREFIX}/etc/thttpd.conf.sample
-	@${ECHO_CMD} "logfile=${PREFIX}/www/logs/thttpd.log" >> ${PREFIX}/etc/thttpd.conf.sample
-	@${ECHO_CMD} "pidfile=/var/run/thttpd.pid" >> ${PREFIX}/etc/thttpd.conf.sample
-	@if [ ! -f ${PREFIX}/etc/rc.d/thttpd.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/thttpd.sh startup file."; \
-		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/thttpd.sh ${PREFIX}/etc/rc.d/thttpd.sh; \
-		${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|g' ${PREFIX}/etc/rc.d/thttpd.sh; \
-	fi
+	@${INSTALL_DATA} ${WRKDIR}/thttpd.conf.sample ${PREFIX}/etc/thttpd.conf.sample
+	@${INSTALL_SCRIPT} ${WRKDIR}/thttpd.sh ${PREFIX}/etc/rc.d/thttpd.sh
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/thttpd
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/notes.html ${PREFIX}/share/doc/thttpd
 .endif
 
+post-build:
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/thttpd.sh > ${WRKDIR}/thttpd.sh
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/thttpd.conf.sample > ${WRKDIR}/thttpd.conf.sample
+
 post-install:
+	@${SED} ${SED_SCRIPT} ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
-post-configure: config-message
+post-configure:
 .if ${OSVERSION} > 502101
 	@cd ${WRKSRC} && patch < ${PATCHDIR}/extra-patch-config.h
 .endif
-
-post-build: config-message
-
-config-message:
-	@${ECHO} "====================================================================="
-	@${ECHO} ""
-	@${ECHO} "Be sure to take a look at the options in config.h before (re)building"
-	@${ECHO} "if you want to tweak the server."
-	@${ECHO} ""
-	@${ECHO} "====================================================================="
 
 .include <bsd.port.post.mk>
diff -ruN thttpd.orig/files/thttpd.conf.sample thttpd/files/thttpd.conf.sample
--- thttpd.orig/files/thttpd.conf.sample	Wed Dec 31 16:00:00 1969
+++ thttpd/files/thttpd.conf.sample	Mon Oct  4 02:02:39 2004
@@ -0,0 +1,6 @@
+user=%%WWWOWN%%
+dir=%%PREFIX%%/www/data
+chroot
+cgipat=*.cgi
+logfile=/var/log/thttpd.log
+pidfile=/var/run/thttpd.pid
diff -ruN thttpd.orig/files/thttpd.sh thttpd/files/thttpd.sh
--- thttpd.orig/files/thttpd.sh	Tue Aug 13 14:39:47 2002
+++ thttpd/files/thttpd.sh	Mon Oct  4 02:05:04 2004
@@ -1,18 +1,29 @@
 #!/bin/sh
+#
+# <<insert FreeBSD CVS ID tag here>>
+#
 
-case "$1" in
-start)
-	if [ -x %%PREFIX%%/sbin/thttpd_wrapper ]; then
-		%%PREFIX%%/sbin/thttpd_wrapper &
-		echo -n ' thttpd'
-	fi
-	;;
-stop)
-	kill `cat /var/run/thttpd_wrapper.pid` && killall thttpd && echo -n ' thttpd'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
+# PROVIDE: thttpd
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD shutdown
 
-exit 0
+#
+# Add the following line to /etc/rc.conf to enable thttpd:
+#
+# thttpd_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+name=thttpd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/thttpd
+required_files=%%PREFIX%%/etc/thttpd.conf
+
+thttpd_enable=${thttpd_enable:-"NO"}
+thttpd_flags=${thttpd_flags:-"-C %%PREFIX%%/etc/thttpd.conf"}
+
+load_rc_config $name
+run_rc_command "$1"
diff -ruN thttpd.orig/pkg-message thttpd/pkg-message
--- thttpd.orig/pkg-message	Wed Mar 22 18:25:32 2000
+++ thttpd/pkg-message	Mon Oct  4 02:00:28 2004
@@ -1,11 +1,9 @@
-===========================================================================
+-----------------------------------------------------------------
+If you want users to be able to create their own Web
+subdirectories off of the main web directory, you need to:
 
-	If you want users to be able to create their own web
-	subdirectories off of the main web directory, you need to:
-
-	a) add a group for www admins
-	b) chgrp yourgroup ${PREFIX}/bin/makeweb ${PREFIX}/www
-	c) chmod 2755 ${PREFIX}/bin/makeweb
-	d) tell them about makeweb(1)
-
-===========================================================================
+  1. Add a group for www admins
+  2. chgrp yourgroup %%PREFIX%%/bin/makeweb %%PREFIX%%/www
+  3. chmod 2755 %%PREFIX%%/bin/makeweb
+  4. Tell them about makeweb(1)
+-----------------------------------------------------------------
diff -ruN thttpd.orig/pkg-plist thttpd/pkg-plist
--- thttpd.orig/pkg-plist	Tue Jun  8 23:16:04 2004
+++ thttpd/pkg-plist	Mon Oct  4 02:07:08 2004
@@ -4,7 +4,6 @@
 etc/rc.d/thttpd.sh
 etc/thttpd.conf.sample
 sbin/thttpd
-sbin/thttpd_wrapper
 %%PORTDOCS%%%%DOCSDIR%%/notes.html
 www/cgi-bin/phf
 www/cgi-bin/redirect
@@ -12,4 +11,3 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/www/cgi-bin 2> /dev/null || true
 @unexec rmdir %D/www/data 2> /dev/null || true
-@unexec rmdir %D/www/logs 2> /dev/null || true
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->anders 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Oct 5 03:54:59 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=72298 

From: "Volker Stolz" <vs@freebsd.org>
To: bug-followup@freebsd.org, freebsd@jdc.parodius.com
Cc:  
Subject: Re: ports/72298: thttpd update (move to rc_subr)
Date: Mon, 18 Apr 2005 15:20:13 +0200

 While I'm not going to touch this, add data-point:
 Should probably  be rewritten to USE_RC_SUBR=thttpd.sh,  
 SUB_FILES+=pkg-message
 and friends.
 
 Cheers,
    Volker

From: Florent Thoumie <flz@xbsd.org>
To: freebsd@jdc.parodius.com, freebsd-gnats-submit@FreeBSD.org
Cc: vs@FreeBSD.org, anders@FreeBSD.org
Subject: Re: ports/72298: thttpd update (move to rc_subr)
Date: Fri, 22 Apr 2005 09:28:42 +0200

 --=-hlQyUZjcap8MAPbqdbqs
 Content-Type: multipart/mixed; boundary="=-BXdFae15k6jtD0b1Y6Iz"
 
 
 --=-BXdFae15k6jtD0b1Y6Iz
 Content-Type: text/plain
 Content-Transfer-Encoding: quoted-printable
 
 	I've done that and sent it to anders privately but got no=20
 	answer. So I'm putting the patch here.
 
 --=20
 Florent Thoumie
 flz@xbsd.org
 
 --=-BXdFae15k6jtD0b1Y6Iz
 Content-Disposition: attachment; filename=thttpd.diff
 Content-Type: text/x-patch; name=thttpd.diff; charset=UTF-8
 Content-Transfer-Encoding: base64
 
 SW5kZXg6IE1ha2VmaWxlDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvcGN2cy9wb3J0cy93
 d3cvdGh0dHBkL01ha2VmaWxlLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4zNg0KZGlmZiAtdSAt
 cjEuMzYgTWFrZWZpbGUNCi0tLSBNYWtlZmlsZQkyOCBNYXkgMjAwNCAxMjo0ODozOCAtMDAwMAkx
 LjM2DQorKysgTWFrZWZpbGUJMTQgQXByIDIwMDUgMDg6NDU6MjMgLTAwMDANCkBAIC03LDYgKzcs
 NyBAQA0KIA0KIFBPUlROQU1FPQl0aHR0cGQNCiBQT1JUVkVSU0lPTj0JMi4yNWINCitQT1JUUkVW
 SVNJT049CTENCiBDQVRFR09SSUVTPQl3d3cgaXB2Ng0KIE1BU1RFUl9TSVRFUz0JaHR0cDovL3d3
 dy5hY21lLmNvbS9zb2Z0d2FyZS90aHR0cGQvIFwNCiAJCWh0dHA6Ly9hdHJlaWRlcy5mcmVlbml4
 Lm5vL35hbmRlcnMvDQpAQCAtMjAsMTkgKzIxLDI2IEBADQogSUdOT1JFRklMRVM9CW5vdGVzLmh0
 bWwNCiANCiBHTlVfQ09ORklHVVJFPQl5ZXMNCi1VU0VfUkVJTlBMQUNFPQl5ZXMNCisNCitVU0Vf
 UkNfU1VCUj0JdGh0dHBkLnNoDQorU1VCX0ZJTEVTPQlwa2ctbWVzc2FnZSB0aHR0cGQuY29uZi5z
 YW1wbGUNCitTVUJfTElTVD0JV1dXT1dOPSR7V1dXT1dOfQ0KIA0KIE1BTjE9CQltYWtld2ViLjEg
 aHRwYXNzd2QuMQ0KIE1BTjg9CQl0aHR0cGQuOCByZWRpcmVjdC44IHNzaS44IHN5c2xvZ3RvY2Vy
 bi44DQogDQogLmluY2x1ZGUgPGJzZC5wb3J0LnByZS5taz4NCiANCisuaWYgJHtPU1ZFUlNJT059
 ID4gNTAyMTAxDQorcG9zdC1jb25maWd1cmU6DQorCUBjZCAke1dSS1NSQ30gJiYgJHtQQVRDSH0g
 PCAke1BBVENIRElSfS9leHRyYS1wYXRjaC1jb25maWcuaA0KKy5lbmRpZg0KKw0KIGRvLWluc3Rh
 bGw6DQogCUAke0lOU1RBTExfUFJPR1JBTX0gJHtXUktTUkN9L3RodHRwZCAke1BSRUZJWH0vc2Jp
 bi8NCiAJQCR7SU5TVEFMTF9NQU59ICR7V1JLU1JDfS90aHR0cGQuOCAke1BSRUZJWH0vbWFuL21h
 bjgNCiAJQCR7SU5TVEFMTH0gLWQgLW8gcm9vdCAtZyB3aGVlbCAtbSAwNzU1ICR7UFJFRklYfS93
 d3cNCiAJQCR7SU5TVEFMTH0gLWQgLW8gcm9vdCAtZyB3aGVlbCAtbSAwNzU1ICR7UFJFRklYfS93
 d3cvZGF0YQ0KLQlAJHtJTlNUQUxMfSAtZCAtbyByb290IC1nIHdoZWVsIC1tIDA3NTUgJHtQUkVG
 SVh9L3d3dy9sb2dzDQogCUAke0lOU1RBTEx9IC1kIC1vIHJvb3QgLWcgd2hlZWwgLW0gMDc1NSAk
 e1BSRUZJWH0vd3d3L2NnaS1iaW4NCiAJQCR7SU5TVEFMTF9QUk9HUkFNfSAke1dSS1NSQ30vY2dp
 LXNyYy9yZWRpcmVjdCAke1BSRUZJWH0vd3d3L2NnaS1iaW4vDQogCUAke0lOU1RBTExfUFJPR1JB
 TX0gJHtXUktTUkN9L2NnaS1zcmMvc3NpICR7UFJFRklYfS93d3cvY2dpLWJpbi8NCkBAIC00MCwz
 MiArNDgsMTMgQEANCiAJQCR7SU5TVEFMTF9NQU59ICR7V1JLU1JDfS9jZ2ktc3JjL3JlZGlyZWN0
 LjggJHtQUkVGSVh9L21hbi9tYW44DQogCUAke0lOU1RBTExfTUFOfSAke1dSS1NSQ30vY2dpLXNy
 Yy9zc2kuOCAke1BSRUZJWH0vbWFuL21hbjgNCiAJQCR7SU5TVEFMTF9QUk9HUkFNfSAke1dSS1NS
 Q30vZXh0cmFzL21ha2V3ZWIgJHtQUkVGSVh9L2Jpbi8NCi0JQCR7SU5TVEFMTH0gLWMgLW0gNzU1
 IC1vIHJvb3QgLWcgd2hlZWwgJHtXUktTUkN9L2V4dHJhcy9zeXNsb2d0b2Nlcm4gJHtQUkVGSVh9
 L2Jpbi8NCiAJQCR7SU5TVEFMTF9QUk9HUkFNfSAke1dSS1NSQ30vZXh0cmFzL2h0cGFzc3dkICR7
 UFJFRklYfS9iaW4vDQorCUAke0lOU1RBTExfU0NSSVBUfSAke1dSS1NSQ30vZXh0cmFzL3N5c2xv
 Z3RvY2VybiAke1BSRUZJWH0vYmluLw0KIAlAJHtJTlNUQUxMX01BTn0gJHtXUktTUkN9L2V4dHJh
 cy9tYWtld2ViLjEgJHtQUkVGSVh9L21hbi9tYW4xDQogCUAke0lOU1RBTExfTUFOfSAke1dSS1NS
 Q30vZXh0cmFzL2h0cGFzc3dkLjEgJHtQUkVGSVh9L21hbi9tYW4xDQogCUAke0lOU1RBTExfTUFO
 fSAke1dSS1NSQ30vZXh0cmFzL3N5c2xvZ3RvY2Vybi44ICR7UFJFRklYfS9tYW4vbWFuOA0KLQlA
 aWYgWyAhIC1mICR7UFJFRklYfS9zYmluL3RodHRwZF93cmFwcGVyIF07IHRoZW4gXA0KLQkJJHtF
 Q0hPfSAiSW5zdGFsbGluZyAke1BSRUZJWH0vc2Jpbi90aHR0cGRfd3JhcHBlciBmaWxlLiI7IFwN
 Ci0JCSR7RUNIT19DTUR9ICIjIS9iaW4vc2giID4gJHtQUkVGSVh9L3NiaW4vdGh0dHBkX3dyYXBw
 ZXI7IFwNCi0JCSR7RUNIT19DTUR9ICIke0VDSE9fQ01EfSBcJCRcJCQgPiAvdmFyL3J1bi90aHR0
 cGRfd3JhcHBlci5waWQiID4+ICR7UFJFRklYfS9zYmluL3RodHRwZF93cmFwcGVyOyBcDQotCQkk
 e0VDSE9fQ01EfSAid2hpbGUgdHJ1ZSA7IGRvIiA+PiAke1BSRUZJWH0vc2Jpbi90aHR0cGRfd3Jh
 cHBlcjsgXA0KLQkJJHtFQ0hPX0NNRH0gIgkke1BSRUZJWH0vc2Jpbi90aHR0cGQgLUQgLUMgJHtQ
 UkVGSVh9L2V0Yy90aHR0cGQuY29uZiIgPj4gJHtQUkVGSVh9L3NiaW4vdGh0dHBkX3dyYXBwZXI7
 IFwNCi0JCSR7RUNIT19DTUR9ICIJc2xlZXAgMTAiID4+ICR7UFJFRklYfS9zYmluL3RodHRwZF93
 cmFwcGVyOyBcDQotCQkke0VDSE9fQ01EfSAiZG9uZSIgPj4gJHtQUkVGSVh9L3NiaW4vdGh0dHBk
 X3dyYXBwZXI7IFwNCi0JCSR7Q0hNT0R9IDc1MSAke1BSRUZJWH0vc2Jpbi90aHR0cGRfd3JhcHBl
 cjsgXA0KLQlmaQ0KLQlAJHtFQ0hPfSAiSW5zdGFsbGluZyAke1BSRUZJWH0vZXRjL3RodHRwZC5j
 b25mLnNhbXBsZSBjb25maWd1cmF0aW9uIGZpbGUuIg0KLQlAJHtFQ0hPX0NNRH0gImRpcj0ke1BS
 RUZJWH0vd3d3L2RhdGEiID4gJHtQUkVGSVh9L2V0Yy90aHR0cGQuY29uZi5zYW1wbGUNCi0JQCR7
 RUNIT19DTUR9ICJjaHJvb3QiID4+ICR7UFJFRklYfS9ldGMvdGh0dHBkLmNvbmYuc2FtcGxlDQot
 CUAke0VDSE9fQ01EfSAiY2dpcGF0PSouY2dpIiA+PiAke1BSRUZJWH0vZXRjL3RodHRwZC5jb25m
 LnNhbXBsZQ0KLQlAJHtFQ0hPX0NNRH0gImxvZ2ZpbGU9JHtQUkVGSVh9L3d3dy9sb2dzL3RodHRw
 ZC5sb2ciID4+ICR7UFJFRklYfS9ldGMvdGh0dHBkLmNvbmYuc2FtcGxlDQotCUAke0VDSE9fQ01E
 fSAicGlkZmlsZT0vdmFyL3J1bi90aHR0cGQucGlkIiA+PiAke1BSRUZJWH0vZXRjL3RodHRwZC5j
 b25mLnNhbXBsZQ0KLQlAaWYgWyAhIC1mICR7UFJFRklYfS9ldGMvcmMuZC90aHR0cGQuc2ggXTsg
 dGhlbiBcDQotCQkke0VDSE99ICJJbnN0YWxsaW5nICR7UFJFRklYfS9ldGMvcmMuZC90aHR0cGQu
 c2ggc3RhcnR1cCBmaWxlLiI7IFwNCi0JCSR7SU5TVEFMTF9TQ1JJUFR9IC1tIDc1MSAke0ZJTEVT
 RElSfS90aHR0cGQuc2ggJHtQUkVGSVh9L2V0Yy9yYy5kL3RodHRwZC5zaDsgXA0KLQkJJHtSRUlO
 UExBQ0VfQ01EfSAtaSAnJyAtZSAnc3wlJVBSRUZJWCUlfCR7UFJFRklYfXxnJyAke1BSRUZJWH0v
 ZXRjL3JjLmQvdGh0dHBkLnNoOyBcDQotCWZpDQorCUAke0lOU1RBTExfREFUQX0gJHtXUktESVJ9
 L3RodHRwZC5jb25mLnNhbXBsZSAke1BSRUZJWH0vZXRjL3RodHRwZC5jb25mLnNhbXBsZQ0KKwlA
 JHtJTlNUQUxMX1NDUklQVH0gJHtXUktESVJ9L3RodHRwZC5zaCAke1BSRUZJWH0vZXRjL3JjLmQv
 dGh0dHBkLnNoDQogLmlmICFkZWZpbmVkKE5PUE9SVERPQ1MpDQogCUAke01LRElSfSAke1BSRUZJ
 WH0vc2hhcmUvZG9jL3RodHRwZA0KIAlAJHtJTlNUQUxMX0RBVEF9ICR7RElTVERJUn0vJHtESVNU
 X1NVQkRJUn0vbm90ZXMuaHRtbCAke1BSRUZJWH0vc2hhcmUvZG9jL3RodHRwZA0KQEAgLTc0LDE5
 ICs2Myw0IEBADQogcG9zdC1pbnN0YWxsOg0KIAlAJHtDQVR9ICR7UEtHTUVTU0FHRX0NCiANCi1w
 b3N0LWNvbmZpZ3VyZTogY29uZmlnLW1lc3NhZ2UNCi0uaWYgJHtPU1ZFUlNJT059ID4gNTAyMTAx
 DQotCUBjZCAke1dSS1NSQ30gJiYgcGF0Y2ggPCAke1BBVENIRElSfS9leHRyYS1wYXRjaC1jb25m
 aWcuaA0KLS5lbmRpZg0KLQ0KLXBvc3QtYnVpbGQ6IGNvbmZpZy1tZXNzYWdlDQotDQotY29uZmln
 LW1lc3NhZ2U6DQotCUAke0VDSE99ICI9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0iDQotCUAke0VDSE99ICIiDQotCUAk
 e0VDSE99ICJCZSBzdXJlIHRvIHRha2UgYSBsb29rIGF0IHRoZSBvcHRpb25zIGluIGNvbmZpZy5o
 IGJlZm9yZSAocmUpYnVpbGRpbmciDQotCUAke0VDSE99ICJpZiB5b3Ugd2FudCB0byB0d2VhayB0
 aGUgc2VydmVyLiINCi0JQCR7RUNIT30gIiINCi0JQCR7RUNIT30gIj09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSINCi0N
 CiAuaW5jbHVkZSA8YnNkLnBvcnQucG9zdC5taz4NCkluZGV4OiBwa2ctbWVzc2FnZQ0KPT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PQ0KUkNTIGZpbGU6IHBrZy1tZXNzYWdlDQpkaWZmIC1OIHBrZy1tZXNzYWdlDQotLS0gcGtn
 LW1lc3NhZ2UJMjMgTWFyIDIwMDAgMDI6MjU6MzIgLTAwMDAJMS4xDQorKysgL2Rldi9udWxsCTEg
 SmFuIDE5NzAgMDA6MDA6MDAgLTAwMDANCkBAIC0xLDExICswLDAgQEANCi09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT0NCi0NCi0JSWYgeW91IHdhbnQgdXNlcnMgdG8gYmUgYWJsZSB0byBjcmVhdGUgdGhlaXIg
 b3duIHdlYg0KLQlzdWJkaXJlY3RvcmllcyBvZmYgb2YgdGhlIG1haW4gd2ViIGRpcmVjdG9yeSwg
 eW91IG5lZWQgdG86DQotDQotCWEpIGFkZCBhIGdyb3VwIGZvciB3d3cgYWRtaW5zDQotCWIpIGNo
 Z3JwIHlvdXJncm91cCAke1BSRUZJWH0vYmluL21ha2V3ZWIgJHtQUkVGSVh9L3d3dw0KLQljKSBj
 aG1vZCAyNzU1ICR7UFJFRklYfS9iaW4vbWFrZXdlYg0KLQlkKSB0ZWxsIHRoZW0gYWJvdXQgbWFr
 ZXdlYigxKQ0KLQ0KLT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KSW5kZXg6IHBrZy1wbGlzdA0KPT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PQ0KUkNTIGZpbGU6IC9ob21lL3BjdnMvcG9ydHMvd3d3L3RodHRwZC9wa2ctcGxpc3Qsdg0K
 cmV0cmlldmluZyByZXZpc2lvbiAxLjgNCmRpZmYgLXUgLXIxLjggcGtnLXBsaXN0DQotLS0gcGtn
 LXBsaXN0CTkgSnVuIDIwMDQgMDY6MTY6MDQgLTAwMDAJMS44DQorKysgcGtnLXBsaXN0CTE0IEFw
 ciAyMDA1IDA4OjQ1OjIzIC0wMDAwDQpAQCAtMSwxMCArMSw4IEBADQogYmluL2h0cGFzc3dkDQog
 YmluL21ha2V3ZWINCiBiaW4vc3lzbG9ndG9jZXJuDQotZXRjL3JjLmQvdGh0dHBkLnNoDQogZXRj
 L3RodHRwZC5jb25mLnNhbXBsZQ0KIHNiaW4vdGh0dHBkDQotc2Jpbi90aHR0cGRfd3JhcHBlcg0K
 ICUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL25vdGVzLmh0bWwNCiB3d3cvY2dpLWJpbi9waGYNCiB3
 d3cvY2dpLWJpbi9yZWRpcmVjdA0KQEAgLTEyLDQgKzEwLDMgQEANCiAlJVBPUlRET0NTJSVAZGly
 cm0gJSVET0NTRElSJSUNCiBAdW5leGVjIHJtZGlyICVEL3d3dy9jZ2ktYmluIDI+IC9kZXYvbnVs
 bCB8fCB0cnVlDQogQHVuZXhlYyBybWRpciAlRC93d3cvZGF0YSAyPiAvZGV2L251bGwgfHwgdHJ1
 ZQ0KLUB1bmV4ZWMgcm1kaXIgJUQvd3d3L2xvZ3MgMj4gL2Rldi9udWxsIHx8IHRydWUNCkluZGV4
 OiBmaWxlcy9wa2ctbWVzc2FnZS5pbg0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IGZpbGVzL3BrZy1t
 ZXNzYWdlLmluDQpkaWZmIC1OIGZpbGVzL3BrZy1tZXNzYWdlLmluDQotLS0gL2Rldi9udWxsCTEg
 SmFuIDE5NzAgMDA6MDA6MDAgLTAwMDANCisrKyBmaWxlcy9wa2ctbWVzc2FnZS5pbgkxNCBBcHIg
 MjAwNSAwODo0NToyMyAtMDAwMA0KQEAgLTAsMCArMSw5IEBADQorLS0tLS0tLS0tLS0tLS0tLS0t
 LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCitJZiB5b3Ug
 d2FudCB1c2VycyB0byBiZSBhYmxlIHRvIGNyZWF0ZSB0aGVpciBvd24gV2ViDQorc3ViZGlyZWN0
 b3JpZXMgb2ZmIG9mIHRoZSBtYWluIHdlYiBkaXJlY3RvcnksIHlvdSBuZWVkIHRvOg0KKw0KKyAg
 MS4gQWRkIGEgZ3JvdXAgZm9yIHd3dyBhZG1pbnMNCisgIDIuIGNoZ3JwIHlvdXJncm91cCAlJVBS
 RUZJWCUlL2Jpbi9tYWtld2ViICUlUFJFRklYJSUvd3d3DQorICAzLiBjaG1vZCAyNzU1ICUlUFJF
 RklYJSUvYmluL21ha2V3ZWINCisgIDQuIFRlbGwgdGhlbSBhYm91dCBtYWtld2ViKDEpDQorLS0t
 LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
 LS0tLS0NCkluZGV4OiBmaWxlcy90aHR0cGQuY29uZi5zYW1wbGUuaW4NCj09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJD
 UyBmaWxlOiBmaWxlcy90aHR0cGQuY29uZi5zYW1wbGUuaW4NCmRpZmYgLU4gZmlsZXMvdGh0dHBk
 LmNvbmYuc2FtcGxlLmluDQotLS0gL2Rldi9udWxsCTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDAN
 CisrKyBmaWxlcy90aHR0cGQuY29uZi5zYW1wbGUuaW4JMTQgQXByIDIwMDUgMDg6NDU6MjMgLTAw
 MDANCkBAIC0wLDAgKzEsNiBAQA0KK3VzZXI9JSVXV1dPV04lJQ0KK2Rpcj0lJVBSRUZJWCUlL3d3
 dy9kYXRhDQorY2hyb290DQorY2dpcGF0PSouY2dpDQorbG9nZmlsZT0vdmFyL2xvZy90aHR0cGQu
 bG9nDQorcGlkZmlsZT0vdmFyL3J1bi90aHR0cGQucGlkDQpJbmRleDogZmlsZXMvdGh0dHBkLnNo
 DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09DQpSQ1MgZmlsZTogZmlsZXMvdGh0dHBkLnNoDQpkaWZmIC1OIGZpbGVzL3Ro
 dHRwZC5zaA0KLS0tIGZpbGVzL3RodHRwZC5zaAkxMyBBdWcgMjAwMiAyMTozOTo0NyAtMDAwMAkx
 LjMNCisrKyAvZGV2L251bGwJMSBKYW4gMTk3MCAwMDowMDowMCAtMDAwMA0KQEAgLTEsMTggKzAs
 MCBAQA0KLSMhL2Jpbi9zaA0KLQ0KLWNhc2UgIiQxIiBpbg0KLXN0YXJ0KQ0KLQlpZiBbIC14ICUl
 UFJFRklYJSUvc2Jpbi90aHR0cGRfd3JhcHBlciBdOyB0aGVuDQotCQklJVBSRUZJWCUlL3NiaW4v
 dGh0dHBkX3dyYXBwZXIgJg0KLQkJZWNobyAtbiAnIHRodHRwZCcNCi0JZmkNCi0JOzsNCi1zdG9w
 KQ0KLQlraWxsIGBjYXQgL3Zhci9ydW4vdGh0dHBkX3dyYXBwZXIucGlkYCAmJiBraWxsYWxsIHRo
 dHRwZCAmJiBlY2hvIC1uICcgdGh0dHBkJw0KLQk7Ow0KLSopDQotCWVjaG8gIlVzYWdlOiBgYmFz
 ZW5hbWUgJDBgIHtzdGFydHxzdG9wfSIgPiYyDQotCTs7DQotZXNhYw0KLQ0KLWV4aXQgMA0KSW5k
 ZXg6IGZpbGVzL3RodHRwZC5zaC5pbg0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IGZpbGVzL3RodHRw
 ZC5zaC5pbg0KZGlmZiAtTiBmaWxlcy90aHR0cGQuc2guaW4NCi0tLSAvZGV2L251bGwJMSBKYW4g
 MTk3MCAwMDowMDowMCAtMDAwMA0KKysrIGZpbGVzL3RodHRwZC5zaC5pbgkxNCBBcHIgMjAwNSAw
 ODo0NToyMyAtMDAwMA0KQEAgLTAsMCArMSwyOSBAQA0KKyMhL2Jpbi9zaA0KKyMNCisjICRGcmVl
 QlNEJA0KKyMNCisNCisjIFBST1ZJREU6IHRodHRwZA0KKyMgUkVRVUlSRTogTkVUV09SS0lORyBT
 RVJWRVJTDQorIyBCRUZPUkU6IERBRU1PTg0KKyMgS0VZV09SRDogRnJlZUJTRCBzaHV0ZG93bg0K
 Kw0KKyMNCisjIEFkZCB0aGUgZm9sbG93aW5nIGxpbmUgdG8gL2V0Yy9yYy5jb25mIHRvIGVuYWJs
 ZSB0aHR0cGQ6DQorIw0KKyMgdGh0dHBkX2VuYWJsZT0iWUVTIg0KKyMNCisNCisuICUlUkNfU1VC
 UiUlDQorDQorbmFtZT10aHR0cGQNCityY3Zhcj1gc2V0X3JjdmFyYA0KKw0KK2NvbW1hbmQ9JSVQ
 UkVGSVglJS9zYmluL3RodHRwZA0KK3JlcXVpcmVkX2ZpbGVzPSUlUFJFRklYJSUvZXRjL3RodHRw
 ZC5jb25mDQorDQordGh0dHBkX2VuYWJsZT0ke3RodHRwZF9lbmFibGU6LSJOTyJ9DQordGh0dHBk
 X2ZsYWdzPSR7dGh0dHBkX2ZsYWdzOi0iLUMgJSVQUkVGSVglJS9ldGMvdGh0dHBkLmNvbmYifQ0K
 Kw0KK2xvYWRfcmNfY29uZmlnICRuYW1lDQorcnVuX3JjX2NvbW1hbmQgIiQxIg0K
 
 
 --=-BXdFae15k6jtD0b1Y6Iz--
 
 --=-hlQyUZjcap8MAPbqdbqs
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Description: This is a digitally signed message part
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (FreeBSD)
 
 iD8DBQBCaKeqMxEkbVFH3PQRAh/zAJ9Z9KydnAhKorlBi+pMLbOi1vCUyQCeKbCZ
 qJTKTD4eeJ375SrMUUrh2nA=
 =2L4q
 -----END PGP SIGNATURE-----
 
 --=-hlQyUZjcap8MAPbqdbqs--
 
State-Changed-From-To: open->closed 
State-Changed-By: anders 
State-Changed-When: Mon May 30 20:33:01 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=72298 
>Unformatted:
