207 Commits

Author SHA1 Message Date
obrien
6ff32b5cd2 Merge rev 1.28 (CAN-2005-0753 / FreeBSD-SA-05:05.cvs fixes),
rev 1.27 ("iso8601" option keyword) revs 1.12/1.10/1.5/1.4 ($CVSHeader$
support) rev 1.2 ($CVS_LOCAL_BRANCH_NUM support for local commit
feature of cvsup)  into version 1.11.22.

Note rev 1.21 ("-D date" checkout bug relating to 1.1.1.1 vs 1.1
revisions), rev 1.13 (allow -D'date' with -r'branch' on a checkout),
rev 1.6 (use xstrdup rather than strdup)  are fixed in the vendor sources
2008-01-13 06:12:27 +00:00
obrien
9d9d59dd54 Merge rev 1.11 ("iso8601" option keyword) into version 1.11.22.
(all our other local changes are OBE)
2008-01-13 06:11:36 +00:00
obrien
7575169e50 Merge rev 1.2 (extensions to the $CVSROOT/config syntax) and
rev 1.4 (1.12 CVSROOT/config keyword expansion forward compatability)
into version 1.11.22.
2008-01-13 06:10:58 +00:00
obrien
89cdc74185 Merge rev 1.25 ("iso8601" option keyword), rev 1.23 (blame),
rev 1.17 (environtmental var "CVS_OPTIONS"), rev 1.14 ('-g' option to
support shared-group access), rev 1.7 ('-R' read-only repository mode),
rev 1.6 (support for checking out from a read-only repository),
revs 1.4 & 1.5 ("tagexpand=")  into version 1.11.22.
2008-01-13 06:10:18 +00:00
obrien
8981de8610 Merge rev 1.9 (put the blank line back in the beginning of constructed
log messages being passed to $EDITOR)  into version 1.11.22.
2008-01-13 06:09:41 +00:00
obrien
c2c220d228 Merge rev 1.3 ('-n' option) & rev. 1.2 ("iso8601" option keyword)
into version 1.11.22.
2008-01-13 06:08:49 +00:00
obrien
1d7ee3ab51 Merge rev 1.3 (catch write-lock attempts immediately if running in
read-only mode) & rev 1.2 (check out from read-only repository support)
into version 1.11.22.
2008-01-13 06:08:17 +00:00
obrien
31b70a95c6 Merge revs 1.2 (comprehensive CVS/Template support) into version 1.11.22. 2008-01-13 06:07:20 +00:00
obrien
c63d336bc9 Merge rev 1.2 (do not check val-tags if the repository is read-only)
into version 1.11.22.
2008-01-13 06:06:41 +00:00
obrien
d2efc9179e Toss all of our local changes - they are OBE.
However, stay with version 1.9.26's buflen of BUFSIZ as we have in the
past vs. going with the 1.10+ limited length of 128.
2008-01-13 06:06:15 +00:00
obrien
5ed02a66eb Merge rev 1.16: implement -j for cvs diff, allowing tag:date based diffs
into version 1.11.22.
2008-01-13 06:05:24 +00:00
obrien
f8bcc52bc3 Change default from rsh to ssh. (moved from client.c).
Merge rev 1.14: comprehensive -T CVS/Template support, rev 1.9: new long
flag that causes cvs to ignore the CVSROOT/passwd file, rev 1.3: support
for checking out from a read-only repository, rev. 1.2: support for local
$Id$ keyword  into cvs 1.11.22.
Note that rev 1.4 (make verifymsg extra useful) is OBE.
2008-01-13 06:04:43 +00:00
obrien
6569844331 Merge rev 1.7: always upload new files, even if the timestamps match,
rev 1.4: flip the default for CVS_RSH to "ssh", rev 1.2: fix a problem
sometimes seen when doing checkouts from a local repo and committing
via remote cvs (a cvs -d override of the mismatched CVS/Root files was
missing)  into cvs 1.11.22.
2008-01-13 06:02:28 +00:00
obrien
8120aecbe7 Merge our -T comprehensive CVS/Template support into cvs 1.11.22. 2008-01-13 06:00:42 +00:00
obrien
17d5b79080 Update for the 1.11.22 import. 2008-01-13 05:50:33 +00:00
obrien
def79099e7 This commit was generated by cvs2svn to compensate for changes in r175261,
which included commits to RCS files with non-trunk default branches.
2008-01-13 05:49:32 +00:00
obrien
55b663837d Import cvs-1.11.22 onto vendor branch. 2008-01-13 05:49:32 +00:00
peter
2bb84b573e Add a forward compatability hook so that current cvs can recognize future
CVSROOT/config file options that control keyword expansion.   cvs-1.12 has
its own $Id$ expansion controls and they're configured in CVSROOT/config
rather than CVSROOT/options.  The problem is that current cvs-1.11.x
doesn't understand the future keywords.....

Add trivial forward support for the new keywords for when cvs-1.12
hits the tree down the road. CVSROOT/options won't be going away - cvsup
uses it.
2008-01-07 07:47:21 +00:00
obrien
a836858474 Reduce diffs to vendor's 1.11.17. 2007-12-31 03:42:05 +00:00
obrien
d4da9a4a18 Add the '-n' option which is the opposite of '-N', "Do not list tags."
The '-n' option is needed when one has "log -N" in their ~/.cvsrc, but
wishes to see tags for a particular invocation.
2006-12-12 03:20:36 +00:00
cperciva
b5dafedcd7 Correct insecure temporary file usage.
Security:	FreeBSD-SA-05:20.cvsbug
2005-09-07 13:39:44 +00:00
keramida
e19c1e09f5 Spell "committing" correctly. 2005-07-28 13:53:45 +00:00
simon
40aaae3b1a Correct multiple security related errors: a buffer overflow, NULL
pointer dereferences, possible use of uninitialized variables, and
memory leaks.

Security:	CAN-2005-0753
Security:	FreeBSD-SA-05:05.cvs
Approved by:	peter
2005-04-22 17:58:25 +00:00
des
79a91ff42c Do not check val-tags if the repository is read-only.
Approved by:	maintainer's silence
MFC after:	2 weeks
2004-08-05 17:47:35 +00:00
des
0e2eb33ac3 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
b04a2d6a7a 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
8416bda1d2 Import cvs-1.11.17 onto vendor branch. 2004-06-10 19:05:38 +00:00
peter
1ca65160a6 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
des
186c7aa46c The list of files / directories to remove has moved to FREEBSD-Xlist. 2004-06-09 20:51:26 +00:00
des
1236d175c6 List of files and directories to delete before importing a new release. 2004-06-09 20:14:53 +00:00
des
4dcedfc486 Merge updated patch from vendor branch (1.1.1.17) 2004-05-20 13:17:16 +00:00
des
3d101ef985 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
des
8f2e3e022b Merge parser fix from vendor branch (rev 1.1.1.16) 2004-05-19 06:21:56 +00:00
des
52b98bc9df Fix a couple of parser bugs. 2004-05-19 06:11:44 +00:00
peter
f38d95d303 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
ad4edd00d3 Fix merge typo. Add missing ",". 2004-04-15 01:31:28 +00:00
peter
a79695e04d File removed from vendor branch 2004-04-15 01:19:11 +00:00
peter
e521a8e42c 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
39ae581ddb Initial merge of cvs-1.11.5 -> 1.11.15 changes onto mainline 2004-04-15 01:17:28 +00:00
peter
6045cae71a Import cvs-1.11.15 2004-04-15 01:01:56 +00:00
peter
3aa249bff6 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
nectar
de2beba6ff Merge security fix from vendor branch (revision 1.1.1.14). 2004-01-21 16:29:16 +00:00
nectar
0de1aa939e 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
nectar
cf29303145 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
obrien
b876c3cd17 Document CVS_CLIENT_PORT. 2003-11-13 17:57:53 +00:00
obrien
58bbb89074 Add "blame" as an "annotate" alias for interoperability with subversion. 2003-07-07 19:15:36 +00:00
des
0077bc4bf0 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
93e8ee0f1a Turn off Checkin-prog and Update-prog. 2003-01-21 22:10:13 +00:00
peter
9d868620cc This file is gone on the vendor branch and no longer referenced in the
source.
2003-01-21 22:02:26 +00:00
peter
aa1e88ae9b 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