Commit Graph

183 Commits

Author SHA1 Message Date
Dag-Erling Smørgrav
8290e396fb Add an "iso8601" option keyword which causes 'cvs log' etc. to print
dates in ISO 8601 format.

Approved by:	peter
MFC after:	2 weeks
2004-07-06 08:10:38 +00:00
Peter Wemm
c21444aae2 Merge 1.11.15+ -> 1.11.17 changes onto mainline. I've left cvs.1 alone
for now.
2004-06-10 19:12:50 +00:00
Peter Wemm
1df53a9a3f This commit was generated by cvs2svn to compensate for changes in r130303,
which included commits to RCS files with non-trunk default branches.
2004-06-10 19:05:38 +00:00
Peter Wemm
83c36f7f98 Import cvs-1.11.17 onto vendor branch. 2004-06-10 19:05:38 +00:00
Dag-Erling Smørgrav
782de70aff The list of files / directories to remove has moved to FREEBSD-Xlist. 2004-06-09 20:51:26 +00:00
Dag-Erling Smørgrav
4abf92e4b8 List of files and directories to delete before importing a new release. 2004-06-09 20:14:53 +00:00
Dag-Erling Smørgrav
62fcc3d3d0 Merge updated patch from vendor branch (1.1.1.17) 2004-05-20 13:17:16 +00:00
Dag-Erling Smørgrav
b0e9f4d203 The previous commit broke compatibility with certain buggy third-party
CVS clients.  This commit fixes that and brings this file up-to-date
with CVS 1.1.16.

Obtained from:	ccvs.cvshome.org
2004-05-20 13:11:32 +00:00
Dag-Erling Smørgrav
ab203c2d8c Merge parser fix from vendor branch (rev 1.1.1.16) 2004-05-19 06:21:56 +00:00
Dag-Erling Smørgrav
f6fb3b4a3a Fix a couple of parser bugs. 2004-05-19 06:11:44 +00:00
Peter Wemm
9dc16a5e25 Change WriteTemplate to take const char * args.
The Name_Root() call seems to be defunct, remove it because it was
causing compile problems.  The real magic seems to be in the Parse_Info()
callback (which was also updated for const char * args).
2004-04-15 01:41:05 +00:00
Peter Wemm
091764700c Fix merge typo. Add missing ",". 2004-04-15 01:31:28 +00:00
Peter Wemm
e9701b59b1 File removed from vendor branch 2004-04-15 01:19:11 +00:00
Peter Wemm
36b42f0be0 This commit was generated by cvs2svn to compensate for changes in r128270,
which included commits to RCS files with non-trunk default branches.
2004-04-15 01:19:11 +00:00
Peter Wemm
25773c5448 Initial merge of cvs-1.11.5 -> 1.11.15 changes onto mainline 2004-04-15 01:17:28 +00:00
Peter Wemm
10bfecb8b5 Import cvs-1.11.15 2004-04-15 01:01:56 +00:00
Peter Wemm
edc4a449d1 This commit was generated by cvs2svn to compensate for changes in r128266,
which included commits to RCS files with non-trunk default branches.
2004-04-15 01:01:56 +00:00
Jacques Vidrine
462959355e Merge security fix from vendor branch (revision 1.1.1.14). 2004-01-21 16:29:16 +00:00
Jacques Vidrine
c8ae5f0562 Incorporate two security fixes from later versions of CVS.
From the NEWS file of cvs 1.11.11:

  * pserver can no longer be configured to run as root via the
    $CVSROOT/CVSROOT/passwd file, so if your passwd file is
    compromised, it no longer leads directly to a root hack.  Attempts
    to root will also be logged via the syslog.

  * Malformed module requests could cause the CVS server to attempt
    to create directories and possibly files at the root of the
    filesystem holding the CVS repository.  Filesystem permissions
    usually prevent the creation of these misplaced directories, but
    nevertheless, the CVS server now rejects the malformed requests.

Obtained from:	ccvs.cvshome.org
2004-01-21 16:27:56 +00:00
Jacques Vidrine
4db0ba50f1 This commit was generated by cvs2svn to compensate for changes in r124793,
which included commits to RCS files with non-trunk default branches.
2004-01-21 16:27:56 +00:00
David E. O'Brien
f53fef5bbe Document CVS_CLIENT_PORT. 2003-11-13 17:57:53 +00:00
David E. O'Brien
e220ac8c40 Add "blame" as an "annotate" alias for interoperability with subversion. 2003-07-07 19:15:36 +00:00
Dag-Erling Smørgrav
b5bd3dd547 Add support for OpenBSD extensions to the $CVSROOT/config syntax.
Approved by:	peter
Obtained from:	OpenBSD
2003-03-20 11:05:48 +00:00
Peter Wemm
fd98984aaf Turn off Checkin-prog and Update-prog. 2003-01-21 22:10:13 +00:00
Peter Wemm
794bef18e7 This file is gone on the vendor branch and no longer referenced in the
source.
2003-01-21 22:02:26 +00:00
Peter Wemm
27e93a05a2 This commit was generated by cvs2svn to compensate for changes in r109661,
which included commits to RCS files with non-trunk default branches.
2003-01-21 22:02:26 +00:00
Peter Wemm
9de666118b Merge cvs-1.11.2.1-20021201 -> 1.11.5 changes onto mainline 2003-01-21 22:01:38 +00:00
Peter Wemm
5d3193e26b This should never have been imported. Nuke from vendor branch. 2003-01-21 21:58:47 +00:00
Peter Wemm
3a7972097e This commit was generated by cvs2svn to compensate for changes in r109658,
which included commits to RCS files with non-trunk default branches.
2003-01-21 21:58:47 +00:00
Peter Wemm
10582a5671 Import cvs-1.11.5 onto vendor branch 2003-01-21 21:53:03 +00:00
Peter Wemm
67eea7a2ff This commit was generated by cvs2svn to compensate for changes in r109655,
which included commits to RCS files with non-trunk default branches.
2003-01-21 21:53:03 +00:00
Peter Wemm
fada329269 Merge 1.11.2 -> 1.11.2.1-20021201 changes onto mainline
Approved by:	re
2002-12-02 03:17:49 +00:00
Peter Wemm
6361f125fb Import cvs-1.11.2.1 as of 2002/12/01 onto vendor branch. This fixes all
of the bugs that I know of.  We've been running a slightly older version
of this on freefall/repoman, where it was afflicted by a silly merge error
on my part (fixed).

Approved by:  re
2002-12-02 03:13:37 +00:00
Peter Wemm
6711752f92 This commit was generated by cvs2svn to compensate for changes in r107484,
which included commits to RCS files with non-trunk default branches.
2002-12-02 03:13:37 +00:00
Peter Wemm
e9c371a38d Fix a cvs server bug introduced in 1.11.2, in the words of the author:
---
Fix communication hanging in communication shutdown phase, caused by at
least older CVS clients (version < 1.11.2) and a semantically incorrect
usage of getc() by the server.
---

getc() was being used on a blocking socket/pipe.

Submitted by:   rse
2002-09-02 07:58:04 +00:00
Peter Wemm
4551799d25 Repo copy these files to the bmake area, these are not part of the
cvs vendor release and should not have been 'cvs add'ed there in
the first place.
2002-09-02 06:09:03 +00:00
Peter Wemm
92ca58259a Remove these files from the vendor branch, they are no longer in 1.11.2 2002-09-02 06:02:40 +00:00
Peter Wemm
f77c9f0c11 Minor updates after 1.11.2 import 2002-09-02 05:58:30 +00:00
Peter Wemm
8df8fc83d5 Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainline 2002-09-02 05:57:14 +00:00
Peter Wemm
b2b29aad0d Import cvs-1.11.2 onto vendor branch
Obtained from: http://www.cvshome.org/
2002-09-02 05:50:28 +00:00
Peter Wemm
0471b259a4 This commit was generated by cvs2svn to compensate for changes in r102840,
which included commits to RCS files with non-trunk default branches.
2002-09-02 05:50:28 +00:00
Bill Fenner
0ef587351e Always upload new files, even if the timestamps match. This is a workaround
for the trouble that DES and I had with MFCs: when "cvs update -jfoo -jbar"
creates a new file, it sets the version to 0 ("new") but sets the timestamp
in the Entries file to the timestamp of the file that's new on the branch.
The CVS client doesn't upload files whose timestamps match with the Entries
file, so these new files don't get uploaded to the server and the server
fails when trying to check them in.

PR:		bin/40227
Approved by:	peter
MFC after:	2 weeks
2002-07-08 10:05:26 +00:00
Giorgos Keramidas
96044fe8c3 CVS_RSH defaults to 'ssh' these days, and not 'rsh'.
PR:		docs/37429
Submitted by:	Martin v. Löwis <martin@v.loewis.de>
Reviewed by:	peter
2002-05-12 02:12:04 +00:00
Matthew Dillon
ccc5f0046b oops, forgot to commit man page for cvs changes 2001-09-21 19:05:36 +00:00
Matthew Dillon
984918456b Implement comprehensive CVS/Template support to complement the Template
support that already exists for checkout.  The -T option for cvs update
and cvs checkout may be used to cause CVS to retrieve/update the checkin
template when possible.

MFC after:	1 week
2001-09-15 05:57:52 +00:00
Matthew Dillon
3471d10cbc Implement -j for cvs diff, allowing tag:date based diffs (normally date-based
diffs are against the head branch only).

MFC after:	1 week
2001-09-15 05:50:59 +00:00
Peter Wemm
d7c5f05199 Merge vendor branch onto mainline (try to fix HAVE_KERBEROS) 2001-08-20 08:47:21 +00:00
Peter Wemm
025111ae13 Fix the HAVE_KERBEROS case. It seems somebody got carried away
with cut/paste in the last release.

Submitted by:	Makoto MATSUSHITA <matusita@jp.FreeBSD.org>
Obtained from:	http://ccvs.cvshome.org/source/browse/ccvs/src/client.c.diff?r1=1.302&r2=1.303
2001-08-20 08:42:00 +00:00
Peter Wemm
9c347fa626 Revert part of the 1.11->1.11.1p1 change. Put the blank line back in
the beginning of constructed log messages being passed to $EDITOR.  This
is where folks start typing.
2001-08-13 21:21:13 +00:00
Peter Wemm
a12033aa17 Argh, this could not possibly have worked as it existed in the tree. 2001-08-10 11:14:53 +00:00