From: Simon Schubert <corecode@dragonflybsd.org>
Date: Sun, 13 Mar 2005 11:43:08 +0000 (+0000)
Subject: Switch to CVS 1.12.11
X-Git-Tag: v2.0.1~8233
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/fffa0a21a167d61a88cf61d928b9f6a266fe75d4?hp=92e585b860e58b6e06735dc3bbd30256c1bf9112

Switch to CVS 1.12.11
---

diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc
index 7107ea378d..2f72f52281 100644
--- a/gnu/usr.bin/cvs/Makefile.inc
+++ b/gnu/usr.bin/cvs/Makefile.inc
@@ -1,9 +1,9 @@
-# $DragonFly: src/gnu/usr.bin/cvs/Makefile.inc,v 1.4 2005/01/25 14:00:18 joerg Exp $
+# $DragonFly: src/gnu/usr.bin/cvs/Makefile.inc,v 1.5 2005/03/13 11:43:07 corecode Exp $
 #
 
 .if !defined(CVSDIR)
 
-CVSDIR=		$(.CURDIR)/../../../../contrib/cvs-1.12.9
+CVSDIR=		$(.CURDIR)/../../../../contrib/cvs-1.12.11
 
 .if exists(${.OBJDIR}/../lib)
 LIBCVSDIR=	${.OBJDIR}/../lib
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index db47016d0d..58bd2101b2 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.32.2.6 2003/01/21 23:06:51 peter Exp $
-# $DragonFly: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.8 2005/03/01 23:18:32 corecode Exp $
+# $DragonFly: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.9 2005/03/13 11:43:07 corecode Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -17,15 +17,16 @@ SRCS=	add.c admin.c annotate.c buffer.c \
 	commit.c create_adm.c cvsrc.c edit.c entries.c error.c \
 	exithandle.c expand_path.c fileattr.c filesubr.c find_names.c \
 	hardlink.c hash.c history.c ignore.c import.c lock.c log.c \
-	log-buffer.c login.c logmsg.c mkmodules.c \
-	modules.c myndbm.c no_diff.c patch.c prepend_args.c \
+	log-buffer.c login.c logmsg.c ls.c mkmodules.c \
+	modules.c ms-buffer.c myndbm.c no_diff.c patch.c prepend_args.c \
 	rcs.c rcscmds.c \
 	recurse.c release.c remove.c repos.c root.c rsh-client.c run.c \
-	scramble.c server.c socket-client.c status.c subr.c tag.c update.c \
-	vers_ts.c version.c watch.c wrapper.c zlib.c \
+	scramble.c server.c socket-client.c stack.c status.c subr.c tag.c \
+	update.c vers_ts.c version.c watch.c wrapper.c zlib.c \
 	main.c diff.c ${PATCHES}
 
-PATCHES=main.c.patch diff.c.patch root.c.patch parseinfo.c.patch cvs.h.patch
+PATCHES=main.c.patch diff.c.patch root.c.patch rcs.c.patch \
+	parseinfo.c.patch cvs.h.patch
 CONTRIBDIR=	${CVSDIR}/src
 
 ${.OBJDIR}/cvs.1: cvs.1.patch
diff --git a/gnu/usr.bin/cvs/cvs/cvs.h.patch b/gnu/usr.bin/cvs/cvs/cvs.h.patch
index 7990e306ce..83394c7abd 100644
--- a/gnu/usr.bin/cvs/cvs/cvs.h.patch
+++ b/gnu/usr.bin/cvs/cvs/cvs.h.patch
@@ -1,16 +1,11 @@
-# $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/cvs.h.patch,v 1.1 2005/03/01 23:18:32 corecode Exp $
-Index: cvs.h
-===================================================================
-RCS file: /space/src/cvs/dragonfly/src/contrib/cvs-1.12.9/src/cvs.h,v
-retrieving revision 1.1
-diff -u -r1.1 cvs.h
---- cvs.h	3 Aug 2004 18:08:51 -0000	1.1
-+++ cvs.h	17 Oct 2004 22:22:15 -0000
-@@ -166,6 +166,7 @@
- #define CVSROOTADM_WRITERS	"writers"
- #define CVSROOTADM_PASSWD	"passwd"
- #define CVSROOTADM_CONFIG	"config"
+$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/cvs.h.patch,v 1.2 2005/03/13 11:43:07 corecode Exp $
+--- /usr/src/contrib/cvs-1.12.11/src/cvs.h	2005-01-05 22:17:43.000000000 +0100
++++ cvs.h	2005-03-06 23:59:54.000000000 +0100
+@@ -161,6 +161,7 @@
+ #define	CVSROOTADM_LOGINFO	"loginfo"
+ #define	CVSROOTADM_MODULES	"modules"
+ #define CVSROOTADM_NOTIFY	"notify"
 +#define CVSROOTADM_OPTIONS	"options"
- 
- #define CVSNULLREPOS		"Emptydir"	/* an empty directory */
- 
+ #define CVSROOTADM_PASSWD	"passwd"
+ #define CVSROOTADM_POSTADMIN	"postadmin"
+ #define CVSROOTADM_POSTPROXY	"postproxy"
diff --git a/gnu/usr.bin/cvs/cvs/diff.c.patch b/gnu/usr.bin/cvs/cvs/diff.c.patch
index 57cb323f4d..3de61616da 100644
--- a/gnu/usr.bin/cvs/cvs/diff.c.patch
+++ b/gnu/usr.bin/cvs/cvs/diff.c.patch
@@ -1,13 +1,7 @@
-# $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/diff.c.patch,v 1.1 2004/05/20 02:27:56 dillon Exp $
-Index: src/diff.c
-===================================================================
-RCS file: /cvs/src/contrib/cvs/src/diff.c,v
-retrieving revision 1.1.1.2
-retrieving revision 1.5
-diff -u -r1.1.1.2 -r1.5
---- src/diff.c	20 Jan 2004 05:37:23 -0000	1.1.1.2
-+++ src/diff.c	22 Jan 2004 16:47:12 -0000	1.5
-@@ -49,6 +51,7 @@
+$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/diff.c.patch,v 1.2 2005/03/13 11:43:07 corecode Exp $
+--- /usr/src/contrib/cvs-1.12.11/src/diff.c	2005-01-05 22:17:43.000000000 +0100
++++ diff.c	2005-03-06 23:43:51.000000000 +0100
+@@ -47,6 +47,7 @@
  static char *diff_rev1, *diff_rev2;
  /* Command line dates, from -D option.  Malloc'd.  */
  static char *diff_date1, *diff_date2;
@@ -15,7 +9,7 @@ diff -u -r1.1.1.2 -r1.5
  static char *use_rev1, *use_rev2;
  static int have_rev1_label, have_rev2_label;
  
-@@ -267,6 +270,8 @@
+@@ -265,6 +266,8 @@
      diff_rev2 = NULL;
      diff_date1 = NULL;
      diff_date2 = NULL;
@@ -24,7 +18,7 @@ diff -u -r1.1.1.2 -r1.5
  
      optind = 0;
      /* FIXME: This should really be allocating an argv to be passed to diff
-@@ -277,7 +282,7 @@
+@@ -275,7 +278,7 @@
       * to diff.
       */
      while ((c = getopt_long (argc, argv,
@@ -33,7 +27,7 @@ diff -u -r1.1.1.2 -r1.5
  			     longopts, &option_index)) != -1)
      {
  	switch (c)
-@@ -340,6 +345,26 @@
+@@ -338,6 +341,26 @@
  		    free (options);
  		options = RCS_check_kflag (optarg);
  		break;
@@ -60,7 +54,7 @@ diff -u -r1.1.1.2 -r1.5
  	    case 'r':
  		if (diff_rev2 != NULL || diff_date2 != NULL)
  		    error (1, 0,
-@@ -388,13 +413,17 @@
+@@ -386,13 +409,17 @@
  	send_option_string (opts);
  	if (options[0] != '\0')
  	    send_arg (options);
@@ -82,22 +76,22 @@ diff -u -r1.1.1.2 -r1.5
  	    client_senddate (diff_date2);
  	send_arg ("--");
  
-@@ -408,12 +437,9 @@
+@@ -406,12 +433,9 @@
  
  	send_to_server ("diff\012", 0);
          err = get_responses_and_close ();
 -	free (options);
 -	options = NULL;
--	return (err);
+-	return err;
 -    }
 +    } else
  #endif
 -
 +    {
      if (diff_rev1 != NULL)
- 	tag_check_valid (diff_rev1, argc, argv, local, 0, "");
+ 	tag_check_valid (diff_rev1, argc, argv, local, 0, "", false);
      if (diff_rev2 != NULL)
-@@ -430,7 +456,7 @@
+@@ -428,7 +452,7 @@
  	    ( diff_fileproc, diff_filesdoneproc, diff_dirproc,
  	      diff_dirleaveproc, NULL, argc, argv, local,
  	      which, 0, CVS_LOCK_READ, (char *) NULL, 1, (char *) NULL );
@@ -106,7 +100,7 @@ diff -u -r1.1.1.2 -r1.5
      /* clean up */
      free (options);
      options = NULL;
-@@ -439,6 +465,10 @@
+@@ -437,6 +461,10 @@
  	free (diff_date1);
      if (diff_date2 != NULL)
  	free (diff_date2);
diff --git a/gnu/usr.bin/cvs/cvs/main.c.patch b/gnu/usr.bin/cvs/cvs/main.c.patch
index dc18f86554..c0da3cb41d 100644
--- a/gnu/usr.bin/cvs/cvs/main.c.patch
+++ b/gnu/usr.bin/cvs/cvs/main.c.patch
@@ -1,13 +1,7 @@
-# $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/main.c.patch,v 1.1 2004/05/20 02:27:56 dillon Exp $
-Index: src/main.c
-===================================================================
-RCS file: /cvs/src/contrib/cvs/src/main.c,v
-retrieving revision 1.1.1.2
-retrieving revision 1.6
-diff -u -r1.1.1.2 -r1.6
---- src/main.c	20 Jan 2004 05:37:27 -0000	1.1.1.2
-+++ src/main.c	30 Jan 2004 17:13:35 -0000	1.6
-@@ -248,6 +249,7 @@
+$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/main.c.patch,v 1.2 2005/03/13 11:43:07 corecode Exp $
+--- /usr/src/contrib/cvs-1.12.11/src/main.c	2005-01-05 22:17:44.000000000 +0100
++++ main.c	2005-03-07 09:06:36.000000000 +0100
+@@ -241,6 +241,7 @@
      "    -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",
@@ -15,7 +9,7 @@ diff -u -r1.1.1.2 -r1.6
      "    -n           Do not execute anything that will change the disk.\n",
      "    -t           Show trace of program execution (repeat for more\n",
      "                 verbosity) -- try with -n.\n",
-@@ -423,7 +425,7 @@
+@@ -426,7 +427,7 @@
      int help = 0;		/* Has the user asked for help?  This
  				   lets us support the `cvs -H cmd'
  				   convention to give help for cmd. */
@@ -24,7 +18,7 @@ diff -u -r1.1.1.2 -r1.6
      static struct option long_options[] =
      {
          {"help", 0, NULL, 'H'},
-@@ -558,6 +560,13 @@
+@@ -559,6 +560,13 @@
  	    case 'w':
  		cvswrite = 1;
  		break;
@@ -38,7 +32,7 @@ diff -u -r1.1.1.2 -r1.6
  	    case 't':
  		trace++;
  		break;
-@@ -668,12 +677,15 @@
+@@ -662,12 +670,15 @@
      if (argc < 1)
  	usage (usg);
  
diff --git a/gnu/usr.bin/cvs/cvs/parseinfo.c.patch b/gnu/usr.bin/cvs/cvs/parseinfo.c.patch
index 7cbb488125..f4226eba4d 100644
--- a/gnu/usr.bin/cvs/cvs/parseinfo.c.patch
+++ b/gnu/usr.bin/cvs/cvs/parseinfo.c.patch
@@ -1,95 +1,61 @@
-$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/parseinfo.c.patch,v 1.1 2005/03/01 23:18:32 corecode Exp $
-Index: parseinfo.c
-===================================================================
-RCS file: /space/cvs/dragonfly/src/contrib/cvs-1.12.9/src/parseinfo.c,v
-retrieving revision 1.1
-diff -u -r1.1 parseinfo.c
---- parseinfo.c	3 Aug 2004 18:08:51 -0000	1.1
-+++ parseinfo.c	18 Nov 2004 16:47:34 -0000
-@@ -220,15 +220,14 @@
- 
-    Returns 0 for success, negative value for failure.  Call
-    error(0, ...) on errors in addition to the return value.  */
-+
-+static int
-+parse_config_file (const char *cvsroot, const char *config);
-+
- int
- parse_config (char *cvsroot)
+$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/parseinfo.c.patch,v 1.2 2005/03/13 11:43:07 corecode Exp $
+--- /usr/src/contrib/cvs-1.12.11/src/parseinfo.c	2005-01-05 22:17:43.000000000 +0100
++++ parseinfo.c	2005-03-06 23:57:22.000000000 +0100
+@@ -333,8 +333,8 @@
+  *
+  *   xmalloc() failures are fatal, per usual.
+  */
+-struct config *
+-parse_config (const char *cvsroot)
++static struct config *
++parse_config_file (const char *cvsroot, const char *config_name, struct config *retval)
  {
--    char *infopath;
--    FILE *fp_info;
--    char *line = NULL;
--    size_t line_allocated = 0;
--    size_t len;
--    char *p;
-+    int ret;
-     /* FIXME-reentrancy: If we do a multi-threaded server, this would need
-        to go to the per-connection data structures.  */
-     static int parsed = 0;
-@@ -238,9 +237,25 @@
-     if (parsed)
- 	return 0;
-     parsed = 1;
-+   
-+    ret = parse_config_file (cvsroot, CVSROOTADM_CONFIG);
-+    ret = parse_config_file (cvsroot, CVSROOTADM_OPTIONS) || ret;
-+
-+    return ret;
-+}
-+
-+static int
-+parse_config_file (const char *cvsroot, const char *config_name)
-+{
-+    char *infopath = NULL;
-+    FILE *fp_info;
-+    char *line = NULL;
-+    size_t line_allocated = 0;
-+    size_t len;
-+    char *p;
+     char *infopath;
+     FILE *fp_info;
+@@ -342,13 +342,13 @@
+     size_t line_allocated = 0;
+     size_t len;
+     char *p;
+-    struct config *retval;
+ 
+     TRACE (TRACE_FUNCTION, "parse_config (%s)", cvsroot);
  
-     infopath = xmalloc (strlen (cvsroot)
--			+ sizeof (CVSROOTADM_CONFIG)
-+			+ strlen (config_name)
- 			+ sizeof (CVSROOTADM)
- 			+ 10);
-     if (infopath == NULL)
-@@ -253,7 +268,7 @@
-     strcat (infopath, "/");
-     strcat (infopath, CVSROOTADM);
-     strcat (infopath, "/");
--    strcat (infopath, CVSROOTADM_CONFIG);
-+    strcat (infopath, config_name);
+-    retval = new_config ();
++    if (retval == NULL)
++	retval = new_config ();
+ 
+-    infopath = Xasprintf ("%s/%s/%s", cvsroot, CVSROOTADM, CVSROOTADM_CONFIG);
++    infopath = Xasprintf ("%s/%s/%s", cvsroot, CVSROOTADM, config_name);
  
      fp_info = CVS_FOPEN (infopath, "r");
      if (fp_info == NULL)
-@@ -345,12 +360,14 @@
- 		goto error_return;
- 	    }
+@@ -431,9 +431,11 @@
+ 	    readBool (infopath, "SystemAuth", p, &dummy);
  	}
+ #endif
 -	else if (strcmp (line, "LocalKeyword") == 0)
 +	else if (strcmp (line, "LocalKeyword") == 0 ||
-+		strcmp (line, "tag") == 0)
- 	{
- 	    RCS_setlocalid(p);
- 		
- 	}
++		 strcmp (line, "tag") == 0)
+ 	    RCS_setlocalid (&retval->keywords, p);
 -	else if (strcmp (line, "KeywordExpand") == 0)
 +	else if (strcmp (line, "KeywordExpand") == 0 ||
-+		strcmp (line, "tagexpand") == 0)
- 	{
- 	    RCS_setincexc(p);
- 		
-@@ -447,7 +464,11 @@
- 	       the new features.  */
- 	    error (0, 0, "%s: unrecognized keyword '%s'",
- 		   infopath, line);
--	    goto error_return;
++		 strcmp (line, "tagexpand") == 0)
+ 	    RCS_setincexc (&retval->keywords, p);
+ 	else if (strcmp (line, "PreservePermissions") == 0)
+ #ifdef PRESERVE_PERMISSIONS_SUPPORT
+@@ -547,3 +549,15 @@
+ 	free (line);
+     return retval;
+ }
 +
-+	    /* Don't break processing on legacy CVSROOT/options keywords */
-+	    if (strcmp (line, "umask") != 0 &&
-+		strcmp (line, "dlimit") != 0)
-+	        goto error_return;
- 	}
-     }
-     if (ferror (fp_info))
++struct config *
++parse_config (const char *cvsroot)
++{
++    struct config *retval;
++
++    retval = NULL;
++    retval = parse_config_file (cvsroot, CVSROOTADM_CONFIG, retval);
++    retval = parse_config_file (cvsroot, CVSROOTADM_OPTIONS, retval);
++
++    return retval;
++}
diff --git a/gnu/usr.bin/cvs/cvs/rcs.c.patch b/gnu/usr.bin/cvs/cvs/rcs.c.patch
new file mode 100644
index 0000000000..81d6489320
--- /dev/null
+++ b/gnu/usr.bin/cvs/cvs/rcs.c.patch
@@ -0,0 +1,13 @@
+$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/rcs.c.patch,v 1.1 2005/03/13 11:43:07 corecode Exp $
+--- /usr/src/contrib/cvs-1.12.11/src/rcs.c	2005-01-05 22:17:44.000000000 +0100
++++ rcs.c	2005-03-08 14:20:41.000000000 +0100
+@@ -3463,6 +3463,9 @@
+     KEYWORD_INIT (new, KEYWORD_SOURCE, "Source");
+     KEYWORD_INIT (new, KEYWORD_STATE, "State");
+ 
++    /* Per default, expand local keyword like Id */
++    new[KEYWORD_LOCALID].expandto = KEYWORD_ID;
++
+     return new;
+ }
+ 
diff --git a/gnu/usr.bin/cvs/doc/Makefile b/gnu/usr.bin/cvs/doc/Makefile
index e4d1c29e9a..eed5cc1074 100644
--- a/gnu/usr.bin/cvs/doc/Makefile
+++ b/gnu/usr.bin/cvs/doc/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/cvs/doc/Makefile,v 1.12.2.3 2002/12/19 21:18:01 peter Exp $
-# $DragonFly: src/gnu/usr.bin/cvs/doc/Makefile,v 1.3 2004/01/31 06:56:37 dillon Exp $
+# $DragonFly: src/gnu/usr.bin/cvs/doc/Makefile,v 1.4 2005/03/13 11:43:08 corecode Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -10,4 +10,11 @@ INFOSECTION= "Programming & development tools."
 INFOENTRY_cvs= "* CVS: (cvs).			CVS Reference Manual."
 INFOENTRY_cvsclient= "* CVS-CLIENT: (cvsclient).	CVS client/server Reference Manual."
 
+cvs.info: getdate-cvs.texi
+
+getdate-cvs.texi: getdate.texi
+	sed -e "s/^@chapter /@appendixsec /" \
+	    -e "s/^@section /@appendixsubsec /" \
+	    < ${.ALLSRC} > ${.TARGET}
+
 .include <bsd.info.mk>
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
index 28d8fe6ab2..8adbcb568e 100644
--- a/gnu/usr.bin/cvs/lib/Makefile
+++ b/gnu/usr.bin/cvs/lib/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/cvs/lib/Makefile,v 1.19.2.4 2003/01/21 23:06:52 peter Exp $
-# $DragonFly: src/gnu/usr.bin/cvs/lib/Makefile,v 1.8 2004/08/03 18:11:56 dillon Exp $
+# $DragonFly: src/gnu/usr.bin/cvs/lib/Makefile,v 1.9 2005/03/13 11:43:08 corecode Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -13,7 +13,7 @@ INTERNALLIB=	YES
 CFLAGS+= -I. -I${CVSDIR}/src -I${CVSDIR}/lib
 CFLAGS+= -DHAVE_CONFIG_H -DIN_LIBINTL
 YFLAGS=
-CLEANFILES+=	config.h
+CLEANFILES+=	config.h alloca.h getopt.h
 
 VERSION!=       sed < ${CVSDIR}/configure \
 		-e '/^[ 	]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q
@@ -22,12 +22,14 @@ CVS_UMASK_DFLT?=	002
 CVS_ADMIN_GROUP?=	cvsadmin
 CVS_TMPDIR_DFLT?=	/tmp
 
-SRCS=	config.h argmatch.c getdate.y getline.c getndelim2.c getnline.c \
-	getopt.c getopt1.c getpass.c lstat.c md5.c savecwd.c \
-	sighandle.c stat.c stripslash.c \
-	xmalloc.c xgetwd.c xstrdup.c yesno.c \
-	asnprintf.c vasnprintf.c ls.c stack.c \
-	printf-parse.c printf-args.c exitfail.c basename.c 
+SRCS=	config.h \
+	sighandle.c allocsa.c alloca.h basename.c dirname.c stripslash.c \
+	exitfail.c getdate.c getopt.h getopt.c getopt1.c gettime.c \
+	getnline.c md5.c save-cwd.c strftime.c xmalloc.c xalloc-die.c \
+	xgetcwd.c xgethostname.c xreadlink.c yesno.c \
+	sunos57-select.c getline.c getndelim2.c mktime.c \
+	getpass.c rpmatch.c vasnprintf.c printf-args.c printf-parse.c \
+	asnprintf.c
 
 config.h: config.h.proto
 	sed -e "s,@VERSION@,${VERSION}-DragonFly,g" \
@@ -36,4 +38,10 @@ config.h: config.h.proto
 	    -e "s,@CVS_ADMIN_GROUP@,${CVS_ADMIN_GROUP},g" \
 	    ${.ALLSRC} > ${.TARGET}
 
+alloca.h: alloca_.h
+	cp ${.ALLSRC} ${.TARGET}
+
+getopt.h: getopt_.h
+	cp ${.ALLSRC} ${.TARGET}
+
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cvs/lib/config.h.proto b/gnu/usr.bin/cvs/lib/config.h.proto
index 09d9c55101..0659b4852f 100644
--- a/gnu/usr.bin/cvs/lib/config.h.proto
+++ b/gnu/usr.bin/cvs/lib/config.h.proto
@@ -1,4 +1,4 @@
-/* $DragonFly: src/gnu/usr.bin/cvs/lib/config.h.proto,v 1.5 2004/08/03 18:11:56 dillon Exp $ */
+/* $DragonFly: src/gnu/usr.bin/cvs/lib/config.h.proto,v 1.6 2005/03/13 11:43:08 corecode Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
@@ -58,6 +58,9 @@
 /* Define to enable encryption support. */
 /* #undef ENCRYPTION */
 
+/* Define as good substitute value for EOVERFLOW. */
+/* #undef EOVERFLOW */
+
 /* Define if this executable will be running on case insensitive file systems.
    In the client case, this means that it will request that the server pretend
    to be case insensitive if it isn't already. */
@@ -66,17 +69,17 @@
 /* Define on systems for which file names may have a so-called `drive letter'
    prefix, define this to compute the length of that prefix, including the
    colon. */
-/* #undef FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX */
+#define FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX 0
 
 /* Define if the backslash character may also serve as a file name component
    separator. */
-/* #undef FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR */
+#define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 0
 
-#if FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
-# define FILESYSTEM_PREFIX_LEN(Filename) \
+#if FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
+# define FILE_SYSTEM_PREFIX_LEN(Filename) \
   ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)
 #else
-# define FILESYSTEM_PREFIX_LEN(Filename) 0
+# define FILE_SYSTEM_PREFIX_LEN(Filename) 0
 #endif
 
 /* When committing or importing files, you must enter a log message. Normally,
@@ -88,6 +91,9 @@
    message to be appended to the temp file when the editor is started. */
 /* #undef FORCE_USE_EDITOR */
 
+/* Define if gettimeofday clobbers localtime's static buffer. */
+/* #undef GETTIMEOFDAY_CLOBBERS_LOCALTIME_BUFFER */
+
 /* Define to an alternative value if GSS_C_NT_HOSTBASED_SERVICE isn't defined
    in the gssapi.h header file. MIT Kerberos 1.2.1 requires this. Only
    relevant when using GSSAPI. */
@@ -96,8 +102,13 @@
 /* Define to 1 if you have the `alarm' function. */
 #define HAVE_ALARM 1
 
-/* Define to 1 if you have `alloca', as a function or macro. */
-/* #undef HAVE_ALLOCA */
+/* Define to 1 if you have `alloca' after including <alloca.h>, a header that
+   may be supplied by this distribution. */
+#define HAVE_ALLOCA 1
+
+/* Define HAVE_ALLOCA_H for backward compatibility with older code that
+   includes <alloca.h> only if HAVE_ALLOCA_H is defined. */
+#define HAVE_ALLOCA_H 1
 
 /* Define to 1 if you have the `atexit' function. */
 #define HAVE_ATEXIT 1
@@ -141,6 +152,10 @@
    you don't. */
 #define HAVE_DECL_FGETS_UNLOCKED 0
 
+/* Define to 1 if you have the declaration of `flockfile', and to 0 if you
+   don't. */
+#define HAVE_DECL_FLOCKFILE 1
+
 /* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if
    you don't. */
 #define HAVE_DECL_FPUTC_UNLOCKED 0
@@ -153,9 +168,9 @@
    you don't. */
 #define HAVE_DECL_FREAD_UNLOCKED 0
 
-/* Define to 1 if you have the declaration of `free', and to 0 if you don't.
-   */
-#define HAVE_DECL_FREE 1
+/* Define to 1 if you have the declaration of `funlockfile', and to 0 if you
+   don't. */
+#define HAVE_DECL_FUNLOCKFILE 1
 
 /* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
    you don't. */
@@ -173,6 +188,10 @@
    */
 #define HAVE_DECL_GETENV 1
 
+/* Define to 1 if you have the declaration of `getpass', and to 0 if you
+   don't. */
+#define HAVE_DECL_GETPASS 1
+
 /* Define to 1 if you have the declaration of `nanosleep', and to 0 if you
    don't. */
 #define HAVE_DECL_NANOSLEEP 1
@@ -199,6 +218,12 @@
 /* Define to 1 if you have the `dup2' function. */
 #define HAVE_DUP2 1
 
+/* Define if you have the declaration of environ. */
+/* #undef HAVE_ENVIRON_DECL */
+
+/* Define if you have the declaration of errno. */
+/* #undef HAVE_ERRNO_DECL */
+
 /* Define to 1 if you have the `fchdir' function. */
 #define HAVE_FCHDIR 1
 
@@ -208,12 +233,6 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
-/* Define to 1 if your system has a working POSIX `fnmatch' function. */
-#define HAVE_FNMATCH 1
-
-/* Define to 1 if you have the <fnmatch.h> header file. */
-#define HAVE_FNMATCH_H 1
-
 /* Define to 1 if you have the `fork' function. */
 #define HAVE_FORK 1
 
@@ -229,6 +248,12 @@
 /* Define to 1 if you have the `ftruncate' function. */
 #define HAVE_FTRUNCATE 1
 
+/* Define to 1 if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
+/* Define if getcwd (NULL, 0) allocates memory for result. */
+#define HAVE_GETCWD_NULL 1
+
 /* Define to 1 if you have the `getdelim' function. */
 /* #undef HAVE_GETDELIM */
 
@@ -241,6 +266,12 @@
 /* Define to 1 if you have the `gethostname' function. */
 #define HAVE_GETHOSTNAME 1
 
+/* Define to 1 if you have the <getopt.h> header file. */
+#define HAVE_GETOPT_H 1
+
+/* Define to 1 if you have the `getopt_long_only' function. */
+#define HAVE_GETOPT_LONG_ONLY 1
+
 /* Define to 1 if you have the `getpagesize' function. */
 #define HAVE_GETPAGESIZE 1
 
@@ -265,6 +296,9 @@
 /* Define to 1 if you have the <gssapi.h> header file. */
 /* #undef HAVE_GSSAPI_H */
 
+/* Define if you have the hstrerror function. */
+#define HAVE_HSTRERROR 1
+
 /* Define if you have the iconv() function. */
 /* #undef HAVE_ICONV */
 
@@ -274,7 +308,7 @@
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
 #define HAVE_INTMAX_T 1
 
-/* Define to 1 if you have the <inttypes.h> header file. */
+/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
 #define HAVE_INTTYPES_H 1
 
 /* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
@@ -350,7 +384,7 @@
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the `mempcpy' function. */
-#define HAVE_MEMPCPY 1
+/* #undef HAVE_MEMPCPY */
 
 /* Define to 1 if you have the `mkdir' function. */
 #define HAVE_MKDIR 1
@@ -364,15 +398,15 @@
 /* Define to 1 if you have a working `mmap' system call. */
 #define HAVE_MMAP 1
 
-/* Define to 1 if you have the `nanosleep' function. */
-#define HAVE_NANOSLEEP 1
-
 /* Define to 1 if you have the <ndbm.h> header file. */
 #define HAVE_NDBM_H 1
 
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 /* #undef HAVE_NDIR_H */
 
+/* Define to 1 if you have the <OS.h> header file. */
+/* #undef HAVE_OS_H */
+
 /* Define to enable system authentication with PAM instead of using the simple
    getpwnam interface. This allows authentication (in theory) with any PAM
    module, e.g. on systems with shadow passwords or via LDAP */
@@ -410,9 +444,18 @@
 /* Define to 1 if you have the `rename' function. */
 #define HAVE_RENAME 1
 
+/* Define to 1 if you have the `rpmatch' function. */
+/* #undef HAVE_RPMATCH */
+
 /* Define to 1 if you have run the test for working tzset. */
 #define HAVE_RUN_TZSET_TEST 1
 
+/* Define to 1 if you have the <search.h> header file. */
+/* #undef HAVE_SEARCH_H */
+
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
 /* Define if the diff library should use setmode for binary files. */
 /* #undef HAVE_SETMODE */
 
@@ -439,7 +482,7 @@
 /* #undef HAVE_STAT_EMPTY_STRING_BUG */
 
 /* Define to 1 if stdbool.h conforms to C99. */
-#define HAVE_STDBOOL_H 1
+/* #undef HAVE_STDBOOL_H */
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
@@ -448,9 +491,15 @@
    uintmax_t. */
 #define HAVE_STDINT_H_WITH_UINTMAX 1
 
+/* Define to 1 if you have the <stdio_ext.h> header file. */
+/* #undef HAVE_STDIO_EXT_H */
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
 /* Define if you have strchr (always for CVS). */
 #define HAVE_STRCHR 1
 
@@ -469,6 +518,9 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
+/* Define to 1 if you have the `strncasecmp' function. */
+#define HAVE_STRNCASECMP 1
+
 /* Define to 1 if you have the `strstr' function. */
 #define HAVE_STRSTR 1
 
@@ -481,7 +533,7 @@
 /* Define to 1 if `st_rdev' is member of `struct stat'. */
 #define HAVE_STRUCT_STAT_ST_RDEV 1
 
-/* Define to 1 if you have the `struct timesepc' structure. */
+/* Define if struct timespec is declared in <time.h>. */
 #define HAVE_STRUCT_TIMESPEC 1
 
 /* Define to 1 if `tm_zone' is member of `struct tm'. */
@@ -500,6 +552,9 @@
 /* Define to 1 if you have the <sys/file.h> header file. */
 #define HAVE_SYS_FILE_H 1
 
+/* Define to 1 if you have the <sys/inttypes.h> header file. */
+/* #undef HAVE_SYS_INTTYPES_H */
+
 /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
    */
 /* #undef HAVE_SYS_NDIR_H */
@@ -516,9 +571,6 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-#define HAVE_SYS_TIMEB_H 1
-
 /* Define to 1 if you have the <sys/time.h> header file. */
 #define HAVE_SYS_TIME_H 1
 
@@ -533,14 +585,17 @@
 
 /* Define to 1 if localtime_r, etc. have the type signatures that POSIX
    requires. */
-/* #undef HAVE_TIME_R_POSIX */
+#define HAVE_TIME_R_POSIX 1
 
 /* Define if struct tm has the tm_gmtoff member. */
 #define HAVE_TM_GMTOFF 1
 
 /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
    `HAVE_STRUCT_TM_TM_ZONE' instead. */
-/* #undef HAVE_TM_ZONE */
+#define HAVE_TM_ZONE 1
+
+/* Define to 1 if you have the `tsearch' function. */
+/* #undef HAVE_TSEARCH */
 
 /* Define to 1 if you don't have `tm_zone' but do have the external array
    `tzname'. */
@@ -558,12 +613,12 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define to 1 if you have the `unsetenv' function. */
+#define HAVE_UNSETENV 1
+
 /* Define if you have the 'unsigned long long' type. */
 #define HAVE_UNSIGNED_LONG_LONG 1
 
-/* Define to 1 if you have the `usleep' function. */
-/* #undef HAVE_USLEEP */
-
 /* Define to 1 if you have the <utime.h> header file. */
 #define HAVE_UTIME_H 1
 
@@ -574,7 +629,10 @@
 #define HAVE_VALLOC 1
 
 /* Define to 1 if you have the `vasnprintf' function. */
-#define HAVE_VASNPRINTF 1
+/* #undef HAVE_VASNPRINTF */
+
+/* Define to 1 if you have the `vasprintf' function. */
+#define HAVE_VASPRINTF 1
 
 /* Define to 1 if you have the `vfork' function. */
 #define HAVE_VFORK 1
@@ -606,8 +664,14 @@
 /* Define if you have the 'wint_t' type. */
 #define HAVE_WINT_T 1
 
+/* Define to 1 if you have the `wmemchr' function. */
+/* #undef HAVE_WMEMCHR */
+
+/* Define to 1 if you have the `wmemcpy' function. */
+/* #undef HAVE_WMEMCPY */
+
 /* Define to 1 if you have the `wmempcpy' function. */
-#define HAVE_WMEMPCPY 1
+/* #undef HAVE_WMEMPCPY */
 
 /* Define to 1 if `fork' works. */
 #define HAVE_WORKING_FORK 1
@@ -624,7 +688,7 @@
 /* Define to 1 if you have the `__secure_getenv' function. */
 /* #undef HAVE___SECURE_GETENV */
 
-#if FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 #else
 # define ISSLASH(C) ((C) == '/')
@@ -646,7 +710,10 @@
 
 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    slash. */
-/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+
+/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
+#define MALLOC_0_IS_NONNULL 1
 
 /* By default, CVS stores its modules and other such items in flat text files
    (MY_NDBM enables this). Turning off MY_NDBM causes CVS to look for a
@@ -678,6 +745,11 @@
    */
 #define PAM_SERVICE_NAME "cvs"
 
+/* Define if you want CVS to be able to serve as a transparent proxy for write
+   operations. Disabling this may produce a slight performance gain on some
+   systems, at the expense of write proxy support. */
+#define PROXY_SUPPORT 1
+
 /* Path to the pr utility */
 #define PR_PROGRAM "/usr/bin/pr"
 
@@ -720,6 +792,20 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
+/* Define to 1 if strerror_r returns char *. */
+/* #undef STRERROR_R_CHAR_P */
+
+/* Define to be the nanoseconds member of struct stat's st_mtim, if it exists.
+   */
+/* #undef ST_MTIM_NSEC */
+
+/* Enable support for the pre 1.12.1 *info scripting hook format strings.
+   Disable this option for a smaller executable once your scripting hooks have
+   been updated to use the new *info format strings by passing
+   "--disable-old-info-format-support" option to configure or by commenting
+   out the line below. */
+#define SUPPORT_OLD_INFO_FMT_STRINGS 1
+
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #define TIME_WITH_SYS_TIME 1
 
@@ -729,6 +815,16 @@
    directory for temporary files). */
 #define TMPDIR_DFLT "@TMPDIR_DFLT@"
 
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Define if tzset clobbers localtime's static buffer. */
+/* #undef TZSET_CLOBBERS_LOCALTIME_BUFFER */
+
+/* Define to its maximum value if an unsigned integer type of width exactly 32
+   bits exists and the standard includes do not define UINT32_MAX. */
+/* #undef UINT32_MAX */
+
 /* The default umask to use when creating or otherwise setting file or
    directory permissions in the repository. Must be a value in the range of 0
    through 0777. For example, a value of 002 allows group rwx access and world
@@ -737,13 +833,63 @@
    which is interpreted as an octal number. */
 #define UMASK_DFLT @UMASK_DFLT@
 
+/* Define if double is the first floating point type detected with its size.
+   */
+#define UNIQUE_FLOAT_TYPE_DOUBLE 1
+
+/* Define if float is the first floating point type detected with its size. */
+#define UNIQUE_FLOAT_TYPE_FLOAT 1
+
+/* Define if long double is the first floating point type detected with its
+   size. */
+#define UNIQUE_FLOAT_TYPE_LONG_DOUBLE 1
+
+/* Define if char is the first integer type detected with its size. */
+#define UNIQUE_INT_TYPE_CHAR 1
+
+/* Define if int is the first integer type detected with its size. */
+#define UNIQUE_INT_TYPE_INT 1
+
+/* Define if intmax_t is the first integer type detected with its size. */
+/* #undef UNIQUE_INT_TYPE_INTMAX_T */
+
+/* Define if long int is the first integer type detected with its size. */
+/* #undef UNIQUE_INT_TYPE_LONG */
+
+/* Define if long long is the first integer type detected with its size. */
+#define UNIQUE_INT_TYPE_LONG_LONG 1
+
+/* Define if ptrdiff_t is the first integer type detected with its size. */
+/* #undef UNIQUE_INT_TYPE_PTRDIFF_T */
+
+/* Define if short is the first integer type detected with its size. */
+#define UNIQUE_INT_TYPE_SHORT 1
+
+/* Define if size_t is the first integer type detected with its size. */
+/* #undef UNIQUE_INT_TYPE_SIZE_T */
+
+/* Define if wint_t is the first integer type detected with its size. */
+/* #undef UNIQUE_INT_TYPE_WINT_T */
+
 /* Define if setmode is required when writing binary data to stdout. */
 /* #undef USE_SETMODE_STDOUT */
 
+/* Define to 1 if you want getc etc. to use unlocked I/O if available.
+   Unlocked I/O can improve performance in unithreaded apps, but it is not
+   safe for multithreaded apps. */
+#define USE_UNLOCKED_IO 1
+
 /* Define if utime requires write access to the file (true on Windows, but not
    Unix). */
 /* #undef UTIME_EXPECTS_WRITABLE */
 
+/* Define if unsetenv() returns void, not int. */
+#define VOID_UNSETENV 1
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
 /* Define to 1 if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */
@@ -778,31 +924,73 @@
 /* Define to force lib/regex.c to define re_comp et al. */
 #define _REGEX_RE_COMP 1
 
+/* Define for Solaris 2.5.1 so uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT32_T */
+
+/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+/* Define to rpl_ if the getopt replacement functions and variables should be
+   used. */
+#define __GETOPT_PREFIX rpl_
+
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
+/* Define to a replacement function name for fnmatch(). */
+/* #undef fnmatch */
+
 /* Define to a replacement function name for getline(). */
 #define getline gnu_getline
 
-/* We want to always use the GNULIB version of getpass which we have in lib,
-   so define getpass to something that won't conflict with any existing system
-   declarations. */
+/* Define to a replacement function name for getpass(). */
 #define getpass gnu_getpass
 
+/* Define to rpl_gettimeofday if the replacement function should be used. */
+/* #undef gettimeofday */
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 /* #undef gid_t */
 
+/* Define to rpl_gmtime if the replacement function should be used. */
+/* #undef gmtime */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
+/* #undef intmax_t */
+
+/* Define to rpl_localtime if the replacement function should be used. */
+/* #undef localtime */
+
 /* Define to rpl_malloc if the replacement function should be used. */
 /* #undef malloc */
 
+/* Define to a type if <wchar.h> does not define. */
+/* #undef mbstate_t */
+
 /* Define to rpl_mkstemp if the replacement function should be used. */
 /* #undef mkstemp */
 
+/* Define to rpl_mktime if the replacement function should be used. */
+#define mktime rpl_mktime
+
 /* Define to `int' if <sys/types.h> does not define. */
 /* #undef mode_t */
 
 /* Define to the name of the strftime replacement function. */
-#define my_strftime	strftime
+#define my_strftime nstrftime
+
+/* Define to rpl_nanosleep if the replacement function should be used. */
+/* #undef nanosleep */
 
 /* Define to `int' if <sys/types.h> does not define. */
 /* #undef pid_t */
@@ -814,12 +1002,28 @@
    supported. Do not define if restrict is supported directly. */
 #define restrict __restrict
 
+/* Define to rpl_select if the replacement function should be used. */
+#define select rpl_select
+
+/* Define to empty if the C compiler doesn't support this keyword. */
+/* #undef signed */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
 /* Define as a signed type of the same size as size_t. */
 /* #undef ssize_t */
 
+/* Define to rpl_tzset if the wrapper function should be used. */
+/* #undef tzset */
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 /* #undef uid_t */
 
+/* Define to the type of a unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint32_t */
+
 /* Define to unsigned long or unsigned long long if <stdint.h> and
    <inttypes.h> don't define. */
 /* #undef uintmax_t */