OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Apr-2004 20:12:43
Branch: HEAD Handle: 2004041419124200
Modified files:
openpkg-src/cvs cvs.patch.rse cvs.spec
Log:
upgrading package: cvs 1.12.6 -> 1.12.7
Summary:
Revision Changes Path
1.9 +204 -220 openpkg-src/cvs/cvs.patch.rse
1.84 +2 -2 openpkg-src/cvs/cvs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.patch.rse
============================================================================
$ cvs diff -u -r1.8 -r1.9 cvs.patch.rse
--- openpkg-src/cvs/cvs.patch.rse 13 Apr 2004 14:59:36 -0000 1.8
+++ openpkg-src/cvs/cvs.patch.rse 14 Apr 2004 18:12:42 -0000 1.9
@@ -318,11 +318,11 @@
Index: src/add.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/add.c,v
-retrieving revision 1.1.1.10
-diff -u -d -r1.1.1.10 add.c
---- src/add.c 20 Feb 2004 21:23:02 -0000 1.1.1.10
-+++ src/add.c 16 Mar 2004 15:42:15 -0000
-@@ -740,6 +740,9 @@
+retrieving revision 1.1.1.11
+diff -u -d -r1.1.1.11 add.c
+--- src/add.c 22 Mar 2004 17:26:42 -0000 1.1.1.11
++++ src/add.c 14 Apr 2004 17:52:40 -0000
+@@ -837,6 +837,9 @@
li->type = T_TITLE;
li->tag = xstrdup (tag);
li->rev_old = li->rev_new = NULL;
@@ -335,10 +335,10 @@
Index: src/admin.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/admin.c,v
-retrieving revision 1.1.1.12
-diff -u -d -r1.1.1.12 admin.c
---- src/admin.c 20 Feb 2004 21:23:02 -0000 1.1.1.12
-+++ src/admin.c 16 Mar 2004 15:41:47 -0000
+retrieving revision 1.1.1.13
+diff -u -d -r1.1.1.13 admin.c
+--- src/admin.c 22 Mar 2004 17:26:42 -0000 1.1.1.13
++++ src/admin.c 14 Apr 2004 17:52:40 -0000
@@ -137,6 +137,160 @@
dat->av[dat->ac++] = newelt;
}
@@ -521,29 +521,13 @@
err = start_recursion
(admin_fileproc, NULL, admin_dirproc,
NULL, &admin_data,
-Index: src/buffer.c
-===================================================================
-RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/buffer.c,v
-retrieving revision 1.1.1.7
-diff -u -d -r1.1.1.7 buffer.c
---- src/buffer.c 3 Mar 2004 13:53:04 -0000 1.1.1.7
-+++ src/buffer.c 16 Mar 2004 15:41:47 -0000
-@@ -1340,7 +1340,7 @@
- int closefp = 1;
-
- /* Must be a pipe or a socket. What could go wrong? */
-- assert (fstat ( fileno (bc->fp), &s ) != -1);
-+ assert (fstat ( fileno (bc->fp), &s ) != -1); /* RSE XXX */
-
- /* Flush the buffer if we can */
- if (buf->flush)
Index: src/checkin.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/checkin.c,v
-retrieving revision 1.1.1.3
-diff -u -d -r1.1.1.3 checkin.c
---- src/checkin.c 19 Aug 2003 12:20:47 -0000 1.1.1.3
-+++ src/checkin.c 27 Oct 2003 19:07:22 -0000
+retrieving revision 1.1.1.4
+diff -u -d -r1.1.1.4 checkin.c
+--- src/checkin.c 22 Mar 2004 17:26:42 -0000 1.1.1.4
++++ src/checkin.c 14 Apr 2004 17:54:36 -0000
@@ -26,14 +26,27 @@
Vers_TS *vers;
int set_time;
@@ -572,30 +556,24 @@
tocvsPath = wrap_tocvs_process_file (finfo->file);
if (!noexec)
-@@ -54,11 +67,22 @@
+@@ -54,8 +67,16 @@
*/
- assert ( finfo->rcs != NULL );
+ assert (finfo->rcs != NULL);
+#ifdef RSE_PATCH_COSMETICS_HARD
+ flags = RCS_FLAGS_KEEPFILE;
+ if (really_quiet || quiet)
+ flags |= RCS_FLAGS_QUIET;
-+ switch ( RCS_checkin ( finfo->rcs,
-+ finfo->file,
-+ message,
-+ rev,
-+ flags ) )
-+#else
- switch ( RCS_checkin ( finfo->rcs,
- finfo->file,
- message,
- rev,
- RCS_FLAGS_KEEPFILE ) )
++ switch (RCS_checkin (finfo->rcs, finfo->file, message, rev,
++ flags))
++#else
+ switch (RCS_checkin (finfo->rcs, finfo->file, message, rev,
+ RCS_FLAGS_KEEPFILE))
+#endif
{
case 0: /* everything normal */
-@@ -122,6 +146,16 @@
+@@ -119,6 +140,16 @@
history_write (type, NULL, vers->vn_rcs,
finfo->file, finfo->repository);
@@ -615,11 +593,11 @@
Index: src/client.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/client.c,v
-retrieving revision 1.1.1.13
-diff -u -d -r1.1.1.13 client.c
---- src/client.c 25 Feb 2004 07:22:43 -0000 1.1.1.13
-+++ src/client.c 16 Mar 2004 15:41:47 -0000
-@@ -54,6 +54,9 @@
+retrieving revision 1.1.1.14
+diff -u -d -r1.1.1.14 client.c
+--- src/client.c 11 Apr 2004 16:32:34 -0000 1.1.1.14
++++ src/client.c 14 Apr 2004 17:52:40 -0000
+@@ -68,6 +68,9 @@
int status (int argc, char **argv);
int tag (int argc, char **argv);
int update (int argc, char **argv);
@@ -629,7 +607,7 @@
/* All the response handling functions. */
static void handle_ok (char *, int);
-@@ -197,14 +200,34 @@
+@@ -211,14 +214,34 @@
: Name_Root ((char *) NULL, (char *) NULL));
}
@@ -664,7 +642,7 @@
free (this_root);
}
-@@ -2137,6 +2160,9 @@
+@@ -2226,6 +2249,9 @@
/* Add a directory name to the list of those sent to the
server. */
if (update_dir && (*update_dir != '\0')
@@ -677,11 +655,11 @@
Index: src/commit.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/commit.c,v
-retrieving revision 1.1.1.14
-diff -u -d -r1.1.1.14 commit.c
---- src/commit.c 24 Feb 2004 16:44:01 -0000 1.1.1.14
-+++ src/commit.c 16 Mar 2004 15:41:47 -0000
-@@ -292,6 +292,9 @@
+retrieving revision 1.1.1.15
+diff -u -d -r1.1.1.15 commit.c
+--- src/commit.c 5 Apr 2004 15:36:08 -0000 1.1.1.15
++++ src/commit.c 14 Apr 2004 17:52:41 -0000
+@@ -298,6 +298,9 @@
data->type = status;
data->tag = xstrdup (vers->tag);
data->rev_old = data->rev_new = NULL;
@@ -691,7 +669,7 @@
node->type = UPDATE;
node->delproc = update_delproc;
-@@ -967,7 +970,16 @@
+@@ -973,7 +976,16 @@
xmalloc (sizeof (struct logfile_info)));
li->type = status;
li->tag = xstrdup (vers->tag);
@@ -708,7 +686,7 @@
li->rev_new = NULL;
p->data = li;
(void) addnode (ulist, p);
-@@ -2261,6 +2273,10 @@
+@@ -2286,6 +2298,10 @@
free (li->rev_old);
if (li->rev_new)
free (li->rev_new);
@@ -722,11 +700,11 @@
Index: src/create_adm.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/create_adm.c,v
-retrieving revision 1.1.1.7
-diff -u -d -r1.1.1.7 create_adm.c
---- src/create_adm.c 23 Jul 2003 20:40:07 -0000 1.1.1.7
-+++ src/create_adm.c 27 Oct 2003 19:26:55 -0000
-@@ -21,6 +21,41 @@
+retrieving revision 1.1.1.8
+diff -u -d -r1.1.1.8 create_adm.c
+--- src/create_adm.c 22 Mar 2004 17:26:44 -0000 1.1.1.8
++++ src/create_adm.c 14 Apr 2004 17:52:41 -0000
+@@ -23,6 +23,41 @@
or after which CVS might do something non-useful. If WARN is zero, then
don't print warnings; all errors are fatal then. */
@@ -766,9 +744,9 @@
+#endif
+
int
- Create_Admin (char *dir, char *update_dir, char *repository, char *tag, char
*date, int nonbranch, int warn, int dotemplate)
- {
-@@ -150,6 +185,20 @@
+ Create_Admin (const char *dir, const char *update_dir, const char *repository,
+ const char *tag, const char *date, int nonbranch, int warn,
+@@ -154,6 +189,20 @@
/* Create a new CVS/Tag file */
WriteTag (dir, tag, date, nonbranch, update_dir, repository);
@@ -792,10 +770,10 @@
Index: src/cvs.h
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/cvs.h,v
-retrieving revision 1.1.1.13
-diff -u -d -r1.1.1.13 cvs.h
---- src/cvs.h 24 Feb 2004 16:44:01 -0000 1.1.1.13
-+++ src/cvs.h 16 Mar 2004 15:41:48 -0000
+retrieving revision 1.1.1.14
+diff -u -d -r1.1.1.14 cvs.h
+--- src/cvs.h 6 Apr 2004 19:24:57 -0000 1.1.1.14
++++ src/cvs.h 14 Apr 2004 18:01:29 -0000
@@ -7,6 +7,45 @@
*/
@@ -876,7 +854,7 @@
#define CVSNULLREPOS "Emptydir" /* an empty directory */
-@@ -449,6 +515,27 @@
+@@ -451,6 +517,27 @@
void root_allow_free (void);
int root_allow_ok (char *);
@@ -901,10 +879,10 @@
+void cvsroot_synchronize(cvsroot_type *, int);
+#endif
+
+ char *previous_rev (RCSNode *rcs, const char *rev);
char *gca (const char *rev1, const char *rev2);
void check_numeric (const char *, int, char **);
- char *getcaller (void);
-@@ -565,6 +652,10 @@
+@@ -605,6 +692,10 @@
void expand_wild (int argc, char **argv,
int *pargc, char ***pargv);
@@ -915,7 +893,7 @@
#ifdef SERVER_SUPPORT
int cvs_casecmp (const char *, const char *);
int fopen_case (char *, char *, FILE **, char **);
-@@ -841,6 +932,9 @@
+@@ -854,6 +945,9 @@
NULL for add or import */
char *rev_new; /* rev number after a commit/modify,
add, or import, NULL for remove */
@@ -925,7 +903,7 @@
};
/* Wrappers. */
-@@ -880,6 +974,13 @@
+@@ -894,6 +988,13 @@
int unedit (int argc, char **argv);
int editors (int argc, char **argv);
int watchers (int argc, char **argv);
@@ -939,7 +917,7 @@
int annotate (int argc, char **argv);
int add (int argc, char **argv);
int admin (int argc, char **argv);
-@@ -909,6 +1010,9 @@
+@@ -923,8 +1024,11 @@
int cvsstatus (int argc, char **argv);
int cvstag (int argc, char **argv);
int version (int argc, char **argv);
@@ -947,15 +925,18 @@
+extern int cvslist (int argc, char **argv);
+#endif
- unsigned long int lookup_command_attribute (char *);
+-unsigned long int lookup_command_attribute (char *);
++unsigned long int lookup_command_attribute (const char *);
+ #if defined(AUTH_CLIENT_SUPPORT) || defined(AUTH_SERVER_SUPPORT)
+ char *scramble (char *str);
Index: src/cvsrc.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/cvsrc.c,v
-retrieving revision 1.1.1.4
-diff -u -d -r1.1.1.4 cvsrc.c
---- src/cvsrc.c 23 Jul 2003 20:40:07 -0000 1.1.1.4
-+++ src/cvsrc.c 27 Oct 2003 19:07:23 -0000
+retrieving revision 1.1.1.5
+diff -u -d -r1.1.1.5 cvsrc.c
+--- src/cvsrc.c 5 Apr 2004 15:36:09 -0000 1.1.1.5
++++ src/cvsrc.c 14 Apr 2004 17:57:21 -0000
@@ -12,6 +12,203 @@
#include "cvs.h"
#include "getline.h"
@@ -1160,9 +1141,9 @@
/* this file is to be found in the user's home directory */
#ifndef CVSRC_FILENAME
-@@ -23,13 +220,73 @@
+@@ -21,13 +218,67 @@
- extern char *strtok (char *, const char *);
+ #define GROW 10
+#ifdef RSE_PATCH_CVSRC
+static void read_cvsrc_parentdirs ();
@@ -1174,10 +1155,7 @@
+#ifdef RSE_PATCH_CVSRC
+void
-+read_cvsrc (argc, argv, cmdname)
-+ int *argc;
-+ char ***argv;
-+ char *cmdname;
++read_cvsrc (int *argc, char ***argv, const char *cmdname)
+{
+ /* try to read .cvsrc files from parent directories */
+ read_cvsrc_parentdirs(argc, argv, cmdname);
@@ -1190,10 +1168,7 @@
+
+/* read .cvsrc files from all parent directories (including the current dir) */
+static void
-+read_cvsrc_parentdirs (argc, argv, cmdname)
-+ int *argc;
-+ char ***argv;
-+ char *cmdname;
++read_cvsrc_parentdirs (int *argc, char ***argv, const char *cmdname)
+{
+ char cwd[PATH_MAX];
+ char *cp;
@@ -1227,14 +1202,14 @@
+{
+#else
void
- read_cvsrc (int *argc, char ***argv, char *cmdname)
+ read_cvsrc (int *argc, char ***argv, const char *cmdname)
{
char *homedir;
+#endif
char *homeinit;
FILE *cvsrcfile;
-@@ -61,7 +318,9 @@
+@@ -59,7 +310,9 @@
/* determine filename for ~/.cvsrc */
@@ -1244,7 +1219,7 @@
/* If we can't find a home directory, ignore ~/.cvsrc. This may
make tracking down problems a bit of a pain, but on the other
hand it might be obnoxious to complain when CVS will function
-@@ -117,9 +376,15 @@
+@@ -115,9 +368,15 @@
if (found)
{
/* skip over command in the options line */
@@ -1263,11 +1238,11 @@
Index: src/diff.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/diff.c,v
-retrieving revision 1.1.1.10
-diff -u -d -r1.1.1.10 diff.c
---- src/diff.c 25 Nov 2003 16:11:47 -0000 1.1.1.10
-+++ src/diff.c 5 Dec 2003 20:26:45 -0000
-@@ -51,6 +51,10 @@
+retrieving revision 1.1.1.11
+diff -u -d -r1.1.1.11 diff.c
+--- src/diff.c 22 Mar 2004 17:26:44 -0000 1.1.1.11
++++ src/diff.c 14 Apr 2004 17:52:41 -0000
+@@ -49,6 +49,10 @@
static char *diff_date1, *diff_date2;
static char *use_rev1, *use_rev2;
static int have_rev1_label, have_rev2_label;
@@ -1278,7 +1253,7 @@
/* Revision of the user file, if it is unchanged from something in the
repository and we want to use that fact. */
-@@ -267,6 +271,10 @@
+@@ -265,6 +269,10 @@
diff_rev2 = NULL;
diff_date1 = NULL;
diff_date2 = NULL;
@@ -1289,7 +1264,7 @@
optind = 0;
/* FIXME: This should really be allocating an argv to be passed to diff
-@@ -277,7 +285,14 @@
+@@ -275,7 +283,14 @@
* to diff.
*/
while ((c = getopt_long (argc, argv,
@@ -1304,7 +1279,7 @@
longopts, &option_index)) != -1)
{
switch (c)
-@@ -286,7 +301,11 @@
+@@ -284,7 +299,11 @@
xrealloc_and_strcat (&opts, &opts_allocated, " --side-by-side");
break;
case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
@@ -1316,7 +1291,7 @@
case 'u': case 'w':
case '0': case '1': case '2': case '3': case '4': case '5':
case '6': case '7': case '8': case '9':
-@@ -358,6 +377,39 @@
+@@ -356,6 +375,39 @@
else
diff_date1 = Make_Date (optarg);
break;
@@ -1356,7 +1331,7 @@
case 'N':
empty_files = 1;
break;
-@@ -388,14 +440,32 @@
+@@ -386,14 +438,32 @@
send_option_string (opts);
if (options[0] != '\0')
send_arg (options);
@@ -1389,7 +1364,7 @@
send_arg ("--");
/* Send the current files unless diffing two revs from the archive */
-@@ -435,6 +505,12 @@
+@@ -433,6 +503,12 @@
free (options);
options = NULL;
@@ -1402,7 +1377,7 @@
if (diff_date1 != NULL)
free (diff_date1);
if (diff_date2 != NULL)
-@@ -488,7 +564,11 @@
+@@ -486,7 +562,11 @@
char *head =
(vers->vn_rcs == NULL
? NULL
@@ -1414,7 +1389,7 @@
exists = head != NULL && !RCS_isdead(vers->srcfile, head);
if (head != NULL)
free (head);
-@@ -822,7 +902,11 @@
+@@ -877,7 +957,11 @@
if (diff_rev1 && strcmp (diff_rev1, TAG_HEAD) == 0)
{
if (vers->vn_rcs != NULL && vers->srcfile != NULL)
@@ -1426,7 +1401,7 @@
}
else
{
-@@ -838,7 +922,11 @@
+@@ -893,7 +977,11 @@
if (diff_rev2 && strcmp (diff_rev2, TAG_HEAD) == 0)
{
if (vers->vn_rcs != NULL && vers->srcfile != NULL)
@@ -1474,10 +1449,10 @@
Index: src/history.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/history.c,v
-retrieving revision 1.1.1.9
-diff -u -d -r1.1.1.9 history.c
---- src/history.c 8 Oct 2003 21:37:21 -0000 1.1.1.9
-+++ src/history.c 27 Oct 2003 19:10:23 -0000
+retrieving revision 1.1.1.10
+diff -u -d -r1.1.1.10 history.c
+--- src/history.c 22 Mar 2004 17:26:45 -0000 1.1.1.10
++++ src/history.c 14 Apr 2004 17:52:41 -0000
@@ -237,6 +237,9 @@
static char *tz_name = "+0000";
@@ -1499,7 +1474,7 @@
else
{
fname = xmalloc (strlen (current_parsed_root->directory) + sizeof (CVSROOTADM)
-@@ -713,10 +720,18 @@
+@@ -717,10 +724,18 @@
return;
if ( strchr(logHistory, type) == NULL )
return;
@@ -1521,10 +1496,10 @@
Index: src/import.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/import.c,v
-retrieving revision 1.1.1.8
-diff -u -d -r1.1.1.8 import.c
---- src/import.c 4 Mar 2004 03:00:25 -0000 1.1.1.8
-+++ src/import.c 16 Mar 2004 15:42:26 -0000
+retrieving revision 1.1.1.9
+diff -u -d -r1.1.1.9 import.c
+--- src/import.c 5 Apr 2004 15:36:09 -0000 1.1.1.9
++++ src/import.c 14 Apr 2004 17:52:42 -0000
@@ -56,6 +56,141 @@
NULL
};
@@ -1667,7 +1642,7 @@
int
import (int argc, char **argv)
{
-@@ -302,6 +437,12 @@
+@@ -301,6 +436,12 @@
error (1, 0, "attempt to import the repository");
}
@@ -1680,7 +1655,7 @@
/*
* Make all newly created directories writable. Should really use a more
* sophisticated security mechanism here.
-@@ -341,7 +482,11 @@
+@@ -340,7 +481,11 @@
"Use the following command to help the merge:");
cvs_output_tagged ("newline", NULL);
cvs_output_tagged ("newline", NULL);
@@ -1692,7 +1667,7 @@
cvs_output_tagged ("text", program_name);
if (CVSroot_cmdline != NULL)
{
-@@ -368,7 +513,11 @@
+@@ -367,7 +512,11 @@
conflicts);
(void) fprintf (logfp,
"Use the following command to help the merge:\n\n");
@@ -1704,7 +1679,7 @@
(void) fprintf (logfp, "-j%s:yesterday -j%s %s\n\n",
argv[1], argv[1], argv[0]);
}
-@@ -391,6 +540,9 @@
+@@ -390,6 +539,9 @@
li->type = T_TITLE;
li->tag = xstrdup (vbranch);
li->rev_old = li->rev_new = NULL;
@@ -1714,7 +1689,7 @@
p->data = li;
(void) addnode (ulist, p);
Update_Logfile (repository, message, logfp, ulist);
-@@ -668,7 +820,11 @@
+@@ -667,7 +819,11 @@
*/
if (add_tags (vers->srcfile, vfile, vtag, targc, targv))
retval = 1;
@@ -2018,13 +1993,13 @@
Index: src/logmsg.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/logmsg.c,v
-retrieving revision 1.1.1.9
-diff -u -d -r1.1.1.9 logmsg.c
---- src/logmsg.c 20 Feb 2004 21:23:03 -0000 1.1.1.9
-+++ src/logmsg.c 13 Apr 2004 14:11:44 -0000
-@@ -616,6 +616,9 @@
- char *arg = NULL;
- char *f, *d;
+retrieving revision 1.1.1.10
+diff -u -d -r1.1.1.10 logmsg.c
+--- src/logmsg.c 22 Mar 2004 17:26:46 -0000 1.1.1.10
++++ src/logmsg.c 14 Apr 2004 17:52:42 -0000
+@@ -625,6 +625,9 @@
+ const char *f;
+ char *d;
size_t doff;
+#ifdef RSE_PATCH_EXTRAPERCENT
+ char buf[64];
@@ -2032,7 +2007,7 @@
if (p->data == NULL) return 1;
-@@ -626,6 +629,37 @@
+@@ -635,6 +638,37 @@
{
switch (*f++)
{
@@ -2073,10 +2048,10 @@
Index: src/main.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/main.c,v
-retrieving revision 1.1.1.12
-diff -u -d -r1.1.1.12 main.c
---- src/main.c 18 Feb 2004 19:24:19 -0000 1.1.1.12
-+++ src/main.c 13 Apr 2004 14:40:03 -0000
+retrieving revision 1.1.1.13
+diff -u -d -r1.1.1.13 main.c
+--- src/main.c 5 Apr 2004 15:36:09 -0000 1.1.1.13
++++ src/main.c 14 Apr 2004 18:01:20 -0000
@@ -54,6 +54,11 @@
mode_t cvsumask = UMASK_DFLT;
@@ -2140,18 +2115,18 @@
+ /* support for `cvs -H <cmd>' */
+ if (argc == -1) {
+ (void)fprintf(stderr, "Usage: %s %s [command arguments]\n",
-+ program_name, command_name);
++ program_name, cvs_cmd_name);
+ exit (EXIT_FAILURE);
+ }
+
+ /* execute the command */
-+ cmd = expand_path(argv[0], command_name, 0, 0);
++ cmd = expand_path(argv[0], cvs_cmd_name, 0, 0);
+ run_setup(cmd);
+ for (i = 1; i < argc; i++)
+ run_arg(argv[i]);
+ if (run_exec(RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL) != 0)
+ error(1, 0, "program `%s' of custom command `%s' returned non-zero",
-+ cmd, command_name);
++ cmd, cvs_cmd_name);
+ free(cmd);
+
+ return 0;
@@ -2214,6 +2189,15 @@
" -s VAR=VAL Set CVS user variable.\n",
"(Specify the --help option for a list of other help options)\n",
NULL
+@@ -325,7 +397,7 @@
+
+
+ unsigned long int
+-lookup_command_attribute (char *cmd_name)
++lookup_command_attribute (const char *cmd_name)
+ {
+ const struct cmd *cm;
+
@@ -334,6 +406,20 @@
if (strcmp (cmd_name, cm->fullname) == 0)
break;
@@ -2300,18 +2284,18 @@
+ * go directly to the master repository).
+ */
+ if (use_cvsrc) {
-+ command_name = argv[optind];
-+ if (command_name != NULL && command_name[0] != '\0') {
++ cvs_cmd_name = argv[optind];
++ if (cvs_cmd_name != NULL && cvs_cmd_name[0] != '\0') {
+ for (cm = cmds; cm->fullname != NULL; cm++)
+ {
-+ if (cm->nick1 && !strcmp(command_name, cm->nick1))
++ if (cm->nick1 && !strcmp(cvs_cmd_name, cm->nick1))
+ break;
-+ if (cm->nick2 && !strcmp(command_name, cm->nick2))
++ if (cm->nick2 && !strcmp(cvs_cmd_name, cm->nick2))
+ break;
-+ if (!strcmp(command_name, cm->fullname))
++ if (!strcmp(cvs_cmd_name, cm->fullname))
+ break;
+ }
-+ command_name = cm->fullname;
++ cvs_cmd_name = cm->fullname;
+ }
+ }
+#endif
@@ -2324,22 +2308,22 @@
+#ifdef RSE_PATCH_GLOBALOPTION
+ if (use_cvsrc) {
-+ if (command_name != NULL && command_name[0] != '\0') {
++ if (cvs_cmd_name != NULL && cvs_cmd_name[0] != '\0') {
+ char *cmd;
+#ifdef RSE_PATCH_GLOBALOPTION_PARTLY
-+ if ( strcmp(command_name, "commit") == 0
-+ || strcmp(command_name, "tag") == 0
-+ || strcmp(command_name, "rtag") == 0
-+ || strcmp(command_name, "history") == 0
-+ || strcmp(command_name, "admin") == 0
-+ || strcmp(command_name, "import") == 0
++ if ( strcmp(cvs_cmd_name, "commit") == 0
++ || strcmp(cvs_cmd_name, "tag") == 0
++ || strcmp(cvs_cmd_name, "rtag") == 0
++ || strcmp(cvs_cmd_name, "history") == 0
++ || strcmp(cvs_cmd_name, "admin") == 0
++ || strcmp(cvs_cmd_name, "import") == 0
+#ifdef RSE_PATCH_RLIST
-+ || strcmp(command_name, "rlist") == 0
++ || strcmp(cvs_cmd_name, "rlist") == 0
+#endif
-+ || strcmp(command_name, "rdiff") == 0) {
++ || strcmp(cvs_cmd_name, "rdiff") == 0) {
+#endif
-+ cmd = xmalloc(4 + strlen(command_name) + 1);
-+ sprintf(cmd, "cvs/%s", command_name);
++ cmd = xmalloc(4 + strlen(cvs_cmd_name) + 1);
++ sprintf(cmd, "cvs/%s", cvs_cmd_name);
+ read_cvsrc (&argc, &argv, cmd);
+#ifdef RSE_PATCH_GLOBALOPTION_PARTLY
+ }
@@ -2442,9 +2426,9 @@
+ cm = NULL;
+ {
+ int i;
-+ command_name = argv[0];
++ cvs_cmd_name = argv[0];
+ for (i = 0; i < customcmd_num; i++) {
-+ if (strcmp(customcmd_tab[i].name, command_name) == 0) {
++ if (strcmp(customcmd_tab[i].name, cvs_cmd_name) == 0) {
+ struct cmd *ccm;
+ ccm = (struct cmd *)xmalloc(sizeof(struct cmd));
+ ccm->nick1 = NULL;
@@ -2464,7 +2448,7 @@
@@ -699,6 +941,10 @@
else
- command_name = cm->fullname; /* Global pointer for later use */
+ cvs_cmd_name = cm->fullname; /* Global pointer for later use */
+#ifdef RSE_PATCH_CUSTOMCMD
+ }
@@ -2489,9 +2473,9 @@
+#endif
+
+#ifdef RSE_PATCH_SETXID
-+ if ( strcmp(command_name, "kserver") != 0
-+ && strcmp(command_name, "pserver") != 0
-+ && strcmp(command_name, "server") == 0) {
++ if ( strcmp(cvs_cmd_name, "kserver") != 0
++ && strcmp(cvs_cmd_name, "pserver") != 0
++ && strcmp(cvs_cmd_name, "server") == 0) {
+ uid_t uid, euid;
+ gid_t gid, egid;
+ struct passwd *pw;
@@ -2550,7 +2534,7 @@
# endif /* HAVE_KERBEROS */
+#ifdef RSE_PATCH_PSERVERD
-+ if (strcmp(command_name, "pserverd") == 0) {
++ if (strcmp(cvs_cmd_name, "pserverd") == 0) {
+ /*
+ * perform the socket listening. This returns multiple times,
+ * i.e., for each connection. But the parent never returns.
@@ -2561,18 +2545,18 @@
+ * switch to regular "cvs server" operation.
+ */
+ argc = 0;
-+ command_name = "server";
++ cvs_cmd_name = "server";
+ }
+#endif
# if defined (AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI)
- if (strcmp (command_name, "pserver") == 0)
+ if (strcmp (cvs_cmd_name, "pserver") == 0)
@@ -766,6 +1092,10 @@
#endif /* SERVER_SUPPORT */
+#ifdef RSE_PATCH_CVSROOT
-+ if (strcmp(command_name, "root") == 0)
++ if (strcmp(cvs_cmd_name, "root") == 0)
+ standalone_command = 1;
+#endif
@@ -2599,7 +2583,7 @@
+#ifdef RSE_PATCH_CVSROOT
+ if (CVSroot_cmdline == NULL || !cvsroot_cmdline_isreal) {
+ cvsroot_type *e;
-+ if (lookup_command_attribute(command_name) &
CVS_CMD_MODIFIES_REPOSITORY) {
++ if (lookup_command_attribute(cvs_cmd_name) &
CVS_CMD_MODIFIES_REPOSITORY) {
+ if ((e = cvsroot_lookup(NULL, NULL, CVSroot)) != NULL) {
+ /* command modifies repository and we still operare on
+ the slave repository, so switch to the master
repository,
@@ -2674,10 +2658,10 @@
save_errno = errno;
/* If this is "cvs init", the root need not exist yet. */
+#ifdef RSE_PATCH_CVSROOT
-+ if (strcmp (command_name, "init") != 0 &&
-+ strcmp (command_name, "root") != 0)
++ if (strcmp (cvs_cmd_name, "init") != 0 &&
++ strcmp (cvs_cmd_name, "root") != 0)
+#else
- if (strcmp (command_name, "init") != 0)
+ if (strcmp (cvs_cmd_name, "init") != 0)
+#endif
{
error (1, save_errno, "%s", path);
@@ -2702,7 +2686,7 @@
+ cmd = expand_path(cvs_prolog, "prolog", 0, 0);
+ run_setup(cmd);
+ run_arg("prolog");
-+ run_arg(command_name);
++ run_arg(cvs_cmd_name);
+ if (CurDir != NULL)
+ run_arg(CurDir);
+ else
@@ -2745,7 +2729,7 @@
+ cmd = expand_path(cvs_epilog, "epilog", 0, 0);
+ run_setup(cmd);
+ run_arg("epilog");
-+ run_arg(command_name);
++ run_arg(cvs_cmd_name);
+ if (CurDir != NULL)
+ run_arg(CurDir);
+ else
@@ -2878,10 +2862,10 @@
Index: src/parseinfo.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/parseinfo.c,v
-retrieving revision 1.1.1.10
-diff -u -d -r1.1.1.10 parseinfo.c
---- src/parseinfo.c 18 Feb 2004 19:24:20 -0000 1.1.1.10
-+++ src/parseinfo.c 16 Mar 2004 15:41:49 -0000
+retrieving revision 1.1.1.11
+diff -u -d -r1.1.1.11 parseinfo.c
+--- src/parseinfo.c 22 Mar 2004 17:26:47 -0000 1.1.1.11
++++ src/parseinfo.c 14 Apr 2004 17:52:42 -0000
@@ -10,6 +10,9 @@
#include "getline.h"
@@ -2890,9 +2874,9 @@
+extern char *history_file;
+#endif
- /*
- * Parse the INFOFILE file for the specified REPOSITORY. Invoke CALLPROC for
-@@ -387,7 +390,24 @@
+
+
+@@ -391,7 +394,24 @@
{
if (lock_dir != NULL)
free (lock_dir);
@@ -2917,7 +2901,7 @@
/* Could try some validity checking, like whether we can
opendir it or something, but I don't see any particular
reason to do that now rather than waiting until lock.c. */
-@@ -409,6 +429,19 @@
+@@ -413,6 +433,19 @@
else if (strcmp (p, "stat") == 0)
RereadLogAfterVerify = LOGMSG_REREAD_STAT;
}
@@ -2937,7 +2921,7 @@
else if (strcmp (line, "UserAdminOptions") == 0)
{
UserAdminOptions = xmalloc(strlen(p) + 1);
-@@ -441,9 +474,11 @@
+@@ -445,9 +478,11 @@
adding new keywords to your CVSROOT/config file is not
particularly recommended unless you are planning on using
the new features. */
@@ -2952,11 +2936,11 @@
Index: src/repos.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/repos.c,v
-retrieving revision 1.1.1.7
-diff -u -d -r1.1.1.7 repos.c
---- src/repos.c 11 Nov 2003 00:55:54 -0000 1.1.1.7
-+++ src/repos.c 5 Dec 2003 20:22:15 -0000
-@@ -193,3 +193,11 @@
+retrieving revision 1.1.1.8
+diff -u -d -r1.1.1.8 repos.c
+--- src/repos.c 22 Mar 2004 17:26:49 -0000 1.1.1.8
++++ src/repos.c 14 Apr 2004 17:52:42 -0000
+@@ -200,3 +200,11 @@
repository[len - 2] = '\0';
}
}
@@ -2971,10 +2955,10 @@
Index: src/root.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/root.c,v
-retrieving revision 1.1.1.11
-diff -u -d -r1.1.1.11 root.c
---- src/root.c 24 Feb 2004 16:44:01 -0000 1.1.1.11
-+++ src/root.c 13 Apr 2004 14:40:24 -0000
+retrieving revision 1.1.1.12
+diff -u -d -r1.1.1.12 root.c
+--- src/root.c 7 Apr 2004 01:17:30 -0000 1.1.1.12
++++ src/root.c 14 Apr 2004 18:02:49 -0000
@@ -125,6 +125,9 @@
/* allocate space to return and fill it in */
strip_trailing_slashes (root);
@@ -2985,7 +2969,7 @@
out:
free (cvsadm);
free (tmp);
-@@ -253,7 +256,86 @@
+@@ -255,7 +258,86 @@
return 0;
}
@@ -3072,7 +3056,7 @@
/* This global variable holds the global -d option. It is NULL if -d
was not used, which means that we must get the CVSroot information
-@@ -815,3 +897,471 @@
+@@ -899,3 +981,471 @@
/* NOTREACHED */
}
#endif
@@ -3309,7 +3293,7 @@
+ if (trace) {
+ cvs_output(program_name, 0);
+ cvs_output(" ", 1);
-+ cvs_output(command_name, 0);
++ cvs_output(cvs_cmd_name, 0);
+ cvs_output(": Executing ", 0);
+ run_print(stdout);
+ cvs_output("\n", 0);
@@ -3330,7 +3314,7 @@
+ if (trace) {
+ cvs_output(program_name, 0);
+ cvs_output(" ", 1);
-+ cvs_output(command_name, 0);
++ cvs_output(cvs_cmd_name, 0);
+ cvs_output(": Executing ", 0);
+ run_print(stdout);
+ cvs_output("\n", 0);
@@ -3547,10 +3531,10 @@
Index: src/sanity.sh
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/sanity.sh,v
-retrieving revision 1.1.1.13
-diff -u -d -r1.1.1.13 sanity.sh
---- src/sanity.sh 4 Mar 2004 03:02:52 -0000 1.1.1.13
-+++ src/sanity.sh 16 Mar 2004 15:41:52 -0000
+retrieving revision 1.1.1.14
+diff -u -d -r1.1.1.14 sanity.sh
+--- src/sanity.sh 11 Apr 2004 16:32:41 -0000 1.1.1.14
++++ src/sanity.sh 14 Apr 2004 17:52:46 -0000
@@ -391,6 +391,7 @@
# "debugger"
#set -x
@@ -3559,7 +3543,7 @@
echo 'This test should produce no other output than this message, and a final
"OK".'
echo '(Note that the test can take an hour or more to run and periodically stops'
echo 'for as long as one minute. Do not assume there is a problem just because'
-@@ -11098,10 +11099,12 @@
+@@ -11289,10 +11290,12 @@
############################################################
# Check out the whole repository
mkdir 1; cd 1
@@ -3573,7 +3557,7 @@
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
-@@ -11121,10 +11124,12 @@
+@@ -11312,10 +11315,12 @@
############################################################
# Check out CVSROOT
mkdir 1; cd 1
@@ -3587,7 +3571,7 @@
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
-@@ -11147,10 +11152,12 @@
+@@ -11338,10 +11343,12 @@
mkdir 1; cd 1
dotest modules-3 "${testcvs} -q co somedir" ''
cd somedir
@@ -3601,7 +3585,7 @@
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
-@@ -22960,7 +22967,7 @@
+@@ -23164,7 +23171,7 @@
add a line on trunk after trunktag"
# But diff thinks that HEAD is "br1". Case (b) from cvs.texinfo.
# Probably people are relying on it.
@@ -3613,10 +3597,10 @@
Index: src/server.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/server.c,v
-retrieving revision 1.1.1.14
-diff -u -d -r1.1.1.14 server.c
---- src/server.c 3 Mar 2004 13:53:05 -0000 1.1.1.14
-+++ src/server.c 16 Mar 2004 15:41:52 -0000
+retrieving revision 1.1.1.15
+diff -u -d -r1.1.1.15 server.c
+--- src/server.c 6 Apr 2004 20:17:55 -0000 1.1.1.15
++++ src/server.c 14 Apr 2004 17:52:47 -0000
@@ -112,6 +112,16 @@
# endif /* AUTH_SERVER_SUPPORT */
@@ -3658,7 +3642,7 @@
if (status == 0)
{
if (!outside_root (repos))
-@@ -3851,6 +3871,17 @@
+@@ -3871,6 +3891,17 @@
}
/* See server.h for description. */
@@ -3676,7 +3660,7 @@
void
server_modtime (struct file_info *finfo, Vers_TS *vers_ts)
-@@ -4586,6 +4617,9 @@
+@@ -4617,6 +4648,9 @@
REQ_LINE("expand-modules", serve_expand_modules, 0),
REQ_LINE("ci", serve_ci, RQ_ESSENTIAL),
REQ_LINE("co", serve_co, RQ_ESSENTIAL),
@@ -3686,7 +3670,7 @@
REQ_LINE("update", serve_update, RQ_ESSENTIAL),
REQ_LINE("diff", serve_diff, 0),
REQ_LINE("log", serve_log, 0),
-@@ -5270,8 +5304,13 @@
+@@ -5300,8 +5334,13 @@
{
char *env;
@@ -3700,7 +3684,7 @@
(void) putenv (env);
env = xmalloc (sizeof "USER=" + strlen (username));
-@@ -5803,6 +5842,10 @@
+@@ -5837,6 +5876,10 @@
|| !strip_trailing_newlines (password))
error (1, 0, "Maximum line length exceeded during authentication.");
@@ -3711,7 +3695,7 @@
/* ... and make sure the protocol ends on the right foot. */
/* See above comment about error handling. */
getnline( &tmp, &tmp_allocated, PATH_MAX, stdin );
-@@ -6513,3 +6556,517 @@
+@@ -6566,3 +6609,517 @@
cvs_output (text, 0);
}
}
@@ -4232,11 +4216,11 @@
Index: src/subr.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/subr.c,v
-retrieving revision 1.1.1.11
-diff -u -d -r1.1.1.11 subr.c
---- src/subr.c 11 Mar 2004 14:58:25 -0000 1.1.1.11
-+++ src/subr.c 16 Mar 2004 15:41:52 -0000
-@@ -234,6 +234,22 @@
+retrieving revision 1.1.1.12
+diff -u -d -r1.1.1.12 subr.c
+--- src/subr.c 5 Apr 2004 15:36:17 -0000 1.1.1.12
++++ src/subr.c 14 Apr 2004 17:52:47 -0000
+@@ -236,6 +236,22 @@
uid_t uid;
#endif
@@ -4259,7 +4243,7 @@
/* If there is a CVS username, return it. */
#ifdef AUTH_SERVER_SUPPORT
if (CVS_Username != NULL)
-@@ -696,6 +712,73 @@
+@@ -764,6 +780,73 @@
return backup_name;
}
@@ -4336,11 +4320,11 @@
Index: src/update.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/update.c,v
-retrieving revision 1.1.1.12
-diff -u -d -r1.1.1.12 update.c
---- src/update.c 3 Mar 2004 13:53:05 -0000 1.1.1.12
-+++ src/update.c 16 Mar 2004 15:41:53 -0000
-@@ -1730,6 +1730,17 @@
+retrieving revision 1.1.1.13
+diff -u -d -r1.1.1.13 update.c
+--- src/update.c 25 Mar 2004 21:34:11 -0000 1.1.1.13
++++ src/update.c 14 Apr 2004 17:52:47 -0000
+@@ -1740,6 +1740,17 @@
patch can't handle that. */
fail = 1;
}
@@ -4358,7 +4342,7 @@
fclose (e);
}
-@@ -2532,8 +2543,16 @@
+@@ -2546,8 +2557,16 @@
write_letter (finfo, 'C');
}
else
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.spec
============================================================================
$ cvs diff -u -r1.83 -r1.84 cvs.spec
--- openpkg-src/cvs/cvs.spec 13 Apr 2004 14:59:36 -0000 1.83
+++ openpkg-src/cvs/cvs.spec 14 Apr 2004 18:12:42 -0000 1.84
@@ -24,7 +24,7 @@
##
# the involved versions
-%define V_cvs 1.12.6
+%define V_cvs 1.12.7
%define V_cvslock 0.2
# package information
@@ -38,7 +38,7 @@
Group: SCM
License: GPL
Version: %{V_cvs}
-Release: 20040413
+Release: 20040414
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
