Commit Graph

114 Commits

Author SHA1 Message Date
Jacques Vidrine
462959355e Merge security fix from vendor branch (revision 1.1.1.14). 2004-01-21 16:29:16 +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
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
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
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
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
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
740adac6b6 Generate version.c on the fly rather than using a generated file. 2001-08-10 10:29:04 +00:00
Peter Wemm
c26899044d This commit was generated by cvs2svn to compensate for changes in r81422,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:29:04 +00:00
Peter Wemm
f39ea30777 Get the version source from the (more) correct place.
Remove the obsolete cvsbug.sh script
2001-08-10 10:22:43 +00:00
Peter Wemm
d51af2baf3 This commit was generated by cvs2svn to compensate for changes in r81420,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:22:43 +00:00
Peter Wemm
92afd3b803 Remove file obsoleted in 1.11.1p1 import 2001-08-10 10:02:36 +00:00
Peter Wemm
a2b4cbc808 This commit was generated by cvs2svn to compensate for changes in r81412,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:02:36 +00:00
Peter Wemm
64e56da987 Initial merge of cvs-1.11 -> 1.11.1p1 changes onto mainline. There is
still some suspicious and/or broken stuff to fix yet.
2001-08-10 09:53:06 +00:00
Peter Wemm
7f22ecb0da Import cvs-1.11.1p1 onto vendor branch 2001-08-10 09:43:22 +00:00
Peter Wemm
398ed02b53 This commit was generated by cvs2svn to compensate for changes in r81404,
which included commits to RCS files with non-trunk default branches.
2001-08-10 09:43:22 +00:00
Peter Wemm
4fd2864862 Flip the default for CVS_RSH to "ssh". I am tired of getting asked this
all the time, and IMHO it is long overdue.
2001-02-23 04:52:30 +00:00
John Polstra
ae5dbaf270 Fix a bug that shows up when checking out files by date with the
"-D date" command line option.  There is code in the original to
handle a special case.  If the date search finds revision 1.1 it
is supposed to check whether revision 1.1.1.1 has the same date
stamp, which would indicate that the file was originally brought
in with "cvs import".  In that case it is supposed to return the
vendor branch version 1.1.1.1.

However, there is a bug in the code.  It actually compares the date
of revision 1.1 for equality with the date given on the command
line -- clearly wrong.  This commit fixes the coding bug.

There is an additional bug which is _not_ fixed in this commit.
The date comparison should not be a strict equality test.  It should
allow a fudge factor of, say, 2-3 seconds.  Old versions of CVS
created the two revisions with two separate invocations of the RCS
"ci" command.  We have many old files in the tree in which the
dates of revisions 1.1 and 1.1.1.1 differ by 1 second.

Approved by:	peter
2000-10-29 03:56:49 +00:00
Peter Wemm
ba9369b9b9 Merge changes from 1.10.7 -> 1.11 into mainline. Note that the old
anoncvs no-password hack is gone and is replaced by the official version.
2000-10-02 06:43:58 +00:00
Peter Wemm
a3b502f88f Import cvs-1.11 onto vendor branch. 2000-10-02 06:33:59 +00:00
Peter Wemm
d65e2e3fd6 This commit was generated by cvs2svn to compensate for changes in r66525,
which included commits to RCS files with non-trunk default branches.
2000-10-02 06:33:59 +00:00
Kris Kennaway
cb358f5cfb Use X x X's in mkstemp(). 2000-01-10 08:56:01 +00:00
Peter Wemm
dd4450d659 I believe this fixes the problem certain people have been seeing when doing
checkouts from a local repo and committing via remote cvs.  A cvs -d
override of the mismatched CVS/Root files was missing.  This is a client
side fix, I'd appreciate it if the folks having trouble with this would
update their cvs client and pay particular attention next time..
2000-01-06 17:57:24 +00:00
Peter Wemm
5e84812fa3 Take a shot at using mkstemp() since we have a __warn_references() on
the other temporary file creation functions..
1999-12-11 14:58:02 +00:00
Peter Wemm
337c65c54d Merge error. rcs_lockfile is freed after unlock. 1999-12-11 13:19:17 +00:00
Peter Wemm
f1ddedaa09 Merge cyclic changes from 1.10.7 into our mainline. I did this seperately
as cvs update -j had kittens over the whole thing and I ended up merging
it by hand.
1999-12-11 13:00:18 +00:00
Peter Wemm
9bd45385bc Merge cyclic changes for 1.10.7 only our mainline. 1999-12-11 12:50:10 +00:00
Peter Wemm
d818196804 Import cvs-1.10.7. There are a number of nasty bugs that have been fixed.
Obtained from:  cyclic.com
1999-12-11 12:24:21 +00:00
Peter Wemm
6687a375a9 This commit was generated by cvs2svn to compensate for changes in r54427,
which included commits to RCS files with non-trunk default branches.
1999-12-11 12:24:21 +00:00
David E. O'Brien
b0576ff7e0 Call isspace() directly to get rid of an objectionable include. 1999-12-04 08:44:05 +00:00
David E. O'Brien
eaf4925a25 Support the environtmental var "CVS_OPTIONS". Which can hold a set of
default options for cvs.  These options are interpreted first and can be
overwritten by explicit command line parameters.

Obtained from:	GNU Grep 2.3
1999-12-04 01:23:26 +00:00