* upstreamer maintainer suggests that we run without taint checks on perl 5.8

* cosmetics
This commit is contained in:
naddy 2003-08-16 23:18:41 +00:00
parent aba08b93d4
commit 6637f37428
2 changed files with 11 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2003/08/16 18:12:10 naddy Exp $
# $OpenBSD: Makefile,v 1.29 2003/08/16 23:18:41 naddy Exp $
# $FreeBSD: ports/devel/cvsweb/Makefile,v 1.28 2000/09/23 20:48:45 knu Exp $
COMMENT= "WWW CGI script to browse CVS repository trees"
@ -33,7 +33,7 @@ ICONS= back.gif dir.gif text.gif \
SUBST_VARS= CONFDIR
do-configure:
@perl -i -pe 's@%%SYSCONFDIR%%@${CONFDIR}@g' ${WRKSRC}/cvsweb.cgi
@perl -i -pe 's@%%CONFDIR%%@${CONFDIR}@g' ${WRKSRC}/cvsweb.cgi
do-install:
${INSTALL_SCRIPT_DIR} ${PREFIX}/cgi-bin

View File

@ -1,12 +1,18 @@
$OpenBSD: patch-cvsweb_cgi,v 1.10 2003/08/16 18:12:10 naddy Exp $
$OpenBSD: patch-cvsweb_cgi,v 1.11 2003/08/16 23:18:41 naddy Exp $
--- cvsweb.cgi.orig 2002-09-26 22:56:05.000000000 +0200
+++ cvsweb.cgi 2003-08-16 18:22:40.000000000 +0200
+++ cvsweb.cgi 2003-08-17 01:07:29.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!/usr/bin/perl -w
#
# cvsweb - a CGI interface to CVS trees.
#
@@ -157,7 +157,7 @@ use File::Basename ();
# == EDIT this ==
# Locations to search for user configuration, in order:
-for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') {
+for ("$mydir/cvsweb.conf", '%%SYSCONFDIR%%/cvsweb/cvsweb.conf') {
+for ("$mydir/cvsweb.conf", '%%CONFDIR%%/cvsweb/cvsweb.conf') {
if (defined($_) && -r $_) {
$config = $_;
last;