|
|
@@ -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.8
|
|
|
-diff -u -d -r1.1.1.8 add.c
|
|
|
---- src/add.c 4 Oct 2003 21:12:44 -0000 1.1.1.8
|
|
|
-+++ src/add.c 27 Oct 2003 19:07:22 -0000
|
|
|
-@@ -797,6 +797,9 @@
|
|
|
+retrieving revision 1.1.1.9
|
|
|
+diff -u -d -r1.1.1.9 add.c
|
|
|
+--- src/add.c 25 Nov 2003 20:51:25 -0000 1.1.1.9
|
|
|
++++ src/add.c 5 Dec 2003 20:22:14 -0000
|
|
|
+@@ -740,6 +740,9 @@
|
|
|
li->type = T_TITLE;
|
|
|
li->tag = xstrdup (tag);
|
|
|
li->rev_old = li->rev_new = NULL;
|
|
|
@@ -500,11 +500,10 @@ diff -u -d -r1.1.1.10 admin.c
|
|
|
int
|
|
|
admin (int argc, char **argv)
|
|
|
{
|
|
|
-@@ -512,6 +666,20 @@
|
|
|
- #endif /* CLIENT_SUPPORT */
|
|
|
+@@ -513,6 +667,20 @@
|
|
|
|
|
|
lock_tree_for_write (argc, argv, 0, W_LOCAL, 0);
|
|
|
-+
|
|
|
+
|
|
|
+#ifdef RSE_PATCH_ADMININFO
|
|
|
+ /* allow `CVSROOT/CVSROOT/admininfo' filters to check whether the
|
|
|
+ `cvs admin' operation is authorized for all the specified files
|
|
|
@@ -518,9 +517,10 @@ diff -u -d -r1.1.1.10 admin.c
|
|
|
+ error(1, 0, "correct above errors first!");
|
|
|
+ }
|
|
|
+#endif
|
|
|
-
|
|
|
++
|
|
|
err = start_recursion
|
|
|
( admin_fileproc, (FILESDONEPROC) NULL, admin_dirproc,
|
|
|
+ (DIRLEAVEPROC) NULL, (void *) &admin_data,
|
|
|
Index: src/buffer.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/buffer.c,v
|
|
|
@@ -595,11 +595,10 @@ diff -u -d -r1.1.1.3 checkin.c
|
|
|
{
|
|
|
case 0: /* everything normal */
|
|
|
|
|
|
-@@ -121,6 +145,16 @@
|
|
|
- vers->options, vers->tag, vers->date, (char *) 0);
|
|
|
+@@ -122,6 +146,16 @@
|
|
|
history_write (type, NULL, vers->vn_rcs,
|
|
|
finfo->file, finfo->repository);
|
|
|
-+
|
|
|
+
|
|
|
+#ifdef RSE_PATCH_ADDFILEATTR
|
|
|
+ if (type == 'A') {
|
|
|
+ char *attr;
|
|
|
@@ -609,16 +608,17 @@ diff -u -d -r1.1.1.3 checkin.c
|
|
|
+ }
|
|
|
+ }
|
|
|
+#endif
|
|
|
-
|
|
|
++
|
|
|
if (tocvsPath)
|
|
|
if (unlink_file_dir (tocvsPath) < 0)
|
|
|
+ error (0, errno, "cannot remove %s", tocvsPath);
|
|
|
Index: src/client.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/client.c,v
|
|
|
-retrieving revision 1.1.1.11
|
|
|
-diff -u -d -r1.1.1.11 client.c
|
|
|
---- src/client.c 4 Oct 2003 21:13:04 -0000 1.1.1.11
|
|
|
-+++ src/client.c 27 Oct 2003 19:08:04 -0000
|
|
|
+retrieving revision 1.1.1.12
|
|
|
+diff -u -d -r1.1.1.12 client.c
|
|
|
+--- src/client.c 25 Nov 2003 20:51:59 -0000 1.1.1.12
|
|
|
++++ src/client.c 5 Dec 2003 20:22:14 -0000
|
|
|
@@ -53,6 +53,9 @@
|
|
|
int status (int argc, char **argv);
|
|
|
int tag (int argc, char **argv);
|
|
|
@@ -677,11 +677,11 @@ diff -u -d -r1.1.1.11 client.c
|
|
|
Index: src/commit.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/commit.c,v
|
|
|
-retrieving revision 1.1.1.11
|
|
|
-diff -u -d -r1.1.1.11 commit.c
|
|
|
---- src/commit.c 21 Oct 2003 21:04:04 -0000 1.1.1.11
|
|
|
-+++ src/commit.c 27 Oct 2003 19:07:23 -0000
|
|
|
-@@ -276,6 +276,9 @@
|
|
|
+retrieving revision 1.1.1.12
|
|
|
+diff -u -d -r1.1.1.12 commit.c
|
|
|
+--- src/commit.c 25 Nov 2003 20:39:42 -0000 1.1.1.12
|
|
|
++++ src/commit.c 5 Dec 2003 20:22:14 -0000
|
|
|
+@@ -291,6 +291,9 @@
|
|
|
data->type = status;
|
|
|
data->tag = xstrdup (vers->tag);
|
|
|
data->rev_old = data->rev_new = NULL;
|
|
|
@@ -691,7 +691,7 @@ diff -u -d -r1.1.1.11 commit.c
|
|
|
|
|
|
node->type = UPDATE;
|
|
|
node->delproc = update_delproc;
|
|
|
-@@ -941,7 +944,16 @@
|
|
|
+@@ -967,7 +970,16 @@
|
|
|
xmalloc (sizeof (struct logfile_info)));
|
|
|
li->type = status;
|
|
|
li->tag = xstrdup (vers->tag);
|
|
|
@@ -708,7 +708,7 @@ diff -u -d -r1.1.1.11 commit.c
|
|
|
li->rev_new = NULL;
|
|
|
p->data = (char *) li;
|
|
|
(void) addnode (ulist, p);
|
|
|
-@@ -2161,6 +2173,10 @@
|
|
|
+@@ -2187,6 +2199,10 @@
|
|
|
free (li->rev_old);
|
|
|
if (li->rev_new)
|
|
|
free (li->rev_new);
|
|
|
@@ -792,10 +792,10 @@ diff -u -d -r1.1.1.7 create_adm.c
|
|
|
Index: src/cvs.h
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/cvs.h,v
|
|
|
-retrieving revision 1.1.1.10
|
|
|
-diff -u -d -r1.1.1.10 cvs.h
|
|
|
---- src/cvs.h 9 Oct 2003 16:26:45 -0000 1.1.1.10
|
|
|
-+++ src/cvs.h 27 Oct 2003 19:19:42 -0000
|
|
|
+retrieving revision 1.1.1.11
|
|
|
+diff -u -d -r1.1.1.11 cvs.h
|
|
|
+--- src/cvs.h 25 Nov 2003 20:52:08 -0000 1.1.1.11
|
|
|
++++ src/cvs.h 5 Dec 2003 20:22:14 -0000
|
|
|
@@ -7,6 +7,45 @@
|
|
|
*/
|
|
|
|
|
|
@@ -904,9 +904,9 @@ diff -u -d -r1.1.1.10 cvs.h
|
|
|
char *gca (const char *rev1, const char *rev2);
|
|
|
void check_numeric (const char *, int, char **);
|
|
|
char *getcaller (void);
|
|
|
-@@ -559,6 +646,10 @@
|
|
|
- char *locate_file_in_dir (const char *dir, const char *file );
|
|
|
- #endif /* SERVER_SUPPORT && !FILENAMES_CASE_INSENSITIVE */
|
|
|
+@@ -556,6 +643,10 @@
|
|
|
+ void expand_wild (int argc, char **argv,
|
|
|
+ int *pargc, char ***pargv);
|
|
|
|
|
|
+#ifdef RSE_PATCH_HANDLE
|
|
|
+int handle2dates(char *, time_t *, time_t *);
|
|
|
@@ -915,7 +915,7 @@ diff -u -d -r1.1.1.10 cvs.h
|
|
|
#ifdef SERVER_SUPPORT
|
|
|
int cvs_casecmp (const char *, const char *);
|
|
|
int fopen_case (char *, char *, FILE **, char **);
|
|
|
-@@ -806,6 +897,9 @@
|
|
|
+@@ -803,6 +894,9 @@
|
|
|
NULL for add or import */
|
|
|
char *rev_new; /* rev number after a commit/modify,
|
|
|
add, or import, NULL for remove */
|
|
|
@@ -925,7 +925,7 @@ diff -u -d -r1.1.1.10 cvs.h
|
|
|
};
|
|
|
|
|
|
/* Wrappers. */
|
|
|
-@@ -845,6 +939,13 @@
|
|
|
+@@ -842,6 +936,13 @@
|
|
|
int unedit (int argc, char **argv);
|
|
|
int editors (int argc, char **argv);
|
|
|
int watchers (int argc, char **argv);
|
|
|
@@ -939,7 +939,7 @@ diff -u -d -r1.1.1.10 cvs.h
|
|
|
int annotate (int argc, char **argv);
|
|
|
int add (int argc, char **argv);
|
|
|
int admin (int argc, char **argv);
|
|
|
-@@ -874,6 +975,9 @@
|
|
|
+@@ -871,6 +972,9 @@
|
|
|
int cvsstatus (int argc, char **argv);
|
|
|
int cvstag (int argc, char **argv);
|
|
|
int version (int argc, char **argv);
|
|
|
@@ -1263,10 +1263,10 @@ diff -u -d -r1.1.1.4 cvsrc.c
|
|
|
Index: src/diff.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/diff.c,v
|
|
|
-retrieving revision 1.1.1.9
|
|
|
-diff -u -d -r1.1.1.9 diff.c
|
|
|
---- src/diff.c 29 Sep 2003 18:43:19 -0000 1.1.1.9
|
|
|
-+++ src/diff.c 27 Oct 2003 19:07:23 -0000
|
|
|
+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 @@
|
|
|
static char *diff_date1, *diff_date2;
|
|
|
static char *use_rev1, *use_rev2;
|
|
|
@@ -1416,28 +1416,28 @@ diff -u -d -r1.1.1.9 diff.c
|
|
|
free (head);
|
|
|
@@ -822,7 +902,11 @@
|
|
|
if (diff_rev1 && strcmp (diff_rev1, TAG_HEAD) == 0)
|
|
|
- use_rev1 = ((vers->vn_rcs == NULL || vers->srcfile == NULL)
|
|
|
- ? NULL
|
|
|
+ {
|
|
|
+ if (vers->vn_rcs != NULL && vers->srcfile != NULL)
|
|
|
+#ifdef RSE_PATCH_DIFFHEAD
|
|
|
-+ : RCS_head (vers->srcfile));
|
|
|
++ use_rev1 = RCS_head (vers->srcfile);
|
|
|
+#else
|
|
|
- : RCS_branch_head (vers->srcfile, vers->vn_rcs));
|
|
|
+ use_rev1 = RCS_branch_head (vers->srcfile, vers->vn_rcs);
|
|
|
+#endif
|
|
|
+ }
|
|
|
else
|
|
|
{
|
|
|
- xvers = Version_TS (finfo, NULL, diff_rev1, diff_date1, 1, 0);
|
|
|
-@@ -837,7 +921,11 @@
|
|
|
+@@ -838,7 +922,11 @@
|
|
|
if (diff_rev2 && strcmp (diff_rev2, TAG_HEAD) == 0)
|
|
|
- use_rev2 = ((vers->vn_rcs == NULL || vers->srcfile == NULL)
|
|
|
- ? NULL
|
|
|
+ {
|
|
|
+ if (vers->vn_rcs != NULL && vers->srcfile != NULL)
|
|
|
+#ifdef RSE_PATCH_DIFFHEAD
|
|
|
-+ : RCS_head (vers->srcfile));
|
|
|
++ use_rev2 = RCS_head (vers->srcfile);
|
|
|
+#else
|
|
|
- : RCS_branch_head (vers->srcfile, vers->vn_rcs));
|
|
|
+ use_rev2 = RCS_branch_head (vers->srcfile, vers->vn_rcs);
|
|
|
+#endif
|
|
|
+ }
|
|
|
else
|
|
|
{
|
|
|
- xvers = Version_TS (finfo, NULL, diff_rev2, diff_date2, 1, 0);
|
|
|
Index: src/hash.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/hash.c,v
|
|
|
@@ -2068,10 +2068,10 @@ diff -u -d -r1.1.1.8 logmsg.c
|
|
|
Index: src/main.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/main.c,v
|
|
|
-retrieving revision 1.1.1.10
|
|
|
-diff -u -d -r1.1.1.10 main.c
|
|
|
---- src/main.c 8 Oct 2003 15:47:32 -0000 1.1.1.10
|
|
|
-+++ src/main.c 27 Oct 2003 19:51:02 -0000
|
|
|
+retrieving revision 1.1.1.11
|
|
|
+diff -u -d -r1.1.1.11 main.c
|
|
|
+--- src/main.c 25 Nov 2003 16:11:47 -0000 1.1.1.11
|
|
|
++++ src/main.c 5 Dec 2003 20:22:15 -0000
|
|
|
@@ -51,6 +51,11 @@
|
|
|
|
|
|
mode_t cvsumask = UMASK_DFLT;
|
|
|
@@ -2364,7 +2364,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
case 'Q':
|
|
|
really_quiet = 1;
|
|
|
/* FALL THROUGH */
|
|
|
-@@ -606,10 +780,34 @@
|
|
|
+@@ -605,10 +779,34 @@
|
|
|
case 'd':
|
|
|
if (CVSroot_cmdline != NULL)
|
|
|
free (CVSroot_cmdline);
|
|
|
@@ -2399,7 +2399,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
free_CVSroot = 0;
|
|
|
}
|
|
|
CVSroot = CVSroot_cmdline;
|
|
|
-@@ -658,6 +856,28 @@
|
|
|
+@@ -657,6 +855,28 @@
|
|
|
We will issue an error later if stream
|
|
|
authentication is not supported. */
|
|
|
break;
|
|
|
@@ -2428,7 +2428,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
case '?':
|
|
|
default:
|
|
|
usage (usg);
|
|
|
-@@ -675,6 +895,28 @@
|
|
|
+@@ -674,6 +894,28 @@
|
|
|
Using this option to access a repository which some users write to may\n\
|
|
|
cause intermittent sandbox corruption.");
|
|
|
}
|
|
|
@@ -2457,7 +2457,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
|
|
|
/* Look up the command name. */
|
|
|
|
|
|
-@@ -697,6 +939,10 @@
|
|
|
+@@ -696,6 +938,10 @@
|
|
|
else
|
|
|
command_name = cm->fullname; /* Global pointer for later use */
|
|
|
|
|
|
@@ -2468,7 +2468,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
if (help)
|
|
|
{
|
|
|
argc = -1; /* some functions only check for this */
|
|
|
-@@ -724,6 +970,71 @@
|
|
|
+@@ -723,6 +969,71 @@
|
|
|
CVSUMASK_ENV, cp);
|
|
|
}
|
|
|
|
|
|
@@ -2540,7 +2540,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
#ifdef SERVER_SUPPORT
|
|
|
|
|
|
# ifdef HAVE_KERBEROS
|
|
|
-@@ -740,6 +1051,21 @@
|
|
|
+@@ -739,6 +1050,21 @@
|
|
|
}
|
|
|
# endif /* HAVE_KERBEROS */
|
|
|
|
|
|
@@ -2562,7 +2562,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
|
|
|
# if defined (AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI)
|
|
|
if (strcmp (command_name, "pserver") == 0)
|
|
|
-@@ -764,6 +1090,10 @@
|
|
|
+@@ -763,6 +1089,10 @@
|
|
|
|
|
|
#endif /* SERVER_SUPPORT */
|
|
|
|
|
|
@@ -2573,7 +2573,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
|
|
|
#ifdef SERVER_SUPPORT
|
|
|
if (server_active)
|
|
|
-@@ -826,8 +1156,12 @@
|
|
|
+@@ -825,8 +1155,12 @@
|
|
|
in server mode, since the client will send the repository
|
|
|
directory after the connection is made. */
|
|
|
|
|
|
@@ -2586,7 +2586,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
{
|
|
|
char *CVSADM_Root;
|
|
|
|
|
|
-@@ -883,6 +1217,54 @@
|
|
|
+@@ -882,6 +1216,54 @@
|
|
|
error (1, 0,
|
|
|
"CVS/Root file (if any).");
|
|
|
}
|
|
|
@@ -2641,7 +2641,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
}
|
|
|
|
|
|
/* Here begins the big loop over unique cvsroot values. We
|
|
|
-@@ -915,6 +1297,9 @@
|
|
|
+@@ -914,6 +1296,9 @@
|
|
|
end of things. */
|
|
|
|
|
|
while (
|
|
|
@@ -2651,7 +2651,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
#ifdef SERVER_SUPPORT
|
|
|
server_active ||
|
|
|
#endif
|
|
|
-@@ -926,8 +1311,12 @@
|
|
|
+@@ -925,8 +1310,12 @@
|
|
|
in server mode, since the client will send the repository
|
|
|
directory after the connection is made. */
|
|
|
|
|
|
@@ -2757,7 +2757,7 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
|
|
|
/* Mark this root directory as done. When the server is
|
|
|
active, current_root will be NULL -- don't try and
|
|
|
-@@ -1060,11 +1505,20 @@
|
|
|
+@@ -1060,12 +1505,21 @@
|
|
|
dellist (&root_directories);
|
|
|
#endif
|
|
|
|
|
|
@@ -2770,14 +2770,15 @@ diff -u -d -r1.1.1.10 main.c
|
|
|
break;
|
|
|
#endif
|
|
|
} /* end of loop for cvsroot values */
|
|
|
-+
|
|
|
+
|
|
|
+#ifdef RSE_PATCH_CVSROOT
|
|
|
+ if (cvsroot_sync != NULL)
|
|
|
+ cvsroot_synchronize(cvsroot_sync, 0);
|
|
|
+#endif
|
|
|
-
|
|
|
++
|
|
|
} /* end of stuff that gets done if the user DOESN'T ask for help */
|
|
|
|
|
|
+ if (free_CVSroot)
|
|
|
Index: src/mkmodules.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/mkmodules.c,v
|
|
|
@@ -2946,10 +2947,10 @@ diff -u -d -r1.1.1.9 parseinfo.c
|
|
|
Index: src/repos.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/repos.c,v
|
|
|
-retrieving revision 1.1.1.6
|
|
|
-diff -u -d -r1.1.1.6 repos.c
|
|
|
---- src/repos.c 24 Oct 2003 20:34:26 -0000 1.1.1.6
|
|
|
-+++ src/repos.c 27 Oct 2003 19:07:25 -0000
|
|
|
+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 @@
|
|
|
repository[len - 2] = '\0';
|
|
|
}
|
|
|
@@ -2965,10 +2966,10 @@ diff -u -d -r1.1.1.6 repos.c
|
|
|
Index: src/root.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/root.c,v
|
|
|
-retrieving revision 1.1.1.9
|
|
|
-diff -u -d -r1.1.1.9 root.c
|
|
|
---- src/root.c 4 Oct 2003 21:09:59 -0000 1.1.1.9
|
|
|
-+++ src/root.c 27 Oct 2003 19:07:25 -0000
|
|
|
+retrieving revision 1.1.1.10
|
|
|
+diff -u -d -r1.1.1.10 root.c
|
|
|
+--- src/root.c 25 Nov 2003 16:11:50 -0000 1.1.1.10
|
|
|
++++ src/root.c 5 Dec 2003 20:22:15 -0000
|
|
|
@@ -125,6 +125,9 @@
|
|
|
/* allocate space to return and fill it in */
|
|
|
strip_trailing_slashes (root);
|
|
|
@@ -3066,7 +3067,7 @@ diff -u -d -r1.1.1.9 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
|
|
|
-@@ -812,5 +894,473 @@
|
|
|
+@@ -814,5 +896,473 @@
|
|
|
/* NOTREACHED */
|
|
|
}
|
|
|
#endif
|
|
|
@@ -3543,11 +3544,11 @@ diff -u -d -r1.1.1.9 root.c
|
|
|
Index: src/sanity.sh
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/sanity.sh,v
|
|
|
-retrieving revision 1.1.1.9
|
|
|
-diff -u -d -r1.1.1.9 sanity.sh
|
|
|
---- src/sanity.sh 26 Oct 2003 22:25:19 -0000 1.1.1.9
|
|
|
-+++ src/sanity.sh 27 Oct 2003 19:21:04 -0000
|
|
|
-@@ -322,6 +322,7 @@
|
|
|
+retrieving revision 1.1.1.10
|
|
|
+diff -u -d -r1.1.1.10 sanity.sh
|
|
|
+--- src/sanity.sh 3 Dec 2003 23:14:32 -0000 1.1.1.10
|
|
|
++++ src/sanity.sh 5 Dec 2003 20:22:18 -0000
|
|
|
+@@ -391,6 +391,7 @@
|
|
|
# "debugger"
|
|
|
#set -x
|
|
|
|
|
|
@@ -3555,7 +3556,7 @@ diff -u -d -r1.1.1.9 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'
|
|
|
-@@ -10529,10 +10530,12 @@
|
|
|
+@@ -10803,10 +10804,12 @@
|
|
|
############################################################
|
|
|
# Check out the whole repository
|
|
|
mkdir 1; cd 1
|
|
|
@@ -3569,7 +3570,7 @@ diff -u -d -r1.1.1.9 sanity.sh
|
|
|
U CVSROOT/loginfo
|
|
|
U CVSROOT/modules
|
|
|
U CVSROOT/notify
|
|
|
-@@ -10552,10 +10555,12 @@
|
|
|
+@@ -10826,10 +10829,12 @@
|
|
|
############################################################
|
|
|
# Check out CVSROOT
|
|
|
mkdir 1; cd 1
|
|
|
@@ -3583,7 +3584,7 @@ diff -u -d -r1.1.1.9 sanity.sh
|
|
|
U CVSROOT/loginfo
|
|
|
U CVSROOT/modules
|
|
|
U CVSROOT/notify
|
|
|
-@@ -10578,10 +10583,12 @@
|
|
|
+@@ -10852,10 +10857,12 @@
|
|
|
mkdir 1; cd 1
|
|
|
dotest modules-3 "${testcvs} -q co somedir" ''
|
|
|
cd somedir
|
|
|
@@ -3597,7 +3598,7 @@ diff -u -d -r1.1.1.9 sanity.sh
|
|
|
U CVSROOT/loginfo
|
|
|
U CVSROOT/modules
|
|
|
U CVSROOT/notify
|
|
|
-@@ -21430,7 +21437,7 @@
|
|
|
+@@ -21840,7 +21847,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.
|
|
|
@@ -3609,10 +3610,10 @@ diff -u -d -r1.1.1.9 sanity.sh
|
|
|
Index: src/server.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/server.c,v
|
|
|
-retrieving revision 1.1.1.10
|
|
|
-diff -u -d -r1.1.1.10 server.c
|
|
|
---- src/server.c 14 Oct 2003 16:55:56 -0000 1.1.1.10
|
|
|
-+++ src/server.c 27 Oct 2003 19:33:24 -0000
|
|
|
+retrieving revision 1.1.1.11
|
|
|
+diff -u -d -r1.1.1.11 server.c
|
|
|
+--- src/server.c 25 Nov 2003 16:12:03 -0000 1.1.1.11
|
|
|
++++ src/server.c 5 Dec 2003 20:22:20 -0000
|
|
|
@@ -112,6 +112,16 @@
|
|
|
|
|
|
# endif /* AUTH_SERVER_SUPPORT */
|
|
|
@@ -3644,8 +3645,8 @@ diff -u -d -r1.1.1.10 server.c
|
|
|
if (!isabsolute (arg))
|
|
|
{
|
|
|
if (alloc_pending (80 + strlen (arg)))
|
|
|
-@@ -1114,6 +1131,9 @@
|
|
|
- TRACE( TRACE_FUNCTION, "serve_directory (%s)", arg );
|
|
|
+@@ -1116,6 +1133,9 @@
|
|
|
+ TRACE( TRACE_FUNCTION, "serve_directory (%s)", arg ? arg : "(null)" );
|
|
|
|
|
|
status = buf_read_line (buf_from_net, &repos, (int *) NULL);
|
|
|
+#ifdef RSE_PATCH_MAPROOT
|
|
|
@@ -3654,7 +3655,7 @@ diff -u -d -r1.1.1.10 server.c
|
|
|
if (status == 0)
|
|
|
{
|
|
|
if (!outside_root (repos))
|
|
|
-@@ -3803,6 +3823,17 @@
|
|
|
+@@ -3808,6 +3828,17 @@
|
|
|
}
|
|
|
|
|
|
/* See server.h for description. */
|
|
|
@@ -3672,7 +3673,7 @@ diff -u -d -r1.1.1.10 server.c
|
|
|
|
|
|
void
|
|
|
server_modtime (struct file_info *finfo, Vers_TS *vers_ts)
|
|
|
-@@ -4536,6 +4567,9 @@
|
|
|
+@@ -4541,6 +4572,9 @@
|
|
|
REQ_LINE("expand-modules", serve_expand_modules, 0),
|
|
|
REQ_LINE("ci", serve_ci, RQ_ESSENTIAL),
|
|
|
REQ_LINE("co", serve_co, RQ_ESSENTIAL),
|
|
|
@@ -3682,7 +3683,7 @@ diff -u -d -r1.1.1.10 server.c
|
|
|
REQ_LINE("update", serve_update, RQ_ESSENTIAL),
|
|
|
REQ_LINE("diff", serve_diff, 0),
|
|
|
REQ_LINE("log", serve_log, 0),
|
|
|
-@@ -5174,8 +5208,13 @@
|
|
|
+@@ -5179,8 +5213,13 @@
|
|
|
{
|
|
|
char *env;
|
|
|
|
|
|
@@ -3696,7 +3697,7 @@ diff -u -d -r1.1.1.10 server.c
|
|
|
(void) putenv (env);
|
|
|
|
|
|
env = xmalloc (sizeof "USER=" + strlen (username));
|
|
|
-@@ -5707,6 +5746,10 @@
|
|
|
+@@ -5712,6 +5751,10 @@
|
|
|
|| !strip_trailing_newlines (password))
|
|
|
error (1, 0, "Maximum line length exceeded during authentication.");
|
|
|
|
|
|
@@ -3707,7 +3708,7 @@ diff -u -d -r1.1.1.10 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 );
|
|
|
-@@ -6417,3 +6460,517 @@
|
|
|
+@@ -6422,3 +6465,517 @@
|
|
|
cvs_output (text, 0);
|
|
|
}
|
|
|
}
|
|
|
@@ -4228,10 +4229,10 @@ diff -u -d -r1.1.1.10 server.c
|
|
|
Index: src/subr.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/subr.c,v
|
|
|
-retrieving revision 1.1.1.9
|
|
|
-diff -u -d -r1.1.1.9 subr.c
|
|
|
---- src/subr.c 8 Oct 2003 13:44:02 -0000 1.1.1.9
|
|
|
-+++ src/subr.c 27 Oct 2003 19:07:28 -0000
|
|
|
+retrieving revision 1.1.1.10
|
|
|
+diff -u -d -r1.1.1.10 subr.c
|
|
|
+--- src/subr.c 25 Nov 2003 20:52:41 -0000 1.1.1.10
|
|
|
++++ src/subr.c 5 Dec 2003 20:22:20 -0000
|
|
|
@@ -321,6 +321,22 @@
|
|
|
uid_t uid;
|
|
|
#endif
|
|
|
@@ -4255,11 +4256,10 @@ diff -u -d -r1.1.1.9 subr.c
|
|
|
/* If there is a CVS username, return it. */
|
|
|
#ifdef AUTH_SERVER_SUPPORT
|
|
|
if (CVS_Username != NULL)
|
|
|
-@@ -783,6 +799,73 @@
|
|
|
-
|
|
|
+@@ -784,6 +800,73 @@
|
|
|
return backup_name;
|
|
|
}
|
|
|
-+
|
|
|
+
|
|
|
+#ifdef RSE_PATCH_HANDLE
|
|
|
+/* handle: 2000041317203601
|
|
|
+ date1: 2000/04/13 17:20:36
|
|
|
@@ -4326,16 +4326,17 @@ diff -u -d -r1.1.1.9 subr.c
|
|
|
+ return 1;
|
|
|
+}
|
|
|
+#endif
|
|
|
-
|
|
|
++
|
|
|
/*
|
|
|
* Copy a string into a buffer escaping any shell metacharacters. The
|
|
|
+ * buffer should be at least twice as long as the string.
|
|
|
Index: src/update.c
|
|
|
===================================================================
|
|
|
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/update.c,v
|
|
|
-retrieving revision 1.1.1.10
|
|
|
-diff -u -d -r1.1.1.10 update.c
|
|
|
---- src/update.c 24 Oct 2003 21:02:35 -0000 1.1.1.10
|
|
|
-+++ src/update.c 27 Oct 2003 19:07:29 -0000
|
|
|
+retrieving revision 1.1.1.11
|
|
|
+diff -u -d -r1.1.1.11 update.c
|
|
|
+--- src/update.c 25 Nov 2003 16:12:03 -0000 1.1.1.11
|
|
|
++++ src/update.c 5 Dec 2003 20:22:20 -0000
|
|
|
@@ -1725,6 +1725,17 @@
|
|
|
patch can't handle that. */
|
|
|
fail = 1;
|
|
|
@@ -4354,7 +4355,7 @@ diff -u -d -r1.1.1.10 update.c
|
|
|
fclose (e);
|
|
|
}
|
|
|
|
|
|
-@@ -2527,8 +2538,16 @@
|
|
|
+@@ -2528,8 +2539,16 @@
|
|
|
write_letter (finfo, 'C');
|
|
|
}
|
|
|
else
|