Update to 1.11.6.

* A warning message is now issued if an administrative file contains
more than one DEFAULT entry.

* An error running a verifymsg script (such as referencing an unset
user variable or the script not existing) now causes the verification
to fail.

* Errors in administrative files commands (like unset user variables)
are no longer reported unless the command is actually executed.

* When a file is initially checked out, its last access time is
now set to the current time rather than being set to the time the
file was last checked in like the modification time is.

* The Checkin.prog and Update.prog functionality has been removed.
This fuctionality previously allowed executables to be specified
in the modules file to be run at update and checkin time, but users
could edit these files on a per workspace basis, creating a security
hole.
[NB: already fixed in the package earlier -- wiz]

* Corrected the path in a failed write error message.

* Autoconf and Automake are no longer run automatically unless you
run configure with --enable-maintainer-mode.  Accordingly,
noautomake.sh is no longer needed and has been removed.

* We've standardized on Automake version 1.7.5 and Autoconf version
2.57 to get at a few new macros.  Again, this should only really
affect developers.  See the section of the INSTALL file about using
the autotools if you are compiling CVS yourself.

21 files changed, 115 insertions, 137 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 7b34a72355f..e20714aef29 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.65 2003/06/19 21:55:26 seb Exp $
+# $NetBSD: Makefile,v 1.66 2003/07/12 09:19:17 wiz Exp $
 #
 
-DISTNAME=	cvs-1.11.5
-PKGREVISION=	1
+DISTNAME=	cvs-1.11.6
 CATEGORIES=	devel
-MASTER_SITES=	http://ftp.cvshome.org/${DISTNAME}/ \
-		${MASTER_SITE_GNU:=non-gnu/cvs/}
+MASTER_SITES=	http://www.cvshome.org/files/19/10/ \
+		http://ftp.cvshome.org/release/stable/${DISTNAME}/
+#		${MASTER_SITE_GNU:=non-gnu/cvs/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://www.cvshome.org/
@@ -22,7 +23,7 @@ USE_BUILDLINK2=		yes
 	empty(MACHINE_PLATFORM:MSunOS-5.[89]-*) && empty(MACHINE_PLATFORM:MLinux-*)
 CONFIGURE_ARGS+=	--enable-ipv6
 PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=		cvs-1.11.4-v6-20030102.diff.gz
+PATCHFILES=		cvs-1.11.6-v6-20030623.diff.gz
 PATCH_DIST_STRIP=	-p1
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo
index f87db04eb81..c4525602a77 100644
--- a/devel/cvs/distinfo
+++ b/devel/cvs/distinfo
@@ -1,27 +1,27 @@
-$NetBSD: distinfo,v 1.12 2003/06/19 21:55:26 seb Exp $
+$NetBSD: distinfo,v 1.13 2003/07/12 09:19:17 wiz Exp $
 
-SHA1 (cvs-1.11.5.tar.gz) = d60316d12c0aa7c3140e62db614b9ac10ed42f2c
-Size (cvs-1.11.5.tar.gz) = 2741316 bytes
-SHA1 (cvs-1.11.4-v6-20030102.diff.gz) = e162597be51853fde2f849c2bc07ba580891ae1e
-Size (cvs-1.11.4-v6-20030102.diff.gz) = 12671 bytes
-SHA1 (patch-aa) = f4edc7f2c99937881042d8fd39aec3ef6a4ba70a
-SHA1 (patch-ab) = 7aa219b430e49244373ccaa049403a94be4d4191
-SHA1 (patch-ac) = 432bc81bc7fb89644b2b7a9fff991a1dee32ee38
-SHA1 (patch-ae) = 509ba28b402049573cff6d9dba471332e39834fa
-SHA1 (patch-af) = 0463ada714be222594597906a84b177e803c5940
-SHA1 (patch-ah) = bb2e096452371e6006427a175271efa30b75110b
-SHA1 (patch-ai) = a269d62c85379f5b91dff3bf129d0608f0ceb94c
-SHA1 (patch-ak) = ddf7dfb70c23be3eeeda2bd7fff6b8dd7514c053
+SHA1 (cvs-1.11.6.tar.bz2) = e6190e49ba9563cb7381dd4c48067baf8f55088d
+Size (cvs-1.11.6.tar.bz2) = 2182557 bytes
+SHA1 (cvs-1.11.6-v6-20030623.diff.gz) = 4bef884ef1dedfc3183569fa106fb385241d5e04
+Size (cvs-1.11.6-v6-20030623.diff.gz) = 12673 bytes
+SHA1 (patch-aa) = c2fe0fe235db5037a808735ba0309ebfa784d64d
+SHA1 (patch-ab) = 8f2f183f73b2856b8fe2dd0e97f2a4057f5f45d8
+SHA1 (patch-ac) = 2d9ae4a6f0b01a1fa6c24ab91c78b1ff8dd18b93
+SHA1 (patch-ae) = d9d52b667be1488766b2998f8120d3cbd38933aa
+SHA1 (patch-af) = ce745223b1067c9c606444c1fbf1876a9cb4aef8
+SHA1 (patch-ah) = c95edfbd5849aae732219c6d30e70709c9385a88
+SHA1 (patch-ai) = 1bf4f08fd8135743072faacd0bc1b029045eb72a
+SHA1 (patch-ak) = 9d8b5633a589d0e423f0da8bf029f9141604738b
 SHA1 (patch-al) = ee92e34d058b33dda84d6c600580eaf555fe684f
-SHA1 (patch-am) = 8523249e8bef265449ddbb491dcc1d5d36fa8255
-SHA1 (patch-an) = 2061110f6f5f44397182b917bd44abe3e63d47a4
-SHA1 (patch-ao) = 0f8472015729f95451c5da6034057ed81695395a
-SHA1 (patch-ap) = ca2b22cde32b13904d7c6d047a30109fb9b53ec4
+SHA1 (patch-am) = 1f808c65a0468591a7fe7f91997d57d12ec29219
+SHA1 (patch-an) = 135fef9b9f69ef26f37b8133a59cddb9251c1244
+SHA1 (patch-ao) = c766cb068e9af1aa5a17eba82c8f49072d9a2fe6
+SHA1 (patch-ap) = 2c87c125ed061beb43ff34d57324ad9a14b918e3
 SHA1 (patch-aq) = d346e0034589969e88ef5e1efb750302d3d44898
-SHA1 (patch-ar) = 1ab5df642981fe5f8bcfd37b595f7e188172eaef
-SHA1 (patch-as) = 1553c1c32eef8872a6d8b0b4866be447335119f2
-SHA1 (patch-at) = 0243e9179442efebfd81cb8900daa7032f9ee9ea
-SHA1 (patch-au) = 50795e0c4d4d7100aabcde20e54fce913291e0c1
-SHA1 (patch-av) = be58c2e99b8e90e924a39d888e3bf81884847bdc
-SHA1 (patch-ay) = fc032523f28431dae99d03e677eb43b7d2cd5901
-SHA1 (patch-az) = 9ae7d47ad2295c4598b88d425fee52f9afeb6081
+SHA1 (patch-ar) = 5c713d8c3535bd2df7a15e97874b83d5ea9803e2
+SHA1 (patch-as) = d98c8e17ce673dd3f448b3a90520b3a390ecbed7
+SHA1 (patch-at) = 478dc986d4ea636bb7087a14757c6ca9970102a2
+SHA1 (patch-au) = c7f0afc02e05219e64253a4b833d76981e7f7f3d
+SHA1 (patch-av) = 1cd085ad012a94caa1a3ad6107746f963d335f7e
+SHA1 (patch-ay) = 2a81a1bfe6397f0f851f96b37ae4fc660ebda635
+SHA1 (patch-az) = dd0adf7a0178e52678199bc2d3ef7bbcd8be985d
diff --git a/devel/cvs/patches/patch-aa b/devel/cvs/patches/patch-aa
index dfe53993b75..209ac75ab8e 100644
--- a/devel/cvs/patches/patch-aa
+++ b/devel/cvs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2003/01/15 22:49:37 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2003/07/12 09:19:17 wiz Exp $
 
---- Makefile.in.orig	Sat Dec 28 19:04:33 2002
+--- Makefile.in.orig	Sun May 25 16:28:10 2003
 +++ Makefile.in
-@@ -102,7 +102,7 @@ install_sh = @install_sh@
+@@ -142,7 +142,7 @@ target_alias = @target_alias@
  
  # Unix source subdirs, where we'll want to run lint and etags:
  # This is a legacy variable from b4 Automake
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.6 2003/01/15 22:49:37 wiz Exp $
  # All other subdirs:
  SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
  	windows-NT os2 emx vms
-@@ -130,7 +130,7 @@ subdir = .
+@@ -169,7 +169,7 @@ subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
@@ -19,4 +19,4 @@ $NetBSD: patch-aa,v 1.6 2003/01/15 22:49:37 wiz Exp $
 +CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile
  DIST_SOURCES =
  
- RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
diff --git a/devel/cvs/patches/patch-ab b/devel/cvs/patches/patch-ab
index e9a5e392a42..574f07243ff 100644
--- a/devel/cvs/patches/patch-ab
+++ b/devel/cvs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2003/06/19 21:55:26 seb Exp $
+$NetBSD: patch-ab,v 1.8 2003/07/12 09:19:18 wiz Exp $
 
---- doc/cvs.texinfo.orig	Wed Apr 17 20:24:27 2002
+--- doc/cvs.texinfo.orig	Sat Apr 26 22:09:23 2003
 +++ doc/cvs.texinfo
-@@ -13478,6 +13482,11 @@
+@@ -13453,6 +13453,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 9b4fe6f75d1..c4d214f9d1d 100644
--- a/devel/cvs/patches/patch-ac
+++ b/devel/cvs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2002/11/24 21:31:22 hubertf Exp $
+$NetBSD: patch-ac,v 1.6 2003/07/12 09:19:18 wiz Exp $
 
---- src/Makefile.in.orig	Wed Apr 17 21:47:47 2002
+--- src/Makefile.in.orig	Sun May 25 16:28:37 2003
 +++ src/Makefile.in
-@@ -180,7 +180,7 @@
+@@ -225,7 +225,7 @@ cvs_SOURCES = \
  cvs_LDADD = \
  	../diff/libdiff.a \
  	../lib/libcvs.a \
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2002/11/24 21:31:22 hubertf Exp $
  
  
  # extra clean targets
-@@ -222,7 +222,7 @@
+@@ -268,7 +268,7 @@ am_cvs_OBJECTS = add.$(OBJEXT) admin.$(O
  	update.$(OBJEXT) version.$(OBJEXT) vers_ts.$(OBJEXT) \
  	watch.$(OBJEXT) wrapper.$(OBJEXT) zlib.$(OBJEXT)
  cvs_OBJECTS = $(am_cvs_OBJECTS)
diff --git a/devel/cvs/patches/patch-ae b/devel/cvs/patches/patch-ae
index 620f0ca05e5..fe9cdba4c3d 100644
--- a/devel/cvs/patches/patch-ae
+++ b/devel/cvs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2002/11/24 21:31:23 hubertf Exp $
+$NetBSD: patch-ae,v 1.5 2003/07/12 09:19:18 wiz Exp $
 
---- src/rcs.c.orig	Tue Mar 19 20:15:45 2002
+--- src/rcs.c.orig	Tue Mar 18 01:28:06 2003
 +++ src/rcs.c
-@@ -3466,7 +3466,7 @@
+@@ -3394,7 +3394,7 @@ struct rcs_keyword
      size_t len;
  };
  #define KEYWORD_INIT(s) (s), sizeof (s) - 1
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.4 2002/11/24 21:31:23 hubertf Exp $
  {
      { KEYWORD_INIT ("Author") },
      { KEYWORD_INIT ("Date") },
-@@ -3479,6 +3479,7 @@
+@@ -3407,6 +3407,7 @@ static const struct rcs_keyword keywords
      { KEYWORD_INIT ("Revision") },
      { KEYWORD_INIT ("Source") },
      { KEYWORD_INIT ("State") },
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.4 2002/11/24 21:31:23 hubertf Exp $
      { NULL, 0 }
  };
  enum keyword
-@@ -3493,7 +3494,8 @@
+@@ -3421,7 +3422,8 @@ enum keyword
      KEYWORD_RCSFILE,
      KEYWORD_REVISION,
      KEYWORD_SOURCE,
@@ -29,7 +29,7 @@ $NetBSD: patch-ae,v 1.4 2002/11/24 21:31:23 hubertf Exp $
  };
  
  /* Convert an RCS date string into a readable string.  This is like
-@@ -3630,6 +3632,11 @@
+@@ -3558,6 +3560,11 @@ expand_keywords (rcs, ver, name, log, lo
  	return;
      }
  
@@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.4 2002/11/24 21:31:23 hubertf Exp $
      /* If we are using -kkvl, dig out the locker information if any.  */
      locker = NULL;
      if (expand == KFLAG_KVL)
-@@ -3721,6 +3728,7 @@
+@@ -3649,6 +3656,7 @@ expand_keywords (rcs, ver, name, log, lo
  
  	    case KEYWORD_HEADER:
  	    case KEYWORD_ID:
@@ -49,7 +49,7 @@ $NetBSD: patch-ae,v 1.4 2002/11/24 21:31:23 hubertf Exp $
  		{
  		    char *path;
  		    int free_path;
-@@ -4352,7 +4360,7 @@
+@@ -4281,7 +4289,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 37c7580389c..d6ab5e63ceb 100644
--- a/devel/cvs/patches/patch-af
+++ b/devel/cvs/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2002/11/24 21:31:23 hubertf Exp $
+$NetBSD: patch-af,v 1.7 2003/07/12 09:19:18 wiz Exp $
 
---- src/update.c.orig	Sun Jul  8 22:51:46 2001
+--- src/update.c.orig	Sat Apr 26 21:51:11 2003
 +++ src/update.c
-@@ -1403,11 +1403,18 @@
+@@ -1336,11 +1336,18 @@ VERS: ", 0);
  		    xchmod (finfo->file, 1);
  		else
  		{
diff --git a/devel/cvs/patches/patch-ah b/devel/cvs/patches/patch-ah
index 95eca0cb1bd..12dbc8fbc8c 100644
--- a/devel/cvs/patches/patch-ah
+++ b/devel/cvs/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2002/11/24 21:31:23 hubertf Exp $
+$NetBSD: patch-ah,v 1.5 2003/07/12 09:19:18 wiz Exp $
 
 --- src/mkmodules.c.orig	Fri Sep  7 16:22:39 2001
 +++ src/mkmodules.c
-@@ -307,6 +307,9 @@
+@@ -307,6 +307,9 @@ static const char *const config_contents
      "# repositories.  Set it to `never' (the previous CVS behavior) to prevent\n",
      "# verifymsg scripts from changing the log message.\n",
      "#RereadLogAfterVerify=always\n",
diff --git a/devel/cvs/patches/patch-ai b/devel/cvs/patches/patch-ai
index 94f4bc39a4a..cc5c76ca5d5 100644
--- a/devel/cvs/patches/patch-ai
+++ b/devel/cvs/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.4 2002/11/24 21:31:23 hubertf Exp $
+$NetBSD: patch-ai,v 1.5 2003/07/12 09:19:18 wiz Exp $
 
---- src/parseinfo.c.orig	Fri Aug 24 19:47:02 2001
+--- src/parseinfo.c.orig	Sun May 25 16:10:16 2003
 +++ src/parseinfo.c
-@@ -340,6 +340,14 @@
+@@ -346,6 +346,14 @@ parse_config (cvsroot)
  		goto error_return;
  	    }
  	}
diff --git a/devel/cvs/patches/patch-ak b/devel/cvs/patches/patch-ak
index e92d1ef8060..b2cc0d21c69 100644
--- a/devel/cvs/patches/patch-ak
+++ b/devel/cvs/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.4 2002/11/24 21:31:24 hubertf Exp $
+$NetBSD: patch-ak,v 1.5 2003/07/12 09:19:19 wiz Exp $
 
---- src/checkout.c.orig	Thu Jul 19 18:35:32 2001
+--- src/checkout.c.orig	Thu Feb 27 18:47:01 2003
 +++ src/checkout.c
-@@ -191,7 +191,7 @@
+@@ -191,7 +191,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 9f322004390..58cc417b72f 100644
--- a/devel/cvs/patches/patch-am
+++ b/devel/cvs/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.6 2002/11/24 21:31:24 hubertf Exp $
+$NetBSD: patch-am,v 1.7 2003/07/12 09:19:19 wiz Exp $
 
---- src/cvs.h.orig	Fri Aug 24 19:47:02 2001
+--- src/cvs.h.orig	Sat Apr 26 20:11:31 2003
 +++ src/cvs.h
-@@ -366,6 +366,7 @@
+@@ -367,6 +367,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.6 2002/11/24 21:31:24 hubertf Exp $
  
  
  
-@@ -384,6 +385,7 @@
+@@ -385,6 +386,7 @@ extern int safe_location PROTO ((char *)
  
  extern int trace;		/* Show all commands */
  extern int noexec;		/* Don't modify disk anywhere */
@@ -18,7 +18,7 @@ $NetBSD: patch-am,v 1.6 2002/11/24 21:31:24 hubertf Exp $
  extern int logoff;		/* Don't write history entry */
  
  extern int top_level_admin;
-@@ -660,6 +662,7 @@
+@@ -663,6 +665,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 */
diff --git a/devel/cvs/patches/patch-an b/devel/cvs/patches/patch-an
index 0dbe74b2fb2..94d1462ed20 100644
--- a/devel/cvs/patches/patch-an
+++ b/devel/cvs/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.3 2002/11/24 21:31:24 hubertf Exp $
+$NetBSD: patch-an,v 1.4 2003/07/12 09:19:19 wiz Exp $
 
---- src/history.c.orig	Thu May  3 21:35:16 2001
+--- src/history.c.orig	Tue Mar  4 21:08:12 2003
 +++ src/history.c
-@@ -731,7 +731,7 @@
+@@ -740,7 +740,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 | O_CREAT | OPEN_BINARY, 0666);
+     fd = CVS_OPEN (fname, O_WRONLY | O_APPEND | OPEN_BINARY, 0666);
      if (fd < 0)
diff --git a/devel/cvs/patches/patch-ao b/devel/cvs/patches/patch-ao
index da2af580017..c2ab650661a 100644
--- a/devel/cvs/patches/patch-ao
+++ b/devel/cvs/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.3 2002/11/24 21:31:24 hubertf Exp $
+$NetBSD: patch-ao,v 1.4 2003/07/12 09:19:19 wiz Exp $
 
---- src/lock.c.orig	Wed Sep 26 20:54:09 2001
+--- src/lock.c.orig	Fri Feb 28 22:46:48 2003
 +++ src/lock.c
-@@ -403,7 +403,7 @@
+@@ -413,7 +413,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.3 2002/11/24 21:31:24 hubertf Exp $
  	return (0);
  
      /* we only do one directory at a time for read locks! */
-@@ -475,7 +475,7 @@
+@@ -485,7 +485,7 @@ Writer_Lock (list)
  {
      char *wait_repos;
  
diff --git a/devel/cvs/patches/patch-ap b/devel/cvs/patches/patch-ap
index e3578e1aaab..11ebe2c47c4 100644
--- a/devel/cvs/patches/patch-ap
+++ b/devel/cvs/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.4 2002/11/24 21:31:24 hubertf Exp $
+$NetBSD: patch-ap,v 1.5 2003/07/12 09:19:19 wiz Exp $
 
---- src/main.c.orig	Tue Mar 19 20:15:45 2002
+--- src/main.c.orig	Fri May  2 03:12:55 2003
 +++ src/main.c
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,7 @@ int really_quiet = 0;
  int quiet = 0;
  int trace = 0;
  int noexec = 0;
@@ -10,7 +10,7 @@ $NetBSD: patch-ap,v 1.4 2002/11/24 21:31:24 hubertf Exp $
  int logoff = 0;
  
  /* Set if we should be writing CVSADM directories at top level.  At
-@@ -49,6 +50,7 @@
+@@ -49,6 +50,7 @@ int logoff = 0;
  int top_level_admin = 0;
  
  mode_t cvsumask = UMASK_DFLT;
@@ -18,7 +18,7 @@ $NetBSD: patch-ap,v 1.4 2002/11/24 21:31:24 hubertf Exp $
  
  char *CurDir;
  
-@@ -249,6 +251,7 @@
+@@ -249,6 +251,7 @@ static const char *const opt_usage[] =
      "    -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",
@@ -26,7 +26,7 @@ $NetBSD: patch-ap,v 1.4 2002/11/24 21:31:24 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",
-@@ -407,7 +410,7 @@
+@@ -407,7 +410,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.4 2002/11/24 21:31:24 hubertf Exp $
      static struct option long_options[] =
      {
          {"help", 0, NULL, 'H'},
-@@ -537,6 +540,8 @@
+@@ -537,6 +540,8 @@ main (argc, argv)
  		break;
  	    case 'n':
  		noexec = 1;
diff --git a/devel/cvs/patches/patch-ar b/devel/cvs/patches/patch-ar
index 385ebf103d5..39052fd8ebe 100644
--- a/devel/cvs/patches/patch-ar
+++ b/devel/cvs/patches/patch-ar
@@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.8 2003/01/21 09:57:50 wiz Exp $
+$NetBSD: patch-ar,v 1.9 2003/07/12 09:19:19 wiz Exp $
 
---- src/server.c.orig	Tue Jan 21 10:46:47 2003
+--- src/server.c.orig	Sat Jul 12 09:09:22 2003
 +++ src/server.c
 @@ -772,6 +772,7 @@ E Protocol error: Root says \"%s\" but p
         nothing.  But for rsh, we need to do it now.  */
@@ -18,7 +18,7 @@ $NetBSD: patch-ar,v 1.8 2003/01/21 09:57:50 wiz Exp $
  
  #ifdef HAVE_PUTENV
      env = xmalloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2);
-@@ -2174,6 +2176,8 @@ serve_global_option (arg)
+@@ -2170,6 +2172,8 @@ serve_global_option (arg)
      {
  	case 'n':
  	    noexec = 1;
@@ -27,21 +27,7 @@ $NetBSD: patch-ar,v 1.8 2003/01/21 09:57:50 wiz Exp $
  	    break;
  	case 'q':
  	    quiet = 1;
-@@ -4745,8 +4749,13 @@ struct request requests[] =
-   REQ_LINE("Max-dotdot", serve_max_dotdot, 0),
-   REQ_LINE("Static-directory", serve_static_directory, 0),
-   REQ_LINE("Sticky", serve_sticky, 0),
-+#ifdef notdef
-   REQ_LINE("Checkin-prog", serve_checkin_prog, 0),
-   REQ_LINE("Update-prog", serve_update_prog, 0),
-+#else
-+  REQ_LINE("Checkin-prog", serve_noop, 0),
-+  REQ_LINE("Update-prog", serve_noop, 0),
-+#endif
-   REQ_LINE("Entry", serve_entry, RQ_ESSENTIAL),
-   REQ_LINE("Kopt", serve_kopt, 0),
-   REQ_LINE("Checkin-time", serve_checkin_time, 0),
-@@ -5237,6 +5246,7 @@ switch_to_user (username)
+@@ -5127,6 +5131,7 @@ switch_to_user (username)
      const char *username;
  {
      struct passwd *pw;
@@ -49,7 +35,7 @@ $NetBSD: patch-ar,v 1.8 2003/01/21 09:57:50 wiz Exp $
  
      pw = getpwnam (username);
      if (pw == NULL)
-@@ -5296,7 +5306,15 @@ error 0 %s: no such user\n", username);
+@@ -5191,7 +5196,15 @@ error 0 %s: no such system user\n", user
  	}
      }
  
diff --git a/devel/cvs/patches/patch-as b/devel/cvs/patches/patch-as
index 9558ccccca7..0baf6ef8666 100644
--- a/devel/cvs/patches/patch-as
+++ b/devel/cvs/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.3 2002/11/24 21:31:25 hubertf Exp $
+$NetBSD: patch-as,v 1.4 2003/07/12 09:19:19 wiz Exp $
 
---- src/tag.c.orig	Wed Jun  6 21:43:04 2001
+--- src/tag.c.orig	Fri Jan 31 21:15:13 2003
 +++ src/tag.c
-@@ -1295,7 +1295,7 @@
+@@ -1300,7 +1300,7 @@ Numeric tag %s contains characters other
  	/* The tags is valid but not mentioned in val-tags.  Add it.  */
  	datum value;
  
diff --git a/devel/cvs/patches/patch-at b/devel/cvs/patches/patch-at
index d0460be353d..7e1d064c187 100644
--- a/devel/cvs/patches/patch-at
+++ b/devel/cvs/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.5 2002/11/24 21:31:25 hubertf Exp $
+$NetBSD: patch-at,v 1.6 2003/07/12 09:19:19 wiz Exp $
 
---- src/logmsg.c.orig	Fri Sep 14 19:12:10 2001
+--- src/logmsg.c.orig	Tue May 20 20:12:23 2003
 +++ src/logmsg.c
-@@ -298,7 +298,7 @@
+@@ -301,7 +301,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,
@@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.5 2002/11/24 21:31:25 hubertf Exp $
  	error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0,
  	       editinfo_editor ? "Logfile verification failed" :
  	       "warning: editor session failed");
-@@ -686,6 +686,15 @@
+@@ -678,6 +678,15 @@ title_proc (p, closure)
  			xrealloc (str_list,
  				  strlen (str_list) + strlen (p->key) + 5);
  		    (void) strcat (str_list, p->key);
diff --git a/devel/cvs/patches/patch-au b/devel/cvs/patches/patch-au
index 40bc57188c0..8af19f1e03a 100644
--- a/devel/cvs/patches/patch-au
+++ b/devel/cvs/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.4 2002/11/24 21:31:25 hubertf Exp $
+$NetBSD: patch-au,v 1.5 2003/07/12 09:19:20 wiz Exp $
 
---- src/commit.c.orig	Fri Aug 24 19:47:02 2001
+--- src/commit.c.orig	Sun May 25 16:10:16 2003
 +++ src/commit.c
-@@ -982,7 +982,9 @@
+@@ -978,7 +978,9 @@ warning: file `%s' seems to still contai
  		  xmalloc (sizeof (struct logfile_info)));
  	    li->type = status;
  	    li->tag = xstrdup (vers->tag);
@@ -13,12 +13,12 @@ $NetBSD: patch-au,v 1.4 2002/11/24 21:31:25 hubertf Exp $
  	    li->rev_new = NULL;
  	    p->data = (char *) li;
  	    (void) addnode (ulist, p);
-@@ -1489,7 +1491,7 @@
- 		run_print (stdout);
- 		cvs_output ("'\n", 0);
- 		cvs_flushout ();
--		(void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL);
-+		(void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL | RUN_UNSETXID);
- 		free (repos);
- 	    }
- 	    else
+@@ -1126,7 +1128,7 @@ precommit_proc (repository, filter)
+     run_setup (filter);
+     run_arg (repository);
+     (void) walklist (saved_ulist, precommit_list_proc, NULL);
+-    return (run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL|RUN_REALLY));
++    return (run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL|RUN_REALLY|RUN_UNSETXID));
+ }
+ 
+ /*
diff --git a/devel/cvs/patches/patch-av b/devel/cvs/patches/patch-av
index 53c923268b0..58439a9f0fa 100644
--- a/devel/cvs/patches/patch-av
+++ b/devel/cvs/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.7 2003/01/15 22:49:38 wiz Exp $
+$NetBSD: patch-av,v 1.8 2003/07/12 09:19:20 wiz Exp $
 
---- configure.in.orig	Wed Jan 15 23:00:31 2003
+--- configure.in.orig	Sat Jul 12 09:09:22 2003
 +++ configure.in
-@@ -345,7 +345,7 @@ if test -n "$krb_h"; then
+@@ -356,7 +356,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.
@@ -11,12 +11,3 @@ $NetBSD: patch-av,v 1.7 2003/01/15 22:49:38 wiz Exp $
         LDFLAGS=$hold_ldflags
    else
         AC_CHECK_LIB(krb,printf,[krb_lib=yes krb_libdir=])
-@@ -354,7 +354,7 @@ if test -n "$krb_h"; then
-     AC_DEFINE([HAVE_KERBEROS], 1,
- 	      [Define if you have MIT Kerberos version 4 available.])
-     test -n "${krb_libdir}" && LIBS="${LIBS} -L${krb_libdir}"
--    LIBS="${LIBS} -lkrb"
-+    LIBS="${LIBS} -lkrb -ldes -lcom_err -lroken -lcrypt"
-     # Put -L${krb_libdir} in LDFLAGS temporarily so that it appears before
-     # -ldes in the command line.  Don't do it permanently so that we honor
-     # the user's setting for LDFLAGS
diff --git a/devel/cvs/patches/patch-ay b/devel/cvs/patches/patch-ay
index a6300695fce..a999e321287 100644
--- a/devel/cvs/patches/patch-ay
+++ b/devel/cvs/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.3 2002/11/24 21:31:26 hubertf Exp $
+$NetBSD: patch-ay,v 1.4 2003/07/12 09:19:20 wiz Exp $
 
---- src/run.c.orig	Wed Jan 24 04:35:10 2001
+--- src/run.c.orig	Wed Feb  5 20:46:52 2003
 +++ src/run.c
-@@ -189,6 +189,13 @@
+@@ -189,6 +189,13 @@ run_exec (stin, stout, sterr, flags)
  #endif
      if (pid == 0)
      {
diff --git a/devel/cvs/patches/patch-az b/devel/cvs/patches/patch-az
index 9530d53fff6..798782d32f9 100644
--- a/devel/cvs/patches/patch-az
+++ b/devel/cvs/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.3 2002/11/24 21:31:26 hubertf Exp $
+$NetBSD: patch-az,v 1.4 2003/07/12 09:19:20 wiz Exp $
 
---- src/modules.c.orig	Thu Jun 21 23:23:09 2001
+--- src/modules.c.orig	Sat Apr 26 20:30:13 2003
 +++ src/modules.c
-@@ -745,7 +745,8 @@
+@@ -697,7 +697,8 @@ module `%s' is a request for a file in a
  		    cvs_output ("'\n", 0);
  		    cvs_flushout ();
  		}