Mirror commits to cvs in base system:

Make LOCALID a runtime option, instead of a compiletime option, by moving
the value to CVSROOT/config (repository specific).
Some minor fixes for buffer sizes.
Add a RCS Id where missing; add some warning about the deprecated
RCS_LOCALID variable.
Both changes from OpenBSD.
Bump to 1.11nb1.

9 files changed, 129 insertions, 30 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 8d3a6101dea..d4591d63f14 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2000/10/18 03:31:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.32 2000/10/21 19:29:05 wiz Exp $
 #
 
-DISTNAME=       cvs-1.11
+DISTNAME=	cvs-1.11
+PKGNAME=	${DISTNAME}nb1
 CATEGORIES=	devel
-MASTER_SITES=   ftp://ftp.cvshome.org/pub/${DISTNAME}/ \
+MASTER_SITES=	ftp://ftp.cvshome.org/pub/${DISTNAME}/ \
 		${MASTER_SITE_GNU:=cvs/}
 
 MAINTAINER=	tv@netbsd.org
@@ -12,8 +13,6 @@ HOMEPAGE=	http://www.cvshome.org/
 GNU_CONFIGURE=	yes
 USE_GTEXINFO=	yes
 
-BUILD_DEFS+=	RCS_LOCALID
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
@@ -37,7 +36,8 @@ CONFIGURE_ARGS+=	--with-krb4=no
 #.endif
 
 .if defined(RCS_LOCALID)
-CFLAGS+=	-DLOCALID=\"\\\"${RCS_LOCALID}\\\"\"
+pre-fetch:
+	@echo RCS_LOCALID is now replaced by the tag variable in CVSROOT/config.
 .endif
 
 CONFIGURE_ENV+=	perl_path=${PERL5}
diff --git a/devel/cvs/files/patch-sum b/devel/cvs/files/patch-sum
index fcf6963b327..fde3003dd11 100644
--- a/devel/cvs/files/patch-sum
+++ b/devel/cvs/files/patch-sum
@@ -1,25 +1,27 @@
-$NetBSD: patch-sum,v 1.9 2000/10/18 03:31:15 hubertf Exp $
+$NetBSD: patch-sum,v 1.10 2000/10/21 19:29:06 wiz Exp $
 
 MD5 (patch-aa) = 87ac7c35c0dfd74d274b6032cb11c3a3
 MD5 (patch-ab) = 582f4e9e7c390a407df52a4baccd979e
 MD5 (patch-ac) = e7ff730e87b13ba56af16e9db2334550
 MD5 (patch-ad) = a2d7df4269ad5e6cd5730c37bb354b8b
-MD5 (patch-ae) = 01f994646e4d8ba20b6a38fb81496672
-MD5 (patch-af) = b8801bee112d538135a9ec08660e1b61
+MD5 (patch-ae) = 3bfdc675e8c59de4a9c4157d00048b0f
+MD5 (patch-af) = 86bcf13667e4c1866e397508e25d65cd
 MD5 (patch-ag) = 0b07944e7d3ae215325c2dc05ca0f191
+MD5 (patch-ah) = f69390d98ad36c7dad8016f62296f2f0
+MD5 (patch-ai) = 7f56ef76d75934c916675269b17233ce
 MD5 (patch-ak) = c4fce62d350decea0f0c20ee53e7b618
 MD5 (patch-al) = 7c374e30d426324f39423944edfd158d
-MD5 (patch-am) = b9a29bd6c99d5f250a39a3b0e4561bbe
+MD5 (patch-am) = 8f9938de2656c908abc9469ef86c5702
 MD5 (patch-an) = 2695c0b9c45c21fa004a750b69595697
 MD5 (patch-ao) = acb748a3058898cbb0cebc0d881c9361
-MD5 (patch-ap) = 1d7d2a9a3daba487cf9de8d05348c0ca
+MD5 (patch-ap) = 94433b449faa5e468ecb25e58114e062
 MD5 (patch-aq) = f100cb527846b8ea5e9d5029e34f5881
 MD5 (patch-ar) = 88032cc13f9d9712e764dcf3572d55e0
 MD5 (patch-as) = 57bb4e77f01132eb20d0a66f6141540c
 MD5 (patch-at) = a3a3221012536f04c230f9cb5dabcabe
 MD5 (patch-au) = c8c6999a983456c1e09626c26aecb2bc
 MD5 (patch-av) = 15444411b2beb5b9adca8f9cbb7304d9
-MD5 (patch-aw) = cc139d5fe1c82acf7f051800869cd68a
+MD5 (patch-aw) = 81e1465f9c46aeee12b25e5452087fc2
 MD5 (patch-ax) = d3e9dbd9a7563ebf8419cf77715b3952
 MD5 (patch-ay) = 582a67798f19e25bcfd5d6c6201bdc76
 MD5 (patch-az) = bc7e2eed182940b59bb4a839cc88d05b
diff --git a/devel/cvs/patches/patch-ae b/devel/cvs/patches/patch-ae
index 1e8ef1ab755..153b76bb33c 100644
--- a/devel/cvs/patches/patch-ae
+++ b/devel/cvs/patches/patch-ae
@@ -1,18 +1,25 @@
-$NetBSD: patch-ae,v 1.2 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-ae,v 1.3 2000/10/21 19:29:06 wiz Exp $
 
 --- src/rcs.c.orig	Mon Aug 21 23:16:38 2000
 +++ src/rcs.c
-@@ -3361,6 +3361,9 @@
+@@ -3348,7 +3348,7 @@
+     size_t len;
+ };
+ #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") },
+@@ -3361,6 +3361,7 @@
      { KEYWORD_INIT ("Revision") },
      { KEYWORD_INIT ("Source") },
      { KEYWORD_INIT ("State") },
-+#ifdef LOCALID
-+    { KEYWORD_INIT (LOCALID) },
-+#endif
++    { NULL, 0 },
      { NULL, 0 }
  };
  enum keyword
-@@ -3375,7 +3378,8 @@
+@@ -3375,7 +3376,8 @@
      KEYWORD_RCSFILE,
      KEYWORD_REVISION,
      KEYWORD_SOURCE,
@@ -22,7 +29,19 @@ $NetBSD: patch-ae,v 1.2 2000/10/18 03:31:16 hubertf Exp $
  };
  
  /* Convert an RCS date string into a readable string.  This is like
-@@ -3603,6 +3607,7 @@
+@@ -3512,6 +3514,11 @@
+ 	return;
+     }
+ 
++    if (RCS_citag != NULL) {
++	keywords[KEYWORD_LOCALID].string = RCS_citag;
++	keywords[KEYWORD_LOCALID].len = strlen(RCS_citag);
++    }
++
+     /* If we are using -kkvl, dig out the locker information if any.  */
+     locker = NULL;
+     if (expand == KFLAG_KVL)
+@@ -3603,6 +3610,7 @@
  
  	    case KEYWORD_HEADER:
  	    case KEYWORD_ID:
@@ -30,3 +49,12 @@ $NetBSD: patch-ae,v 1.2 2000/10/18 03:31:16 hubertf Exp $
  		{
  		    char *path;
  		    int free_path;
+@@ -4234,7 +4242,7 @@
+ 	if (info != NULL)
+ 	{
+ 	    /* If the size of `devtype' changes, fix the sscanf call also */
+-	    char devtype[16];
++	    char devtype[16+1];
+ 
+ 	    if (sscanf (info->data, "%16s %lu",
+ 			devtype, &devnum_long) < 2)
diff --git a/devel/cvs/patches/patch-af b/devel/cvs/patches/patch-af
index 20d8ea275b9..6bef6a0fec3 100644
--- a/devel/cvs/patches/patch-af
+++ b/devel/cvs/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-af,v 1.4 2000/10/21 19:29:06 wiz Exp $
 
 --- src/update.c.orig	Wed Jul 26 21:29:01 2000
 +++ src/update.c
@@ -22,3 +22,21 @@ $NetBSD: patch-af,v 1.3 2000/10/18 03:31:16 hubertf Exp $
  		}
  	    }
  
+@@ -2678,7 +2685,7 @@
+ 	    else
+ 	    {
+ 		/* If the size of `ftype' changes, fix the sscanf call also */
+-		char ftype[16];
++		char ftype[16+1];
+ 		if (sscanf (n->data, "%16s %lu", ftype,
+ 			    &dev_long) < 2)
+ 		    error (1, 0, "%s:%s has bad `special' newphrase %s",
+@@ -2756,7 +2763,7 @@
+ 	    else
+ 	    {
+ 		/* If the size of `ftype' changes, fix the sscanf call also */
+-		char ftype[16];
++		char ftype[16+1];
+ 		if (sscanf (n->data, "%16s %lu", ftype,
+ 			    &dev_long) < 2)
+ 		    error (1, 0, "%s:%s has bad `special' newphrase %s",
diff --git a/devel/cvs/patches/patch-ah b/devel/cvs/patches/patch-ah
new file mode 100644
index 00000000000..57ac7bb100d
--- /dev/null
+++ b/devel/cvs/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.3 2000/10/21 19:29:06 wiz Exp $
+
+--- src/mkmodules.c.orig	Fri Sep  8 17:28:36 2000
++++ src/mkmodules.c
+@@ -297,6 +297,9 @@
+     "# Set `LogHistory' to `all' or `TOFEWGCMAR' to log all transactions to the\n",
+     "# history file, or a subset as needed (ie `TMAR' logs all write operations)\n",
+     "#LogHistory=TOFEWGCMAR\n",
++    "\n",
++    "# Set this to the name of a local tag to use in addition to Id\n",
++    "#tag=OurTag\n",
+     NULL
+ };
+ 
diff --git a/devel/cvs/patches/patch-ai b/devel/cvs/patches/patch-ai
new file mode 100644
index 00000000000..48b24124c9b
--- /dev/null
+++ b/devel/cvs/patches/patch-ai
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.3 2000/10/21 19:29:06 wiz Exp $
+
+--- src/parseinfo.c.orig	Mon Mar 13 20:15:31 2000
++++ src/parseinfo.c
+@@ -335,6 +335,14 @@
+ 		goto error_return;
+ 	    }
+ 	}
++	else if (strcmp (line, "tag") == 0) {
++	    RCS_citag = strdup(p);
++	    if (RCS_citag == NULL) {
++		error (0, 0, "%s: no memory for local tag '%s'",
++		       infopath, p);
++		goto error_return;
++	    }
++	}
+ 	else if (strcmp (line, "PreservePermissions") == 0)
+ 	{
+ 	    if (strcmp (p, "no") == 0)
diff --git a/devel/cvs/patches/patch-am b/devel/cvs/patches/patch-am
index 6912b1cb8f9..2c527592873 100644
--- a/devel/cvs/patches/patch-am
+++ b/devel/cvs/patches/patch-am
@@ -1,8 +1,16 @@
-$NetBSD: patch-am,v 1.4 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-am,v 1.5 2000/10/21 19:29:06 wiz Exp $
 
 --- src/cvs.h.orig	Sat Jul  8 21:57:21 2000
 +++ src/cvs.h
-@@ -394,6 +394,7 @@
+@@ -363,6 +363,7 @@
+ extern int use_editor;
+ extern int cvswrite;
+ extern mode_t cvsumask;
++extern char *RCS_citag;
+ 
+ /* Access method specified in CVSroot. */
+ typedef enum {
+@@ -394,6 +395,7 @@
  
  extern int trace;		/* Show all commands */
  extern int noexec;		/* Don't modify disk anywhere */
@@ -10,7 +18,7 @@ $NetBSD: patch-am,v 1.4 2000/10/18 03:31:16 hubertf Exp $
  extern int logoff;		/* Don't write history entry */
  
  extern int top_level_admin;
-@@ -654,6 +655,7 @@
+@@ -654,6 +656,7 @@
  #define	RUN_STDOUT_APPEND	0x0004	/* append to stdout, don't truncate */
  #define	RUN_STDERR_APPEND	0x0008	/* append to stderr, don't truncate */
  #define	RUN_SIGIGNORE		0x0010	/* ignore interrupts for command */
diff --git a/devel/cvs/patches/patch-ap b/devel/cvs/patches/patch-ap
index 0e4cfe48472..c9434200919 100644
--- a/devel/cvs/patches/patch-ap
+++ b/devel/cvs/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.2 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-ap,v 1.3 2000/10/21 19:29:06 wiz Exp $
 
 --- src/main.c.orig	Thu Sep  7 01:35:04 2000
 +++ src/main.c
@@ -10,7 +10,15 @@ $NetBSD: patch-ap,v 1.2 2000/10/18 03:31:16 hubertf Exp $
  int logoff = 0;
  
  /* Set if we should be writing CVSADM directories at top level.  At
-@@ -239,6 +240,7 @@
+@@ -49,6 +50,7 @@
+ int top_level_admin = 0;
+ 
+ mode_t cvsumask = UMASK_DFLT;
++char *RCS_citag = NULL;
+ 
+ char *CurDir;
+ 
+@@ -239,6 +241,7 @@
      "    -w           Make checked-out files read-write (default).\n",
      "    -l           Turn history logging off.\n",
      "    -n           Do not execute anything that will change the disk.\n",
@@ -18,7 +26,7 @@ $NetBSD: patch-ap,v 1.2 2000/10/18 03:31:16 hubertf Exp $
      "    -t           Show trace of program execution -- try with -n.\n",
      "    -v           CVS version and copyright.\n",
      "    -T tmpdir    Use 'tmpdir' for temporary files.\n",
-@@ -432,7 +434,7 @@
+@@ -432,7 +435,7 @@
      int help = 0;		/* Has the user asked for help?  This
  				   lets us support the `cvs -H cmd'
  				   convention to give help for cmd. */
@@ -27,7 +35,7 @@ $NetBSD: patch-ap,v 1.2 2000/10/18 03:31:16 hubertf Exp $
      static struct option long_options[] =
      {
          {"help", 0, NULL, 'H'},
-@@ -562,6 +564,8 @@
+@@ -562,6 +565,8 @@
  		break;
  	    case 'n':
  		noexec = 1;
@@ -36,7 +44,7 @@ $NetBSD: patch-ap,v 1.2 2000/10/18 03:31:16 hubertf Exp $
  	    case 'l':			/* Fall through */
  		logoff = 1;
  		break;
-@@ -936,7 +940,7 @@
+@@ -936,7 +941,7 @@
  		/*
  		 * Check to see if the repository exists.
  		 */
diff --git a/devel/cvs/patches/patch-aw b/devel/cvs/patches/patch-aw
index 5ccb8d7810e..e0bd01b1510 100644
--- a/devel/cvs/patches/patch-aw
+++ b/devel/cvs/patches/patch-aw
@@ -1,5 +1,7 @@
---- configure.orig	Wed Oct 18 04:35:53 2000
-+++ configure	Wed Oct 18 04:36:01 2000
+$NetBSD: patch-aw,v 1.5 2000/10/21 19:29:06 wiz Exp $
+
+--- configure.orig	Tue Aug  1 18:13:25 2000
++++ configure
 @@ -2820,19 +2820,22 @@
    
  fi