summaryrefslogtreecommitdiff
path: root/devel/cvs-devel/files/patch-freebsdlocal
diff options
context:
space:
mode:
Diffstat (limited to 'devel/cvs-devel/files/patch-freebsdlocal')
-rw-r--r--devel/cvs-devel/files/patch-freebsdlocal1669
1 files changed, 0 insertions, 1669 deletions
diff --git a/devel/cvs-devel/files/patch-freebsdlocal b/devel/cvs-devel/files/patch-freebsdlocal
deleted file mode 100644
index 6ac3284903e1..000000000000
--- a/devel/cvs-devel/files/patch-freebsdlocal
+++ /dev/null
@@ -1,1669 +0,0 @@
-Index: FREEBSD-upgrade
-diff -u /dev/null src/contrib/cvs/FREEBSD-upgrade:1.10
---- /dev/null Fri Apr 16 06:29:02 2004
-+++ FREEBSD-upgrade Mon Sep 2 14:58:30 2002
-@@ -0,0 +1,58 @@
-+FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.10 2002/09/02 05:58:30 peter Exp $
-+
-+MAINTAINER= peter@FreeBSD.org
-+
-+This directory contains the virgin CVS source on the vendor branch. Do
-+not under any circumstances commit new versions onto the mainline, new
-+versions or official-patch versions must be imported.
-+
-+To prepare a new cvs dist for import, extract it into a fresh directory;
-+
-+The following generated files were deleted:
-+doc/*.ps
-+doc/*.info*
-+doc/texinfo.tex
-+lib/getdate.c
-+cvsnt.*
-+cvs.spec*
-+build.com
-+*/*.com
-+*/*.dsp
-+*/.cvsignore
-+.cvsignore
-+README.VMS
-+
-+The following non-freebsd-specific directories were deleted:
-+os2
-+emx
-+windows-NT
-+vms
-+zlib
-+
-+It is imported from it's top level directory something like this:
-+ cvs -n import src/contrib/cvs CVSHOME v<version>
-+
-+The -n option is "dont do anything" so you can see what is about to happen
-+first. Remove it when it looks ok.
-+
-+The initial import was done with:
-+ cvs import src/contrib/cvs CVSHOME v1_8_1
-+
-+When new versions are imported, cvs will give instructions on how to merge
-+the local and vendor changes when/if conflicts arise..
-+
-+The developers can be reached at: <devel-cvs@cyclic.com>. Local changes
-+that are suitable for public consumption should be submitted for inclusion
-+in future releases.
-+
-+peter@freebsd.org - 20 Aug 1996
-+
-+Current local changes:
-+ - CVS_LOCAL_BRANCH_NUM environment variable support for choosing the
-+ magic branch number. (for CVSup local-commit support)
-+ - CVSREADONLYFS environment variable and global option -R to enable
-+ no-locking readonly mode (eg: cvs repo is a cdrom or mirror)
-+ - the verify message script can edit the submitted log message.
-+ - CVSROOT/options file
-+ - Variable keyword expansion controls including custom keywords.
-+ - $ CVSHeader$ keyword - like Header, but with $CVSROOT stripped off.
-Index: contrib/sccs2rcs.in
-diff -u src/contrib/cvs/contrib/sccs2rcs.in:1.1.1.3 src/contrib/cvs/contrib/sccs2rcs.in:1.5
---- src/contrib/cvs/contrib/sccs2rcs.in:1.1.1.3 Thu Apr 15 10:01:55 2004
-+++ contrib/sccs2rcs.in Thu Apr 15 10:17:25 2004
-@@ -48,6 +48,7 @@
- # -Allan G. Schrum schrum@ofsoptics.com agschrum@mindspring.com
- # Fri Sep 26 10:40:40 EDT 2003
- #
-+# FreeBSD: src/contrib/cvs/contrib/sccs2rcs.in,v 1.5 2004/04/15 01:17:25 peter Exp $
-
-
- #we'll assume the user set up the path correctly
-Index: diff/diagmeet.note
-diff -u src/contrib/cvs/diff/diagmeet.note:1.1.1.1 src/contrib/cvs/diff/diagmeet.note:removed
---- src/contrib/cvs/diff/diagmeet.note:1.1.1.1 Mon Jan 26 12:09:49 1998
-+++ diff/diagmeet.note Fri Apr 16 06:29:02 2004
-@@ -1,71 +0,0 @@
--Here is a comparison matrix which shows a case in which
--it is possible for the forward and backward scan in `diag'
--to meet along a nonzero length of diagonal simultaneous
--(so that bdiag[d] and fdiag[d] are not equal)
--even though there is no snake on that diagonal at the meeting point.
--
--
-- 85 1 1 1 159 1 1 17
-- 1 2 3 4
--60
-- 1 2
--1
-- 2 2 3 4
--71
-- 3 3 4 5
--85
-- 4 3 4 5
--17
-- 5 4 5
--1
-- 6 4 5 6
--183
-- 7 5 6 7
--10
-- 8 6 7
--1
-- 9 6 7 8
--12
-- 7 8 9 10
--13
-- 10 8 9 10
--14
-- 10 9 10
--17
-- 10 10
--1
-- 10 9 10
--1
-- 8 10 10 10
--183
-- 8 7 9 9 9
--10
-- 7 6 8 9 8 8
--1
-- 6 5 7 7
--1
-- 5 6 6
--1
-- 5 5 5
--50
-- 5 4 4 4
--1
-- 4 3 3
--85
-- 5 4 3 2 2
--1
-- 2 1
--17
-- 5 4 3 2 1 1
--1
-- 1 0
-- 85 1 1 1 159 1 1 17
--
--
--
--
--
--
--
--
--
-Index: diff/diff3.c
-diff -u src/contrib/cvs/diff/diff3.c:1.1.1.7 src/contrib/cvs/diff/diff3.c:1.6
---- src/contrib/cvs/diff/diff3.c:1.1.1.7 Thu Apr 15 10:01:56 2004
-+++ diff/diff3.c Thu Apr 15 10:17:26 2004
-@@ -12,6 +12,9 @@
- GNU General Public License for more details.
-
- */
-+/*
-+ * FreeBSD: src/contrib/cvs/diff/diff3.c,v 1.6 2004/04/15 01:17:26 peter Exp $
-+ */
-
- /* Written by Randy Smith */
- /* Librarification by Tim Pierce */
-Index: lib/md5.h
-diff -u src/contrib/cvs/lib/md5.h:1.1.1.3 src/contrib/cvs/lib/md5.h:1.2
---- src/contrib/cvs/lib/md5.h:1.1.1.3 Sat Dec 11 21:22:56 1999
-+++ lib/md5.h Sun Dec 12 00:10:02 1999
-@@ -1,8 +1,21 @@
- /* See md5.c for explanation and copyright information. */
-
-+/*
-+ * FreeBSD: src/contrib/cvs/lib/md5.h,v 1.2 1999/12/11 15:10:02 peter Exp $
-+ */
-+
- #ifndef MD5_H
- #define MD5_H
-
-+#ifdef __FreeBSD__
-+#define cvs_MD5Context MD5Context
-+#define cvs_MD5Init MD5Init
-+#define cvs_MD5Update MD5Update
-+#define cvs_MD5Final MD5Final
-+#define cvs_MD5Transform MD5Transform
-+#include <sys/md5.h>
-+#else
-+
- /* Unlike previous versions of this code, uint32 need not be exactly
- 32 bits, merely 32 bits or more. Choosing a data type which is 32
- bits instead of 64 is not important; speed is considerably more
-@@ -22,5 +35,7 @@
- void cvs_MD5Final PROTO ((unsigned char digest[16],
- struct cvs_MD5Context *context));
- void cvs_MD5Transform PROTO ((cvs_uint32 buf[4], const unsigned char in[64]));
-+
-+#endif
-
- #endif /* !MD5_H */
-Index: man/cvsbug.8
-diff -u src/contrib/cvs/man/cvsbug.8:1.1.1.4 src/contrib/cvs/man/cvsbug.8:1.3
---- src/contrib/cvs/man/cvsbug.8:1.1.1.4 Mon Sep 2 14:50:19 2002
-+++ man/cvsbug.8 Mon Oct 2 15:43:55 2000
-@@ -17,6 +17,7 @@
- .\" General Public License for more details.
- .\"
- .\" ---------------------------------------------------------------------------
-+.\" FreeBSD: src/contrib/cvs/man/cvsbug.8,v 1.3 2000/10/02 06:43:55 peter Exp $
- .nh
- .TH CVSBUG 8 xVERSIONx "February 1993"
- .SH NAME
-Index: src/buffer.c
-diff -u src/contrib/cvs/src/buffer.c:1.1.1.7 src/contrib/cvs/src/buffer.c:1.5
---- src/contrib/cvs/src/buffer.c:1.1.1.7 Thu Apr 15 10:01:55 2004
-+++ src/buffer.c Thu Apr 15 10:17:26 2004
-@@ -1,5 +1,7 @@
- /* Code for the buffer data structure. */
-
-+/* FreeBSD: src/contrib/cvs/src/buffer.c,v 1.5 2004/04/15 01:17:26 peter Exp $ */
-+
- #include <assert.h>
- #include "cvs.h"
- #include "buffer.h"
-Index: src/checkout.c
-diff -u src/contrib/cvs/src/checkout.c:1.1.1.13 src/contrib/cvs/src/checkout.c:1.5
---- src/contrib/cvs/src/checkout.c:1.1.1.13 Thu Apr 15 10:01:55 2004
-+++ src/checkout.c Thu Apr 15 10:17:26 2004
-@@ -33,6 +33,10 @@
- * edited by the user, if necessary (when the repository is moved, e.g.)
- */
-
-+/*
-+ * FreeBSD: src/contrib/cvs/src/checkout.c,v 1.5 2004/04/15 01:17:26 peter Exp $
-+ */
-+
- #include <assert.h>
- #include "cvs.h"
-
-@@ -50,6 +54,7 @@
- "\t-N\tDon't shorten module paths if -d specified.\n",
- "\t-P\tPrune empty directories.\n",
- "\t-R\tProcess directories recursively.\n",
-+ "\t-T\tCreate Template file from local repository for remote commit.\n",
- "\t-c\t\"cat\" the module database.\n",
- "\t-f\tForce a head revision match if tag/date not found.\n",
- "\t-l\tLocal directory only, not recursive\n",
-@@ -92,6 +97,7 @@
- static char *join_rev1;
- static char *join_rev2;
- static int join_tags_validated;
-+static int pull_template;
- static char *preload_update_dir;
- static char *history_name;
- static enum mtype m_type;
-@@ -139,7 +145,7 @@
- else
- {
- m_type = CHECKOUT;
-- valid_options = "+ANnk:d:flRpQqcsr:D:j:P";
-+ valid_options = "+ANnk:d:flRpTQqcsr:D:j:P";
- valid_usage = checkout_usage;
- }
-
-@@ -168,6 +174,9 @@
- case 'n':
- run_module_prog = 0;
- break;
-+ case 'T':
-+ pull_template = 1;
-+ break;
- case 'Q':
- case 'q':
- #ifdef SERVER_SUPPORT
-@@ -1096,8 +1105,7 @@
- force_tag_match, 0 /* !local */ ,
- 1 /* update -d */ , aflag, checkout_prune_dirs,
- pipeout, which, join_rev1, join_rev2,
-- preload_update_dir, m_type == CHECKOUT,
-- repository);
-+ preload_update_dir, pull_template, repository);
- goto out;
- }
-
-@@ -1153,8 +1161,7 @@
- err += do_update (argc - 1, argv + 1, options, tag, date,
- force_tag_match, local_specified, 1 /* update -d */,
- aflag, checkout_prune_dirs, pipeout, which, join_rev1,
-- join_rev2, preload_update_dir, m_type == CHECKOUT,
-- repository);
-+ join_rev2, preload_update_dir, pull_template, repository);
- out:
- free (preload_update_dir);
- preload_update_dir = oldupdate;
-Index: src/client.c
-diff -u src/contrib/cvs/src/client.c:1.1.1.15 src/contrib/cvs/src/client.c:1.11
---- src/contrib/cvs/src/client.c:1.1.1.15 Thu Apr 15 10:01:55 2004
-+++ src/client.c Thu Apr 15 10:17:26 2004
-@@ -10,6 +10,10 @@
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details. */
-
-+/*
-+ * FreeBSD: src/contrib/cvs/src/client.c,v 1.11 2004/04/15 01:17:26 peter Exp $
-+ */
-+
- #ifdef HAVE_CONFIG_H
- # include "config.h"
- #endif /* HAVE_CONFIG_H */
-@@ -262,7 +266,7 @@
- }
-
- /* Now check the value for root. */
-- if (this_root && current_parsed_root
-+ if (CVSroot_cmdline == NULL && this_root && current_parsed_root
- && (strcmp (this_root, current_parsed_root->original) != 0))
- {
- /* Don't send this, since the CVSROOTs don't match. */
-@@ -4732,7 +4736,7 @@
- example in CVS_RSH or other such mechanisms to be devised,
- if that is what they want (the manual already tells them
- that). */
-- cvs_rsh = "rsh";
-+ cvs_rsh = "ssh";
- if (!cvs_server)
- cvs_server = "cvs";
-
-@@ -4793,7 +4797,7 @@
- int child_pid;
-
- if (!cvs_rsh)
-- cvs_rsh = "rsh";
-+ cvs_rsh = "ssh";
- if (!cvs_server)
- cvs_server = "cvs";
-
-@@ -5151,7 +5155,8 @@
- }
- else if (vers->ts_rcs == NULL
- || args->force
-- || strcmp (vers->ts_user, vers->ts_rcs) != 0)
-+ || strcmp (vers->ts_user, vers->ts_rcs) != 0
-+ || (vers->vn_user && *vers->vn_user == '0'))
- {
- if (args->no_contents
- && supported_request ("Is-modified"))
-Index: src/commit.c
-diff -u src/contrib/cvs/src/commit.c:1.1.1.13 src/contrib/cvs/src/commit.c:1.14
---- src/contrib/cvs/src/commit.c:1.1.1.13 Thu Apr 15 10:01:55 2004
-+++ src/commit.c Thu Apr 15 10:17:26 2004
-@@ -12,6 +12,7 @@
- *
- * The call is: cvs commit [options] files...
- *
-+ * FreeBSD: src/contrib/cvs/src/commit.c,v 1.14 2004/04/15 01:17:26 peter Exp $
- */
-
- #include <assert.h>
-Index: src/cvs.h
-diff -u src/contrib/cvs/src/cvs.h:1.1.1.14 src/contrib/cvs/src/cvs.h:1.19
---- src/contrib/cvs/src/cvs.h:1.1.1.14 Thu Apr 15 10:01:55 2004
-+++ src/cvs.h Thu Apr 15 10:41:05 2004
-@@ -9,6 +9,7 @@
- /*
- * basic information used in all source files
- *
-+ * FreeBSD: src/contrib/cvs/src/cvs.h,v 1.19 2004/04/15 01:41:05 peter Exp $
- */
-
-
-@@ -190,6 +191,7 @@
- #define CVSROOTADM_WRITERS "writers"
- #define CVSROOTADM_PASSWD "passwd"
- #define CVSROOTADM_CONFIG "config"
-+#define CVSROOTADM_OPTIONS "options"
-
- #define CVSNULLREPOS "Emptydir" /* an empty directory */
-
-@@ -259,6 +261,8 @@
- #define CVSREAD_ENV "CVSREAD" /* make files read-only */
- #define CVSREAD_DFLT 0 /* writable files by default */
-
-+#define CVSREADONLYFS_ENV "CVSREADONLYFS" /* repository is read-only */
-+
- #define TMPDIR_ENV "TMPDIR" /* Temporary directory */
-
- #define EDITOR1_ENV "CVSEDITOR" /* which editor to use */
-@@ -368,6 +372,7 @@
- extern int use_editor;
- extern int cvswrite;
- extern mode_t cvsumask;
-+extern char *RCS_citag;
-
-
-
-@@ -386,7 +391,9 @@
-
- extern int trace; /* Show all commands */
- extern int noexec; /* Don't modify disk anywhere */
-+extern int readonlyfs; /* fail on all write locks; succeed all read locks */
- extern int logoff; /* Don't write history entry */
-+extern int require_real_user; /* skip CVSROOT/passwd, /etc/passwd users only*/
-
- extern int top_level_admin;
-
-@@ -494,6 +501,7 @@
- char *strcat_filename_onto_homedir PROTO ((const char *, const char *));
- char *cvs_temp_name PROTO ((void));
- FILE *cvs_temp_file PROTO ((char **filename));
-+void parseopts PROTO ((const char *root));
-
- int numdots PROTO((const char *s));
- char *increment_revnum PROTO ((const char *));
-@@ -572,6 +580,7 @@
- void WriteTag PROTO ((const char *dir, const char *tag, const char *date,
- int nonbranch, const char *update_dir,
- const char *repository));
-+void WriteTemplate PROTO ((const char *dir, const char *update_dir));
- void cat_module PROTO((int status));
- void check_entries PROTO((char *dir));
- void close_module PROTO((DBM * db));
-Index: src/diff.c
-diff -u src/contrib/cvs/src/diff.c:1.1.1.12 src/contrib/cvs/src/diff.c:1.21
---- src/contrib/cvs/src/diff.c:1.1.1.12 Thu Apr 15 10:01:55 2004
-+++ src/diff.c Thu Apr 15 10:31:28 2004
-@@ -12,6 +12,8 @@
- *
- * Without any file arguments, runs diff against all the currently modified
- * files.
-+ *
-+ * FreeBSD: src/contrib/cvs/src/diff.c,v 1.21 2004/04/15 01:31:28 peter Exp $
- */
-
- #include <assert.h>
-@@ -52,6 +54,7 @@
- static char *diff_rev1, *diff_rev2;
- /* Command line dates, from -D option. Malloc'd. */
- static char *diff_date1, *diff_date2;
-+static char *diff_join1, *diff_join2;
- static char *use_rev1, *use_rev2;
- static int have_rev1_label, have_rev2_label;
-
-@@ -272,6 +275,8 @@
- diff_rev2 = NULL;
- diff_date1 = NULL;
- diff_date2 = NULL;
-+ diff_join1 = NULL;
-+ diff_join2 = NULL;
-
- optind = 0;
- /* FIXME: This should really be allocating an argv to be passed to diff
-@@ -282,7 +287,7 @@
- * to diff.
- */
- while ((c = getopt_long (argc, argv,
-- "+abcdefhilnpstuwy0123456789BHNRTC:D:F:I:L:U:W:k:r:",
-+ "+abcdefhilnpstuwy0123456789BHNRTC:D:F:I:L:U:W:k:r:j:",
- longopts, &option_index)) != -1)
- {
- switch (c)
-@@ -345,6 +350,27 @@
- free (options);
- options = RCS_check_kflag (optarg);
- break;
-+ case 'j':
-+ {
-+ char *ptr;
-+ char *cpy = strdup(optarg);
-+
-+ if ((ptr = strchr(optarg, ':')) != NULL)
-+ *ptr++ = 0;
-+ if (diff_rev2 != NULL || diff_date2 != NULL)
-+ error (1, 0,
-+ "no more than two revisions/dates can be specified");
-+ if (diff_rev1 != NULL || diff_date1 != NULL) {
-+ diff_join2 = cpy;
-+ diff_rev2 = optarg;
-+ diff_date2 = ptr ? Make_Date(ptr) : NULL;
-+ } else {
-+ diff_join1 = cpy;
-+ diff_rev1 = optarg;
-+ diff_date1 = ptr ? Make_Date(ptr) : NULL;
-+ }
-+ }
-+ break;
- case 'r':
- if (diff_rev2 != NULL || diff_date2 != NULL)
- error (1, 0,
-@@ -393,13 +419,18 @@
- send_option_string (opts);
- if (options[0] != '\0')
- send_arg (options);
-- if (diff_rev1)
-+ if (diff_join1)
-+ option_with_arg ("-j", diff_join1);
-+ else if (diff_rev1)
- option_with_arg ("-r", diff_rev1);
-- if (diff_date1)
-+ else if (diff_date1)
- client_senddate (diff_date1);
-- if (diff_rev2)
-+
-+ if (diff_join2)
-+ option_with_arg ("-j", diff_join2);
-+ else if (diff_rev2)
- option_with_arg ("-r", diff_rev2);
-- if (diff_date2)
-+ else if (diff_date2)
- client_senddate (diff_date2);
- send_arg ("--");
-
-@@ -413,28 +444,26 @@
-
- send_to_server ("diff\012", 0);
- err = get_responses_and_close ();
-- free (options);
-- options = NULL;
-- return (err);
-- }
-+ } else
- #endif
--
-- if (diff_rev1 != NULL)
-- tag_check_valid (diff_rev1, argc, argv, local, 0, "");
-- if (diff_rev2 != NULL)
-- tag_check_valid (diff_rev2, argc, argv, local, 0, "");
--
-- which = W_LOCAL;
-- if (diff_rev1 != NULL || diff_date1 != NULL)
-- which |= W_REPOS | W_ATTIC;
--
-- wrap_setup ();
--
-- /* start the recursion processor */
-- err = start_recursion (diff_fileproc, diff_filesdoneproc, diff_dirproc,
-- diff_dirleaveproc, NULL, argc, argv, local,
-- which, 0, CVS_LOCK_READ, (char *) NULL, 1,
-- (char *) NULL);
-+ {
-+ if (diff_rev1 != NULL)
-+ tag_check_valid (diff_rev1, argc, argv, local, 0, "");
-+ if (diff_rev2 != NULL)
-+ tag_check_valid (diff_rev2, argc, argv, local, 0, "");
-+
-+ which = W_LOCAL;
-+ if (diff_rev1 != NULL || diff_date1 != NULL)
-+ which |= W_REPOS | W_ATTIC;
-+
-+ wrap_setup ();
-+
-+ /* start the recursion processor */
-+ err = start_recursion (diff_fileproc, diff_filesdoneproc, diff_dirproc,
-+ diff_dirleaveproc, NULL, argc, argv, local,
-+ which, 0, CVS_LOCK_READ, (char *) NULL, 1,
-+ (char *) NULL);
-+ }
-
- /* clean up */
- free (options);
-@@ -444,6 +473,10 @@
- free (diff_date1);
- if (diff_date2 != NULL)
- free (diff_date2);
-+ if (diff_join1 != NULL)
-+ free (diff_join1);
-+ if (diff_join2 != NULL)
-+ free (diff_join2);
-
- return (err);
- }
-@@ -489,7 +522,7 @@
- int exists;
-
- exists = 0;
-- /* special handling for TAG_HEAD */
-+ /* special handling for TAG_HEAD XXX */
- if (diff_rev1 && strcmp (diff_rev1, TAG_HEAD) == 0)
- {
- char *head =
-@@ -886,7 +919,7 @@
-
- if (diff_rev1 || diff_date1)
- {
-- /* special handling for TAG_HEAD */
-+ /* special handling for TAG_HEAD XXX */
- if (diff_rev1 && strcmp (diff_rev1, TAG_HEAD) == 0)
- {
- if (vers->vn_rcs != NULL && vers->srcfile != NULL)
-@@ -902,7 +935,7 @@
- }
- if (diff_rev2 || diff_date2)
- {
-- /* special handling for TAG_HEAD */
-+ /* special handling for TAG_HEAD XXX */
- if (diff_rev2 && strcmp (diff_rev2, TAG_HEAD) == 0)
- {
- if (vers->vn_rcs != NULL && vers->srcfile != NULL)
-Index: src/entries.c
-diff -u src/contrib/cvs/src/entries.c:1.1.1.8 src/contrib/cvs/src/entries.c:1.4
---- src/contrib/cvs/src/entries.c:1.1.1.8 Thu Apr 15 10:01:55 2004
-+++ src/entries.c Thu Apr 15 10:41:05 2004
-@@ -11,6 +11,9 @@
- * the Entries file.
- */
-
-+/*
-+ * FreeBSD: src/contrib/cvs/src/entries.c,v 1.4 2004/04/15 01:41:05 peter Exp $
-+ */
- #include "cvs.h"
- #include "getline.h"
-
-@@ -633,6 +636,72 @@
- /* put the node into the list */
- addnode (list, p);
- return (p);
-+}
-+
-+static char *root_template;
-+
-+static int
-+get_root_template(const char *repository, const char *path)
-+{
-+ if (root_template) {
-+ if (strcmp(path, root_template) == 0)
-+ return(0);
-+ free(root_template);
-+ }
-+ if ((root_template = strdup(path)) == NULL)
-+ return(-1);
-+ return(0);
-+}
-+
-+/*
-+ * Write out/Clear the CVS/Template file.
-+ */
-+void
-+WriteTemplate (dir, update_dir)
-+ const char *dir;
-+ const char *update_dir;
-+{
-+ char *tmp = NULL;
-+ struct stat st1;
-+ struct stat st2;
-+
-+ if (Parse_Info(CVSROOTADM_RCSINFO, "cvs", get_root_template, 1) < 0)
-+ return;
-+
-+ if (asprintf(&tmp, "%s/%s", dir, CVSADM_TEMPLATE) < 0)
-+ error (1, errno, "out of memory");
-+
-+ if (stat(root_template, &st1) == 0) {
-+ if (stat(tmp, &st2) < 0 || st1.st_mtime != st2.st_mtime) {
-+ FILE *fi;
-+ FILE *fo;
-+
-+ if ((fi = open_file(root_template, "r")) != NULL) {
-+ if ((fo = open_file(tmp, "w")) != NULL) {
-+ int n;
-+ char buf[256];
-+
-+ while ((n = fread(buf, 1, sizeof(buf), fi)) > 0)
-+ fwrite(buf, 1, n, fo);
-+ fflush(fo);
-+ if (ferror(fi) || ferror(fo)) {
-+ fclose(fo);
-+ remove(tmp);
-+ error (1, errno, "error copying Template");
-+ } else {
-+ struct timeval times[2];
-+ fclose(fo);
-+ times[0].tv_sec = st1.st_mtime;
-+ times[0].tv_usec = 0;
-+ times[1] = times[0];
-+ utimes(tmp, times);
-+ }
-+ }
-+ fclose(fi);
-+ }
-+ }
-+ }
-+ free(tmp);
- }
-
- /*
-Index: src/filesubr.c
-diff -u src/contrib/cvs/src/filesubr.c:1.1.1.11 src/contrib/cvs/src/filesubr.c:1.11
---- src/contrib/cvs/src/filesubr.c:1.1.1.11 Thu Apr 15 10:01:55 2004
-+++ src/filesubr.c Thu Apr 15 10:17:27 2004
-@@ -17,6 +17,10 @@
- definitions under operating systems (like, say, Windows NT) with different
- file system semantics. */
-
-+/*
-+ * FreeBSD: src/contrib/cvs/src/filesubr.c,v 1.11 2004/04/15 01:17:27 peter Exp $
-+ */
-+
- #include <assert.h>
- #include "cvs.h"
-
-@@ -872,8 +876,8 @@
- const char *link;
- {
- char *file = NULL;
-- int buflen = 128;
-- int link_name_len;
-+ int buflen = BUFSIZ;
-+ int linklen;
-
- /* Get the name of the file to which `from' is linked.
- FIXME: what portability issues arise here? Are readlink &
-@@ -881,15 +885,15 @@
- do
- {
- file = xrealloc (file, buflen);
-- link_name_len = readlink (link, file, buflen - 1);
-+ errno = 0;
-+ linklen = readlink (link, file, buflen - 1);
- buflen *= 2;
- }
-- while (link_name_len < 0 && errno == ENAMETOOLONG);
-+ while (linklen == -1 && errno == ENAMETOOLONG);
-
-- if (link_name_len < 0)
-+ if (linklen == -1)
- error (1, errno, "cannot readlink %s", link);
--
-- file[link_name_len] = '\0';
-+ file[linklen] = '\0';
-
- return file;
- }
-Index: src/import.c
-diff -u src/contrib/cvs/src/import.c:1.1.1.13 src/contrib/cvs/src/import.c:1.12
---- src/contrib/cvs/src/import.c:1.1.1.13 Thu Apr 15 10:01:55 2004
-+++ src/import.c Thu Apr 15 10:17:27 2004
-@@ -14,6 +14,8 @@
- * VendorReleTag Tag for this particular release
- *
- * Additional arguments specify more Vendor Release Tags.
-+ *
-+ * FreeBSD: src/contrib/cvs/src/import.c,v 1.12 2004/04/15 01:17:27 peter Exp $
- */
-
- #include "cvs.h"
-Index: src/lock.c
-diff -u src/contrib/cvs/src/lock.c:1.1.1.12 src/contrib/cvs/src/lock.c:1.13
---- src/contrib/cvs/src/lock.c:1.1.1.12 Thu Apr 15 10:01:55 2004
-+++ src/lock.c Thu Apr 15 10:17:27 2004
-@@ -8,6 +8,8 @@
- * Set Lock
- *
- * Lock file support for CVS.
-+ *
-+ * FreeBSD: src/contrib/cvs/src/lock.c,v 1.13 2004/04/15 01:17:27 peter Exp $
- */
-
- /* The node Concurrency in doc/cvs.texinfo has a brief introduction to
-@@ -407,7 +409,7 @@
- (void) fprintf (stderr, "%s-> Reader_Lock(%s)\n", CLIENT_SERVER_STR,
- xrepository);
-
-- if (noexec)
-+ if (noexec || readonlyfs)
- return 0;
-
- /* we only do one directory at a time for read locks! */
-@@ -483,6 +485,11 @@
-
- if (noexec)
- return 0;
-+
-+ if (readonlyfs) {
-+ error (0, 0, "write lock failed - read-only repository");
-+ return (1);
-+ }
-
- /* We only know how to do one list at a time */
- if (locklist != (List *) NULL)
-Index: src/login.c
-diff -u src/contrib/cvs/src/login.c:1.1.1.9 src/contrib/cvs/src/login.c:1.8
---- src/contrib/cvs/src/login.c:1.1.1.9 Thu Apr 15 10:01:55 2004
-+++ src/login.c Thu Apr 15 10:17:27 2004
-@@ -5,6 +5,8 @@
- * specified in the README file that comes with CVS.
- *
- * Allow user to log in for an authenticating server.
-+ *
-+ * FreeBSD: src/contrib/cvs/src/login.c,v 1.8 2004/04/15 01:17:27 peter Exp $
- */
-
- #include "cvs.h"
-Index: src/logmsg.c
-diff -u src/contrib/cvs/src/logmsg.c:1.1.1.10 src/contrib/cvs/src/logmsg.c:1.12
---- src/contrib/cvs/src/logmsg.c:1.1.1.10 Thu Apr 15 10:01:55 2004
-+++ src/logmsg.c Thu Apr 15 10:17:27 2004
-@@ -4,6 +4,8 @@
- *
- * You may distribute under the terms of the GNU General Public License as
- * specified in the README file that comes with the CVS source distribution.
-+ *
-+ * FreeBSD: src/contrib/cvs/src/logmsg.c,v 1.12 2004/04/15 01:17:27 peter Exp $
- */
-
- #include <assert.h>
-@@ -226,6 +228,8 @@
- (*messagep)[strlen (*messagep) - 1] != '\n')
- (void) fprintf (fp, "\n");
- }
-+ else
-+ (void) fprintf (fp, "\n");
-
- if (repository != NULL)
- /* tack templates on if necessary */
-Index: src/main.c
-diff -u src/contrib/cvs/src/main.c:1.1.1.13 src/contrib/cvs/src/main.c:1.24
---- src/contrib/cvs/src/main.c:1.1.1.13 Thu Apr 15 10:01:55 2004
-+++ src/main.c Thu Apr 15 10:17:27 2004
-@@ -10,10 +10,12 @@
- * Credit to Dick Grune, Vrije Universiteit, Amsterdam, for writing
- * the shell-script CVS system that this is based on.
- *
-+ * FreeBSD: src/contrib/cvs/src/main.c,v 1.24 2004/04/15 01:17:27 peter Exp $
- */
-
- #include <assert.h>
- #include "cvs.h"
-+#include "prepend_args.h"
-
- #ifdef HAVE_WINSOCK_H
- #include <winsock.h>
-@@ -41,6 +43,8 @@
- int quiet = 0;
- int trace = 0;
- int noexec = 0;
-+int readonlyfs = 0;
-+int require_real_user = 0;
- int logoff = 0;
-
- /* Set if we should be writing CVSADM directories at top level. At
-@@ -106,7 +110,7 @@
- {
- { "add", "ad", "new", add, CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
- { "admin", "adm", "rcs", admin, CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
-- { "annotate", "ann", NULL, annotate, CVS_CMD_USES_WORK_DIR },
-+ { "annotate", "ann", "blame", annotate, CVS_CMD_USES_WORK_DIR },
- { "checkout", "co", "get", checkout, 0 },
- { "commit", "ci", "com", commit, CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
- { "diff", "di", "dif", diff, CVS_CMD_USES_WORK_DIR },
-@@ -247,8 +251,10 @@
- " -q Cause CVS to be somewhat quiet.\n",
- " -r Make checked-out files read-only.\n",
- " -w Make checked-out files read-write (default).\n",
-+ " -g Force group-write perms on checked-out files.\n",
- " -n Do not execute anything that will change the disk.\n",
- " -t Show trace of program execution -- try with -n.\n",
-+ " -R Assume repository is read-only, such as CDROM\n",
- " -v CVS version and copyright.\n",
- " -T tmpdir Use 'tmpdir' for temporary files.\n",
- " -e editor Use 'editor' for editing log information.\n",
-@@ -406,7 +412,7 @@
- int help = 0; /* Has the user asked for help? This
- lets us support the `cvs -H cmd'
- convention to give help for cmd. */
-- static const char short_options[] = "+Qqrwtnvb:T:e:d:Hfz:s:xa";
-+ static const char short_options[] = "+QqgrwtnRvb:T:e:d:Hfz:s:xaU";
- static struct option long_options[] =
- {
- {"help", 0, NULL, 'H'},
-@@ -469,6 +475,12 @@
- }
- if (getenv (CVSREAD_ENV) != NULL)
- cvswrite = 0;
-+ if (getenv (CVSREADONLYFS_ENV) != NULL) {
-+ readonlyfs = 1;
-+ logoff = 1;
-+ }
-+
-+ prepend_default_options (getenv ("CVS_OPTIONS"), &argc, &argv);
-
- /* Set this to 0 to force getopt initialization. getopt() sets
- this to 1 internally. */
-@@ -531,9 +543,20 @@
- case 'w':
- cvswrite = 1;
- break;
-+ case 'g':
-+ /*
-+ * force full group write perms (used for shared checked-out
-+ * source trees, see manual page)
-+ */
-+ umask(umask(077) & 007);
-+ break;
- case 't':
- trace = 1;
- break;
-+ case 'R':
-+ readonlyfs = 1;
-+ logoff = 1;
-+ break;
- case 'n':
- noexec = 1;
- logoff = 1;
-@@ -623,6 +646,11 @@
- We will issue an error later if stream
- authentication is not supported. */
- break;
-+ case 'U':
-+#ifdef SERVER_SUPPORT
-+ require_real_user = 1;
-+#endif
-+ break;
- case '?':
- default:
- usage (usg);
-@@ -749,6 +777,12 @@
- (void) putenv (env);
- /* do not free env, as putenv has control of it */
- }
-+ {
-+ char *env;
-+ env = xmalloc (sizeof "CVS_PID=" + 32); /* XXX pid < 10^32 */
-+ (void) sprintf (env, "CVS_PID=%ld", (long) getpid ());
-+ (void) putenv (env);
-+ }
- #endif
-
- #ifndef DONT_USE_SIGNALS
-@@ -974,6 +1008,9 @@
- if we didn't, then there would be no way to check in a new
- CVSROOT/config file to fix the broken one! */
- parse_config (current_parsed_root->directory);
-+
-+ /* Now is a convenient time to read CVSROOT/options */
-+ parseopts(current_parsed_root->directory);
- }
-
- #ifdef CLIENT_SUPPORT
-@@ -1165,4 +1202,62 @@
- for (; *cpp; cpp++)
- (void) fprintf (stderr, *cpp);
- error_exit ();
-+}
-+
-+void
-+parseopts(root)
-+ const char *root;
-+{
-+ char path[PATH_MAX];
-+ int save_errno;
-+ char buf[1024];
-+ const char *p;
-+ char *q;
-+ FILE *fp;
-+
-+ if (root == NULL) {
-+ printf("no CVSROOT in parseopts\n");
-+ return;
-+ }
-+ p = strchr (root, ':');
-+ if (p)
-+ p++;
-+ else
-+ p = root;
-+ if (p == NULL) {
-+ printf("mangled CVSROOT in parseopts\n");
-+ return;
-+ }
-+ (void) sprintf (path, "%s/%s/%s", p, CVSROOTADM, CVSROOTADM_OPTIONS);
-+ if ((fp = fopen(path, "r")) != NULL) {
-+ while (fgets(buf, sizeof buf, fp) != NULL) {
-+ if (buf[0] == '#')
-+ continue;
-+ q = strrchr(buf, '\n');
-+ if (q)
-+ *q = '\0';
-+
-+ if (!strncmp(buf, "tag=", 4)) {
-+ char *what;
-+ char *rcs_localid;
-+
-+ rcs_localid = buf + 4;
-+ RCS_setlocalid(rcs_localid);
-+ }
-+ if (!strncmp(buf, "tagexpand=", 10)) {
-+ char *what;
-+ char *rcs_incexc;
-+
-+ rcs_incexc = buf + 10;
-+ RCS_setincexc(rcs_incexc);
-+ }
-+ /*
-+ * OpenBSD has a "umask=" and "dlimit=" command, we silently
-+ * ignore them here since they are not much use to us. cvsumask
-+ * defaults to 002 already, and the dlimit (data size limit)
-+ * should really be handled elsewhere (eg: login.conf).
-+ */
-+ }
-+ fclose(fp);
-+ }
- }
-Index: src/mkmodules.c
-diff -u src/contrib/cvs/src/mkmodules.c:1.1.1.12 src/contrib/cvs/src/mkmodules.c:1.13
---- src/contrib/cvs/src/mkmodules.c:1.1.1.12 Thu Apr 15 10:01:55 2004
-+++ src/mkmodules.c Thu Apr 15 10:17:27 2004
-@@ -3,7 +3,10 @@
- * Copyright (c) 1989-1992, Brian Berliner
- *
- * You may distribute under the terms of the GNU General Public License as
-- * specified in the README file that comes with the CVS kit. */
-+ * specified in the README file that comes with the CVS kit.
-+ *
-+ * FreeBSD: src/contrib/cvs/src/mkmodules.c,v 1.13 2004/04/15 01:17:27 peter Exp $
-+ */
-
- #include "cvs.h"
- #include "getline.h"
-Index: src/parseinfo.c
-diff -u src/contrib/cvs/src/parseinfo.c:1.1.1.12 src/contrib/cvs/src/parseinfo.c:1.3
---- src/contrib/cvs/src/parseinfo.c:1.1.1.12 Thu Apr 15 10:01:55 2004
-+++ src/parseinfo.c Thu Apr 15 10:17:27 2004
-@@ -4,6 +4,8 @@
- *
- * You may distribute under the terms of the GNU General Public License as
- * specified in the README file that comes with the CVS source distribution.
-+ *
-+ * FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3 2004/04/15 01:17:27 peter Exp $
- */
-
- #include "cvs.h"
-@@ -349,6 +351,25 @@
- error (0, 0, "unrecognized value '%s' for SystemAuth", p);
- goto error_return;
- }
-+ }
-+ else if (strcmp (line, "tag") == 0) {
-+ RCS_setlocalid(p);
-+ }
-+ else if (strcmp (line, "umask") == 0) {
-+ cvsumask = (mode_t)(strtol(p, NULL, 8) & 0777);
-+ }
-+ else if (strcmp (line, "dlimit") == 0) {
-+#ifdef BSD
-+#include <sys/resource.h>
-+ struct rlimit rl;
-+
-+ if (getrlimit(RLIMIT_DATA, &rl) != -1) {
-+ rl.rlim_cur = atoi(p);
-+ rl.rlim_cur *= 1024;
-+
-+ (void) setrlimit(RLIMIT_DATA, &rl);
-+ }
-+#endif /* BSD */
- }
- else if (strcmp (line, "PreservePermissions") == 0)
- {
-Index: src/rcs.c
-diff -u src/contrib/cvs/src/rcs.c:1.1.1.14 src/contrib/cvs/src/rcs.c:1.26
---- src/contrib/cvs/src/rcs.c:1.1.1.14 Thu Apr 15 10:01:55 2004
-+++ src/rcs.c Thu Apr 15 10:17:27 2004
-@@ -6,6 +6,8 @@
- *
- * The routines contained in this file do all the rcs file parsing and
- * manipulation
-+ *
-+ * FreeBSD: src/contrib/cvs/src/rcs.c,v 1.26 2004/04/15 01:17:27 peter Exp $
- */
-
- #include <assert.h>
-@@ -134,6 +136,8 @@
- evaluates its arguments multiple times. */
- #define STREQ(a, b) (*(char *)(a) == *(char *)(b) && strcmp ((a), (b)) == 0)
-
-+static char * getfullCVSname PROTO ((char *, char **));
-+
- /*
- * We don't want to use isspace() from the C library because:
- *
-@@ -2502,13 +2506,25 @@
- char *rev;
- {
- int rev_num;
-- char *xrev, *test_branch;
-+ char *xrev, *test_branch, *local_branch_num;
-
- xrev = xmalloc (strlen (rev) + 14); /* enough for .0.number */
- check_rev = xrev;
-
-+ local_branch_num = getenv("CVS_LOCAL_BRANCH_NUM");
-+ if (local_branch_num)
-+ {
-+ rev_num = atoi(local_branch_num);
-+ if (rev_num < 2)
-+ rev_num = 2;
-+ else
-+ rev_num &= ~1;
-+ }
-+ else
-+ rev_num = 2;
-+
- /* only look at even numbered branches */
-- for (rev_num = 2; ; rev_num += 2)
-+ for ( ; ; rev_num += 2)
- {
- /* see if the physical branch exists */
- (void) sprintf (xrev, "%s.%d", rev, rev_num);
-@@ -3481,27 +3497,31 @@
- {
- const char *string;
- size_t len;
-+ int expandit;
- };
- #define KEYWORD_INIT(s) (s), sizeof (s) - 1
--static const struct rcs_keyword keywords[] =
-+static struct rcs_keyword keywords[] =
- {
-- { KEYWORD_INIT ("Author") },
-- { KEYWORD_INIT ("Date") },
-- { KEYWORD_INIT ("Header") },
-- { KEYWORD_INIT ("Id") },
-- { KEYWORD_INIT ("Locker") },
-- { KEYWORD_INIT ("Log") },
-- { KEYWORD_INIT ("Name") },
-- { KEYWORD_INIT ("RCSfile") },
-- { KEYWORD_INIT ("Revision") },
-- { KEYWORD_INIT ("Source") },
-- { KEYWORD_INIT ("State") },
-- { NULL, 0 }
-+ { KEYWORD_INIT ("Author"), 1 },
-+ { KEYWORD_INIT ("Date"), 1 },
-+ { KEYWORD_INIT ("CVSHeader"), 1 },
-+ { KEYWORD_INIT ("Header"), 1 },
-+ { KEYWORD_INIT ("Id"), 1 },
-+ { KEYWORD_INIT ("Locker"), 1 },
-+ { KEYWORD_INIT ("Log"), 1 },
-+ { KEYWORD_INIT ("Name"), 1 },
-+ { KEYWORD_INIT ("RCSfile"), 1 },
-+ { KEYWORD_INIT ("Revision"), 1 },
-+ { KEYWORD_INIT ("Source"), 1 },
-+ { KEYWORD_INIT ("State"), 1 },
-+ { NULL, 0, 0 },
-+ { NULL, 0, 0 }
- };
- enum keyword
- {
- KEYWORD_AUTHOR = 0,
- KEYWORD_DATE,
-+ KEYWORD_CVSHEADER,
- KEYWORD_HEADER,
- KEYWORD_ID,
- KEYWORD_LOCKER,
-@@ -3510,8 +3530,10 @@
- KEYWORD_RCSFILE,
- KEYWORD_REVISION,
- KEYWORD_SOURCE,
-- KEYWORD_STATE
-+ KEYWORD_STATE,
-+ KEYWORD_LOCALID
- };
-+enum keyword keyword_local = KEYWORD_ID;
-
- /* Convert an RCS date string into a readable string. This is like
- the RCS date2str function. */
-@@ -3689,7 +3711,8 @@
- slen = s - srch;
- for (keyword = keywords; keyword->string != NULL; keyword++)
- {
-- if (keyword->len == slen
-+ if (keyword->expandit
-+ && keyword->len == slen
- && strncmp (keyword->string, srch, slen) == 0)
- {
- break;
-@@ -3736,15 +3759,25 @@
- free_value = 1;
- break;
-
-+ case KEYWORD_CVSHEADER:
- case KEYWORD_HEADER:
- case KEYWORD_ID:
-+ case KEYWORD_LOCALID:
- {
- const char *path;
- int free_path;
- char *date;
-+ char *old_path;
-
-- if (kw == KEYWORD_HEADER)
-+ old_path = NULL;
-+ if (kw == KEYWORD_HEADER ||
-+ (kw == KEYWORD_LOCALID &&
-+ keyword_local == KEYWORD_HEADER))
- path = rcs->path;
-+ else if (kw == KEYWORD_CVSHEADER ||
-+ (kw == KEYWORD_LOCALID &&
-+ keyword_local == KEYWORD_CVSHEADER))
-+ path = getfullCVSname(rcs->path, &old_path);
- else
- path = last_component (rcs->path);
- path = escape_keyword_value (path, &free_path);
-@@ -3767,6 +3800,8 @@
- * and we can discard the const.
- */
- free ((char *)path);
-+ if (old_path)
-+ free (old_path);
- free (date);
- free_value = 1;
- }
-@@ -8619,4 +8654,106 @@
- (void) sprintf (label, "-L%s\t%s", path, datebuf);
- }
- return label;
-+}
-+
-+void
-+RCS_setlocalid (arg)
-+ const char *arg;
-+{
-+ char *copy, *next, *key;
-+
-+ copy = xstrdup(arg);
-+ next = copy;
-+ key = strtok(next, "=");
-+
-+ keywords[KEYWORD_LOCALID].string = xstrdup(key);
-+ keywords[KEYWORD_LOCALID].len = strlen(key);
-+ keywords[KEYWORD_LOCALID].expandit = 1;
-+
-+ /* options? */
-+ while (key = strtok(NULL, ",")) {
-+ if (!strcmp(key, keywords[KEYWORD_ID].string))
-+ keyword_local = KEYWORD_ID;
-+ else if (!strcmp(key, keywords[KEYWORD_HEADER].string))
-+ keyword_local = KEYWORD_HEADER;
-+ else if (!strcmp(key, keywords[KEYWORD_CVSHEADER].string))
-+ keyword_local = KEYWORD_CVSHEADER;
-+ else
-+ error(1, 0, "Unknown LocalId mode: %s", key);
-+ }
-+ free(copy);
-+}
-+
-+void
-+RCS_setincexc (arg)
-+ const char *arg;
-+{
-+ char *key;
-+ char *copy, *next;
-+ int include = 0;
-+ struct rcs_keyword *keyword;
-+
-+ copy = xstrdup(arg);
-+ next = copy;
-+ switch (*next++) {
-+ case 'e':
-+ include = 0;
-+ break;
-+ case 'i':
-+ include = 1;
-+ break;
-+ default:
-+ free(copy);
-+ return;
-+ }
-+
-+ if (include)
-+ for (keyword = keywords; keyword->string != NULL; keyword++)
-+ {
-+ keyword->expandit = 0;
-+ }
-+
-+ key = strtok(next, ",");
-+ while (key) {
-+ for (keyword = keywords; keyword->string != NULL; keyword++) {
-+ if (strcmp (keyword->string, key) == 0)
-+ keyword->expandit = include;
-+ }
-+ key = strtok(NULL, ",");
-+ }
-+ free(copy);
-+ return;
-+}
-+
-+#define ATTIC "/" CVSATTIC
-+static char *
-+getfullCVSname(CVSname, pathstore)
-+ char *CVSname, **pathstore;
-+{
-+ if (current_parsed_root->directory) {
-+ int rootlen;
-+ char *c = NULL;
-+ int alen = sizeof(ATTIC) - 1;
-+
-+ *pathstore = xstrdup(CVSname);
-+ if ((c = strrchr(*pathstore, '/')) != NULL) {
-+ if (c - *pathstore >= alen) {
-+ if (!strncmp(c - alen, ATTIC, alen)) {
-+ while (*c != '\0') {
-+ *(c - alen) = *c;
-+ c++;
-+ }
-+ *(c - alen) = '\0';
-+ }
-+ }
-+ }
-+
-+ rootlen = strlen(current_parsed_root->directory);
-+ if (!strncmp(*pathstore, current_parsed_root->directory, rootlen) &&
-+ (*pathstore)[rootlen] == '/')
-+ CVSname = (*pathstore + rootlen + 1);
-+ else
-+ CVSname = (*pathstore);
-+ }
-+ return CVSname;
- }
-Index: src/rcs.h
-diff -u src/contrib/cvs/src/rcs.h:1.1.1.10 src/contrib/cvs/src/rcs.h:1.10
---- src/contrib/cvs/src/rcs.h:1.1.1.10 Thu Apr 15 10:01:55 2004
-+++ src/rcs.h Thu Apr 15 10:17:27 2004
-@@ -6,6 +6,8 @@
- * specified in the README file that comes with the CVS source distribution.
- *
- * RCS source control definitions needed by rcs.c and friends
-+ *
-+ * FreeBSD: src/contrib/cvs/src/rcs.h,v 1.10 2004/04/15 01:17:27 peter Exp $
- */
-
- /* Strings which indicate a conflict if they occur at the start of a line. */
-@@ -244,6 +246,8 @@
- void RCS_deltas PROTO ((RCSNode *, FILE *, struct rcsbuffer *, const char *,
- enum rcs_delta_op, char **, size_t *,
- char **, size_t *));
-+void RCS_setincexc PROTO ((const char *arg));
-+void RCS_setlocalid PROTO ((const char *arg));
- char *make_file_label PROTO ((const char *, const char *, RCSNode *));
-
- extern int preserve_perms;
-Index: src/rcscmds.c
-diff -u src/contrib/cvs/src/rcscmds.c:1.1.1.10 src/contrib/cvs/src/rcscmds.c:1.10
---- src/contrib/cvs/src/rcscmds.c:1.1.1.10 Thu Apr 15 10:01:55 2004
-+++ src/rcscmds.c Thu Apr 15 10:17:27 2004
-@@ -7,6 +7,8 @@
- *
- * The functions in this file provide an interface for performing
- * operations directly on RCS files.
-+ *
-+ * FreeBSD: src/contrib/cvs/src/rcscmds.c,v 1.10 2004/04/15 01:17:27 peter Exp $
- */
-
- #include "cvs.h"
-Index: src/recurse.c
-diff -u src/contrib/cvs/src/recurse.c:1.1.1.13 src/contrib/cvs/src/recurse.c:1.12
---- src/contrib/cvs/src/recurse.c:1.1.1.13 Thu Apr 15 10:01:55 2004
-+++ src/recurse.c Thu Apr 15 10:17:27 2004
-@@ -6,6 +6,7 @@
- *
- * General recursion handler
- *
-+ * FreeBSD: src/contrib/cvs/src/recurse.c,v 1.12 2004/04/15 01:17:27 peter Exp $
- */
-
- #include "cvs.h"
-Index: src/server.c
-diff -u src/contrib/cvs/src/server.c:1.1.1.15 src/contrib/cvs/src/server.c:1.21
---- src/contrib/cvs/src/server.c:1.1.1.15 Thu Apr 15 10:01:55 2004
-+++ src/server.c Thu Apr 15 10:17:27 2004
-@@ -8,6 +8,10 @@
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details. */
-
-+/*
-+ * FreeBSD: src/contrib/cvs/src/server.c,v 1.21 2004/04/15 01:17:27 peter Exp $
-+ */
-+
- #include <assert.h>
- #include "cvs.h"
- #include "watch.h"
-@@ -773,6 +777,9 @@
- nothing. But for rsh, we need to do it now. */
- parse_config (current_parsed_root->directory);
-
-+ /* Now is a good time to read CVSROOT/options too. */
-+ parseopts(current_parsed_root->directory);
-+
- path = xmalloc (strlen (current_parsed_root->directory)
- + sizeof (CVSROOTADM)
- + 2);
-@@ -5508,7 +5515,10 @@
- password file. If so, that's enough to authenticate with. If
- not, we'll check /etc/passwd. */
-
-- rc = check_repository_password (username, password, repository,
-+ if (require_real_user)
-+ rc = 0; /* "not found" */
-+ else
-+ rc = check_repository_password (username, password, repository,
- &host_user);
-
- if (rc == 2)
-Index: src/update.c
-diff -u src/contrib/cvs/src/update.c:1.1.1.14 src/contrib/cvs/src/update.c:1.13
---- src/contrib/cvs/src/update.c:1.1.1.14 Thu Apr 15 10:01:55 2004
-+++ src/update.c Thu Apr 15 10:17:28 2004
-@@ -31,6 +31,8 @@
- * versions, these are updated too. If the -d option was specified, new
- * directories added to the repository are automatically created and updated
- * as well.
-+ *
-+ * FreeBSD: src/contrib/cvs/src/update.c,v 1.13 2004/04/15 01:17:28 peter Exp $
- */
-
- #include "cvs.h"
-@@ -95,10 +97,10 @@
- static int aflag = 0;
- static int toss_local_changes = 0;
- static int force_tag_match = 1;
-+static int pull_template = 0;
- static int update_build_dirs = 0;
- static int update_prune_dirs = 0;
- static int pipeout = 0;
--static int dotemplate = 0;
- #ifdef SERVER_SUPPORT
- static int patches = 0;
- static int rcs_diff_patches = 0;
-@@ -123,6 +125,7 @@
- "\t-j rev\tMerge in changes made between current revision and rev.\n",
- "\t-I ign\tMore files to ignore (! to reset).\n",
- "\t-W spec\tWrappers specification line.\n",
-+ "\t-T\tCreate CVS/Template.\n",
- "(Specify the --help global option for a list of other help options)\n",
- NULL
- };
-@@ -138,6 +141,7 @@
- int c, err;
- int local = 0; /* recursive by default */
- int which; /* where to look for files and dirs */
-+ int xpull_template = 0;
-
- if (argc == -1)
- usage (update_usage);
-@@ -147,7 +151,7 @@
-
- /* parse the args */
- optind = 0;
-- while ((c = getopt (argc, argv, "+ApCPflRQqduk:r:D:j:I:W:")) != -1)
-+ while ((c = getopt (argc, argv, "+ApCPflRQTqduk:r:D:j:I:W:")) != -1)
- {
- switch (c)
- {
-@@ -185,6 +189,9 @@
- "-q or -Q must be specified before \"%s\"",
- cvs_cmd_name);
- break;
-+ case 'T':
-+ xpull_template = 1;
-+ break;
- case 'd':
- update_build_dirs = 1;
- break;
-@@ -413,8 +420,8 @@
- /* call the command line interface */
- err = do_update (argc, argv, options, tag, date, force_tag_match,
- local, update_build_dirs, aflag, update_prune_dirs,
-- pipeout, which, join_rev1, join_rev2, (char *) NULL, 1,
-- (char *) NULL);
-+ pipeout, which, join_rev1, join_rev2, (char *) NULL,
-+ xpull_template, (char *) NULL);
-
- /* free the space Make_Date allocated if necessary */
- if (date != NULL)
-@@ -429,7 +436,7 @@
- int
- do_update (argc, argv, xoptions, xtag, xdate, xforce, local, xbuild, xaflag,
- xprune, xpipeout, which, xjoin_rev1, xjoin_rev2, preload_update_dir,
-- xdotemplate, repository)
-+ xpull_template, repository)
- int argc;
- char **argv;
- char *xoptions;
-@@ -445,7 +452,7 @@
- char *xjoin_rev1;
- char *xjoin_rev2;
- char *preload_update_dir;
-- int xdotemplate;
-+ int xpull_template;
- char *repository;
- {
- int err = 0;
-@@ -460,7 +467,7 @@
- aflag = xaflag;
- update_prune_dirs = xprune;
- pipeout = xpipeout;
-- dotemplate = xdotemplate;
-+ pull_template = xpull_template;
-
- /* setup the join support */
- join_rev1 = xjoin_rev1;
-@@ -602,7 +609,7 @@
- && tag != NULL
- && finfo->rcs != NULL)
- {
-- char *rev = RCS_getversion (finfo->rcs, tag, NULL, 1, NULL);
-+ char *rev = RCS_getversion (finfo->rcs, tag, date, 1, NULL);
- if (rev != NULL
- && !RCS_nodeisbranch (finfo->rcs, tag))
- nonbranch = 1;
-@@ -948,7 +955,7 @@
- via WriteTag. */
- 0,
- 0,
-- dotemplate);
-+ pull_template);
- rewrite_tag = 1;
- nonbranch = 0;
- Subdir_Register (entries, (char *) NULL, dir);
-@@ -1005,6 +1012,12 @@
- WriteTag (dir, tag, date, 0, update_dir, repository);
- rewrite_tag = 1;
- nonbranch = 0;
-+ }
-+
-+ /* keep the CVS/Template file current */
-+ if (pull_template)
-+ {
-+ WriteTemplate (dir, update_dir);
- }
-
- /* initialize the ignore list for this directory */
-Index: src/update.h
-diff -u src/contrib/cvs/src/update.h:1.1.1.4 src/contrib/cvs/src/update.h:1.3
---- src/contrib/cvs/src/update.h:1.1.1.4 Thu Apr 15 10:01:55 2004
-+++ src/update.h Thu Apr 15 10:17:28 2004
-@@ -10,10 +10,14 @@
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details. */
-
-+/*
-+ * FreeBSD: src/contrib/cvs/src/update.h,v 1.3 2004/04/15 01:17:28 peter Exp $
-+ */
-+
- int do_update PROTO((int argc, char *argv[], char *xoptions, char *xtag,
- char *xdate, int xforce, int local, int xbuild,
- int xaflag, int xprune, int xpipeout, int which,
- char *xjoin_rev1, char *xjoin_rev2, char *preload_update_dir,
-- int xdotemplate, char *repository));
-+ int xpull_template, char *repository));
- int joining PROTO((void));
- extern int isemptydir PROTO ((const char *dir, int might_not_exist));
-Index: src/prepend_args.c
-diff -u /dev/null src/gnu/usr.bin/cvs/cvs/prepend_args.c:1.3
---- /dev/null Fri Apr 16 06:29:14 2004
-+++ src/prepend_args.c Mon Sep 2 15:09:03 2002
-@@ -0,0 +1,86 @@
-+/* prepend_args.c - utilility programs for manpiulating argv[]
-+ Copyright (C) 1999 Free Software Foundation, Inc.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2, or (at your option)
-+ any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ 02111-1307, USA. */
-+
-+/* FreeBSD: src/gnu/usr.bin/cvs/cvs/prepend_args.c,v 1.3 2002/09/02 06:09:03 peter Exp $ */
-+
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+#include "cvs.h"
-+#include "prepend_args.h"
-+
-+
-+/* Find the white-space-separated options specified by OPTIONS, and
-+ using BUF to store copies of these options, set ARGV[0], ARGV[1],
-+ etc. to the option copies. Return the number N of options found.
-+ Do not set ARGV[N] to NULL. If ARGV is NULL, do not store ARGV[0]
-+ etc. Backslash can be used to escape whitespace (and backslashes). */
-+static int
-+prepend_args (options, buf, argv)
-+ char const *options;
-+ char *buf;
-+ char **argv;
-+{
-+ char const *o = options;
-+ char *b = buf;
-+ int n = 0;
-+
-+ for (;;)
-+ {
-+ while (isspace ((unsigned char) *o))
-+ o++;
-+ if (!*o)
-+ return n;
-+ if (argv)
-+ argv[n] = b;
-+ n++;
-+
-+ do
-+ if ((*b++ = *o++) == '\\' && *o)
-+ b[-1] = *o++;
-+ while (*o && ! isspace ((unsigned char) *o));
-+
-+ *b++ = '\0';
-+ }
-+}
-+
-+/* Prepend the whitespace-separated options in OPTIONS to the argument
-+ vector of a main program with argument count *PARGC and argument
-+ vector *PARGV. */
-+void
-+prepend_default_options (options, pargc, pargv)
-+ char const *options;
-+ int *pargc;
-+ char ***pargv;
-+{
-+ if (options)
-+ {
-+ char *buf = xmalloc (strlen (options) + 1);
-+ int prepended = prepend_args (options, buf, (char **) NULL);
-+ int argc = *pargc;
-+ char * const *argv = *pargv;
-+ char **pp = (char **) xmalloc ((prepended + argc + 1) * sizeof *pp);
-+ *pargc = prepended + argc;
-+ *pargv = pp;
-+ *pp++ = *argv++;
-+ pp += prepend_args (options, buf, pp);
-+ while ((*pp++ = *argv++))
-+ continue;
-+ }
-+}
-Index: src/prepend_args.h
-diff -u /dev/null src/gnu/usr.bin/cvs/cvs/prepend_args.h:1.2
---- /dev/null Fri Apr 16 06:29:14 2004
-+++ src/prepend_args.h Mon Sep 2 15:09:03 2002
-@@ -0,0 +1,26 @@
-+/* prepend_args.h - utilility programs for manpiulating argv[]
-+ Copyright (C) 1999 Free Software Foundation, Inc.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2, or (at your option)
-+ any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ 02111-1307, USA. */
-+
-+/* FreeBSD: src/gnu/usr.bin/cvs/cvs/prepend_args.h,v 1.2 2002/09/02 06:09:03 peter Exp $ */
-+
-+/* This code, taken from GNU Grep, originally used the "PARAM" macro, as the
-+ current GNU coding standards requires. Older GNU code used the "PROTO"
-+ macro, before the GNU coding standards replaced it. We use the older
-+ form here to keep from having to include another file in cvs/src/main.c. */
-+
-+void prepend_default_options PROTO ((char const *, int *, char ***));