diff options
Diffstat (limited to 'devel/cvs/patches')
-rw-r--r-- | devel/cvs/patches/patch-ab | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ae | 18 | ||||
-rw-r--r-- | devel/cvs/patches/patch-af | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ai | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-al | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-am | 16 | ||||
-rw-r--r-- | devel/cvs/patches/patch-an | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ao | 12 | ||||
-rw-r--r-- | devel/cvs/patches/patch-aq | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ar | 8 | ||||
-rw-r--r-- | devel/cvs/patches/patch-as | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-at | 10 | ||||
-rw-r--r-- | devel/cvs/patches/patch-au | 10 | ||||
-rw-r--r-- | devel/cvs/patches/patch-ay | 6 | ||||
-rw-r--r-- | devel/cvs/patches/patch-az | 6 |
15 files changed, 64 insertions, 64 deletions
diff --git a/devel/cvs/patches/patch-ab b/devel/cvs/patches/patch-ab index 65ad5bf0dfc..e7b83e53100 100644 --- a/devel/cvs/patches/patch-ab +++ b/devel/cvs/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.10 2004/03/04 20:54:40 wiz Exp $ +$NetBSD: patch-ab,v 1.11 2004/04/15 22:28:36 wiz Exp $ ---- doc/cvs.texinfo.orig Wed Feb 4 20:05:46 2004 +--- doc/cvs.texinfo.orig Wed Apr 7 02:46:57 2004 +++ doc/cvs.texinfo -@@ -13446,6 +13446,11 @@ CPU intensive but is not recommended for +@@ -13450,6 +13450,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-ae b/devel/cvs/patches/patch-ae index fbf62d4c781..087957a4fba 100644 --- a/devel/cvs/patches/patch-ae +++ b/devel/cvs/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.7 2004/03/04 20:54:40 wiz Exp $ +$NetBSD: patch-ae,v 1.8 2004/04/15 22:28:36 wiz Exp $ ---- src/rcs.c.orig Tue Feb 3 17:13:43 2004 +--- src/rcs.c.orig Fri Apr 2 21:16:34 2004 +++ src/rcs.c -@@ -3474,7 +3474,7 @@ struct rcs_keyword +@@ -3483,7 +3483,7 @@ struct rcs_keyword size_t len; }; #define KEYWORD_INIT(s) (s), sizeof (s) - 1 @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.7 2004/03/04 20:54:40 wiz Exp $ { { KEYWORD_INIT ("Author") }, { KEYWORD_INIT ("Date") }, -@@ -3487,6 +3487,7 @@ static const struct rcs_keyword keywords +@@ -3496,6 +3496,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.7 2004/03/04 20:54:40 wiz Exp $ { NULL, 0 } }; enum keyword -@@ -3501,7 +3502,8 @@ enum keyword +@@ -3510,7 +3511,8 @@ enum keyword KEYWORD_RCSFILE, KEYWORD_REVISION, KEYWORD_SOURCE, @@ -29,7 +29,7 @@ $NetBSD: patch-ae,v 1.7 2004/03/04 20:54:40 wiz Exp $ }; /* Convert an RCS date string into a readable string. This is like -@@ -3638,6 +3640,11 @@ expand_keywords (rcs, ver, name, log, lo +@@ -3647,6 +3649,11 @@ expand_keywords (rcs, ver, name, log, lo return; } @@ -41,15 +41,15 @@ $NetBSD: patch-ae,v 1.7 2004/03/04 20:54:40 wiz Exp $ /* If we are using -kkvl, dig out the locker information if any. */ locker = NULL; if (expand == KFLAG_KVL) -@@ -3729,6 +3736,7 @@ expand_keywords (rcs, ver, name, log, lo +@@ -3738,6 +3745,7 @@ expand_keywords (rcs, ver, name, log, lo case KEYWORD_HEADER: case KEYWORD_ID: + case KEYWORD_LOCALID: { - char *path; + const char *path; int free_path; -@@ -4361,7 +4369,7 @@ RCS_checkout (rcs, workfile, rev, nameta +@@ -4383,7 +4391,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 ec9d16b17de..be7541096d4 100644 --- a/devel/cvs/patches/patch-af +++ b/devel/cvs/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.8 2003/12/12 22:05:55 wiz Exp $ +$NetBSD: patch-af,v 1.9 2004/04/15 22:28:36 wiz Exp $ ---- src/update.c.orig Tue Nov 11 02:20:12 2003 +--- src/update.c.orig Mon Mar 22 18:20:26 2004 +++ src/update.c -@@ -1338,11 +1338,18 @@ VERS: ", 0); +@@ -1349,11 +1349,18 @@ VERS: ", 0); xchmod (finfo->file, 1); else { diff --git a/devel/cvs/patches/patch-ai b/devel/cvs/patches/patch-ai index 81ede17e5b5..0115cc8e3b1 100644 --- a/devel/cvs/patches/patch-ai +++ b/devel/cvs/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.6 2004/03/04 20:54:40 wiz Exp $ +$NetBSD: patch-ai,v 1.7 2004/04/15 22:28:36 wiz Exp $ ---- src/parseinfo.c.orig Thu Feb 12 20:56:15 2004 +--- src/parseinfo.c.orig Fri Mar 19 21:36:39 2004 +++ src/parseinfo.c -@@ -347,6 +347,14 @@ parse_config (cvsroot) +@@ -350,6 +350,14 @@ parse_config (cvsroot) goto error_return; } } diff --git a/devel/cvs/patches/patch-al b/devel/cvs/patches/patch-al index 841390a2da3..d1c72c36511 100644 --- a/devel/cvs/patches/patch-al +++ b/devel/cvs/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.7 2004/03/04 20:54:40 wiz Exp $ +$NetBSD: patch-al,v 1.8 2004/04/15 22:28:36 wiz Exp $ ---- src/client.c.orig Thu Feb 5 22:45:10 2004 +--- src/client.c.orig Sun Apr 11 17:46:22 2004 +++ src/client.c -@@ -4409,6 +4409,16 @@ start_server () +@@ -4481,6 +4481,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 25b4ddd9347..3968fe8654b 100644 --- a/devel/cvs/patches/patch-am +++ b/devel/cvs/patches/patch-am @@ -1,6 +1,6 @@ -$NetBSD: patch-am,v 1.9 2004/03/04 20:54:40 wiz Exp $ +$NetBSD: patch-am,v 1.10 2004/04/15 22:28:36 wiz Exp $ ---- src/cvs.h.orig Wed Feb 11 16:44:41 2004 +--- src/cvs.h.orig Thu Apr 1 20:53:22 2004 +++ src/cvs.h @@ -368,6 +368,7 @@ extern int really_quiet, quiet; extern int use_editor; @@ -18,11 +18,11 @@ $NetBSD: patch-am,v 1.9 2004/03/04 20:54:40 wiz Exp $ extern int logoff; /* Don't write history entry */ extern int top_level_admin; -@@ -664,6 +666,7 @@ int set_nonblock_fd PROTO((int _fd)); - #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 */ +@@ -681,6 +683,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)); diff --git a/devel/cvs/patches/patch-an b/devel/cvs/patches/patch-an index 8f386dbee8d..1b8209a4f3d 100644 --- a/devel/cvs/patches/patch-an +++ b/devel/cvs/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.5 2003/12/12 22:05:56 wiz Exp $ +$NetBSD: patch-an,v 1.6 2004/04/15 22:28:36 wiz Exp $ ---- src/history.c.orig Wed Oct 8 22:13:47 2003 +--- src/history.c.orig Fri Mar 19 21:10:44 2004 +++ src/history.c -@@ -746,7 +746,7 @@ history_write (type, update_dir, revs, n +@@ -747,7 +747,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 83fa28119bc..55baadbf4fe 100644 --- a/devel/cvs/patches/patch-ao +++ b/devel/cvs/patches/patch-ao @@ -1,22 +1,22 @@ -$NetBSD: patch-ao,v 1.5 2003/12/12 22:05:56 wiz Exp $ +$NetBSD: patch-ao,v 1.6 2004/04/15 22:28:36 wiz Exp $ ---- src/lock.c.orig Tue Nov 11 02:20:10 2003 +--- src/lock.c.orig Thu Apr 1 23:25:57 2004 +++ src/lock.c -@@ -405,7 +405,7 @@ Reader_Lock (xrepository) +@@ -407,7 +407,7 @@ Reader_Lock (xrepository) (void) fprintf (stderr, "%s-> Reader_Lock(%s)\n", CLIENT_SERVER_STR, xrepository); - if (noexec) + if (nolock) - return (0); + return 0; /* we only do one directory at a time for read locks! */ -@@ -477,7 +477,7 @@ Writer_Lock (list) +@@ -481,7 +481,7 @@ Writer_Lock (list) { char *wait_repos; - if (noexec) + if (nolock) - return (0); + return 0; /* We only know how to do one list at a time */ diff --git a/devel/cvs/patches/patch-aq b/devel/cvs/patches/patch-aq index e0320738f4a..4e0e059a847 100644 --- a/devel/cvs/patches/patch-aq +++ b/devel/cvs/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.5 2003/12/12 22:05:56 wiz Exp $ +$NetBSD: patch-aq,v 1.6 2004/04/15 22:28:36 wiz Exp $ ---- src/recurse.c.orig Tue Nov 11 02:20:10 2003 +--- src/recurse.c.orig Fri Mar 19 23:21:18 2004 +++ src/recurse.c -@@ -523,7 +523,7 @@ do_recursion (frame) +@@ -526,7 +526,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 13c50bef12f..2f71d83176d 100644 --- a/devel/cvs/patches/patch-ar +++ b/devel/cvs/patches/patch-ar @@ -1,6 +1,6 @@ -$NetBSD: patch-ar,v 1.11 2004/03/04 20:54:40 wiz Exp $ +$NetBSD: patch-ar,v 1.12 2004/04/15 22:28:36 wiz Exp $ ---- src/server.c.orig Fri Feb 13 15:53:50 2004 +--- src/server.c.orig Tue Apr 6 22:20:55 2004 +++ src/server.c @@ -773,6 +773,7 @@ E Protocol error: Root says \"%s\" but p nothing. But for rsh, we need to do it now. */ @@ -31,7 +31,7 @@ $NetBSD: patch-ar,v 1.11 2004/03/04 20:54:40 wiz Exp $ case 'q': quiet = 1; break; -@@ -5137,6 +5143,7 @@ switch_to_user (cvs_username, username) +@@ -5198,6 +5204,7 @@ switch_to_user (cvs_username, username) const char *username; { struct passwd *pw; @@ -39,7 +39,7 @@ $NetBSD: patch-ar,v 1.11 2004/03/04 20:54:40 wiz Exp $ pw = getpwnam (username); if (pw == NULL) -@@ -5215,7 +5222,15 @@ error 0 %s: no such system user\n", user +@@ -5276,7 +5283,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 d4664e501d8..d2e09a96014 100644 --- a/devel/cvs/patches/patch-as +++ b/devel/cvs/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.5 2004/03/04 20:54:40 wiz Exp $ +$NetBSD: patch-as,v 1.6 2004/04/15 22:28:36 wiz Exp $ ---- src/tag.c.orig Tue Feb 3 15:39:44 2004 +--- src/tag.c.orig Tue Apr 6 20:37:10 2004 +++ src/tag.c -@@ -1299,7 +1299,7 @@ Numeric tag %s contains characters other +@@ -1290,7 +1290,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 6fbe3941719..5a3967d9cc5 100644 --- a/devel/cvs/patches/patch-at +++ b/devel/cvs/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.9 2004/03/04 20:54:40 wiz Exp $ +$NetBSD: patch-at,v 1.10 2004/04/15 22:28:36 wiz Exp $ ---- src/logmsg.c.orig Tue Feb 3 15:39:40 2004 +--- src/logmsg.c.orig Fri Mar 19 21:35:29 2004 +++ src/logmsg.c -@@ -225,6 +225,8 @@ do_editor (dir, messagep, repository, ch +@@ -226,6 +226,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.9 2004/03/04 20:54:40 wiz Exp $ if (repository != NULL) /* tack templates on if necessary */ -@@ -301,7 +303,7 @@ do_editor (dir, messagep, repository, ch +@@ -302,7 +304,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.9 2004/03/04 20:54:40 wiz Exp $ error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0, editinfo_editor ? "Logfile verification failed" : "warning: editor session failed"); -@@ -680,6 +682,15 @@ title_proc (p, closure) +@@ -684,6 +686,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 4cf896359ba..85cc3f207bd 100644 --- a/devel/cvs/patches/patch-au +++ b/devel/cvs/patches/patch-au @@ -1,8 +1,8 @@ -$NetBSD: patch-au,v 1.6 2003/12/12 22:05:56 wiz Exp $ +$NetBSD: patch-au,v 1.7 2004/04/15 22:28:36 wiz Exp $ ---- src/commit.c.orig Tue Nov 25 21:48:45 2003 +--- src/commit.c.orig Thu Apr 1 20:53:22 2004 +++ src/commit.c -@@ -1005,7 +1005,9 @@ warning: file `%s' seems to still contai +@@ -1020,7 +1020,9 @@ warning: file `%s' seems to still contai xmalloc (sizeof (struct logfile_info))); li->type = status; li->tag = xstrdup (vers->tag); @@ -11,9 +11,9 @@ $NetBSD: patch-au,v 1.6 2003/12/12 22:05:56 wiz Exp $ + to be NONE, not the previous dead revision. */ + li->rev_old = status == T_ADDED ? NULL : xstrdup (vers->vn_rcs); li->rev_new = NULL; - p->data = (char *) li; + p->data = li; (void) addnode (ulist, p); -@@ -1153,7 +1155,7 @@ precommit_proc (repository, filter) +@@ -1168,7 +1170,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-ay b/devel/cvs/patches/patch-ay index a999e321287..cc647a42d97 100644 --- a/devel/cvs/patches/patch-ay +++ b/devel/cvs/patches/patch-ay @@ -1,8 +1,8 @@ -$NetBSD: patch-ay,v 1.4 2003/07/12 09:19:20 wiz Exp $ +$NetBSD: patch-ay,v 1.5 2004/04/15 22:28:36 wiz Exp $ ---- src/run.c.orig Wed Feb 5 20:46:52 2003 +--- src/run.c.orig Thu Apr 1 20:53:22 2004 +++ src/run.c -@@ -189,6 +189,13 @@ run_exec (stin, stout, sterr, flags) +@@ -191,6 +191,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 ba8d77c780e..c854320c73a 100644 --- a/devel/cvs/patches/patch-az +++ b/devel/cvs/patches/patch-az @@ -1,8 +1,8 @@ -$NetBSD: patch-az,v 1.6 2004/03/04 20:54:40 wiz Exp $ +$NetBSD: patch-az,v 1.7 2004/04/15 22:28:36 wiz Exp $ ---- src/modules.c.orig Thu Feb 12 20:56:15 2004 +--- src/modules.c.orig Sun Apr 11 16:46:52 2004 +++ src/modules.c -@@ -734,7 +734,8 @@ module `%s' is a request for a file in a +@@ -741,7 +741,8 @@ module `%s' is a request for a file in a cvs_output ("'\n", 0); cvs_flushout (); } |