Update to 1.11.21:

Changes since 1.11.20:
**********************

BUG FIXES

* Thanks to Serguei E. Leontiev, CVS with Kerberos 5 GSSAPI
  should automatically link on FreeBSD 5.x. (bug #14639).

* Thanks to Rahul Bhargava, heavily loaded systems
  suffering from a disk crash or power failure will not lose data they claimed
  to have committed.

* CVS server now handles conflict markers in Entry requests as documented.

* CVS now remembers that binary file merge conflicts occurred until the
  timestamp of the updated binary file changes.

* CVS client now saves some bandwidth by not sending the contents of files
  with conflicts to the server when it isn't needed.

* CVS now does correct locking during import.

* A problem where the server could block indefinitely waiting for an EOF from
  the client when compression was enabled has been fixed.

* `cvs diff' no longer splits its arguments on spaces.

* Thanks to an old report and patch from Stewart Brodie, a
  potential crash in response to a corrupt RCS file has been fixed.

* CVS now locks the history and val-tags files before writing to them.
  Especially with large repositories, users should no longer see new warnings
  about corrupt history records when using the `cvs history' command.  Existing
  corrupt history records will still need to be removed manually.  val-tags
  corruption should have had less obvious effects, but removing the
  CVSROOT/val-tags file and allowing a 1.11.21 or later version of CVS to
  regenerate it may eliminate a few odd behaviors and possibly cause a slight
  speed up of read transactions in large repositories over time.

19 files changed, 86 insertions, 101 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 4be9188a5cb..a23cb8a19e4 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.89 2005/12/05 20:50:02 rillig Exp $
+# $NetBSD: Makefile,v 1.90 2006/01/29 02:40:40 wiz Exp $
 #
 
-DISTNAME=	cvs-1.11.20
+DISTNAME=	cvs-1.11.21
 CATEGORIES=	devel
-PKGREVISION=	2
-MASTER_SITES=	http://ftp.gnu.org/non-gnu/cvs/
+MASTER_SITES=	http://ftp.gnu.org/non-gnu/cvs/source/stable/1.11.21/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	wiz@NetBSD.org
diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo
index 54f0f79cec0..d63a8ea073b 100644
--- a/devel/cvs/distinfo
+++ b/devel/cvs/distinfo
@@ -1,29 +1,28 @@
-$NetBSD: distinfo,v 1.27 2005/08/26 21:36:29 adrianp Exp $
+$NetBSD: distinfo,v 1.28 2006/01/29 02:40:40 wiz Exp $
 
-SHA1 (cvs-1.11.20.tar.bz2) = 47f51a96b5a73e18c96f431f3c494735aa9c0236
-RMD160 (cvs-1.11.20.tar.bz2) = 4f926d661b35dc1bafb5ee5f98487289a907d34d
-Size (cvs-1.11.20.tar.bz2) = 2414744 bytes
+SHA1 (cvs-1.11.21.tar.bz2) = d114ed2943a4027f1277b04f57867a2e09a1f432
+RMD160 (cvs-1.11.21.tar.bz2) = bc3f15b506174de6d304e9608a26e80d3e2f0513
+Size (cvs-1.11.21.tar.bz2) = 2929933 bytes
 SHA1 (patch-aa) = 57bcc59a51d44f436d2f79a0752e44e317589650
-SHA1 (patch-ab) = 3c5ff65e7a087b2e73e933366aae99b6b5549371
-SHA1 (patch-ac) = 4da02fe019da9721afe6f9af0cd1db44214b575e
+SHA1 (patch-ab) = 6196c150bdb56419b59896d783070a8512755919
+SHA1 (patch-ac) = 24022b7dc3a276e91a45a28a36654c5c6611ba46
 SHA1 (patch-ad) = da297e6f5f1a8ad4cf0c47f7b57f6bbb860ea64c
-SHA1 (patch-ae) = 3c9083c3d6532505efc530845feaee70158569b5
-SHA1 (patch-af) = 2f809d054c0b215a6668eda3b18e3ea2c5dfab27
+SHA1 (patch-ae) = a471c39b4700db2c86b10e480585ad979a2dc9b1
+SHA1 (patch-af) = fe22f70e0d281822fb74e8b3c43715ca7f987e79
 SHA1 (patch-ag) = 5dd358a7dbf5db402d3e56faf49e8748afdd05f2
 SHA1 (patch-ah) = 47b9f55979ed65844efe22fb614b105ae247408d
 SHA1 (patch-ai) = d51b3f1429e73156cbfb7e0480a34ac6ce7a208d
-SHA1 (patch-ak) = dc51b6899005cbfdbad1876060c7ef53cce3156f
+SHA1 (patch-ak) = 8be3a5014e9dce3ae5381bcdaaa4530349e6f58c
 SHA1 (patch-al) = 3f20d43ed1423ae6e811d9ec2d35af4932e84b41
-SHA1 (patch-am) = a2a83f3a3788a99f008372f5a8d7ee9a3a6dbf72
-SHA1 (patch-an) = 5fda0f44ff5ee165f18cedd43c6adf97a51e6398
-SHA1 (patch-ao) = e19a61b0ccb0e71491fb53d553f03d85135ef5c6
-SHA1 (patch-ap) = 9aa44fc82540f86aefa14c47f1d2632377a0471f
-SHA1 (patch-aq) = bc828ae6c5eff55e7952752cb50317e268dcdd7b
-SHA1 (patch-ar) = 89c787d8725c6dc4a91268138749a2ec0ec255b1
-SHA1 (patch-as) = 095bab2722f1885db6c6d9e6f599e07444077c15
-SHA1 (patch-at) = 1cbed8c43bda54a851a7ff1b85e78a224cbeeca2
-SHA1 (patch-au) = ba788685ee842d07ac866183185e257ce2dcf749
-SHA1 (patch-av) = d381dbf50a59d78e0a4bf8fff09b2570988d5647
-SHA1 (patch-ay) = 7a0ee5bf1707afeaeb9092ce3faf7fc594044a2b
+SHA1 (patch-am) = 76285476206efe60bdcaf3623ec3cec1cb13cb68
+SHA1 (patch-an) = 3a72df42abde4749d1a15e54481845ba8337f863
+SHA1 (patch-ao) = 035bdc8d83d88577e62602f2fb669f1d0c94f49b
+SHA1 (patch-ap) = c2b5da1fc02df7348b514d3b704984b53de213f5
+SHA1 (patch-aq) = a1fe8e522d05a8fdf3ac6dcb03892b6e6b9d8040
+SHA1 (patch-ar) = 32477a1cbd479225806bbefd04e84c496fbc4691
+SHA1 (patch-at) = 9df99f83f83da870e1d9c86854d04bb5816dc9ff
+SHA1 (patch-au) = 8f8bbda565f0edd2eecb56030ed0301c6044b488
+SHA1 (patch-av) = 84da8f0a398ddf36412becb2aebd7008e3f80c44
+SHA1 (patch-ay) = 6ba3315df137028fc5b2bebfef79aa3d540994c4
 SHA1 (patch-az) = 4b773728b228af6c69d4e10cf59f1677feaa54ea
 SHA1 (patch-ba) = 25f9a2f7e35db0d2bfefae5ebf7be43d21a8a9ee
diff --git a/devel/cvs/options.mk b/devel/cvs/options.mk
index 7291d6a931a..01b07974878 100644
--- a/devel/cvs/options.mk
+++ b/devel/cvs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/12/05 23:55:05 rillig Exp $
+# $NetBSD: options.mk,v 1.3 2006/01/29 02:40:40 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cvs
 PKG_SUPPORTED_OPTIONS=	kerberos
@@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS=	kerberos
 .if empty(MACHINE_PLATFORM:MSunOS-5.[89]-*) && \
     empty(MACHINE_PLATFORM:MSunOS-5.10-*) && \
     empty(MACHINE_PLATFORM:MLinux-*) && \
-    defined(NOT_YET_AVAILABLE_FOR_CVS_1_11_20)
+    defined(NOT_YET_AVAILABLE_FOR_CVS_1_11_21)
 PKG_SUPPORTED_OPTIONS+=	inet6
 .endif
 
diff --git a/devel/cvs/patches/patch-ab b/devel/cvs/patches/patch-ab
index e95230785bf..393e5386ae5 100644
--- a/devel/cvs/patches/patch-ab
+++ b/devel/cvs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2005/04/19 12:39:18 wiz Exp $
+$NetBSD: patch-ab,v 1.16 2006/01/29 02:40:40 wiz Exp $
 
---- doc/cvs.texinfo.orig	2005-04-14 19:38:46.000000000 +0200
+--- doc/cvs.texinfo.orig	2005-09-26 04:49:45.000000000 +0200
 +++ doc/cvs.texinfo
-@@ -13548,6 +13548,11 @@ CPU intensive but is not recommended for
+@@ -13578,6 +13578,11 @@ CPU intensive but is not recommended for
  
  @xref{verifymsg}, for more information on how verifymsg
  may be used.
diff --git a/devel/cvs/patches/patch-ac b/devel/cvs/patches/patch-ac
index 6fe66658d4c..e76e1f95471 100644
--- a/devel/cvs/patches/patch-ac
+++ b/devel/cvs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2005/03/01 15:36:48 wiz Exp $
+$NetBSD: patch-ac,v 1.11 2006/01/29 02:40:40 wiz Exp $
 
---- src/Makefile.in.orig	2005-02-01 00:11:15.000000000 +0100
+--- src/Makefile.in.orig	2005-09-28 05:32:23.000000000 +0200
 +++ src/Makefile.in
-@@ -88,7 +88,7 @@ am_cvs_OBJECTS = add.$(OBJEXT) admin.$(O
+@@ -86,7 +86,7 @@ am_cvs_OBJECTS = add.$(OBJEXT) admin.$(O
  	version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
  	wrapper.$(OBJEXT) zlib.$(OBJEXT)
  cvs_OBJECTS = $(am_cvs_OBJECTS)
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.10 2005/03/01 15:36:48 wiz Exp $
  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(bin_SCRIPTS)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -201,7 +201,7 @@ target_alias = @target_alias@
+@@ -199,7 +199,7 @@ target_alias = @target_alias@
  # some namespace hackery going on that maybe shouldn't be.  Long term fix is to
  # try and remove naming ocnflicts and fix Automake to allow particular includes
  # to be attached only to particular object files.  Short term fix is either or.
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.10 2005/03/01 15:36:48 wiz Exp $
  bin_SCRIPTS = cvsbug
  
  # The cvs executable
-@@ -280,7 +280,7 @@ cvs_SOURCES = \
+@@ -278,7 +278,7 @@ cvs_SOURCES = \
  cvs_LDADD = \
  	../diff/libdiff.a \
  	../lib/libcvs.a \
diff --git a/devel/cvs/patches/patch-ae b/devel/cvs/patches/patch-ae
index 95dc9e78e96..a1bea68bd2f 100644
--- a/devel/cvs/patches/patch-ae
+++ b/devel/cvs/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.10 2005/04/19 12:39:18 wiz Exp $
+$NetBSD: patch-ae,v 1.11 2006/01/29 02:40:40 wiz Exp $
 
---- src/rcs.c.orig	2005-03-17 17:33:47.000000000 +0100
+--- src/rcs.c.orig	2005-09-26 16:31:36.000000000 +0200
 +++ src/rcs.c
 @@ -3534,7 +3534,7 @@ struct rcs_keyword
      size_t len;
@@ -49,7 +49,7 @@ $NetBSD: patch-ae,v 1.10 2005/04/19 12:39:18 wiz Exp $
  		{
  		    const char *path;
  		    int free_path;
-@@ -4446,7 +4454,7 @@ RCS_checkout (rcs, workfile, rev, nameta
+@@ -4462,7 +4470,7 @@ RCS_checkout (rcs, workfile, rev, nameta
  	if (info != NULL)
  	{
  	    /* If the size of `devtype' changes, fix the sscanf call also */
diff --git a/devel/cvs/patches/patch-af b/devel/cvs/patches/patch-af
index 9e2a509f150..17ec21afc07 100644
--- a/devel/cvs/patches/patch-af
+++ b/devel/cvs/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.12 2005/04/19 12:39:18 wiz Exp $
+$NetBSD: patch-af,v 1.13 2006/01/29 02:40:40 wiz Exp $
 
---- src/update.c.orig	2005-03-16 23:01:21.000000000 +0100
+--- src/update.c.orig	2005-09-24 19:58:16.000000000 +0200
 +++ src/update.c
-@@ -1368,11 +1368,18 @@ VERS: ", 0);
+@@ -1341,11 +1341,18 @@ VERS: ", 0);
  		    xchmod (finfo->file, 1);
  		else
  		{
diff --git a/devel/cvs/patches/patch-ak b/devel/cvs/patches/patch-ak
index eb61af5ce0f..96e363a1aaa 100644
--- a/devel/cvs/patches/patch-ak
+++ b/devel/cvs/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.6 2005/03/01 15:36:48 wiz Exp $
+$NetBSD: patch-ak,v 1.7 2006/01/29 02:40:40 wiz Exp $
 
---- src/checkout.c.orig	2005-01-31 23:11:04.000000000 +0100
+--- src/checkout.c.orig	2005-09-24 19:56:35.000000000 +0200
 +++ src/checkout.c
-@@ -196,7 +196,7 @@ checkout (argc, argv)
+@@ -194,7 +194,7 @@ checkout (argc, argv)
  	    case 'p':
  		pipeout = 1;
  		run_module_prog = 0;	/* don't run module prog when piping */
diff --git a/devel/cvs/patches/patch-am b/devel/cvs/patches/patch-am
index 36f3703f769..6d1daff8caa 100644
--- a/devel/cvs/patches/patch-am
+++ b/devel/cvs/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.13 2005/03/01 15:36:48 wiz Exp $
+$NetBSD: patch-am,v 1.14 2006/01/29 02:40:40 wiz Exp $
 
---- src/cvs.h.orig	2005-01-31 23:19:01.000000000 +0100
+--- src/cvs.h.orig	2005-09-22 16:07:05.000000000 +0200
 +++ src/cvs.h
-@@ -380,6 +380,7 @@ extern int really_quiet, quiet;
+@@ -382,6 +382,7 @@ extern int really_quiet, quiet;
  extern int use_editor;
  extern int cvswrite;
  extern mode_t cvsumask;
@@ -10,7 +10,7 @@ $NetBSD: patch-am,v 1.13 2005/03/01 15:36:48 wiz Exp $
  
  
  
-@@ -398,6 +399,7 @@ extern int safe_location PROTO ((char *)
+@@ -400,6 +401,7 @@ extern int safe_location PROTO ((char *)
  
  extern int trace;		/* Show all commands */
  extern int noexec;		/* Don't modify disk anywhere */
@@ -18,11 +18,11 @@ $NetBSD: patch-am,v 1.13 2005/03/01 15:36:48 wiz Exp $
  extern int logoff;		/* Don't write history entry */
  
  extern int top_level_admin;
-@@ -684,6 +686,7 @@ void sleep_past PROTO ((time_t desttime)
+@@ -694,6 +696,7 @@ void sleep_past PROTO ((time_t desttime)
  #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 */
 +#define	RUN_UNSETXID          0x0020	/* undo setxid in child */
  #define	RUN_TTY               (char *)0 /* for the benefit of lint */
  
- void run_arg PROTO((const char *s));
+ void run_add_arg_p PROTO ((int *, size_t *, char ***, const char *s));
diff --git a/devel/cvs/patches/patch-an b/devel/cvs/patches/patch-an
index cf6f4040166..4571cdf5a8e 100644
--- a/devel/cvs/patches/patch-an
+++ b/devel/cvs/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.7 2004/09/09 22:26:17 wiz Exp $
+$NetBSD: patch-an,v 1.8 2006/01/29 02:40:40 wiz Exp $
 
---- src/history.c.orig	2004-06-09 16:34:54.000000000 +0200
+--- src/history.c.orig	2005-08-02 22:46:57.000000000 +0200
 +++ src/history.c
-@@ -750,7 +750,7 @@ history_write (type, update_dir, revs, n
+@@ -760,7 +760,7 @@ history_write (type, update_dir, revs, n
      if (trace)
  	fprintf (stderr, "%s-> fopen(%s,a)\n",
  		 CLIENT_SERVER_STR, fname);
 -    if (noexec)
 +    if (nolock)
  	goto out;
-     fd = CVS_OPEN (fname, O_WRONLY | O_APPEND | OPEN_BINARY, 0666);
-     if (fd < 0)
+ 
+     if (!history_lock (current_parsed_root->directory))
diff --git a/devel/cvs/patches/patch-ao b/devel/cvs/patches/patch-ao
index 2b76c2a9d3f..5022127dd56 100644
--- a/devel/cvs/patches/patch-ao
+++ b/devel/cvs/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.7 2005/03/01 15:36:48 wiz Exp $
+$NetBSD: patch-ao,v 1.8 2006/01/29 02:40:40 wiz Exp $
 
---- src/lock.c.orig	2005-01-31 23:13:07.000000000 +0100
+--- src/lock.c.orig	2005-05-03 17:34:53.000000000 +0200
 +++ src/lock.c
-@@ -412,7 +412,7 @@ Reader_Lock (xrepository)
+@@ -420,7 +420,7 @@ Reader_Lock (xrepository)
  	(void) fprintf (stderr, "%s-> Reader_Lock(%s)\n", CLIENT_SERVER_STR,
                          xrepository);
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.7 2005/03/01 15:36:48 wiz Exp $
  	return 0;
  
      /* we only do one directory at a time for read locks! */
-@@ -486,7 +486,7 @@ Writer_Lock (list)
+@@ -494,7 +494,7 @@ Writer_Lock (list)
  {
      char *wait_repos;
  
diff --git a/devel/cvs/patches/patch-ap b/devel/cvs/patches/patch-ap
index 15884b8653f..72b44112cc5 100644
--- a/devel/cvs/patches/patch-ap
+++ b/devel/cvs/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.7 2005/03/01 15:36:48 wiz Exp $
+$NetBSD: patch-ap,v 1.8 2006/01/29 02:40:40 wiz Exp $
 
---- src/main.c.orig	2005-02-03 15:50:51.000000000 +0100
+--- src/main.c.orig	2005-09-05 20:04:38.000000000 +0200
 +++ src/main.c
 @@ -46,6 +46,7 @@ int really_quiet = 0;
  int quiet = 0;
@@ -18,7 +18,7 @@ $NetBSD: patch-ap,v 1.7 2005/03/01 15:36:48 wiz Exp $
  
  char *CurDir;
  
-@@ -244,6 +246,7 @@ static const char *const opt_usage[] =
+@@ -243,6 +245,7 @@ static const char *const opt_usage[] =
      "    -r           Make checked-out files read-only.\n",
      "    -w           Make checked-out files read-write (default).\n",
      "    -n           Do not execute anything that will change the disk.\n",
@@ -26,7 +26,7 @@ $NetBSD: patch-ap,v 1.7 2005/03/01 15:36:48 wiz 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",
-@@ -402,7 +405,7 @@ main (argc, argv)
+@@ -401,7 +404,7 @@ main (argc, argv)
      int help = 0;		/* Has the user asked for help?  This
  				   lets us support the `cvs -H cmd'
  				   convention to give help for cmd. */
@@ -35,7 +35,7 @@ $NetBSD: patch-ap,v 1.7 2005/03/01 15:36:48 wiz Exp $
      static struct option long_options[] =
      {
          {"help", 0, NULL, 'H'},
-@@ -526,6 +529,11 @@ main (argc, argv)
+@@ -525,6 +528,11 @@ main (argc, argv)
  		break;
  	    case 'n':
  		noexec = 1;
diff --git a/devel/cvs/patches/patch-aq b/devel/cvs/patches/patch-aq
index db1e238f8ba..b1c9c5005ea 100644
--- a/devel/cvs/patches/patch-aq
+++ b/devel/cvs/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.8 2005/03/01 15:36:48 wiz Exp $
+$NetBSD: patch-aq,v 1.9 2006/01/29 02:40:40 wiz Exp $
 
---- src/recurse.c.orig	2005-01-31 23:15:21.000000000 +0100
+--- src/recurse.c.orig	2005-09-04 02:26:43.000000000 +0200
 +++ src/recurse.c
-@@ -554,7 +554,7 @@ do_recursion (frame)
+@@ -551,7 +551,7 @@ do_recursion (frame)
      if (frame->flags == R_SKIP_ALL)
  	return (0);
  
diff --git a/devel/cvs/patches/patch-ar b/devel/cvs/patches/patch-ar
index 8435a62dab1..9c0efcae354 100644
--- a/devel/cvs/patches/patch-ar
+++ b/devel/cvs/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.16 2005/04/19 12:39:18 wiz Exp $
+$NetBSD: patch-ar,v 1.17 2006/01/29 02:40:40 wiz Exp $
 
---- src/server.c.orig	2005-03-16 20:16:01.000000000 +0100
+--- src/server.c.orig	2005-09-22 17:57:34.000000000 +0200
 +++ src/server.c
-@@ -780,6 +780,7 @@ E Protocol error: Root says \"%s\" but p
+@@ -782,6 +782,7 @@ E Protocol error: Root says \"%s\" but p
         nothing.  But for rsh, we need to do it now.  */
      parse_config (current_parsed_root->directory);
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ar,v 1.16 2005/04/19 12:39:18 wiz Exp $
      path = xmalloc (strlen (current_parsed_root->directory)
  		   + sizeof (CVSROOTADM)
  		   + 2);
-@@ -797,6 +798,7 @@ E Protocol error: Root says \"%s\" but p
+@@ -799,6 +800,7 @@ E Protocol error: Root says \"%s\" but p
  	pending_error = save_errno;
      }
      free (path);
@@ -18,7 +18,7 @@ $NetBSD: patch-ar,v 1.16 2005/04/19 12:39:18 wiz Exp $
  
  #ifdef HAVE_PUTENV
      env = xmalloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2);
-@@ -2276,8 +2278,12 @@ serve_global_option (arg)
+@@ -2283,8 +2285,12 @@ serve_global_option (arg)
  	    break;
  	case 'n':
  	    noexec = 1;
@@ -31,7 +31,7 @@ $NetBSD: patch-ar,v 1.16 2005/04/19 12:39:18 wiz Exp $
  	case 'q':
  	    quiet = 1;
  	    break;
-@@ -5301,6 +5307,7 @@ switch_to_user (cvs_username, username)
+@@ -5306,6 +5312,7 @@ switch_to_user (cvs_username, username)
      const char *username;
  {
      struct passwd *pw;
@@ -39,7 +39,7 @@ $NetBSD: patch-ar,v 1.16 2005/04/19 12:39:18 wiz Exp $
  
      pw = getpwnam (username);
      if (pw == NULL)
-@@ -5379,7 +5386,15 @@ error 0 %s: no such system user\n", user
+@@ -5384,7 +5391,15 @@ error 0 %s: no such system user\n", user
  	}
      }
  
diff --git a/devel/cvs/patches/patch-as b/devel/cvs/patches/patch-as
deleted file mode 100644
index 9b0b4761f2c..00000000000
--- a/devel/cvs/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.8 2005/04/19 12:39:18 wiz Exp $
-
---- src/tag.c.orig	2005-03-16 20:16:01.000000000 +0100
-+++ src/tag.c
-@@ -1301,7 +1301,7 @@ Numeric tag %s contains characters other
- 	/* The tags is valid but not mentioned in val-tags.  Add it.  */
- 	datum value;
- 
--	if (noexec || nowrite)
-+	if (noexec || nowrite || nolock)
- 	{
- 	    if (db != NULL)
- 		dbm_close (db);
diff --git a/devel/cvs/patches/patch-at b/devel/cvs/patches/patch-at
index bf97c3c60a2..46fbcaf09be 100644
--- a/devel/cvs/patches/patch-at
+++ b/devel/cvs/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.12 2005/03/01 15:36:48 wiz Exp $
+$NetBSD: patch-at,v 1.13 2006/01/29 02:40:40 wiz Exp $
 
---- src/logmsg.c.orig	2005-01-31 23:13:45.000000000 +0100
+--- src/logmsg.c.orig	2005-09-04 02:26:42.000000000 +0200
 +++ src/logmsg.c
-@@ -231,6 +231,8 @@ do_editor (dir, messagep, repository, ch
+@@ -227,6 +227,8 @@ do_editor (dir, messagep, repository, ch
  	    (*messagep)[strlen (*messagep) - 1] != '\n')
  	    (void) fprintf (fp, "\n");
      }
@@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.12 2005/03/01 15:36:48 wiz Exp $
  
      if (repository != NULL)
  	/* tack templates on if necessary */
-@@ -307,7 +309,7 @@ do_editor (dir, messagep, repository, ch
+@@ -298,7 +300,7 @@ do_editor (dir, messagep, repository, ch
      run_setup (editinfo_editor ? editinfo_editor : Editor);
      run_arg (fname);
      if ((retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
@@ -20,7 +20,7 @@ $NetBSD: patch-at,v 1.12 2005/03/01 15:36:48 wiz Exp $
  	error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0,
  	       editinfo_editor ? "Logfile verification failed" :
  	       "warning: editor session failed");
-@@ -690,6 +692,15 @@ title_proc (p, closure)
+@@ -679,6 +681,15 @@ title_proc (p, closure)
  				  strlen (str_list) + strlen (p->key) + 5);
  		    (void) strcat (str_list, p->key);
  		    break;
diff --git a/devel/cvs/patches/patch-au b/devel/cvs/patches/patch-au
index 7c157389309..30187786c09 100644
--- a/devel/cvs/patches/patch-au
+++ b/devel/cvs/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.10 2005/03/01 15:36:48 wiz Exp $
+$NetBSD: patch-au,v 1.11 2006/01/29 02:40:40 wiz Exp $
 
---- src/commit.c.orig	2005-01-31 23:11:19.000000000 +0100
+--- src/commit.c.orig	2005-09-22 09:56:20.000000000 +0200
 +++ src/commit.c
-@@ -1040,7 +1040,9 @@ warning: file `%s' seems to still contai
+@@ -1024,7 +1024,9 @@ warning: file `%s' seems to still contai
  		  xmalloc (sizeof (struct logfile_info)));
  	    li->type = status;
  	    li->tag = xstrdup (vers->tag);
@@ -13,7 +13,7 @@ $NetBSD: patch-au,v 1.10 2005/03/01 15:36:48 wiz Exp $
  	    li->rev_new = NULL;
  	    p->data = li;
  	    (void) addnode (ulist, p);
-@@ -1192,7 +1194,7 @@ precommit_proc (repository, filter)
+@@ -1176,7 +1178,7 @@ precommit_proc (repository, filter)
      run_setup (filter);
      run_arg (repository);
      (void) walklist (saved_ulist, precommit_list_proc, NULL);
diff --git a/devel/cvs/patches/patch-av b/devel/cvs/patches/patch-av
index 1af4fa162c8..ff31ec358c5 100644
--- a/devel/cvs/patches/patch-av
+++ b/devel/cvs/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.10 2004/09/09 22:26:17 wiz Exp $
+$NetBSD: patch-av,v 1.11 2006/01/29 02:40:40 wiz Exp $
 
---- configure.in.orig	2004-09-10 00:21:52.000000000 +0200
+--- configure.in.orig	2005-09-28 05:29:46.000000000 +0200
 +++ configure.in
-@@ -376,7 +376,7 @@ if test -n "$krb_h"; then
+@@ -377,7 +377,7 @@ if test -n "$krb_h"; then
             [LDFLAGS=$hold_ldflags
              # Using open here instead of printf so we don't
              # get confused by the cached value for printf from above.
diff --git a/devel/cvs/patches/patch-ay b/devel/cvs/patches/patch-ay
index cc647a42d97..35aee93a063 100644
--- a/devel/cvs/patches/patch-ay
+++ b/devel/cvs/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.5 2004/04/15 22:28:36 wiz Exp $
+$NetBSD: patch-ay,v 1.6 2006/01/29 02:40:40 wiz Exp $
 
---- src/run.c.orig	Thu Apr  1 20:53:22 2004
+--- src/run.c.orig	2005-06-07 00:23:30.000000000 +0200
 +++ src/run.c
-@@ -191,6 +191,13 @@ run_exec (stin, stout, sterr, flags)
+@@ -208,6 +208,13 @@ run_exec (stin, stout, sterr, flags)
  #endif
      if (pid == 0)
      {