upgrade patches

cvs/cvs.patches.rse

@@ -1,9 +1,9 @@
 Index: src/README.RSE
 ===================================================================
-RCS file: README.RSE
-diff -N README.RSE
---- /dev/null	Sat Feb 16 13:36:21 2002
-+++ src/README.RSE	Sat Feb 16 13:35:28 2002
+RCS file: src/README.RSE
+diff -N src/README.RSE
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ src/README.RSE	16 Feb 2002 12:35:28 -0000
 @@ -0,0 +1,353 @@
 +
 +  CVS RSE Patches
@@ -363,8 +363,8 @@ Index: src/add.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/add.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 add.c
---- src/add.c	2001/04/19 19:45:31	1.1.1.4
-+++ src/add.c	2002/02/16 12:36:09
+--- src/add.c	19 Apr 2001 19:45:31 -0000	1.1.1.4
++++ src/add.c	16 Feb 2002 12:36:09 -0000
 @@ -798,6 +798,9 @@
  	li->type = T_TITLE;
  	li->tag = xstrdup (tag);
@@ -380,8 +380,8 @@ Index: src/admin.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/admin.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 admin.c
---- src/admin.c	2001/04/24 18:14:53	1.1.1.4
-+++ src/admin.c	2002/02/16 12:36:09
+--- src/admin.c	24 Apr 2001 18:14:53 -0000	1.1.1.4
++++ src/admin.c	16 Feb 2002 12:36:09 -0000
 @@ -139,6 +139,161 @@
      dat->av[dat->ac++] = newelt;
  }
@@ -570,8 +570,8 @@ Index: src/checkin.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/checkin.c,v
 retrieving revision 1.1.1.1
 diff -u -d -u -3 -r1.1.1.1 checkin.c
---- src/checkin.c	1998/02/22 19:46:46	1.1.1.1
-+++ src/checkin.c	2002/02/16 12:36:09
+--- src/checkin.c	22 Feb 1998 19:46:46 -0000	1.1.1.1
++++ src/checkin.c	16 Feb 2002 12:36:09 -0000
 @@ -32,14 +32,27 @@
      Vers_TS *vers;
      int set_time;
@@ -637,8 +637,8 @@ Index: src/checkout.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/checkout.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 checkout.c
---- src/checkout.c	2001/04/24 18:14:53	1.1.1.4
-+++ src/checkout.c	2002/02/16 12:36:09
+--- src/checkout.c	24 Apr 2001 18:14:53 -0000	1.1.1.4
++++ src/checkout.c	16 Feb 2002 12:36:09 -0000
 @@ -179,7 +179,11 @@
  	    case 'p':
  		pipeout = 1;
@@ -656,8 +656,8 @@ Index: src/client.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/client.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 client.c
---- src/client.c	2001/04/24 18:14:53	1.1.1.4
-+++ src/client.c	2002/02/16 12:36:09
+--- src/client.c	24 Apr 2001 18:14:53 -0000	1.1.1.4
++++ src/client.c	16 Feb 2002 12:36:09 -0000
 @@ -105,6 +105,9 @@
  int status PROTO((int argc, char **argv));
  int tag PROTO((int argc, char **argv));
@@ -737,8 +737,8 @@ Index: src/commit.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/commit.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 commit.c
---- src/commit.c	2001/04/24 18:14:53	1.1.1.4
-+++ src/commit.c	2002/02/16 12:36:09
+--- src/commit.c	24 Apr 2001 18:14:53 -0000	1.1.1.4
++++ src/commit.c	16 Feb 2002 12:36:09 -0000
 @@ -296,6 +296,9 @@
      data->type = status;
      data->tag = xstrdup (vers->tag);
@@ -818,8 +818,8 @@ Index: src/create_adm.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/create_adm.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 create_adm.c
---- src/create_adm.c	2001/04/19 19:45:32	1.1.1.4
-+++ src/create_adm.c	2002/02/16 12:36:09
+--- src/create_adm.c	19 Apr 2001 19:45:32 -0000	1.1.1.4
++++ src/create_adm.c	16 Feb 2002 14:00:14 -0000
 @@ -21,6 +21,41 @@
     or after which CVS might do something non-useful.  If WARN is zero, then
     don't print warnings; all errors are fatal then.  */
@@ -851,7 +851,7 @@ diff -u -d -u -3 -r1.1.1.4 create_adm.c
 +
 +static void local_template(char *update_dir, char *repository)
 +{
-+    cvsroot_t *e;
++    cvsroot_type *e;
 +
 +    if ((e = cvsroot_lookup(NULL, NULL, current_parsed_root->original)) != NULL)
 +        Parse_Info(CVSROOTADM_RCSINFO, repository, local_template_cb, 1);
@@ -888,8 +888,8 @@ Index: src/cvs.h
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/cvs.h,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 cvs.h
---- src/cvs.h	2001/04/24 18:14:53	1.1.1.4
-+++ src/cvs.h	2002/02/16 12:36:21
+--- src/cvs.h	24 Apr 2001 18:14:53 -0000	1.1.1.4
++++ src/cvs.h	16 Feb 2002 12:36:21 -0000
 @@ -187,6 +187,33 @@
  #define CVSROOTADM_WRITERS	"writers"
  #define CVSROOTADM_PASSWD	"passwd"
@@ -1045,8 +1045,8 @@ Index: src/cvsrc.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/cvsrc.c,v
 retrieving revision 1.1.1.2
 diff -u -d -u -3 -r1.1.1.2 cvsrc.c
---- src/cvsrc.c	1998/12/23 15:15:00	1.1.1.2
-+++ src/cvsrc.c	2002/02/16 12:36:09
+--- src/cvsrc.c	23 Dec 1998 15:15:00 -0000	1.1.1.2
++++ src/cvsrc.c	16 Feb 2002 12:36:09 -0000
 @@ -12,6 +12,203 @@
  #include "cvs.h"
  #include "getline.h"
@@ -1359,8 +1359,8 @@ Index: src/diff.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/diff.c,v
 retrieving revision 1.1.1.3
 diff -u -d -u -3 -r1.1.1.3 diff.c
---- src/diff.c	2001/04/24 18:14:53	1.1.1.3
-+++ src/diff.c	2002/02/16 12:36:09
+--- src/diff.c	24 Apr 2001 18:14:53 -0000	1.1.1.3
++++ src/diff.c	16 Feb 2002 12:36:09 -0000
 @@ -77,7 +77,11 @@
      "\t-r rev2\tDiff rev1/date1 against rev2.\n",
      "\t--ifdef=arg\tOutput diffs in ifdef format.\n",
@@ -1472,8 +1472,8 @@ Index: src/hash.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/hash.c,v
 retrieving revision 1.1.1.3
 diff -u -d -u -3 -r1.1.1.3 hash.c
---- src/hash.c	2000/09/19 00:06:35	1.1.1.3
-+++ src/hash.c	2002/02/16 12:36:09
+--- src/hash.c	19 Sep 2000 00:06:35 -0000	1.1.1.3
++++ src/hash.c	16 Feb 2002 12:36:09 -0000
 @@ -25,17 +25,25 @@
      const char *key;
  {
@@ -1505,8 +1505,8 @@ Index: src/history.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/history.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 history.c
---- src/history.c	2001/04/19 19:45:32	1.1.1.4
-+++ src/history.c	2002/02/16 12:36:09
+--- src/history.c	19 Apr 2001 19:45:32 -0000	1.1.1.4
++++ src/history.c	16 Feb 2002 12:36:09 -0000
 @@ -235,6 +235,9 @@
  static char *tz_name = "+0000";
  
@@ -1564,8 +1564,8 @@ Index: src/import.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/import.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 import.c
---- src/import.c	2001/04/19 19:45:32	1.1.1.4
-+++ src/import.c	2002/02/16 12:36:09
+--- src/import.c	19 Apr 2001 19:45:32 -0000	1.1.1.4
++++ src/import.c	16 Feb 2002 12:36:09 -0000
 @@ -57,6 +57,140 @@
      NULL
  };
@@ -1780,10 +1780,10 @@ diff -u -d -u -3 -r1.1.1.4 import.c
  	}
 Index: src/list.c
 ===================================================================
-RCS file: list.c
-diff -N list.c
---- /dev/null	Sat Feb 16 13:36:21 2002
-+++ src/list.c	Sat Feb 16 13:36:09 2002
+RCS file: src/list.c
+diff -N src/list.c
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ src/list.c	16 Feb 2002 12:36:09 -0000
 @@ -0,0 +1,282 @@
 +/* 
 + * Copyright (c) 1998, Dan Rich <drich@employees.com>
@@ -2072,8 +2072,8 @@ Index: src/lock.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/lock.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 lock.c
---- src/lock.c	2001/04/19 19:45:32	1.1.1.4
-+++ src/lock.c	2002/02/16 12:36:09
+--- src/lock.c	19 Apr 2001 19:45:32 -0000	1.1.1.4
++++ src/lock.c	16 Feb 2002 12:36:09 -0000
 @@ -396,7 +396,11 @@
      FILE *fp;
      char *tmp;
@@ -2103,8 +2103,8 @@ Index: src/logmsg.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/logmsg.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 logmsg.c
---- src/logmsg.c	2001/04/24 18:14:53	1.1.1.4
-+++ src/logmsg.c	2002/02/16 12:36:09
+--- src/logmsg.c	24 Apr 2001 18:14:53 -0000	1.1.1.4
++++ src/logmsg.c	16 Feb 2002 12:36:09 -0000
 @@ -387,14 +387,26 @@
     independant of the running of an editor for getting a message.
   */
@@ -2250,8 +2250,8 @@ Index: src/main.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/main.c,v
 retrieving revision 1.1.1.5
 diff -u -d -u -3 -r1.1.1.5 main.c
---- src/main.c	2001/04/27 19:57:23	1.1.1.5
-+++ src/main.c	2002/02/16 12:36:09
+--- src/main.c	27 Apr 2001 19:57:23 -0000	1.1.1.5
++++ src/main.c	16 Feb 2002 12:36:09 -0000
 @@ -41,6 +41,9 @@
  int quiet = 0;
  int trace = 0;
@@ -2765,7 +2765,7 @@ diff -u -d -u -3 -r1.1.1.5 main.c
  #if defined (HAVE_KERBEROS) && defined (SERVER_SUPPORT)
  	/* If we are invoked with a single argument "kserver", then we are
  	   running as Kerberos server as root.  Do the authentication as
-@@ -690,7 +1025,22 @@
+@@ -690,6 +1025,21 @@
  	}
  #endif /* HAVE_KERBEROS */
  
@@ -2776,7 +2776,7 @@ diff -u -d -u -3 -r1.1.1.5 main.c
 +         * i.e., for each connection. But the parent never returns.
 +         */
 +        pserver_daemon(argc, argv);
- 
++
 +        /* 
 +         * switch to regular "cvs server" operation.
 +         */
@@ -2784,10 +2784,9 @@ diff -u -d -u -3 -r1.1.1.5 main.c
 +        command_name = "server";
 +    }
 +#endif
-+
+ 
  #if (defined(AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI)) && defined(SERVER_SUPPORT)
  	if (strcmp (command_name, "pserver") == 0)
- 	{
 @@ -714,6 +1064,11 @@
  	server_active = strcmp (command_name, "server") == 0;
  #endif
@@ -3002,8 +3001,8 @@ Index: src/mkmodules.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/mkmodules.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 mkmodules.c
---- src/mkmodules.c	2001/04/19 19:45:32	1.1.1.4
-+++ src/mkmodules.c	2002/02/16 12:36:09
+--- src/mkmodules.c	19 Apr 2001 19:45:32 -0000	1.1.1.4
++++ src/mkmodules.c	16 Feb 2002 12:36:09 -0000
 @@ -186,6 +186,48 @@
      NULL
  };
@@ -3102,8 +3101,8 @@ Index: src/options.h.in
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/options.h.in,v
 retrieving revision 1.1.1.2
 diff -u -d -u -3 -r1.1.1.2 options.h.in
---- src/options.h.in	1999/01/27 22:58:14	1.1.1.2
-+++ src/options.h.in	2002/02/16 12:36:46
+--- src/options.h.in	27 Jan 1999 22:58:14 -0000	1.1.1.2
++++ src/options.h.in	16 Feb 2002 12:36:46 -0000
 @@ -198,3 +198,48 @@
  #ifndef STDC_HEADERS
  extern void exit ();
@@ -3158,8 +3157,8 @@ Index: src/parseinfo.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/parseinfo.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 parseinfo.c
---- src/parseinfo.c	2001/04/19 19:45:32	1.1.1.4
-+++ src/parseinfo.c	2002/02/16 12:36:09
+--- src/parseinfo.c	19 Apr 2001 19:45:32 -0000	1.1.1.4
++++ src/parseinfo.c	16 Feb 2002 12:36:09 -0000
 @@ -11,6 +11,9 @@
  #include <assert.h>
  
@@ -3241,8 +3240,8 @@ Index: src/rcs.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/rcs.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 rcs.c
---- src/rcs.c	2001/04/24 18:14:53	1.1.1.4
-+++ src/rcs.c	2002/02/16 12:36:09
+--- src/rcs.c	24 Apr 2001 18:14:53 -0000	1.1.1.4
++++ src/rcs.c	16 Feb 2002 12:36:09 -0000
 @@ -114,6 +114,10 @@
  static void rcs_internal_unlockfile PROTO ((FILE *, char *));
  static char *rcs_lockfilename PROTO ((char *));
@@ -3406,8 +3405,8 @@ Index: src/recurse.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/recurse.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 recurse.c
---- src/recurse.c	2001/04/19 19:45:33	1.1.1.4
-+++ src/recurse.c	2002/02/16 12:36:09
+--- src/recurse.c	19 Apr 2001 19:45:33 -0000	1.1.1.4
++++ src/recurse.c	16 Feb 2002 12:36:09 -0000
 @@ -508,7 +508,11 @@
      if (frame->flags == R_SKIP_ALL)
  	return (0);
@@ -3437,8 +3436,8 @@ Index: src/repos.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/repos.c,v
 retrieving revision 1.1.1.3
 diff -u -d -u -3 -r1.1.1.3 repos.c
---- src/repos.c	2001/04/19 19:45:33	1.1.1.3
-+++ src/repos.c	2002/02/16 12:36:09
+--- src/repos.c	19 Apr 2001 19:45:33 -0000	1.1.1.3
++++ src/repos.c	16 Feb 2002 12:36:09 -0000
 @@ -204,3 +204,11 @@
  	repository[len - 2] = '\0';
      }
@@ -3456,8 +3455,8 @@ Index: src/root.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/root.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 root.c
---- src/root.c	2001/04/19 19:45:33	1.1.1.4
-+++ src/root.c	2002/02/16 12:36:09
+--- src/root.c	19 Apr 2001 19:45:33 -0000	1.1.1.4
++++ src/root.c	16 Feb 2002 12:36:09 -0000
 @@ -122,6 +122,9 @@
      /* allocate space to return and fill it in */
      strip_trailing_slashes (root);
@@ -4034,8 +4033,8 @@ Index: src/sanity.sh
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/sanity.sh,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 sanity.sh
---- src/sanity.sh	2001/04/25 22:30:56	1.1.1.4
-+++ src/sanity.sh	2002/02/16 12:36:35
+--- src/sanity.sh	25 Apr 2001 22:30:56 -0000	1.1.1.4
++++ src/sanity.sh	16 Feb 2002 12:36:35 -0000
 @@ -104,6 +104,7 @@
  # "debugger"
  #set -x
@@ -4103,8 +4102,8 @@ Index: src/server.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/server.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 server.c
---- src/server.c	2001/04/19 19:34:04	1.1.1.4
-+++ src/server.c	2002/02/16 12:36:09
+--- src/server.c	19 Apr 2001 19:34:04 -0000	1.1.1.4
++++ src/server.c	16 Feb 2002 12:36:09 -0000
 @@ -117,6 +117,13 @@
  
  # endif /* AUTH_SERVER_SUPPORT */
@@ -4849,15 +4848,15 @@ Index: src/subr.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/subr.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 subr.c
---- src/subr.c	2001/04/19 19:34:04	1.1.1.4
-+++ src/subr.c	2002/02/16 12:36:09
+--- src/subr.c	19 Apr 2001 19:34:04 -0000	1.1.1.4
++++ src/subr.c	16 Feb 2002 13:49:47 -0000
 @@ -336,6 +336,22 @@
      uid_t uid;
  #endif
  
 +#ifdef RSE_PATCH_CVSUSER
 +#ifndef RSE_PATCH_CVSUSER_CALLER
-+#define RSE_PATCH_CVSUSER_CALLER "ossp-cvs"
++#define RSE_PATCH_CVSUSER_CALLER "cvs"
 +#endif
 +    uid = getuid();
 +    if ((pw = (struct passwd *)getpwnam(RSE_PATCH_CVSUSER_CALLER)) != NULL) {
@@ -4953,8 +4952,8 @@ Index: src/tag.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/tag.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 tag.c
---- src/tag.c	2001/04/24 17:04:59	1.1.1.4
-+++ src/tag.c	2002/02/16 12:36:09
+--- src/tag.c	24 Apr 2001 17:04:59 -0000	1.1.1.4
++++ src/tag.c	16 Feb 2002 12:36:09 -0000
 @@ -1229,7 +1229,11 @@
  	/* The tags is valid but not mentioned in val-tags.  Add it.  */
  	datum value;
@@ -4972,8 +4971,8 @@ Index: src/update.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/update.c,v
 retrieving revision 1.1.1.4
 diff -u -d -u -3 -r1.1.1.4 update.c
---- src/update.c	2001/04/24 17:04:59	1.1.1.4
-+++ src/update.c	2002/02/16 12:36:09
+--- src/update.c	24 Apr 2001 17:04:59 -0000	1.1.1.4
++++ src/update.c	16 Feb 2002 12:36:09 -0000
 @@ -203,7 +203,11 @@
  		break;
  	    case 'p':
@@ -5026,8 +5025,8 @@ Index: src/version.c
 RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/version.c,v
 retrieving revision 1.1.1.5
 diff -u -d -u -3 -r1.1.1.5 version.c
---- src/version.c	2001/04/27 20:02:28	1.1.1.5
-+++ src/version.c	2002/02/16 12:38:04
+--- src/version.c	27 Apr 2001 20:02:28 -0000	1.1.1.5
++++ src/version.c	16 Feb 2002 12:38:04 -0000
 @@ -12,7 +12,11 @@
  
  #include "cvs.h"

cvs/cvs.spec

@@ -31,10 +31,10 @@
 #   optional support for applying the RSE patches
 %if "%{?rse_patches:set}" != "set"
 %define       rse_patches no
+%endif
 %if "%{?rse_patch_cvsuser_caller:set}" != "set"
 %define       rse_patch_cvsuser_caller cvs
 %endif
-%endif
 
 #   package information
 Name:         cvs
@@ -89,16 +89,19 @@ AutoReqProv:  no
     %setup0 -q -c
     %setup1 -q -T -D -a 1
 %if "%{rse_patches}" == "yes"
-    ( cd cvs-%{V_cvs} && %{l_prefix}/bin/patch -p0 <%{SOURCE cvs.patches.rse} )
+    ( cd cvs-%{V_cvs} 
+      cat %{SOURCE cvs.patches.rse} |\
+      sed -e 's;\(#define RSE_PATCH_CVSUSER_CALLER "\)cvs\("\);\1%{rse_patch_cvsuser_caller}\2;' |\
+      %{l_prefix}/bin/patch -p0 
+    )
 %endif
 
 %build
     ( cd cvs-%{V_cvs}
       CC="%{l_cc}" \
-%if "%{rse_patches}" == "yes"
-      CFLAGS="%{l_cflags -O} -DRSE_PATCHES -DRSE_PATCH_CVSUSER_CALLER=\"%{rse_patch_cvsuser_caller}\"" \
-%else
       CFLAGS="%{l_cflags -O}" \
+%if "%{rse_patches}" == "yes"
+      CPPFLAGS="-DRSE_PATCHES"
 %endif
       ./configure \
           --prefix=%{l_prefix} \