From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from localhost (mandoc.bsd.lv [local]) by mandoc.bsd.lv (OpenSMTPD) with ESMTPA id 0e969a9d for ; Tue, 26 Nov 2019 06:21:58 -0500 (EST) Date: Tue, 26 Nov 2019 06:21:58 -0500 (EST) X-Mailinglist: mandoc-source Reply-To: source@mandoc.bsd.lv MIME-Version: 1.0 From: schwarze@mandoc.bsd.lv To: source@mandoc.bsd.lv Subject: cvsweb: Delete cvshistory.cgi tentacles, yet another piece of X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Message-ID: <8d07951786cafb12@mandoc.bsd.lv> Log Message: ----------- Delete cvshistory.cgi tentacles, yet another piece of abandonware. If it contained anything of value, those parts should be integrated. Modified Files: -------------- cvsweb: INSTALL README cvsweb.cgi cvsweb.conf Revision Data ------------- Index: README =================================================================== RCS file: /home/cvs/mandoc/cvsweb/README,v retrieving revision 4.7 retrieving revision 4.8 diff -LREADME -LREADME -u -p -r4.7 -r4.8 --- README +++ README @@ -80,8 +80,6 @@ o Security fixes to let it work under pe o Annotate works under mod_perl and against a read only repository. -o CVSHistory integration. - o Line number output for HTMLized views. o Support for showing README.cvs.html and README.cvs akin to Apache's Index: cvsweb.conf =================================================================== RCS file: /home/cvs/mandoc/cvsweb/cvsweb.conf,v retrieving revision 4.10 retrieving revision 4.11 diff -Lcvsweb.conf -Lcvsweb.conf -u -p -r4.10 -r4.11 --- cvsweb.conf +++ cvsweb.conf @@ -441,11 +441,6 @@ $use_moddate = 1; # #$file_list_len = 200; -# URL to the CVSHistory script. This should be absolute (but does not need -# to include the host and port if the script is on the same server as -# CVSweb). -#$cvshistory_url = "/cgi-bin/cvshistory.cgi"; - # Whether to allow downloading a tarball or a zip of the current directory. # While downloading of the entire repository is disallowed, depending on # the directory this may take a lot of time and disk space. For some CVS Index: INSTALL =================================================================== RCS file: /home/cvs/mandoc/cvsweb/INSTALL,v retrieving revision 4.6 retrieving revision 4.7 diff -LINSTALL -LINSTALL -u -p -r4.6 -r4.7 --- INSTALL +++ INSTALL @@ -39,9 +39,6 @@ of this document. repository (or a copy of it) therefore; rsh, ssh or pserver access doesn't work yet. - Install CVSHistory if you want to use it with CVSweb, and see (8) for - configuration notes. You'll need version 2.0 or newer. - 2) Copy cvsweb.conf to a configuration directory, typically /usr/local/etc/cvsweb/cvsweb.conf. Edit cvsweb.conf to fit your needs, you'll probably need to tweak the @@ -72,11 +69,6 @@ of this document. 5) Copy cvsweb.css from the css/ directory to a web server directory, and point the $cssurl variable in cvsweb.conf to it. -8) CVSHistory can be used with this - version of CVSweb. See the $cvshistory_url configuration variable in - cvsweb.conf. For best results, configure CVSweb and CVSHistory to use - the same "logical names" for CVS roots. - 9) If you like you can add descriptions to be shown next to each directory or module name. These are read from CVSROOT/descriptions. @@ -149,13 +141,6 @@ Upgrading to 3.0.3 The following configuration variables in cvsweb.conf have changed: $DEBUG is new, and optional. See comments in cvsweb.conf. - -Upgrading to 3.0.1 ------------------- - -The following configuration variables in cvsweb.conf have changed: - - $cvshistory_url is new, and optional. See comments in cvsweb.conf. Upgrading to 3.0.0 ------------------ Index: cvsweb.cgi =================================================================== RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v retrieving revision 4.22 retrieving revision 4.23 diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.22 -r4.23 --- cvsweb.cgi +++ cvsweb.cgi @@ -81,7 +81,7 @@ use vars qw ( $use_moddate $gzip_open $file_list_len $allow_tar @tar_options @gzip_options @zip_options @cvs_options @annotate_options @rcsdiff_options - $HTML_DOCTYPE $HTML_META $cssurl $CSS $cvshistory_url + $HTML_DOCTYPE $HTML_META $cssurl $CSS ); require Compress::Zlib; @@ -173,7 +173,6 @@ sub download_url($$;$); sub download_link($$$;$); sub display_url($$;$); sub display_link($$;$$); -sub history_link($$;$); sub toggleQuery($;$); sub htmlquote($); sub htmlunquote($); @@ -206,7 +205,7 @@ $cvstreedefault = $logo = $defaulttitle $allow_markup = $allow_compress = $edit_option_form = $show_subdir_lastmod = $show_log_in_markup = $preformat_in_markup = $tabstop = $use_moddate = $gzip_open = $DEBUG = - $cvshistory_url = $allow_tar = undef; + $allow_tar = undef; $allow_version_select = $allow_mailtos = $allow_log_extra = 1; @@ -816,10 +815,6 @@ if (-d $fullname) { } else { print '

Current directory: ', clickablePath($where, 0), ''; - if ($cvshistory_url) { - (my $d = $where) =~ s|^/*(.*?)/*$|$1|; - print ' - ', history_link($d, ''); - } print "

\n"; print "

Current tag: ", htmlquote($input{only_with_tag}), "

\n" if $input{only_with_tag}; @@ -2932,10 +2927,6 @@ sub doLog($) &clickablePath($upwhere, 1), "\n

\n"; print "

\n "; print &link('Request diff between arbitrary revisions', '#diff'); - if ($cvshistory_url) { - (my $d = $upwhere) =~ s|/+$||; - print ' - ', history_link($d, $filename); - } print "\n

\n
\n"; print "

\n"; @@ -3666,21 +3657,6 @@ sub display_link($$;$$) return sprintf('%s', display_url($url, $revision, $mtype) . $barequery, htmlquote($textlink)); -} - -# -# Returns a link to CVSHistory for the given directory and filename. -# -sub history_link($$;$) -{ - my ($dir, $file, $text) = @_; - $dir ||= ''; - $file ||= ''; - $text ||= 'History'; - return &link($text, - sprintf('%s?cvsroot=%s;dsearch=%s;fsearch=%s;limit=1', - $cvshistory_url, uri_escape($input{cvsroot} || ''), - uri_escape($dir), uri_escape($file))); } # Returns a Query string with the -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv