upgrading package: cvs 1.12.7 -> 1.12.8

cvs/cvs.patch.rse

@@ -3,7 +3,7 @@ Index: src/README.RSE
 RCS file: src/README.RSE
 diff -N src/README.RSE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/README.RSE	17 Feb 2004 17:02:05 -0000
++++ src/README.RSE	19 May 2004 18:54:35 -0000
 @@ -0,0 +1,310 @@
 +
 +  CVS RSE Patches
@@ -11,7 +11,7 @@ diff -N src/README.RSE
 +
 +  This is the patched version of CVS from Ralf S. Engelschall
 +  <rse@engelschall.com> - an enhanced version of the official CVS
-+  version 1.12.1 (see http://www.cvshome.org/).
++  version 1.12.8 (see http://www.cvshome.org/).
 +
 +  The following changes against the vendor CVS version are provided:
 +    - new `cvs pserverd' for running stand-alone pserver daemons
@@ -318,11 +318,11 @@ diff -N src/README.RSE
 Index: src/add.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/add.c,v
-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 @@
+retrieving revision 1.1.1.12
+diff -u -d -r1.1.1.12 add.c
+--- src/add.c	8 May 2004 23:13:10 -0000	1.1.1.12
++++ src/add.c	19 May 2004 18:33:37 -0000
+@@ -829,6 +829,9 @@
  	li->type = T_TITLE;
  	li->tag = xstrdup (tag);
  	li->rev_old = li->rev_new = NULL;
@@ -524,39 +524,21 @@ diff -u -d -r1.1.1.13 admin.c
 Index: src/checkin.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/checkin.c,v
-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 @@
+retrieving revision 1.1.1.5
+diff -u -d -r1.1.1.5 checkin.c
+--- src/checkin.c	11 May 2004 18:22:29 -0000	1.1.1.5
++++ src/checkin.c	19 May 2004 18:37:53 -0000
+@@ -26,6 +26,9 @@
      Vers_TS *vers;
      int set_time;
      char *tocvsPath = NULL;
 +#ifdef RSE_PATCH_COSMETICS_HARD
 +    int flags;
-+#endif
- 
-     /* Hmm.  This message goes to stdout and the "foo,v  <--  foo"
-        message from "ci" goes to stderr.  This doesn't make a whole
-        lot of sense, but making everything go to stdout can only be
-        gracefully achieved once RCS_checkin is librarified.  */
-+#ifdef RSE_PATCH_COSMETICS_HARD
-+    if (!really_quiet) {
-+#endif
-     cvs_output ("Checking in ", 0);
-     cvs_output (finfo->fullname, 0);
-+#ifdef RSE_PATCH_COSMETICS_HARD
-+    cvs_output ("\n", 0);
-+#else
-     cvs_output (";\n", 0);
-+#endif
-+#ifdef RSE_PATCH_COSMETICS_HARD
-+    }
 +#endif
  
      tocvsPath = wrap_tocvs_process_file (finfo->file);
      if (!noexec)
-@@ -54,8 +67,16 @@
+@@ -46,8 +49,16 @@
       */
      assert (finfo->rcs != NULL);
  
@@ -573,7 +555,7 @@ diff -u -d -r1.1.1.4 checkin.c
      {
  	case 0:			/* everything normal */
  
-@@ -119,6 +140,16 @@
+@@ -111,6 +122,16 @@
  	    history_write (type, NULL, vers->vn_rcs,
  			   finfo->file, finfo->repository);
  
@@ -593,11 +575,11 @@ diff -u -d -r1.1.1.4 checkin.c
 Index: src/client.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/client.c,v
-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 @@
+retrieving revision 1.1.1.15
+diff -u -d -r1.1.1.15 client.c
+--- src/client.c	16 May 2004 00:39:25 -0000	1.1.1.15
++++ src/client.c	19 May 2004 18:33:37 -0000
+@@ -67,6 +67,9 @@
  int status (int argc, char **argv);
  int tag (int argc, char **argv);
  int update (int argc, char **argv);
@@ -607,7 +589,7 @@ diff -u -d -r1.1.1.14 client.c
  
  /* All the response handling functions.  */
  static void handle_ok (char *, int);
-@@ -211,14 +214,34 @@
+@@ -210,14 +213,34 @@
  			 : Name_Root ((char *) NULL, (char *) NULL));
  	}
  
@@ -642,7 +624,7 @@ diff -u -d -r1.1.1.14 client.c
  	free (this_root);
      }
      
-@@ -2226,6 +2249,9 @@
+@@ -2225,6 +2248,9 @@
      /* Add a directory name to the list of those sent to the
         server. */
      if (update_dir && (*update_dir != '\0')
@@ -655,10 +637,10 @@ diff -u -d -r1.1.1.14 client.c
 Index: src/commit.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/commit.c,v
-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
+retrieving revision 1.1.1.16
+diff -u -d -r1.1.1.16 commit.c
+--- src/commit.c	11 May 2004 18:22:29 -0000	1.1.1.16
++++ src/commit.c	19 May 2004 18:33:38 -0000
 @@ -298,6 +298,9 @@
      data->type = status;
      data->tag = xstrdup (vers->tag);
@@ -669,7 +651,7 @@ diff -u -d -r1.1.1.15 commit.c
  
      node->type = UPDATE;
      node->delproc = update_delproc;
-@@ -973,7 +976,16 @@
+@@ -976,7 +979,16 @@
  		  xmalloc (sizeof (struct logfile_info)));
  	    li->type = status;
  	    li->tag = xstrdup (vers->tag);
@@ -686,7 +668,7 @@ diff -u -d -r1.1.1.15 commit.c
  	    li->rev_new = NULL;
  	    p->data = li;
  	    (void) addnode (ulist, p);
-@@ -2286,6 +2298,10 @@
+@@ -2294,6 +2306,10 @@
  	free (li->rev_old);
      if (li->rev_new)
  	free (li->rev_new);
@@ -700,10 +682,10 @@ diff -u -d -r1.1.1.15 commit.c
 Index: src/create_adm.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/create_adm.c,v
-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
+retrieving revision 1.1.1.9
+diff -u -d -r1.1.1.9 create_adm.c
+--- src/create_adm.c	27 Apr 2004 20:36:33 -0000	1.1.1.9
++++ src/create_adm.c	19 May 2004 18:38:23 -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.  */
@@ -764,16 +746,16 @@ diff -u -d -r1.1.1.8 create_adm.c
 +    if (!server_active && !(current_parsed_root->isremote) && dotemplate)
 +        local_template(update_dir, repository);
 +#endif
-     TRACE ( 1, "Create_Admin" );
+     TRACE (1, "Create_Admin");
  
      free (reposcopy);
 Index: src/cvs.h
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/cvs.h,v
-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
+retrieving revision 1.1.1.15
+diff -u -d -r1.1.1.15 cvs.h
+--- src/cvs.h	16 May 2004 00:39:25 -0000	1.1.1.15
++++ src/cvs.h	19 May 2004 18:33:38 -0000
 @@ -7,6 +7,45 @@
   */
  
@@ -820,7 +802,7 @@ diff -u -d -r1.1.1.14 cvs.h
   * basic information used in all source files
   *
   */
-@@ -170,6 +209,33 @@
+@@ -165,6 +204,33 @@
  #define CVSROOTADM_WRITERS	"writers"
  #define CVSROOTADM_PASSWD	"passwd"
  #define CVSROOTADM_CONFIG	"config"
@@ -854,7 +836,7 @@ diff -u -d -r1.1.1.14 cvs.h
  
  #define CVSNULLREPOS		"Emptydir"	/* an empty directory */
  
-@@ -451,6 +517,27 @@
+@@ -446,6 +512,27 @@
  void root_allow_free (void);
  int root_allow_ok (char *);
  
@@ -882,7 +864,7 @@ diff -u -d -r1.1.1.14 cvs.h
  char *previous_rev (RCSNode *rcs, const char *rev);
  char *gca (const char *rev1, const char *rev2);
  void check_numeric (const char *, int, char **);
-@@ -605,6 +692,10 @@
+@@ -607,6 +694,10 @@
  void expand_wild (int argc, char **argv, 
                    int *pargc, char ***pargv);
  
@@ -892,8 +874,8 @@ diff -u -d -r1.1.1.14 cvs.h
 +
  #ifdef SERVER_SUPPORT
  int cvs_casecmp (const char *, const char *);
- int fopen_case (char *, char *, FILE **, char **);
-@@ -854,6 +945,9 @@
+ #endif
+@@ -855,6 +946,9 @@
  				   NULL for add or import */
    char *rev_new;		/* rev number after a commit/modify,
  				   add, or import, NULL for remove */
@@ -903,7 +885,7 @@ diff -u -d -r1.1.1.14 cvs.h
  };
  
  /* Wrappers.  */
-@@ -894,6 +988,13 @@
+@@ -895,6 +989,13 @@
  int unedit (int argc, char **argv);
  int editors (int argc, char **argv);
  int watchers (int argc, char **argv);
@@ -917,7 +899,7 @@ diff -u -d -r1.1.1.14 cvs.h
  int annotate (int argc, char **argv);
  int add (int argc, char **argv);
  int admin (int argc, char **argv);
-@@ -923,8 +1024,11 @@
+@@ -924,8 +1025,11 @@
  int cvsstatus (int argc, char **argv);
  int cvstag (int argc, char **argv);
  int version (int argc, char **argv);
@@ -1416,10 +1398,10 @@ diff -u -d -r1.1.1.11 diff.c
 Index: src/hash.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/hash.c,v
-retrieving revision 1.1.1.6
-diff -u -d -r1.1.1.6 hash.c
---- src/hash.c	20 Feb 2004 21:23:02 -0000	1.1.1.6
-+++ src/hash.c	16 Mar 2004 15:41:48 -0000
+retrieving revision 1.1.1.7
+diff -u -d -r1.1.1.7 hash.c
+--- src/hash.c	27 Apr 2004 20:44:36 -0000	1.1.1.7
++++ src/hash.c	19 May 2004 18:33:38 -0000
 @@ -23,17 +23,25 @@
  hashp (const char *key)
  {
@@ -1445,7 +1427,7 @@ diff -u -d -r1.1.1.6 hash.c
 +#endif
      }
  
-     return (h % HASHSIZE);
+     return h % HASHSIZE;
 Index: src/history.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/history.c,v
@@ -1496,10 +1478,10 @@ diff -u -d -r1.1.1.10 history.c
 Index: src/import.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/import.c,v
-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
+retrieving revision 1.1.1.10
+diff -u -d -r1.1.1.10 import.c
+--- src/import.c	30 Apr 2004 12:57:34 -0000	1.1.1.10
++++ src/import.c	19 May 2004 18:33:38 -0000
 @@ -56,6 +56,141 @@
      NULL
  };
@@ -1706,7 +1688,7 @@ Index: src/list.c
 RCS file: src/list.c
 diff -N src/list.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/list.c	27 Oct 2003 19:28:25 -0000
++++ src/list.c	19 May 2004 18:53:24 -0000
 @@ -0,0 +1,282 @@
 +/* 
 + * Copyright (c) 1998, Dan Rich <drich@employees.com>
@@ -1728,9 +1710,9 @@ diff -N src/list.c
 +#endif
 +
 +static int   cvslist_fileproc (void *callerdat, struct file_info * finfo);
-+static Dtype cvslist_dirproc (void *callerdat, char *dir, char *repos, char *update_dir, List * entries);
++static Dtype cvslist_dirproc (void *callerdat, const char *dir, const char *repos, const char *update_dir, List * entries);
 +static int   cvslist_output_dir (Node * node, void *closure);
-+static int   cvslist_output_file (char *name);
++static int   cvslist_output_file (const char *name);
 +static int   cvslist_tag_proc (Node * p, void *closure);
 +
 +static char *numtag;
@@ -1910,9 +1892,9 @@ diff -N src/list.c
 +/* ARGSUSED */
 +static Dtype cvslist_dirproc(callerdat, dir, repos, update_dir, entries)
 +    void *callerdat;
-+    char *dir;
-+    char *repos;
-+    char *update_dir;
++    const char *dir;
++    const char *repos;
++    const char *update_dir;
 +    List *entries;
 +{
 +    char *buf;
@@ -1946,7 +1928,7 @@ diff -N src/list.c
 +}
 +
 +static int cvslist_output_file(name)
-+    char *name;
++    const char *name;
 +{
 +    char *buf;
 +    char *nlptr;
@@ -2048,10 +2030,10 @@ diff -u -d -r1.1.1.10 logmsg.c
 Index: src/main.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/main.c,v
-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
+retrieving revision 1.1.1.14
+diff -u -d -r1.1.1.14 main.c
+--- src/main.c	16 May 2004 00:39:26 -0000	1.1.1.14
++++ src/main.c	19 May 2004 18:38:57 -0000
 @@ -54,6 +54,11 @@
  
  mode_t cvsumask = UMASK_DFLT;
@@ -2064,13 +2046,14 @@ diff -u -d -r1.1.1.13 main.c
  char *CurDir;
  
  /*
-@@ -128,11 +133,17 @@
+@@ -128,12 +133,18 @@
      { "login",    "logon",    "lgn",       login,     0 },
      { "logout",   NULL,       NULL,        logout,    0 },
  #endif /* AUTH_CLIENT_SUPPORT */
 +#ifdef RSE_PATCH_PSERVERD
 +    { "pserverd", NULL,       NULL,    pserverd },
 +#endif
+     { "ls",       "dir",      "list",      ls,        0 },
  #if (defined(AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI)) && defined(SERVER_SUPPORT)
      { "pserver",  NULL,       NULL,        server,    CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR }, /* placeholder */
  #endif
@@ -2082,7 +2065,7 @@ diff -u -d -r1.1.1.13 main.c
      { "release",  "re",       "rel",       release,   0 },
      { "remove",   "rm",       "delete",    cvsremove, CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
      { "rlog",     "rl",       NULL,        cvslog,    0 },
-@@ -147,9 +158,53 @@
+@@ -149,9 +160,53 @@
      { "version",  "ve",       "ver",       version,   0 },
      { "watch",    NULL,       NULL,        watch,     CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
      { "watchers", NULL,       NULL,        watchers,  CVS_CMD_USES_WORK_DIR },
@@ -2136,7 +2119,7 @@ diff -u -d -r1.1.1.13 main.c
  static const char *const usg[] =
  {
      /* CVS usage messages never have followed the GNU convention of
-@@ -190,9 +245,13 @@
+@@ -192,9 +247,13 @@
         paragraph in ../cvs.spec without assuming the reader knows what
         version control means.  */
  
@@ -2150,13 +2133,14 @@ diff -u -d -r1.1.1.13 main.c
      NULL,
  };
  
-@@ -219,11 +278,17 @@
+@@ -221,12 +280,18 @@
      "        login        Prompt for password for authenticating server\n",
      "        logout       Removes entry in .cvspass for remote repository\n",
  #endif /* AUTH_CLIENT_SUPPORT */
 +#ifdef RSE_PATCH_PSERVERD
 +    "        pserverd     Password server daemon\n",
 +#endif
+     "        ls           List files available from CVS\n",
  #if (defined(AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI)) && defined(SERVER_SUPPORT)
      "        pserver      Password server mode\n",
  #endif
@@ -2168,7 +2152,7 @@ diff -u -d -r1.1.1.13 main.c
      "        release      Indicate that a Module is no longer in use\n",
      "        remove       Remove an entry from the repository\n",
      "        rlog         Print out history information for a module\n",
-@@ -238,6 +303,9 @@
+@@ -242,6 +307,9 @@
      "        version      Show current CVS version(s)\n",
      "        watch        Set watches\n",
      "        watchers     See who is watching a file\n",
@@ -2178,7 +2162,7 @@ diff -u -d -r1.1.1.13 main.c
      "(Specify the --help option for a list of other help options)\n",
      NULL,
  };
-@@ -267,6 +335,10 @@
+@@ -271,6 +339,10 @@
  #endif
      "    -a           Authenticate all net traffic.\n",
  #endif
@@ -2189,7 +2173,7 @@ diff -u -d -r1.1.1.13 main.c
      "    -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 @@
+@@ -329,7 +401,7 @@
  
  
  unsigned long int
@@ -2198,7 +2182,7 @@ diff -u -d -r1.1.1.13 main.c
  {
      const struct cmd *cm;
  
-@@ -334,6 +406,20 @@
+@@ -338,6 +410,20 @@
  	if (strcmp (cmd_name, cm->fullname) == 0)
  	    break;
      }
@@ -2219,7 +2203,7 @@ diff -u -d -r1.1.1.13 main.c
      if (!cm->fullname)
  	error (1, 0, "unknown command: %s", cmd_name);
      return cm->attr;
-@@ -422,11 +508,30 @@
+@@ -426,11 +512,30 @@
      int free_CVSroot = 0;
      int free_Editor = 0;
      int free_Tmpdir = 0;
@@ -2250,7 +2234,7 @@ diff -u -d -r1.1.1.13 main.c
      static struct option long_options[] =
      {
          {"help", 0, NULL, 'H'},
-@@ -435,6 +540,9 @@
+@@ -439,6 +544,9 @@
  	{"help-synonyms", 0, NULL, 2},
  	{"help-options", 0, NULL, 4},
  	{"allow-root", required_argument, NULL, 3},
@@ -2260,7 +2244,7 @@ diff -u -d -r1.1.1.13 main.c
          {0, 0, 0, 0}
      };
      /* `getopt_long' stores the option index here, but right now we
-@@ -499,6 +607,10 @@
+@@ -503,6 +611,10 @@
  	readonlyfs = 1;
  	logoff = 1;
      }
@@ -2271,7 +2255,7 @@ diff -u -d -r1.1.1.13 main.c
  
      /* Set this to 0 to force getopt initialization.  getopt() sets
         this to 1 internally.  */
-@@ -518,12 +630,63 @@
+@@ -522,12 +634,63 @@
  	    use_cvsrc = 0;
      }
  
@@ -2335,7 +2319,7 @@ diff -u -d -r1.1.1.13 main.c
      optind = 0;
      opterr = 1;
  
-@@ -549,6 +712,17 @@
+@@ -553,6 +716,17 @@
  		/* --allow-root */
  		root_allow_add (optarg);
  		break;
@@ -2353,7 +2337,7 @@ diff -u -d -r1.1.1.13 main.c
  	    case 'Q':
  		really_quiet = 1;
  		/* FALL THROUGH */
-@@ -608,10 +782,34 @@
+@@ -612,10 +786,34 @@
  	    case 'd':
  		if (CVSroot_cmdline != NULL)
  		    free (CVSroot_cmdline);
@@ -2388,7 +2372,7 @@ diff -u -d -r1.1.1.13 main.c
  		    free_CVSroot = 0;
  		}
  		CVSroot = CVSroot_cmdline;
-@@ -660,6 +858,28 @@
+@@ -664,6 +862,28 @@
                     We will issue an error later if stream
                     authentication is not supported.  */
  		break;
@@ -2417,7 +2401,7 @@ diff -u -d -r1.1.1.13 main.c
  	    case '?':
  	    default:
                  usage (usg);
-@@ -677,6 +897,28 @@
+@@ -681,6 +901,28 @@
  Using this option to access a repository which some users write to may\n\
  cause intermittent sandbox corruption.");
      }
@@ -2446,7 +2430,7 @@ diff -u -d -r1.1.1.13 main.c
  
      /* Look up the command name. */
  
-@@ -699,6 +941,10 @@
+@@ -703,6 +945,10 @@
      else
  	cvs_cmd_name = cm->fullname;	/* Global pointer for later use */
  
@@ -2457,7 +2441,7 @@ diff -u -d -r1.1.1.13 main.c
      if (help)
      {
  	argc = -1;		/* some functions only check for this */
-@@ -726,6 +972,71 @@
+@@ -730,6 +976,71 @@
  		       CVSUMASK_ENV, cp);
  	}
  
@@ -2529,7 +2513,7 @@ diff -u -d -r1.1.1.13 main.c
  #ifdef SERVER_SUPPORT
  
  # ifdef HAVE_KERBEROS
-@@ -742,6 +1053,21 @@
+@@ -746,6 +1057,21 @@
  	}
  # endif /* HAVE_KERBEROS */
  
@@ -2551,7 +2535,7 @@ diff -u -d -r1.1.1.13 main.c
  
  # if defined (AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI)
  	if (strcmp (cvs_cmd_name, "pserver") == 0)
-@@ -766,6 +1092,10 @@
+@@ -770,6 +1096,10 @@
  
  #endif /* SERVER_SUPPORT */
  
@@ -2562,7 +2546,7 @@ diff -u -d -r1.1.1.13 main.c
  
  #ifdef SERVER_SUPPORT
  	if (server_active)
-@@ -828,8 +1158,12 @@
+@@ -832,8 +1162,12 @@
  	       in server mode, since the client will send the repository
  	       directory after the connection is made. */
  
@@ -2575,7 +2559,7 @@ diff -u -d -r1.1.1.13 main.c
  	{
  	    char *CVSADM_Root;
  	    
-@@ -885,6 +1219,54 @@
+@@ -889,6 +1223,54 @@
  		error (1, 0,
  		       "CVS/Root file (if any).");
  	    }
@@ -2630,7 +2614,7 @@ diff -u -d -r1.1.1.13 main.c
  	}
  
  	/* Here begins the big loop over unique cvsroot values.  We
-@@ -917,6 +1299,9 @@
+@@ -921,6 +1303,9 @@
  	   end of things.  */
  
  	while (
@@ -2640,7 +2624,7 @@ diff -u -d -r1.1.1.13 main.c
  #ifdef SERVER_SUPPORT
  	       server_active ||
  #endif
-@@ -928,8 +1313,12 @@
+@@ -932,8 +1317,12 @@
  	       in server mode, since the client will send the repository
  	       directory after the connection is made. */
  
@@ -2653,7 +2637,7 @@ diff -u -d -r1.1.1.13 main.c
  	    {
  		/* Now we're 100% sure that we have a valid CVSROOT
  		   variable.  Parse it to see if we're supposed to do
-@@ -962,7 +1351,12 @@
+@@ -966,7 +1355,12 @@
  		    {
  			save_errno = errno;
  			/* If this is "cvs init", the root need not exist yet.  */
@@ -2666,7 +2650,7 @@ diff -u -d -r1.1.1.13 main.c
  			{
  			    error (1, save_errno, "%s", path);
  			}
-@@ -998,6 +1392,9 @@
+@@ -1002,6 +1396,9 @@
  	       read_cvsrc and other such places or vice versa.  That sort
  	       of thing probably needs more thought.  */
  	    if (1
@@ -2676,7 +2660,7 @@ diff -u -d -r1.1.1.13 main.c
  #ifdef SERVER_SUPPORT
  		&& !server_active
  #endif
-@@ -1028,7 +1425,31 @@
+@@ -1032,7 +1429,31 @@
  	    }
  #endif
  
@@ -2708,7 +2692,7 @@ diff -u -d -r1.1.1.13 main.c
  #ifdef SERVER_SUPPORT
  		/* Don't worry about lock_cleanup_setup when the server is
  		 * active since we can only go through this loop once in that
-@@ -1040,6 +1461,9 @@
+@@ -1044,6 +1465,9 @@
  		!current_parsed_root->isremote &&
  #endif
  		!lock_cleanup_setup)
@@ -2718,7 +2702,7 @@ diff -u -d -r1.1.1.13 main.c
  	    {
  		/* Set up to clean up any locks we might create on exit.  */
  		cleanup_register (Lock_Cleanup);
-@@ -1048,6 +1472,27 @@
+@@ -1052,6 +1476,27 @@
  
  	    /* Call our worker function.  */
  	    err = (*(cm->func)) (argc, argv);
@@ -2746,7 +2730,7 @@ diff -u -d -r1.1.1.13 main.c
  	
  	    /* Mark this root directory as done.  When the server is
                 active, current_root will be NULL -- don't try and
-@@ -1066,12 +1511,21 @@
+@@ -1070,12 +1515,21 @@
  	    dellist (&root_directories);
  #endif
  
@@ -2936,10 +2920,10 @@ diff -u -d -r1.1.1.11 parseinfo.c
 Index: src/repos.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/repos.c,v
-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
+retrieving revision 1.1.1.9
+diff -u -d -r1.1.1.9 repos.c
+--- src/repos.c	30 Apr 2004 12:57:34 -0000	1.1.1.9
++++ src/repos.c	19 May 2004 18:53:53 -0000
 @@ -200,3 +200,11 @@
  	repository[len - 2] = '\0';
      }
@@ -2955,10 +2939,10 @@ diff -u -d -r1.1.1.8 repos.c
 Index: src/root.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/root.c,v
-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
+retrieving revision 1.1.1.13
+diff -u -d -r1.1.1.13 root.c
+--- src/root.c	30 Apr 2004 12:57:34 -0000	1.1.1.13
++++ src/root.c	19 May 2004 18:33:39 -0000
 @@ -125,6 +125,9 @@
      /* allocate space to return and fill it in */
      strip_trailing_slashes (root);
@@ -3056,7 +3040,7 @@ diff -u -d -r1.1.1.12 root.c
  
  /* 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
-@@ -899,3 +981,471 @@
+@@ -894,3 +976,471 @@
     /* NOTREACHED */
  }
  #endif
@@ -3531,10 +3515,10 @@ diff -u -d -r1.1.1.12 root.c
 Index: src/sanity.sh
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/sanity.sh,v
-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
+retrieving revision 1.1.1.15
+diff -u -d -r1.1.1.15 sanity.sh
+--- src/sanity.sh	16 May 2004 00:39:26 -0000	1.1.1.15
++++ src/sanity.sh	19 May 2004 18:33:42 -0000
 @@ -391,6 +391,7 @@
  # "debugger"
  #set -x
@@ -3543,7 +3527,7 @@ diff -u -d -r1.1.1.14 sanity.sh
  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'
-@@ -11289,10 +11290,12 @@
+@@ -10846,10 +10847,12 @@
  	  ############################################################
  	  # Check out the whole repository
  	  mkdir 1; cd 1
@@ -3557,7 +3541,7 @@ diff -u -d -r1.1.1.14 sanity.sh
  U CVSROOT/loginfo
  U CVSROOT/modules
  U CVSROOT/notify
-@@ -11312,10 +11315,12 @@
+@@ -10867,10 +10870,12 @@
  	  ############################################################
  	  # Check out CVSROOT
  	  mkdir 1; cd 1
@@ -3571,7 +3555,7 @@ diff -u -d -r1.1.1.14 sanity.sh
  U CVSROOT/loginfo
  U CVSROOT/modules
  U CVSROOT/notify
-@@ -11338,10 +11343,12 @@
+@@ -10891,10 +10896,12 @@
  	  mkdir 1; cd 1
  	  dotest modules-3 "${testcvs} -q co somedir" ''
  	  cd somedir
@@ -3585,7 +3569,7 @@ diff -u -d -r1.1.1.14 sanity.sh
  U CVSROOT/loginfo
  U CVSROOT/modules
  U CVSROOT/notify
-@@ -23164,7 +23171,7 @@
+@@ -22061,7 +22068,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.
@@ -3597,10 +3581,10 @@ diff -u -d -r1.1.1.14 sanity.sh
 Index: src/server.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/server.c,v
-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
+retrieving revision 1.1.1.16
+diff -u -d -r1.1.1.16 server.c
+--- src/server.c	18 May 2004 14:21:53 -0000	1.1.1.16
++++ src/server.c	19 May 2004 18:41:07 -0000
 @@ -112,6 +112,16 @@
  
  # endif /* AUTH_SERVER_SUPPORT */
@@ -3632,17 +3616,17 @@ diff -u -d -r1.1.1.15 server.c
      if (!isabsolute (arg))
      {
  	if (alloc_pending (80 + strlen (arg)))
-@@ -1117,6 +1134,9 @@
-     TRACE( TRACE_FUNCTION, "serve_directory (%s)", arg ? arg : "(null)" );
+@@ -1121,6 +1138,9 @@
+     TRACE (TRACE_FUNCTION, "serve_directory (%s)", arg ? arg : "(null)");
  
-     status = buf_read_line (buf_from_net, &repos, (int *) NULL);
+     status = buf_read_line (buf_from_net, &repos, NULL);
 +#ifdef RSE_PATCH_MAPROOT
 +    root_map_it(repos, &repos, 1);
 +#endif
      if (status == 0)
      {
  	if (!outside_root (repos))
-@@ -3871,6 +3891,17 @@
+@@ -3958,6 +3978,17 @@
  }
  
  /* See server.h for description.  */
@@ -3660,7 +3644,7 @@ diff -u -d -r1.1.1.15 server.c
  
  void
  server_modtime (struct file_info *finfo, Vers_TS *vers_ts)
-@@ -4617,6 +4648,9 @@
+@@ -4704,6 +4735,9 @@
    REQ_LINE("expand-modules", serve_expand_modules, 0),
    REQ_LINE("ci", serve_ci, RQ_ESSENTIAL),
    REQ_LINE("co", serve_co, RQ_ESSENTIAL),
@@ -3670,7 +3654,7 @@ diff -u -d -r1.1.1.15 server.c
    REQ_LINE("update", serve_update, RQ_ESSENTIAL),
    REQ_LINE("diff", serve_diff, 0),
    REQ_LINE("log", serve_log, 0),
-@@ -5300,8 +5334,13 @@
+@@ -5403,8 +5437,13 @@
      {
  	char *env;
  
@@ -3684,7 +3668,7 @@ diff -u -d -r1.1.1.15 server.c
  	(void) putenv (env);
  
  	env = xmalloc (sizeof "USER=" + strlen (username));
-@@ -5837,6 +5876,10 @@
+@@ -5940,6 +5979,10 @@
  	|| !strip_trailing_newlines (password))
  	error (1, 0, "Maximum line length exceeded during authentication.");
  
@@ -3695,7 +3679,7 @@ diff -u -d -r1.1.1.15 server.c
      /* ... and make sure the protocol ends on the right foot. */
      /* See above comment about error handling.  */
      getnline( &tmp, &tmp_allocated, PATH_MAX, stdin );
-@@ -6566,3 +6609,517 @@
+@@ -6669,3 +6712,517 @@
  	    cvs_output (text, 0);
      }
  }
@@ -4216,11 +4200,11 @@ diff -u -d -r1.1.1.15 server.c
 Index: src/subr.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/subr.c,v
-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 @@
+retrieving revision 1.1.1.13
+diff -u -d -r1.1.1.13 subr.c
+--- src/subr.c	13 May 2004 14:11:22 -0000	1.1.1.13
++++ src/subr.c	19 May 2004 18:33:43 -0000
+@@ -235,6 +235,22 @@
      uid_t uid;
  #endif
  
@@ -4243,7 +4227,7 @@ diff -u -d -r1.1.1.12 subr.c
      /* If there is a CVS username, return it.  */
  #ifdef AUTH_SERVER_SUPPORT
      if (CVS_Username != NULL)
-@@ -764,6 +780,73 @@
+@@ -763,6 +779,73 @@
      return backup_name;
  }
  
@@ -4320,11 +4304,11 @@ diff -u -d -r1.1.1.12 subr.c
 Index: src/update.c
 ===================================================================
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/update.c,v
-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 @@
+retrieving revision 1.1.1.14
+diff -u -d -r1.1.1.14 update.c
+--- src/update.c	8 May 2004 23:13:10 -0000	1.1.1.14
++++ src/update.c	19 May 2004 18:33:43 -0000
+@@ -1747,6 +1747,17 @@
  	       patch can't handle that.  */
  	    fail = 1;
  	}
@@ -4342,7 +4326,7 @@ diff -u -d -r1.1.1.13 update.c
  	fclose (e);
      }
  
-@@ -2546,8 +2557,16 @@
+@@ -2555,8 +2566,16 @@
  	write_letter (finfo, 'C');
      }
      else

cvs/cvs.spec

@@ -24,7 +24,7 @@
 ##
 
 #   the involved versions
-%define       V_cvs       1.12.7
+%define       V_cvs       1.12.8
 %define       V_cvslock   0.2
 
 #   package information
@@ -38,7 +38,7 @@ Class:        CORE
 Group:        SCM
 License:      GPL
 Version:      %{V_cvs}
-Release:      20040414
+Release:      20040519
 
 #   package options
 %option       with_fsl         yes