+ Update from 1.112 to 2.0.3 (from FreeBSD's cvsweb / local-ports).

  Notable changes:
	- cross site scripting fixes
	- html & perl cleanups
	- add config vars: @ForbiddenFiles, $allow_log_extra,
	  $allow_dir_extra, $allow_source_extra
+ Add local patches to change location of latest version of cvsweb and
  to not display the address section if $address == "".

5 files changed, 87 insertions, 23 deletions

diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index 741adc5ecda..be22c82b8f0 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,22 +1,34 @@
 #
-# $NetBSD: Makefile,v 1.10 2002/06/26 15:42:55 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.11 2002/06/27 03:22:22 lukem Exp $
 #
 
-DISTNAME=		cvsweb-1.112
-CATEGORIES=		net
-MASTER_SITES=		http://stud.fh-heilbronn.de/~zeller/download/
+DISTNAME=		cvsweb-2.0.3
+CATEGORIES=		www
+MASTER_SITES=		ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/knu/
 
-MAINTAINER=		kim@tac.nyc.ny.us
-HOMEPAGE=		http://stud.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi/
+MAINTAINER=		lukem@netbsd.org
+HOMEPAGE=		http://www.freebsd.org/cgi/cvsweb.cgi/projects/cvsweb/
 COMMENT=		Web interface for browsing a CVS repository
 
 USE_BUILDLINK_ONLY=	YES
-WRKSRC=			${WRKDIR}/cvsweb
 
 PKG_SYSCONFSUBDIR?=	httpd
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 
-CONF_FILES=	${EGDIR}/cvsweb.conf.default ${PKG_SYSCONFDIR}/cvsweb.conf
+CVSWEB_CONF_FILES=	cvsweb.conf \
+			cvsweb.conf-freebsd \
+			cvsweb.conf-netbsd \
+			cvsweb.conf-openbsd \
+			cvsweb.conf-ruby
+
+CVSWEB_ICONS=		back.gif dir.gif \
+			miniback.gif minidir.gif minitext.gif text.gif
+
+CVSWEB_DOCS=		ChangeLog INSTALL README README.FreeBSD \
+			TODO TODO.FreeBSD
+
+CONF_FILES=		${EGDIR}/cvsweb.conf ${PKG_SYSCONFDIR}/cvsweb.conf
 
 .if !exists(/usr/bin/rlog)
 DEPENDS+=	rcs-[0-9]*:../../devel/rcs
@@ -25,15 +37,24 @@ DEPENDS+=	rcs-[0-9]*:../../devel/rcs
 do-build:
 	${MV} ${WRKSRC}/cvsweb.cgi ${WRKSRC}/cvsweb.cgi.bak
 	${SED}	-e 's,/usr/bin/perl,${PERL5},'				\
-		-e 's,/usr/local/web/apache/conf/,${PKG_SYSCONFDIR}/,'	\
+		-e 's,/usr/local/etc/cvsweb/,${PKG_SYSCONFDIR}/,'	\
 		${WRKSRC}/cvsweb.cgi.bak > ${WRKSRC}/cvsweb.cgi
 
 do-install:
 	${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/cgi-bin
 	${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/libexec/cgi-bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cvsweb
-	${INSTALL_DATA} ${WRKSRC}/cvsweb.conf \
-		${PREFIX}/share/examples/cvsweb/cvsweb.conf.default
+	${INSTALL_DATA_DIR} ${EGDIR}
+.for f in ${CVSWEB_CONF_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${EGDIR}/${f}
+.endfor
+	${INSTALL_DATA_DIR} ${EGDIR}/icons
+.for f in ${CVSWEB_ICONS}
+	${INSTALL_DATA} ${WRKSRC}/icons/${f} ${EGDIR}/icons/${f}
+.endfor
+	${INSTALL_DATA_DIR} ${DOCDIR}
+.for f in ${CVSWEB_DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
+.endfor
 
 .include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/www/cvsweb/PLIST b/www/cvsweb/PLIST
index 897163017f2..137772fd506 100644
--- a/www/cvsweb/PLIST
+++ b/www/cvsweb/PLIST
@@ -1,4 +1,22 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:38 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/06/27 03:22:23 lukem Exp $
 libexec/cgi-bin/cvsweb.cgi
-share/examples/cvsweb/cvsweb.conf.default
+share/doc/cvsweb/ChangeLog
+share/doc/cvsweb/INSTALL
+share/doc/cvsweb/README
+share/doc/cvsweb/README.FreeBSD
+share/doc/cvsweb/TODO
+share/doc/cvsweb/TODO.FreeBSD
+share/examples/cvsweb/cvsweb.conf
+share/examples/cvsweb/cvsweb.conf-freebsd
+share/examples/cvsweb/cvsweb.conf-netbsd
+share/examples/cvsweb/cvsweb.conf-openbsd
+share/examples/cvsweb/cvsweb.conf-ruby
+share/examples/cvsweb/icons/back.gif
+share/examples/cvsweb/icons/dir.gif
+share/examples/cvsweb/icons/miniback.gif
+share/examples/cvsweb/icons/minidir.gif
+share/examples/cvsweb/icons/minitext.gif
+share/examples/cvsweb/icons/text.gif
+@dirrm share/examples/cvsweb/icons
 @dirrm share/examples/cvsweb
+@dirrm share/doc/cvsweb
diff --git a/www/cvsweb/distinfo b/www/cvsweb/distinfo
index 78b698f8a6f..24bb7f27c58 100644
--- a/www/cvsweb/distinfo
+++ b/www/cvsweb/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/10/15 17:25:10 martti Exp $
+$NetBSD: distinfo,v 1.5 2002/06/27 03:22:24 lukem Exp $
 
-SHA1 (cvsweb-1.112.tar.gz) = 4dc996712c365f064a8b8d26a69b3df083ecac0a
-Size (cvsweb-1.112.tar.gz) = 37239 bytes
-SHA1 (patch-aa) = 318c11abe236a6c5d49cf013817da6849b2855da
+SHA1 (cvsweb-2.0.3.tar.gz) = 9418f039c32fdd7b86fd44f08dd39ff8d2b73a1e
+Size (cvsweb-2.0.3.tar.gz) = 50552 bytes
+SHA1 (patch-aa) = 11d2c6419de56f6cbf8378d970f30254ea378c80
+SHA1 (patch-ab) = cd608a8b6228670f6f0e553b90a693e4cd05ee49
diff --git a/www/cvsweb/patches/patch-aa b/www/cvsweb/patches/patch-aa
index ace0a500130..2eba6383352 100644
--- a/www/cvsweb/patches/patch-aa
+++ b/www/cvsweb/patches/patch-aa
@@ -1,10 +1,18 @@
-$NetBSD: patch-aa,v 1.3 2001/10/15 17:25:10 martti Exp $
+$NetBSD: patch-aa,v 1.4 2002/06/27 03:22:25 lukem Exp $
 
---- cvsweb.cgi.orig	Mon Oct 15 13:45:06 2001
-+++ cvsweb.cgi	Mon Oct 15 13:48:30 2001
+--- cvsweb.cgi.orig	Wed May 22 18:10:18 2002
++++ cvsweb.cgi
 @@ -1,4 +1,4 @@
--#!/usr/bin/perl -wsT
-+#!/usr/bin/perl -s
+-#!/usr/bin/perl -wT
++#!/usr/bin/perl -w
  #
  # cvsweb - a CGI interface to CVS trees.
  #
+@@ -3606,6 +3606,7 @@
+ }
+ 
+ sub html_footer() {
++	return if ($address eq "");
+ 	print "<hr noshade>\n<address>$address</address>\n</body>\n</html>\n";
+ }
+ 
diff --git a/www/cvsweb/patches/patch-ab b/www/cvsweb/patches/patch-ab
new file mode 100644
index 00000000000..d5b51a686a0
--- /dev/null
+++ b/www/cvsweb/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2002/06/27 03:22:25 lukem Exp $
+
+--- cvsweb.conf.orig	Wed May 22 16:19:12 2002
++++ cvsweb.conf
+@@ -181,8 +181,9 @@
+ </p>
+ <p>
+ If you would like to use this CGI script on your own web server and
+-CVS tree, download the latest version <a
+-href="http://www.idaemons.org/~knu/cvsweb/">here</a>, and also check
++CVS tree, check out the latest version
++<a href="http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/cvsweb/">here</a>,
++and also check
+ out Zeller's <a
+ href="http://linux.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi" >CVSweb
+ distribution site</a>.  Bill's original script can be found <a