From 5f95e7c147ec164520a0233d8fb6f49732ca825f Mon Sep 17 00:00:00 2001 From: naddy Date: Wed, 1 Aug 2001 19:59:25 +0000 Subject: [PATCH] Update to knu-cvsweb 1.112.1.82: * Chdir to TMPDIR so it works even when the cgi-bin directory is unreadable. * Let the module/path box appear and work properly when there is only one repository. * perltidy -i=8 -t -pt=2 -bt=2 -sbt=2 -ci=4 -noll -sfs -nasc -ce * MFZ 1.111, but introduce @ForbiddenFiles instead of @DissallowRead to forbid user to cvs checkout/diff/annotate specified files. * MFZ 1.112: A couple of trivial fixes. --- devel/cvsweb/Makefile | 16 ++++++++-------- devel/cvsweb/files/md5 | 6 +++--- devel/cvsweb/patches/patch-cvsweb_cgi | 22 +++++++++++----------- devel/cvsweb/patches/patch-cvsweb_conf | 14 +++++++------- devel/cvsweb/pkg/DESCR | 8 -------- 5 files changed, 29 insertions(+), 37 deletions(-) diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile index 64e403f58b6..9758600778e 100644 --- a/devel/cvsweb/Makefile +++ b/devel/cvsweb/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.15 2001/07/09 16:55:01 naddy Exp $ +# $OpenBSD: Makefile,v 1.16 2001/08/01 19:59:25 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" -DISTNAME= cvsweb-1.110.1.78 +DISTNAME= cvsweb-1.112.1.82 CATEGORIES= devel www NEED_VERSION= 1.402 -HOMEPAGE= http://stud.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi/ +HOMEPAGE= http://www.idaemons.org/~knu/cvsweb/ MAINTAINER= Christian Weisgerber @@ -15,10 +15,10 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \ +MASTER_SITES= http://www.iDaemons.org/distfiles/ \ + ftp://ftp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \ ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \ - ftp://ftp7.de.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \ - http://www.iDaemons.org/distfiles/ + ftp://ftp.se.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ MASTER_SITE_SUBDIR= ports/local-distfiles/knu NO_BUILD= Yes @@ -27,8 +27,8 @@ WRKDIST= ${WRKDIR}/cvsweb PREFIX= /var/www SYSCONFDIR= ${PREFIX}/conf -CONFFILES= cvsweb.conf cvsweb.conf-ruby \ - cvsweb.conf-freebsd cvsweb.conf-openbsd cvsweb.conf-netbsd +CONFFILES= cvsweb.conf cvsweb.conf-freebsd cvsweb.conf-netbsd \ + cvsweb.conf-openbsd cvsweb.conf-ruby ICONS= back.gif dir.gif text.gif \ miniback.gif minidir.gif minitext.gif diff --git a/devel/cvsweb/files/md5 b/devel/cvsweb/files/md5 index 3b7df98a871..5bfad5e7e1a 100644 --- a/devel/cvsweb/files/md5 +++ b/devel/cvsweb/files/md5 @@ -1,3 +1,3 @@ -MD5 (cvsweb-1.110.1.78.tar.gz) = 2e6f84078711531dedae4a94a38f1e72 -RMD160 (cvsweb-1.110.1.78.tar.gz) = ccb11f67b6ec3cd5ca155717612d7c9f77008863 -SHA1 (cvsweb-1.110.1.78.tar.gz) = df84aee61d7287fefbe91657c5c6c4e718ba24fa +MD5 (cvsweb-1.112.1.82.tar.gz) = 848b43261c4a6e3be4db7ed656c5b3cc +RMD160 (cvsweb-1.112.1.82.tar.gz) = 5904c7cb05cb2c13032c3337188d4c8607752ec1 +SHA1 (cvsweb-1.112.1.82.tar.gz) = 16446933bac308dd8b313bda8907ba1c5372e047 diff --git a/devel/cvsweb/patches/patch-cvsweb_cgi b/devel/cvsweb/patches/patch-cvsweb_cgi index 9da99be7768..c68b3d0d5e3 100644 --- a/devel/cvsweb/patches/patch-cvsweb_cgi +++ b/devel/cvsweb/patches/patch-cvsweb_cgi @@ -1,12 +1,12 @@ -$OpenBSD: patch-cvsweb_cgi,v 1.8 2001/03/24 22:39:04 naddy Exp $ ---- cvsweb.cgi.orig Sat Jan 13 08:48:09 2001 -+++ cvsweb.cgi Sun Jan 14 15:13:01 2001 -@@ -151,7 +151,7 @@ use File::Basename; +$OpenBSD: patch-cvsweb_cgi,v 1.9 2001/08/01 19:59:25 naddy Exp $ +--- cvsweb.cgi.orig Wed Aug 1 21:34:42 2001 ++++ cvsweb.cgi Wed Aug 1 21:35:16 2001 +@@ -153,7 +153,7 @@ use File::Basename; + + # == EDIT this == # Locations to search for user configuration, in order: - for ( - "$mydir/cvsweb.conf", -- '/usr/local/etc/cvsweb/cvsweb.conf' -+ '%%SYSCONFDIR%%/cvsweb/cvsweb.conf' - ) { - if (defined($_) && -r $_) { - $config = $_; +-for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') { ++for ("$mydir/cvsweb.conf", '%%SYSCONFDIR%%/cvsweb/cvsweb.conf') { + if (defined($_) && -r $_) { + $config = $_; + last; diff --git a/devel/cvsweb/patches/patch-cvsweb_conf b/devel/cvsweb/patches/patch-cvsweb_conf index 094fe657d93..ee880522c0a 100644 --- a/devel/cvsweb/patches/patch-cvsweb_conf +++ b/devel/cvsweb/patches/patch-cvsweb_conf @@ -1,16 +1,16 @@ -$OpenBSD: patch-cvsweb_conf,v 1.7 2001/07/09 16:55:04 naddy Exp $ ---- cvsweb.conf.orig Fri Jul 6 11:44:28 2001 -+++ cvsweb.conf Mon Jul 9 18:26:56 2001 -@@ -209,7 +209,7 @@ EOT +$OpenBSD: patch-cvsweb_conf,v 1.8 2001/08/01 19:59:25 naddy Exp $ +--- cvsweb.conf.orig Wed Aug 1 21:36:14 2001 ++++ cvsweb.conf Wed Aug 1 21:37:16 2001 +@@ -212,7 +212,7 @@ EOT # These default icons are coming with apache. # If these icons are too large, check out the miniicons in the # icons/ directory; they have a width/height of 16/16 -my $iconsdir = "/icons"; +my $iconsdir = "/icons/cvsweb"; + # format: TEXT ICON-URL width height - %ICONS = ( - back => [ ("[BACK]", "$iconsdir/back.gif", 20, 22) ], -@@ -329,7 +329,7 @@ $inputTextSize = 12; + %ICONS = ( +@@ -346,7 +346,7 @@ $inputTextSize = 12; # cvsweb to guess the correct mime-type on # checkout; you can use the mime.types from # apache here: diff --git a/devel/cvsweb/pkg/DESCR b/devel/cvsweb/pkg/DESCR index aa2fcbbfc0d..c6c1c44789f 100644 --- a/devel/cvsweb/pkg/DESCR +++ b/devel/cvsweb/pkg/DESCR @@ -3,12 +3,4 @@ repository tree via the web. It can display the revision history of a file, as well as diffs between revisions, and download the whole file. -The cvsweb script has been written by Bill Fenner -for the FreeBSD project, improved visually and functionally by Henner -Zeller , Henrik Nordstrom , and -Ken Coar , to be adopted by the NetBSD project. - -Akinori MUSHA is adding more enhancements and doing -some cleanups over Zeller's version. - WWW: ${HOMEPAGE}