From c895d262f96f0395f8c0ac4fab1ca2da188f07a3 Mon Sep 17 00:00:00 2001
From: "dmose%mozilla.org"
 <dmose%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 26 Apr 2000 23:59:15 +0000
Subject: [PATCH] added prerequisite cvs patch and modified README to reflect
 this

git-svn-id: svn://10.0.0.236/trunk@67333 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/despot/README         |  4 ++
 mozilla/webtools/despot/cvs_user.patch | 56 ++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 mozilla/webtools/despot/cvs_user.patch

diff --git a/mozilla/webtools/despot/README b/mozilla/webtools/despot/README
index b68c44c31c6..0a62646c44d 100644
--- a/mozilla/webtools/despot/README
+++ b/mozilla/webtools/despot/README
@@ -14,6 +14,10 @@ and the MySQL-related Perl module collection as documented there.
 You'll need a relatively new version of MySQL: 3.20.32a is known not
 work; 3.22.32 is.
 
+You'll also need to build a version of CVS with the patch in
+cvs_user.patch applied.  I found cvs_user.patch in archives on the
+net; unfortunately I didn't keep track of where.
+
 # create a database called mozusers:
 
 mysqladmin -p create mozusers
diff --git a/mozilla/webtools/despot/cvs_user.patch b/mozilla/webtools/despot/cvs_user.patch
new file mode 100644
index 00000000000..f9342b6be87
--- /dev/null
+++ b/mozilla/webtools/despot/cvs_user.patch
@@ -0,0 +1,56 @@
+Index: doc/cvs.texinfo
+===================================================================
+RCS file: /b/cvsroot/misc/cvs/doc/cvs.texinfo,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -r1.1.1.1 -r1.2
+--- cvs.texinfo	1997/12/19 21:24:55	1.1.1.1
++++ cvs.texinfo	1997/12/22 19:43:15	1.2
+@@ -11620,6 +11620,13 @@
+ @item USER
+ Username of the user running @sc{cvs} (on the @sc{cvs}
+ server machine).
++
++@item CVS_USER
++This is set to the username provided by the user when
++the pserver or kserver access methods are used, and to
++the empty string otherwise.  (CVS_USER and USER may
++differ when @file{$CVSROOT/CVSROOT/passwd} is used to
++map cvs usernames to system usernames.)
+ @end table
+ 
+ If you want to pass a value to the administrative files
+Index: src/server.c
+===================================================================
+RCS file: /b/cvsroot/misc/cvs/src/server.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -r1.1.1.1 -r1.2
+--- server.c	1997/12/19 21:24:53	1.1.1.1
++++ server.c	1997/12/22 19:43:18	1.2
+@@ -4384,10 +4384,10 @@
+     umask (0);
+ 
+ #if HAVE_PUTENV
+-    /* Set LOGNAME and USER in the environment, in case they are
+-       already set to something else.  */
++    /* Set LOGNAME, USER and CVS_USER in the environment, in case they
++       are already set to something else.  */
+     {
+-	char *env;
++	char *env, *cvs_user;
+ 
+ 	env = xmalloc (sizeof "LOGNAME=" + strlen (username));
+ 	(void) sprintf (env, "LOGNAME=%s", username);
+@@ -4396,6 +4396,11 @@
+ 	env = xmalloc (sizeof "USER=" + strlen (username));
+ 	(void) sprintf (env, "USER=%s", username);
+ 	(void) putenv (env);
++
++        cvs_user = NULL != CVS_Username ? CVS_Username : "";
++        env = xmalloc (sizeof "CVS_USER=" + strlen (cvs_user));
++        (void) sprintf (env, "CVS_USER=%s", cvs_user);
++        (void) putenv (env);
+     }
+ #endif /* HAVE_PUTENV */
+ }