diff options
-rw-r--r-- | devel/cvs/Makefile | 6 | ||||
-rw-r--r-- | devel/cvs/distinfo | 44 | ||||
-rw-r--r-- | devel/cvs/patches/patch-aa | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ab | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ac | 8 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ae | 16 | ||||
-rw-r--r-- | devel/cvs/patches/patch-af | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ah | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-al | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-am | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-an | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ao | 8 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ap | 23 | ||||
-rw-r--r-- | devel/cvs/patches/patch-aq | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ar | 18 | ||||
-rw-r--r-- | devel/cvs/patches/patch-at | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-au | 8 | ||||
-rw-r--r-- | devel/cvs/patches/patch-av | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-az | 6 |
19 files changed, 102 insertions, 95 deletions
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index 26aca97f26f..8a85f500a59 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -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 @@ 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.6-v6-20030623.diff.gz +PATCHFILES= cvs-1.11.10-v6-20031205.diff.gz PATCH_DIST_STRIP= -p1 .else CONFIGURE_ARGS+= --disable-ipv6 diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo index 914b8a71546..870c666f704 100644 --- a/devel/cvs/distinfo +++ b/devel/cvs/distinfo @@ -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 --git a/devel/cvs/patches/patch-aa b/devel/cvs/patches/patch-aa index 209ac75ab8e..3ef63a52458 100644 --- a/devel/cvs/patches/patch-aa +++ b/devel/cvs/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.7 2003/07/12 09:19:17 wiz Exp $ # 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 --git a/devel/cvs/patches/patch-ab b/devel/cvs/patches/patch-ab index 574f07243ff..c68a82abffa 100644 --- a/devel/cvs/patches/patch-ab +++ b/devel/cvs/patches/patch-ab @@ -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 --git a/devel/cvs/patches/patch-ac b/devel/cvs/patches/patch-ac index c4d214f9d1d..8b75bb4227a 100644 --- a/devel/cvs/patches/patch-ac +++ b/devel/cvs/patches/patch-ac @@ -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 @@ $NetBSD: patch-ac,v 1.6 2003/07/12 09:19:18 wiz Exp $ # 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 --git a/devel/cvs/patches/patch-ae b/devel/cvs/patches/patch-ae index fe9cdba4c3d..0898f6afed0 100644 --- a/devel/cvs/patches/patch-ae +++ b/devel/cvs/patches/patch-ae @@ -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 @@ $NetBSD: patch-ae,v 1.5 2003/07/12 09:19:18 wiz Exp $ { { 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 @@ $NetBSD: patch-ae,v 1.5 2003/07/12 09:19:18 wiz Exp $ { 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 @@ $NetBSD: patch-ae,v 1.5 2003/07/12 09:19:18 wiz Exp $ }; /* 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 @@ $NetBSD: patch-ae,v 1.5 2003/07/12 09:19:18 wiz Exp $ /* 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 @@ $NetBSD: patch-ae,v 1.5 2003/07/12 09:19:18 wiz Exp $ { 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 --git a/devel/cvs/patches/patch-af b/devel/cvs/patches/patch-af index d6ab5e63ceb..ec9d16b17de 100644 --- a/devel/cvs/patches/patch-af +++ b/devel/cvs/patches/patch-af @@ -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 --git a/devel/cvs/patches/patch-ah b/devel/cvs/patches/patch-ah index 12dbc8fbc8c..99512c108a0 100644 --- a/devel/cvs/patches/patch-ah +++ b/devel/cvs/patches/patch-ah @@ -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 --git a/devel/cvs/patches/patch-al b/devel/cvs/patches/patch-al index 87007abe2e4..21d6527fefb 100644 --- a/devel/cvs/patches/patch-al +++ b/devel/cvs/patches/patch-al @@ -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 --git a/devel/cvs/patches/patch-am b/devel/cvs/patches/patch-am index 58cc417b72f..4a3e89d2798 100644 --- a/devel/cvs/patches/patch-am +++ b/devel/cvs/patches/patch-am @@ -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 @@ $NetBSD: patch-am,v 1.7 2003/07/12 09:19:19 wiz Exp $ 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 --git a/devel/cvs/patches/patch-an b/devel/cvs/patches/patch-an index 94d1462ed20..8f386dbee8d 100644 --- a/devel/cvs/patches/patch-an +++ b/devel/cvs/patches/patch-an @@ -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 --git a/devel/cvs/patches/patch-ao b/devel/cvs/patches/patch-ao index c2ab650661a..83fa28119bc 100644 --- a/devel/cvs/patches/patch-ao +++ b/devel/cvs/patches/patch-ao @@ -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 @@ $NetBSD: patch-ao,v 1.4 2003/07/12 09:19:19 wiz Exp $ 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; diff --git a/devel/cvs/patches/patch-ap b/devel/cvs/patches/patch-ap index 11ebe2c47c4..099f9462c74 100644 --- a/devel/cvs/patches/patch-ap +++ b/devel/cvs/patches/patch-ap @@ -1,6 +1,6 @@ -$NetBSD: patch-ap,v 1.5 2003/07/12 09:19:19 wiz Exp $ +$NetBSD: patch-ap,v 1.6 2003/12/12 22:05:56 wiz Exp $ ---- src/main.c.orig Fri May 2 03:12:55 2003 +--- src/main.c.orig Wed Oct 8 17:49:43 2003 +++ src/main.c @@ -41,6 +41,7 @@ int really_quiet = 0; int quiet = 0; @@ -18,29 +18,32 @@ $NetBSD: patch-ap,v 1.5 2003/07/12 09:19:19 wiz Exp $ char *CurDir; -@@ -249,6 +251,7 @@ static const char *const opt_usage[] = +@@ -248,6 +250,7 @@ static const char *const opt_usage[] = + " -r Make checked-out files read-only.\n", " -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", + " -u Don't create locks (implies -l).\n", " -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 @@ main (argc, argv) +@@ -406,7 +409,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. */ -- static const char short_options[] = "+Qqrwtnlvb:T:e:d:Hfz:s:xa"; -+ static const char short_options[] = "+Qqrwtunlvb:T:e:d:Hfz:s:xa"; +- static const char short_options[] = "+Qqrwtnvb:T:e:d:Hfz:s:xa"; ++ static const char short_options[] = "+Qqrwtunvb:T:e:d:Hfz:s:xa"; static struct option long_options[] = { {"help", 0, NULL, 'H'}, -@@ -537,6 +540,8 @@ main (argc, argv) +@@ -536,6 +539,11 @@ main (argc, argv) break; case 'n': noexec = 1; -+ case 'u': /* Fall through */ + nolock = 1; - case 'l': /* Fall through */ ++ logoff = 1; ++ break; ++ case 'u': ++ nolock = 1; logoff = 1; break; + case 'v': diff --git a/devel/cvs/patches/patch-aq b/devel/cvs/patches/patch-aq index e05732d50a5..e0320738f4a 100644 --- a/devel/cvs/patches/patch-aq +++ b/devel/cvs/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.4 2003/01/15 22:49:38 wiz Exp $ +$NetBSD: patch-aq,v 1.5 2003/12/12 22:05:56 wiz Exp $ ---- src/recurse.c.orig Sat Dec 28 19:01:30 2002 +--- src/recurse.c.orig Tue Nov 11 02:20:10 2003 +++ src/recurse.c -@@ -511,7 +511,7 @@ do_recursion (frame) +@@ -523,7 +523,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 39052fd8ebe..5d61e3c14a4 100644 --- a/devel/cvs/patches/patch-ar +++ b/devel/cvs/patches/patch-ar @@ -1,6 +1,6 @@ -$NetBSD: patch-ar,v 1.9 2003/07/12 09:19:19 wiz Exp $ +$NetBSD: patch-ar,v 1.10 2003/12/12 22:05:56 wiz Exp $ ---- src/server.c.orig Sat Jul 12 09:09:22 2003 +--- src/server.c.orig Wed Oct 8 21:30:07 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,16 +18,20 @@ $NetBSD: patch-ar,v 1.9 2003/07/12 09:19:19 wiz Exp $ #ifdef HAVE_PUTENV env = xmalloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2); -@@ -2170,6 +2172,8 @@ serve_global_option (arg) - { +@@ -2173,8 +2175,12 @@ serve_global_option (arg) + break; case 'n': noexec = 1; -+ case 'u': + nolock = 1; + logoff = 1; break; ++ case 'u': ++ nolock = 1; ++ break; case 'q': quiet = 1; -@@ -5127,6 +5131,7 @@ switch_to_user (username) + break; +@@ -5125,6 +5131,7 @@ switch_to_user (username) const char *username; { struct passwd *pw; @@ -35,7 +39,7 @@ $NetBSD: patch-ar,v 1.9 2003/07/12 09:19:19 wiz Exp $ pw = getpwnam (username); if (pw == NULL) -@@ -5191,7 +5196,15 @@ error 0 %s: no such system user\n", user +@@ -5189,7 +5196,15 @@ error 0 %s: no such system user\n", user } } diff --git a/devel/cvs/patches/patch-at b/devel/cvs/patches/patch-at index 77144ba5408..70e93b41160 100644 --- a/devel/cvs/patches/patch-at +++ b/devel/cvs/patches/patch-at @@ -1,6 +1,6 @@ -$NetBSD: patch-at,v 1.7 2003/07/12 09:39:28 wiz Exp $ +$NetBSD: patch-at,v 1.8 2003/12/12 22:05:56 wiz Exp $ ---- src/logmsg.c.orig Tue May 20 20:12:23 2003 +--- src/logmsg.c.orig Mon Jun 23 15:52:18 2003 +++ src/logmsg.c @@ -225,6 +225,8 @@ do_editor (dir, messagep, repository, ch (*messagep)[strlen (*messagep) - 1] != '\n') @@ -20,7 +20,7 @@ $NetBSD: patch-at,v 1.7 2003/07/12 09:39:28 wiz Exp $ error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0, editinfo_editor ? "Logfile verification failed" : "warning: editor session failed"); -@@ -678,6 +680,15 @@ title_proc (p, closure) +@@ -679,6 +681,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 8af19f1e03a..4cf896359ba 100644 --- a/devel/cvs/patches/patch-au +++ b/devel/cvs/patches/patch-au @@ -1,8 +1,8 @@ -$NetBSD: patch-au,v 1.5 2003/07/12 09:19:20 wiz Exp $ +$NetBSD: patch-au,v 1.6 2003/12/12 22:05:56 wiz Exp $ ---- src/commit.c.orig Sun May 25 16:10:16 2003 +--- src/commit.c.orig Tue Nov 25 21:48:45 2003 +++ src/commit.c -@@ -978,7 +978,9 @@ warning: file `%s' seems to still contai +@@ -1005,7 +1005,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.5 2003/07/12 09:19:20 wiz Exp $ li->rev_new = NULL; p->data = (char *) li; (void) addnode (ulist, p); -@@ -1126,7 +1128,7 @@ precommit_proc (repository, filter) +@@ -1153,7 +1155,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 58439a9f0fa..0bb5c387dbf 100644 --- a/devel/cvs/patches/patch-av +++ b/devel/cvs/patches/patch-av @@ -1,8 +1,8 @@ -$NetBSD: patch-av,v 1.8 2003/07/12 09:19:20 wiz Exp $ +$NetBSD: patch-av,v 1.9 2003/12/12 22:05:56 wiz Exp $ ---- configure.in.orig Sat Jul 12 09:09:22 2003 +--- configure.in.orig Thu Dec 4 01:26:40 2003 +++ configure.in -@@ -356,7 +356,7 @@ if test -n "$krb_h"; then +@@ -375,7 +375,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-az b/devel/cvs/patches/patch-az index 798782d32f9..e5e2c02df25 100644 --- a/devel/cvs/patches/patch-az +++ b/devel/cvs/patches/patch-az @@ -1,8 +1,8 @@ -$NetBSD: patch-az,v 1.4 2003/07/12 09:19:20 wiz Exp $ +$NetBSD: patch-az,v 1.5 2003/12/12 22:05:56 wiz Exp $ ---- src/modules.c.orig Sat Apr 26 20:30:13 2003 +--- src/modules.c.orig Tue Nov 18 17:59:40 2003 +++ src/modules.c -@@ -697,7 +697,8 @@ module `%s' is a request for a file in a +@@ -708,7 +708,8 @@ module `%s' is a request for a file in a cvs_output ("'\n", 0); cvs_flushout (); } |