Commit Graph

228 Commits

Author SHA1 Message Date
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
Peter Wemm
8fd0e04f3a Copy our changes from sccs2rcs.csh to sccs2rcs.in 2001-08-10 11:14:18 +00:00
Peter Wemm
656c0a4692 Removed in cvs-1.11.1p1 import 2001-08-10 11:04:36 +00:00
Peter Wemm
6243bbe945 This commit was generated by cvs2svn to compensate for changes in r81440,
which included commits to RCS files with non-trunk default branches.
2001-08-10 11:04:36 +00:00
Peter Wemm
c4c45a1dc3 Another stray file that got imported a long time ago and never cleaned up. 2001-08-10 11:02:03 +00:00
Peter Wemm
44824e53b8 This commit was generated by cvs2svn to compensate for changes in r81437,
which included commits to RCS files with non-trunk default branches.
2001-08-10 11:02:03 +00:00
Peter Wemm
6431637d4b This file is gone in cvs-1.11.1p1 (replaced by log.in) 2001-08-10 11:00:14 +00:00
Peter Wemm
135d57d5e9 These files have been replaced by .in versions in cvs-1.11.1p1 2001-08-10 10:55:45 +00:00
Peter Wemm
fcaf4ec9ea This commit was generated by cvs2svn to compensate for changes in r81434,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:55:45 +00:00
Peter Wemm
5b05c7e2bc Re-kill this file. It got whiplash being killed and restored on the
mainline, it is truely dead now.
2001-08-10 10:39:29 +00:00
Peter Wemm
7676d5c902 Nuke some stray files that stopped getting imported ages ago. 2001-08-10 10:38:11 +00:00
Peter Wemm
87403039e2 This commit was generated by cvs2svn to compensate for changes in r81426,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:38:11 +00:00
Peter Wemm
17fca17112 Remove some expired files no longer in current cvs 2001-08-10 10:33:41 +00:00
Peter Wemm
f8db74c8fc This commit was generated by cvs2svn to compensate for changes in r81424,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:33:41 +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
2f366f24e8 Remove another obsolete file, last used in cvs-1.10 2001-08-10 10:05:43 +00:00
Peter Wemm
a86e31b209 This commit was generated by cvs2svn to compensate for changes in r81414,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:05: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
bcfbee2150 Tweak for 1.11.1p1 2001-08-10 09:53:53 +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
Peter Wemm
33cd46fe61 Missing quote
PR:		misc/19745
Submitted by:	Tony Finch <dot@dotat.at>
2000-09-25 18:23:34 +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
8bd88c453b Unmangle cvs's MD5* calls. 1999-12-11 15:10:02 +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
5eae5a3482 Update for 1.10.7 update. 1999-12-11 13:11:47 +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
c17d50044b Revert to vendor version. Sigh, this left the vendor branch because
of a fix for a y2k non-problem. :-(
1999-12-11 12:42:49 +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
Peter Wemm
51399659b1 Add maintainer tag, and add a description of a few more things we've
added/changed locally for FreeBSD.
1999-12-08 16:49:38 +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
Peter Wemm
7b72489469 Document the .cvsrc "cvs" option for global options. 1999-12-04 02:15:30 +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
Peter Wemm
9515a35166 If running on the client side of a remote commit, don't reject root when
trying to do a commit.  The server side will use the correct name, and the
client side restriction is just an annoyance.

Requested by:  lots of folks
1999-10-25 06:24:11 +00:00
David E. O'Brien
9fbae1ed46 Document -R. 1999-09-11 13:33:18 +00:00
Bruce Evans
1e455c280e Fixed style bugs in FreeBSD changes. KNF style doesn't apply to gnu
sources.
1999-07-04 15:46:44 +00:00
Peter Wemm
059af14f8e Don't assume branch heads are alive.. (related to previous change to the
older 1.9.26 baseline)
1999-05-10 13:49:51 +00:00
Peter Wemm
16f9c40248 Zap files not in cvs-1.10 1999-04-05 06:36:11 +00:00
Peter Wemm
feeca969b0 Stray files that used to be in 1.9.x that are not in 1.10 1999-04-05 06:31:43 +00:00
Peter Wemm
46a2066259 Merge cvs-1.9.xx -> 1.10 changes onto mainline.
Changes of significance include the top level CVS directory being optional
and defaulting to off..
1999-03-18 09:32:46 +00:00
Peter Wemm
b791882da9 Merge cvs-1.9.xx -> 1.10 changes onto mainline.
The merge turned up a long-standing bug in local additions.  I'm not
quite sure it's right yet.  (the code in question is dealing with
diffs relative to "HEAD" and dead revisions).
1999-03-18 09:31:26 +00:00
Peter Wemm
0008866e58 Import cvs-1.10 onto vendor branch. Merge to follow shortly.
Obtained from:	cyclic.com
1999-03-18 09:21:42 +00:00