Log Message: ----------- merge rev. 3.119.2.10: merge patch-cvsweb_cgi rev. 1.10 from the OpenBSD port, tweaked by me original commit message: date: 2003/08/16 18:12:10; author: naddy; excise functions that require GNU diff; prodding by jolan@ Modified Files: -------------- cvsweb: cvsweb.cgi Revision Data ------------- Index: cvsweb.cgi =================================================================== RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v retrieving revision 4.1 retrieving revision 4.2 diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.1 -r4.2 --- cvsweb.cgi +++ cvsweb.cgi @@ -65,7 +65,7 @@ use vars qw ( @revisions %state %difflines %log %branchpoint @revorder $keywordsubstitution $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi $doCheckout $scriptname $scriptwhere - $where $Browser $nofilelinks $maycompress @stickyvars %funcline_regexp + $where $Browser $nofilelinks $maycompress @stickyvars $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased %input $query $barequery $sortby $bydate $byrev $byauthor $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot @@ -237,7 +237,7 @@ $cvstreedefault = $logo = $defaulttitle $allow_version_select = $allow_mailtos = $allow_log_extra = 1; -@DIFFTYPES = qw(h H u c s); +@DIFFTYPES = qw(h H u c); @DIFFTYPES{@DIFFTYPES} = ( { 'descr' => 'colored', @@ -259,12 +259,6 @@ $allow_version_select = $allow_mailtos = 'opts' => ['-c'], 'colored' => 0, }, - { - 'descr' => 'side by side', - # width=168 should be enough to support 80 character line lengths - 'opts' => ['--side-by-side', '--width=168'], - 'colored' => 0, - }, ); @LOGSORTKEYS = qw(cvs date rev); @@ -555,8 +549,8 @@ foreach (@stickyvars) { } if ($allow_enscript) { - push(@DIFFTYPES, qw(uc cc sc)); - @DIFFTYPES{qw(uc cc sc)} = ( + push(@DIFFTYPES, qw(uc cc)); + @DIFFTYPES{qw(uc cc)} = ( { 'descr' => 'unified, colored', 'opts' => ['-u'], @@ -567,12 +561,6 @@ if ($allow_enscript) { 'opts' => ['-c'], 'colored' => 0, }, - { - 'descr' => 'side by side, colored', - # width=168 should be enough to support 80 character line lengths - 'opts' => ['--side-by-side', '--width=168'], - 'colored' => 0, - }, ); } else { # No Enscript -> respect difftype, but don't offer colorization. @@ -2319,18 +2307,8 @@ sub doDiff($$$$$$) my @difftype = @{$difftype->{opts}}; my $human_readable = $difftype->{colored}; - # Apply special diff options. -p and -F are not available with side by side - # diffs and may cause problems with older (< 2.8) versions of diffutils if - # used with --side-by-side. - if ($showfunc && $f !~ /^s/) { - push(@difftype, '-p'); - while (my ($re1, $re2) = each %funcline_regexp) { - if ($fullname =~ $re1) { - push(@difftype, '-F', $re2); - last; - } - } - } + # Apply special diff options. + push @difftype, '-p' if $showfunc; if ($human_readable) { push(@difftype, '-w') if $hr_ignwhite; -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
Log Message: ----------- merge rev. 3.119.2.11: merge patch-cvsweb_cgi rev. 1.13 from the OpenBSD port relevant part of the original commit message: date: 2013/04/07 20:07:24; author: naddy; More perl 5.16 fixes: * [...] * Fix a deprecation warning. ok tobias@, sthen@ Modified Files: -------------- cvsweb: cvsweb.cgi Revision Data ------------- Index: cvsweb.cgi =================================================================== RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v retrieving revision 4.2 retrieving revision 4.3 diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.2 -r4.3 --- cvsweb.cgi +++ cvsweb.cgi @@ -2934,7 +2934,7 @@ sub printLog($$$;$$) print "<br />\n"; print '<i>'; - if (defined @mytz) { + if (@mytz) { my ($est) = $mytz[(localtime($date{$_}))[8]]; print scalar localtime($date{$_}), " $est</i> ("; } else { -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
Log Message: ----------- merge rev. 3.119.2.12: A web server should absolutely run chrooted, so storing a configuration file below /usr/local/etc/ makes no sense whatsoever. Also, the configuration file should certainly not be in a directory where files can get executed as CGI scripts, so looking in the same directory as cvsweb.cgi is a bad idea, too. Considerably simplify things by hardcoding a reasonable location. The INSTALL file already instructs the user to check this. Modified Files: -------------- cvsweb: cvsweb.cgi Revision Data ------------- Index: cvsweb.cgi =================================================================== RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v retrieving revision 4.3 retrieving revision 4.4 diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.3 -r4.4 --- cvsweb.cgi +++ cvsweb.cgi @@ -88,7 +88,6 @@ use vars qw ( ); use Cwd qw(abs_path); -use File::Basename qw(dirname); use File::Path qw(rmtree); use File::Spec::Functions qw(canonpath catdir catfile curdir devnull rootdir tmpdir updir); @@ -204,22 +203,8 @@ sub checkout_to_temp($$$); # (think mod_perl)... delete(@ENV{qw(PATH IFS CDPATH ENV BASH_ENV)}); -my ($mydir) = (dirname($0) =~ /(.*)/); # untaint - -##### Start of Configuration Area ######## - -# == EDIT this == -# Locations to search for user configuration, in order: -for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') { - if (-r $_) { - $config = $_; - last; - } -} - -##### End of Configuration Area ######## - -undef $mydir; +# Location of the configuration file inside the web server chroot: +$config = '/conf/cvsweb/cvsweb.conf'; ######## Configuration parameters ######### -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
Log Message: ----------- merge rev. 3.119.2.13: Disable Perl taint check for now; to be re-enabled after a security audit. Relevant part of the original commit message: date: 2003/08/16 23:18:41; author: naddy; * upstreamer maintainer suggests that we run without taint checks on perl 5.8 * [...] Modified Files: -------------- cvsweb: cvsweb.cgi Revision Data ------------- Index: cvsweb.cgi =================================================================== RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v retrieving revision 4.4 retrieving revision 4.5 diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.4 -r4.5 --- cvsweb.cgi +++ cvsweb.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl -T +#!/usr/bin/perl # $Id$ # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon # @@ -50,7 +50,6 @@ require 5.006; use strict; - use warnings; use filetest qw(access); -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
Log Message: ----------- merge rev. 3.119.2.14: Switch the order of the name and the section in the $mancgi configuration variable. For the new man.openbsd.org URI syntax, the name must come first. For the old query syntax, both orders work just fine. Modified Files: -------------- cvsweb: cvsweb.cgi Revision Data ------------- Index: cvsweb.cgi =================================================================== RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v retrieving revision 4.5 retrieving revision 4.6 diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.5 -r4.6 --- cvsweb.cgi +++ cvsweb.cgi @@ -1540,7 +1540,7 @@ sub htmlify($;$) }{ my($text, $name, $section) = ($1, $2, defined($3) ? $3 : $4); ($name =~ /[A-Za-z]/ && $name !~ /\.(:|$)/) - ? &link($text, sprintf($mancgi, $section, uri_escape($name))) + ? &link($text, sprintf($mancgi, uri_escape($name), $section)) : $text; }egx; } $_; -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
Log Message: ----------- merge rev. 3.36.2.13: we now have chroot by default; and also remove some useless examples Modified Files: -------------- cvsweb: cvsweb.conf Revision Data ------------- Index: cvsweb.conf =================================================================== RCS file: /home/cvs/mandoc/cvsweb/cvsweb.conf,v retrieving revision 4.3 retrieving revision 4.4 diff -Lcvsweb.conf -Lcvsweb.conf -u -p -r4.3 -r4.4 --- cvsweb.conf +++ cvsweb.conf @@ -56,11 +56,7 @@ $CMD{tar} ||= search_path('tar'); # 'symbolic_name' => ['Name to display', '/path/to/cvsroot'] # @CVSrepositories = ( - 'local' => ['Local Repository', '/var/cvs'], -# 'freebsd' => ['FreeBSD', '/var/ncvs'], -# 'openbsd' => ['OpenBSD', '/var/ncvs'], -# 'netbsd' => ['NetBSD', '/var/ncvs'], -# 'ruby' => ['Ruby', '/var/anoncvs/ruby'], + 'local' => ['Local Repository', '/cvs'], ); # The default CVS root. Note that @CVSrepositories is list, not a hash, -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
Log Message: ----------- merge rev. 3.119.2.25: make empty SCRIPT_NAME work as expected Modified Files: -------------- cvsweb: cvsweb.cgi Revision Data ------------- Index: cvsweb.cgi =================================================================== RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v retrieving revision 4.20 retrieving revision 4.21 diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.20 -r4.21 --- cvsweb.cgi +++ cvsweb.cgi @@ -263,7 +263,7 @@ $scriptname = '' unless defined($scri $where = $pathinfo; $doCheckout = $where =~ s|^/$CheckoutMagic/|/|o; $where =~ s|^/||; -$scriptname =~ s|^/*|/|; +$scriptname =~ s|^/+||; # Let's workaround thttpd's stupidity.. if ($scriptname =~ m|/$|) { @@ -271,6 +271,7 @@ if ($scriptname =~ m|/$|) { my $re = quotemeta $pathinfo; $scriptname =~ s/$re$//; } +$scriptname = "/$scriptname" if $scriptname; # $scriptname : the URI escaped path to this script # $where : the path in the CVS repository (without leading /, or only /) -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv