[pkgsrc/trunk]: pkgsrc/devel/cvs Update to 1.11.10:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cebce70dc99c
branches:  trunk
changeset: 464562:cebce70dc99c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 12 22:05:55 2003 +0000

description:
Update to 1.11.10:

Changes since 1.11.9:
*********************

SERVER SECURITY ISSUES

* Malformed module requests could cause the CVS server to attempt to create
  directories and possibly files at the root of the filesystem holding the CVS
  repository.  Filesystem permissions usually prevent the creation of these
  misplaced directories, but nevertheless, the CVS server now rejects the
  malformed requests.

GENERAL USER ISSUES

* Case insensitive clients using a case sensitive server can now use a
  `cvs rm -f file; cvs add FILE' command sequence to add a file with the same
  name in a new case.

* CVSROOTs which contain a symlink to a real repository should work.

* The configure script now tests whether it is building CVS on a case
  insensitive file system.  If it is, CVS assumes that all file systems on this
  platform will be case insensitive.  This is useful for getting the case
  insensitivity flag set correctly when compiling on Mac OS X and under Cygwin
  on Windows.  Autodetection can be overridden using the
  --disable-case-sensitivity and --enable-case-sensitivity arguments to
  configure.

* A behavior change in `cvs up -jrev1 -jrev2' for modified files with a base
  revision of rev2 (ie, checked-out version matches rev2 and file has been
  modified).  The operation is no longer ignored and instead is passed to
  diff3.  This will potentially re-apply the diffs between the two revisions to
  a modified local file.  Status messages like from a standard merge have also
  been added when the file would not or does not change due to this merge
  request ("[file] already contains the changes between [revisions]...").

* A bug which could stop `cvs admin -mTAG:message' from recursing has been
  fixed.

* Misc documentation cleanup and fixes.

* Some of the contrib scripts, some of the documentation, and sanity.sh were
  modified to use and recommend more portable commands rather than using and
  recommending commands which were not compatible with the POSIX 1003.1-2001
  specification.

DEVELOPER ISSUES

* A new set of tests to test issues specific to case insensitive clients and
  servers has also been added.

* Support has been added to the test suite to support testing over a :ext: link
  to another machine, subject to some stringent requirements.  This support can
  be used, for instance, to test the operation of a case insensitive client
  against a case sensitive server.  Please see the comments in TEST and the
  src/sanity.sh test script itself for more.

* We've standardized on Automake 1.7.9 to get a bug fix.  See the note below
  on the Autoconf upgrade for more details.

* We've standardized on Autoconf version 2.58 to avoid a bug and get at a few
  new macros.  Again, this should only really affect developers, though it is
  possible that CVS will now compile on a few new platforms.  Please see the
  section of the INSTALL file about using the autotools if you are compiling
  CVS yourself.

Changes from 1.11.8 to 1.11.9:

* CVS now knows how to report, as well as record, `P' record types.

* When running the `cvs history' command, clients will now send the
  long-accepted `-e' option, for all records, rather than explicitly requesting
  `P' record types, a request which servers prior to 1.11.7 will reject with a
  fatal error message.

* A problem with locating files requested by case insensitive clients which was
  accidentally introduced in 1.11.6 as part of a fix for a data loss problem
  involving `cvs add's from case insensitive clients has been fixed.  The
  relevant error message was `cvs [<command> aborted]: filE,v is ambiguous;
  could mean FILE,v or file,v'.

* Attempts to use the global `-l' option, removed from both client and server
  as of version 1.11.6, will now elicit a warning rather than a fatal error
  from the server.

Changes from 1.11.7 to 1.11.8:

* A problem in the CVS getpass library that could cause passwords to echo on
  some systems has been fixed.

Changes from 1.11.6 to 1.11.7:

* A segfault that could occur in very rare cases where the stat of a file
  failed during a diff has been fixed.

* Any user with write privleges to the CVSROOT/checkoutlist file could pass
arbitrary format strings directly through to a printf function.  This was
probably bad and has been fixed.  White space at the beginning of error strings
in checkoutlist is now ignored properly.

* In client/server mode, most messages from CVS now contain the actual
command name rather than the generic "server".

* A long-standing bug that prevented most client/server updates from being
logged in the history file has been fixed.

* Updates done via a patch ("P" status) are now logged in the history file
by default and the corresponding "P" history record type is now documented.
If you're setting the LogHistory option in your CVSROOT/config file, you may
want to add "P" to the list of record types.

* CVS now will always compile and its own getpass() function (originally from
GNULIB) in favor of any system one that may exist.  This avoids some problems
with long passwords on some systems and updates us to POSIX.2 compliance, since
getpass() was removed from the POSIX.2 specification.

* A bug that allowed a write lock to be created in a directory despite
there being existing read locks when using LockDir in CVSROOT/config has
been fixed.

* A bug with short patches (`rdiff -s') which caused rdiff to sometimes report
differences that did not exist has been fixed.

* Some minor corrections were made to the diff code to keep diff & rdiff from
printing diff headers with empty change texts when two files have different
revision numbers but the same content.

* The global '-l' option, which suppressed history logging, has been removed
from both client and server.

diffstat:

 devel/cvs/Makefile         |   6 +++---
 devel/cvs/distinfo         |  44 ++++++++++++++++++++++----------------------
 devel/cvs/patches/patch-aa |   6 +++---
 devel/cvs/patches/patch-ab |   6 +++---
 devel/cvs/patches/patch-ac |   8 ++++----
 devel/cvs/patches/patch-ae |  16 ++++++++--------
 devel/cvs/patches/patch-af |   6 +++---
 devel/cvs/patches/patch-ah |   6 +++---
 devel/cvs/patches/patch-al |   6 +++---
 devel/cvs/patches/patch-am |   6 +++---
 devel/cvs/patches/patch-an |   6 +++---
 devel/cvs/patches/patch-ao |   8 ++++----
 devel/cvs/patches/patch-ap |  23 +++++++++++++----------
 devel/cvs/patches/patch-aq |   6 +++---
 devel/cvs/patches/patch-ar |  18 +++++++++++-------
 devel/cvs/patches/patch-at |   6 +++---
 devel/cvs/patches/patch-au |   8 ++++----
 devel/cvs/patches/patch-av |   6 +++---
 devel/cvs/patches/patch-az |   6 +++---
 19 files changed, 102 insertions(+), 95 deletions(-)

diffs (truncated from 489 to 300 lines):

diff -r 99e555e89acf -r cebce70dc99c devel/cvs/Makefile
--- a/devel/cvs/Makefile        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/Makefile        Fri Dec 12 22:05:55 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2003/08/09 10:44:38 seb Exp $
+# $NetBSD: Makefile,v 1.69 2003/12/12 22:05:55 wiz Exp $
 #
 
-DISTNAME=      cvs-1.11.6
+DISTNAME=      cvs-1.11.10
 CATEGORIES=    devel
 MASTER_SITES=  http://www.cvshome.org/files/19/10/ \
                http://ftp.cvshome.org/release/stable/${DISTNAME}/
@@ -23,7 +23,7 @@
        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.6-v6-20030623.diff.gz
+PATCHFILES=            cvs-1.11.10-v6-20031205.diff.gz
 PATCH_DIST_STRIP=      -p1
 .else
 CONFIGURE_ARGS+=       --disable-ipv6
diff -r 99e555e89acf -r cebce70dc99c devel/cvs/distinfo
--- a/devel/cvs/distinfo        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/distinfo        Fri Dec 12 22:05:55 2003 +0000
@@ -1,27 +1,27 @@
-$NetBSD: distinfo,v 1.14 2003/07/12 09:39:28 wiz Exp $
+$NetBSD: distinfo,v 1.15 2003/12/12 22:05:55 wiz Exp $
 
-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 (cvs-1.11.10.tar.bz2) = 94d07cd7893fc2bc1182531744c1dc5a7fc3e3e1
+Size (cvs-1.11.10.tar.bz2) = 2224086 bytes
+SHA1 (cvs-1.11.10-v6-20031205.diff.gz) = 067c1abbb992a5399966a1dc214ed7a6d3e32487
+Size (cvs-1.11.10-v6-20031205.diff.gz) = 12789 bytes
+SHA1 (patch-aa) = fe9b6b7411391fccf0e34e1fcce56aadfa9fbcf6
+SHA1 (patch-ab) = 60be366cb61ef2622a87671fb5c508966856fb35
+SHA1 (patch-ac) = a790d8287633e2b036974889c846840bd25280f9
+SHA1 (patch-ae) = f08a0810ed790a20bbc11996bd40643c657bd9ff
+SHA1 (patch-af) = 3952be37a6654e65fb60c4c499d6ccf0cacb43bd
+SHA1 (patch-ah) = 38a1757ef83789bb780a83bde95c2c6e8f65e1ca
 SHA1 (patch-ai) = 1bf4f08fd8135743072faacd0bc1b029045eb72a
 SHA1 (patch-ak) = 9d8b5633a589d0e423f0da8bf029f9141604738b
-SHA1 (patch-al) = ee92e34d058b33dda84d6c600580eaf555fe684f
-SHA1 (patch-am) = 1f808c65a0468591a7fe7f91997d57d12ec29219
-SHA1 (patch-an) = 135fef9b9f69ef26f37b8133a59cddb9251c1244
-SHA1 (patch-ao) = c766cb068e9af1aa5a17eba82c8f49072d9a2fe6
-SHA1 (patch-ap) = 2c87c125ed061beb43ff34d57324ad9a14b918e3
-SHA1 (patch-aq) = d346e0034589969e88ef5e1efb750302d3d44898
-SHA1 (patch-ar) = 5c713d8c3535bd2df7a15e97874b83d5ea9803e2
+SHA1 (patch-al) = 9d4dfd27633d5e8eca03269189235bb62619f779
+SHA1 (patch-am) = 32b03bfd74a84302793b1b87d6dcd9e8dbba71bd
+SHA1 (patch-an) = 96d7ccd604137e67289444010b16389bdf2193e7
+SHA1 (patch-ao) = c5db3de14d40fd498aabae88f3ad07a749841cf4
+SHA1 (patch-ap) = cca991b0856a3a96718288742d0e1a765b9f435c
+SHA1 (patch-aq) = fc55dea2b0e7b9330966f3c94c4f60d080fc1610
+SHA1 (patch-ar) = a662d82d9ccbac4408453045136f68e65e227eb8
 SHA1 (patch-as) = d98c8e17ce673dd3f448b3a90520b3a390ecbed7
-SHA1 (patch-at) = 6f4e21b173dfc53e9b6bc8894884b8b98d3b687c
-SHA1 (patch-au) = c7f0afc02e05219e64253a4b833d76981e7f7f3d
-SHA1 (patch-av) = 1cd085ad012a94caa1a3ad6107746f963d335f7e
+SHA1 (patch-at) = 30ec853d014b8c76dc7870bb256d81105319670e
+SHA1 (patch-au) = 17499e786aa6f1dbe4f20ce23ec8f9328d28d5d5
+SHA1 (patch-av) = ca8e5c4885430f5f5f14d61bf32788c2bb2e1ee0
 SHA1 (patch-ay) = 2a81a1bfe6397f0f851f96b37ae4fc660ebda635
-SHA1 (patch-az) = dd0adf7a0178e52678199bc2d3ef7bbcd8be985d
+SHA1 (patch-az) = 04d80758d66c515f9325b8bacb46f66010a2d920
diff -r 99e555e89acf -r cebce70dc99c devel/cvs/patches/patch-aa
--- a/devel/cvs/patches/patch-aa        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/patches/patch-aa        Fri Dec 12 22:05:55 2003 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2003/07/12 09:19:17 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2003/12/12 22:05:55 wiz Exp $
 
---- Makefile.in.orig   Sun May 25 16:28:10 2003
+--- Makefile.in.orig   Thu Dec  4 01:27:03 2003
 +++ Makefile.in
 @@ -142,7 +142,7 @@ target_alias = @target_alias@
  
@@ -11,7 +11,7 @@
  # All other subdirs:
  SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
        windows-NT os2 emx vms
-@@ -169,7 +169,7 @@ subdir = .
+@@ -170,7 +170,7 @@ subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
diff -r 99e555e89acf -r cebce70dc99c devel/cvs/patches/patch-ab
--- a/devel/cvs/patches/patch-ab        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/patches/patch-ab        Fri Dec 12 22:05:55 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2003/07/12 09:19:18 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2003/12/12 22:05:55 wiz Exp $
 
---- doc/cvs.texinfo.orig       Sat Apr 26 22:09:23 2003
+--- doc/cvs.texinfo.orig       Tue Nov 18 19:37:48 2003
 +++ doc/cvs.texinfo
-@@ -13453,6 +13453,11 @@ CPU intensive but is not recommended for
+@@ -13439,6 +13439,11 @@ CPU intensive but is not recommended for
  
  @xref{verifymsg}, for more information on how verifymsg
  may be used.
diff -r 99e555e89acf -r cebce70dc99c devel/cvs/patches/patch-ac
--- a/devel/cvs/patches/patch-ac        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/patches/patch-ac        Fri Dec 12 22:05:55 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2003/07/12 09:19:18 wiz Exp $
+$NetBSD: patch-ac,v 1.7 2003/12/12 22:05:55 wiz Exp $
 
---- src/Makefile.in.orig       Sun May 25 16:28:37 2003
+--- src/Makefile.in.orig       Thu Dec  4 01:29:22 2003
 +++ src/Makefile.in
-@@ -225,7 +225,7 @@ cvs_SOURCES = \
+@@ -226,7 +226,7 @@ cvs_SOURCES = \
  cvs_LDADD = \
        ../diff/libdiff.a \
        ../lib/libcvs.a \
@@ -11,7 +11,7 @@
  
  
  # extra clean targets
-@@ -268,7 +268,7 @@ am_cvs_OBJECTS = add.$(OBJEXT) admin.$(O
+@@ -269,7 +269,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 -r 99e555e89acf -r cebce70dc99c devel/cvs/patches/patch-ae
--- a/devel/cvs/patches/patch-ae        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/patches/patch-ae        Fri Dec 12 22:05:55 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2003/07/12 09:19:18 wiz Exp $
+$NetBSD: patch-ae,v 1.6 2003/12/12 22:05:55 wiz Exp $
 
---- src/rcs.c.orig     Tue Mar 18 01:28:06 2003
+--- src/rcs.c.orig     Wed Nov 19 21:17:38 2003
 +++ src/rcs.c
-@@ -3394,7 +3394,7 @@ struct rcs_keyword
+@@ -3517,7 +3517,7 @@ struct rcs_keyword
      size_t len;
  };
  #define KEYWORD_INIT(s) (s), sizeof (s) - 1
@@ -11,7 +11,7 @@
  {
      { KEYWORD_INIT ("Author") },
      { KEYWORD_INIT ("Date") },
-@@ -3407,6 +3407,7 @@ static const struct rcs_keyword keywords
+@@ -3530,6 +3530,7 @@ static const struct rcs_keyword keywords
      { KEYWORD_INIT ("Revision") },
      { KEYWORD_INIT ("Source") },
      { KEYWORD_INIT ("State") },
@@ -19,7 +19,7 @@
      { NULL, 0 }
  };
  enum keyword
-@@ -3421,7 +3422,8 @@ enum keyword
+@@ -3544,7 +3545,8 @@ enum keyword
      KEYWORD_RCSFILE,
      KEYWORD_REVISION,
      KEYWORD_SOURCE,
@@ -29,7 +29,7 @@
  };
  
  /* Convert an RCS date string into a readable string.  This is like
-@@ -3558,6 +3560,11 @@ expand_keywords (rcs, ver, name, log, lo
+@@ -3681,6 +3683,11 @@ expand_keywords (rcs, ver, name, log, lo
        return;
      }
  
@@ -41,7 +41,7 @@
      /* If we are using -kkvl, dig out the locker information if any.  */
      locker = NULL;
      if (expand == KFLAG_KVL)
-@@ -3649,6 +3656,7 @@ expand_keywords (rcs, ver, name, log, lo
+@@ -3772,6 +3779,7 @@ expand_keywords (rcs, ver, name, log, lo
  
            case KEYWORD_HEADER:
            case KEYWORD_ID:
@@ -49,7 +49,7 @@
                {
                    char *path;
                    int free_path;
-@@ -4281,7 +4289,7 @@ RCS_checkout (rcs, workfile, rev, nameta
+@@ -4404,7 +4412,7 @@ RCS_checkout (rcs, workfile, rev, nameta
        if (info != NULL)
        {
            /* If the size of `devtype' changes, fix the sscanf call also */
diff -r 99e555e89acf -r cebce70dc99c devel/cvs/patches/patch-af
--- a/devel/cvs/patches/patch-af        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/patches/patch-af        Fri Dec 12 22:05:55 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.7 2003/07/12 09:19:18 wiz Exp $
+$NetBSD: patch-af,v 1.8 2003/12/12 22:05:55 wiz Exp $
 
---- src/update.c.orig  Sat Apr 26 21:51:11 2003
+--- src/update.c.orig  Tue Nov 11 02:20:12 2003
 +++ src/update.c
-@@ -1336,11 +1336,18 @@ VERS: ", 0);
+@@ -1338,11 +1338,18 @@ VERS: ", 0);
                    xchmod (finfo->file, 1);
                else
                {
diff -r 99e555e89acf -r cebce70dc99c devel/cvs/patches/patch-ah
--- a/devel/cvs/patches/patch-ah        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/patches/patch-ah        Fri Dec 12 22:05:55 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2003/07/12 09:19:18 wiz Exp $
+$NetBSD: patch-ah,v 1.6 2003/12/12 22:05:55 wiz Exp $
 
---- src/mkmodules.c.orig       Fri Sep  7 16:22:39 2001
+--- src/mkmodules.c.orig       Wed Oct  8 21:56:13 2003
 +++ src/mkmodules.c
-@@ -307,6 +307,9 @@ static const char *const config_contents
+@@ -308,6 +308,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 -r 99e555e89acf -r cebce70dc99c devel/cvs/patches/patch-al
--- a/devel/cvs/patches/patch-al        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/patches/patch-al        Fri Dec 12 22:05:55 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.5 2002/11/24 21:31:24 hubertf Exp $
+$NetBSD: patch-al,v 1.6 2003/12/12 22:05:55 wiz Exp $
 
---- src/client.c.orig  Thu Aug  9 22:27:26 2001
+--- src/client.c.orig  Tue Nov 11 02:20:10 2003
 +++ src/client.c
-@@ -4546,6 +4546,16 @@
+@@ -4408,6 +4408,16 @@ start_server ()
                error (1, 0,
                       "This server does not support the global -n option.");
        }
diff -r 99e555e89acf -r cebce70dc99c devel/cvs/patches/patch-am
--- a/devel/cvs/patches/patch-am        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/patches/patch-am        Fri Dec 12 22:05:55 2003 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.7 2003/07/12 09:19:19 wiz Exp $
+$NetBSD: patch-am,v 1.8 2003/12/12 22:05:55 wiz Exp $
 
---- src/cvs.h.orig     Sat Apr 26 20:11:31 2003
+--- src/cvs.h.orig     Tue Nov 11 02:20:10 2003
 +++ src/cvs.h
 @@ -367,6 +367,7 @@ extern int really_quiet, quiet;
  extern int use_editor;
@@ -18,7 +18,7 @@
  extern int logoff;            /* Don't write history entry */
  
  extern int top_level_admin;
-@@ -663,6 +665,7 @@ void sleep_past PROTO ((time_t desttime)
+@@ -666,6 +668,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 -r 99e555e89acf -r cebce70dc99c devel/cvs/patches/patch-an
--- a/devel/cvs/patches/patch-an        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/patches/patch-an        Fri Dec 12 22:05:55 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.4 2003/07/12 09:19:19 wiz Exp $
+$NetBSD: patch-an,v 1.5 2003/12/12 22:05:56 wiz Exp $
 
---- src/history.c.orig Tue Mar  4 21:08:12 2003
+--- src/history.c.orig Wed Oct  8 22:13:47 2003
 +++ src/history.c
-@@ -740,7 +740,7 @@ history_write (type, update_dir, revs, n
+@@ -746,7 +746,7 @@ history_write (type, update_dir, revs, n
      if (trace)
        fprintf (stderr, "%s-> fopen(%s,a)\n",
                 CLIENT_SERVER_STR, fname);
diff -r 99e555e89acf -r cebce70dc99c devel/cvs/patches/patch-ao
--- a/devel/cvs/patches/patch-ao        Fri Dec 12 22:02:20 2003 +0000
+++ b/devel/cvs/patches/patch-ao        Fri Dec 12 22:05:55 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.4 2003/07/12 09:19:19 wiz Exp $
+$NetBSD: patch-ao,v 1.5 2003/12/12 22:05:56 wiz Exp $
 
---- src/lock.c.orig    Fri Feb 28 22:46:48 2003
+--- src/lock.c.orig    Tue Nov 11 02:20:10 2003
 +++ src/lock.c
-@@ -413,7 +413,7 @@ Reader_Lock (xrepository)
+@@ -405,7 +405,7 @@ Reader_Lock (xrepository)
        (void) fprintf (stderr, "%s-> Reader_Lock(%s)\n", CLIENT_SERVER_STR,
                          xrepository);
  
@@ -11,7 +11,7 @@
        return (0);
  
      /* we only do one directory at a time for read locks! */
-@@ -485,7 +485,7 @@ Writer_Lock (list)
+@@ -477,7 +477,7 @@ Writer_Lock (list)
  {
      char *wait_repos;