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 openpkg-web openpkg$ Date: 28-Dec-2002 13:02:00
Branch: HEAD Handle: 2002122812015801
Modified files:
openpkg-re/vcheck vc.cvs
openpkg-src/cvs cvs.patches.rse cvs.spec
openpkg-web news.txt
Removed files:
openpkg-src/cvs cvs.patch
Log:
upgrade to CVS 1.11.3; upgrade RSE patches for 1.11.3
Summary:
Revision Changes Path
1.3 +1 -1 openpkg-re/vcheck/vc.cvs
1.3 +0 -323 openpkg-src/cvs/cvs.patch
1.6 +315 -315 openpkg-src/cvs/cvs.patches.rse
1.41 +2 -6 openpkg-src/cvs/cvs.spec
1.2402 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.cvs
============================================================================
$ cvs diff -u -r1.2 -r1.3 vc.cvs
--- openpkg-re/vcheck/vc.cvs 18 Apr 2002 08:46:37 -0000 1.2
+++ openpkg-re/vcheck/vc.cvs 28 Dec 2002 12:01:58 -0000 1.3
@@ -2,7 +2,7 @@
}
prog cvs = {
- version = 1.11.2
+ version = 1.11.3
url = http://ccvs.cvshome.org/servlets/ProjectDownloadList
regex = cvs-(__VER__)\.tar\.gz
}
@@ .
rm -f openpkg-src/cvs/cvs.patch <<'@@ .'
Index: openpkg-src/cvs/cvs.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.patches.rse
============================================================================
$ cvs diff -u -r1.5 -r1.6 cvs.patches.rse
--- openpkg-src/cvs/cvs.patches.rse 20 Sep 2002 18:12:05 -0000 1.5
+++ openpkg-src/cvs/cvs.patches.rse 28 Dec 2002 12:01:59 -0000 1.6
@@ -3,22 +3,27 @@
RCS file: src/README.RSE
diff -N src/README.RSE
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ src/README.RSE 21 Apr 2002 08:51:42 -0000
++++ src/README.RSE 28 Dec 2002 11:23:25 -0000
@@ -0,0 +1,338 @@
+
+ CVS RSE Patches
+ ===============
+
+ This is the patched version of CVS from Ralf S. Engelschall
-+ <[EMAIL PROTECTED]> - an enhanced version of the official
-+ Cyclic/OpenAvenue's CVS version 1.11.1p1 (see http://www.cvshome.org/).
++ <[EMAIL PROTECTED]> - an enhanced version of the official CVS
++ version 1.11.3 (see http://www.cvshome.org/).
+
-+ The following changes against the avendor CVS version are provided:
-+ - support for .cvsrc files in $HOME _AND_ working and and its parent dirs
-+ - support for $HOME/.cvsroot to alias roots and to support root mirrors
++ The following changes against the vendor CVS version are provided:
++ - new `cvs pserverd' for running stand-alone pserver daemons
++ - support for an `admininfo' hook to ACL `cvs admin' commands.
++ - support for an `importinfo' hook to ACL `cvs import' commands.
++ - support for a `-h<handle>' option to `cvs diff' for compressed time spec.
++ - allow a hard-coded CVS super-user to override the CVS user via $CVSUSER
++ - support for .cvsrc files in both $HOME and working and its parent dirs
++ - support for $HOME/.cvsroot to alias CVSROOTs and to support root mirrors
+ - support global but command specific options in .cvsrc files
+ - support for stand-alone external custom commands `cvs <command>'
-+ - support for prolog and epilog hooks
++ - support for prolog and epilog command line hooks
+ - support `$LocalId$, a local keyword variant of `$Id$'
+ - support `$CVSHeader$, a variant of `$Header$', but without root path
+ - new `cvs -u' option in addition to `cvs -n' for _REAL_ read-only access
@@ -29,14 +34,9 @@
+ - adjusted `cvs diff -rHEAD' to be consistent with other commands
+ - set `$LOGNAME' to the real user and not the CVS user
+ - support for `HistoryFile=<rel-path-under-CVSROOT>' variable in config.
-+ - support for an `admininfo' hook to ACL `cvs admin' commands.
-+ - support for an `importinfo' hook to ACL `cvs import' commands.
-+ - support for a `-h<handle>' option to `cvs diff' for compressed time spec.
+ - use prefix 'T' ("touched/tagged") instead of 'U' ("updated") on `cvs import'
+ - allow `LockDir' configuration directive to use relative paths
-+ - allow a hard-coded CVS super-user to override CVS user via $CVSUSER
+ - additional SetUID/SetGID support for `cvs server' situations.
-+ - new `cvs pserverd' for running stand-alone pserver daemons
+ - new global --map-root=/oldpath:/newpath option for mapping root paths
+ - support for wildcards in CVSROOT/passwd files to decrease admin efforts
+ - various cosmetic changes
@@ -346,11 +346,11 @@
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 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 @@
+retrieving revision 1.1.1.5
+diff -u -d -r1.1.1.5 add.c
+--- src/add.c 24 Oct 2002 18:38:36 -0000 1.1.1.5
++++ src/add.c 28 Dec 2002 10:48:11 -0000
+@@ -799,6 +799,9 @@
li->type = T_TITLE;
li->tag = xstrdup (tag);
li->rev_old = li->rev_new = NULL;
@@ -363,10 +363,10 @@
Index: src/admin.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/admin.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 admin.c
---- src/admin.c 30 Nov 2001 18:37:24 -0000 1.1.1.5
-+++ src/admin.c 21 Apr 2002 08:28:46 -0000
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 admin.c
+--- src/admin.c 16 Dec 2002 17:51:02 -0000 1.1.1.6
++++ src/admin.c 28 Dec 2002 10:48:11 -0000
@@ -139,6 +139,161 @@
dat->av[dat->ac++] = newelt;
}
@@ -529,7 +529,7 @@
int
admin (argc, argv)
int argc;
-@@ -505,6 +660,20 @@
+@@ -516,6 +671,20 @@
#endif /* CLIENT_SUPPORT */
lock_tree_for_write (argc, argv, 0, W_LOCAL, 0);
@@ -550,11 +550,27 @@
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
+retrieving revision 1.1.1.3
+diff -u -d -r1.1.1.3 buffer.c
+--- src/buffer.c 6 Dec 2002 19:47:58 -0000 1.1.1.3
++++ src/buffer.c 28 Dec 2002 10:48:12 -0000
+@@ -1381,7 +1381,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.1
-diff -u -d -u -3 -r1.1.1.1 checkin.c
+diff -u -d -r1.1.1.1 checkin.c
--- 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 @@
@@ -620,10 +636,10 @@
Index: src/checkout.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/checkout.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 checkout.c
---- src/checkout.c 19 Jul 2001 16:35:32 -0000 1.1.1.5
-+++ src/checkout.c 21 Apr 2002 08:28:46 -0000
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 checkout.c
+--- src/checkout.c 4 Dec 2002 19:10:20 -0000 1.1.1.6
++++ src/checkout.c 28 Dec 2002 10:48:12 -0000
@@ -191,7 +191,11 @@
case 'p':
pipeout = 1;
@@ -639,10 +655,10 @@
Index: src/client.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/client.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 client.c
---- src/client.c 9 Aug 2001 20:27:26 -0000 1.1.1.5
-+++ src/client.c 21 Apr 2002 08:28:47 -0000
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 client.c
+--- src/client.c 24 Dec 2002 04:34:59 -0000 1.1.1.6
++++ src/client.c 28 Dec 2002 10:48:12 -0000
@@ -104,6 +104,9 @@
int status PROTO((int argc, char **argv));
int tag PROTO((int argc, char **argv));
@@ -653,8 +669,8 @@
/* All the response handling functions. */
static void handle_ok PROTO((char *, int));
-@@ -250,14 +253,34 @@
- this_root = Name_Root ((char *) NULL, (char *) NULL);
+@@ -251,14 +254,34 @@
+ : Name_Root ((char *) NULL, (char *) NULL));
}
+#ifdef RSE_PATCH_CVSROOT
@@ -688,7 +704,7 @@
free (this_root);
}
-@@ -2758,6 +2781,9 @@
+@@ -2762,6 +2785,9 @@
/* Add a directory name to the list of those sent to the
server. */
if (update_dir && (*update_dir != '\0')
@@ -698,7 +714,7 @@
&& (strcmp (update_dir, ".") != 0)
&& (findnode (dirs_sent_to_server, update_dir) == NULL))
{
-@@ -4546,6 +4572,18 @@
+@@ -4559,6 +4585,18 @@
error (1, 0,
"This server does not support the global -n option.");
}
@@ -720,11 +736,11 @@
Index: src/commit.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/commit.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 commit.c
---- src/commit.c 24 Aug 2001 17:47:02 -0000 1.1.1.5
-+++ src/commit.c 21 Apr 2002 08:46:20 -0000
-@@ -296,6 +296,9 @@
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 commit.c
+--- src/commit.c 4 Dec 2002 19:10:20 -0000 1.1.1.6
++++ src/commit.c 28 Dec 2002 10:48:12 -0000
+@@ -308,6 +308,9 @@
data->type = status;
data->tag = xstrdup (vers->tag);
data->rev_old = data->rev_new = NULL;
@@ -734,7 +750,7 @@
node->type = UPDATE;
node->delproc = update_delproc;
-@@ -982,7 +985,16 @@
+@@ -996,7 +999,16 @@
xmalloc (sizeof (struct logfile_info)));
li->type = status;
li->tag = xstrdup (vers->tag);
@@ -751,7 +767,7 @@
li->rev_new = NULL;
p->data = (char *) li;
(void) addnode (ulist, p);
-@@ -2292,6 +2304,10 @@
+@@ -2314,6 +2326,10 @@
free (li->rev_old);
if (li->rev_new)
free (li->rev_new);
@@ -765,10 +781,10 @@
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 19 Apr 2001 19:45:32 -0000 1.1.1.4
-+++ src/create_adm.c 16 Feb 2002 14:00:14 -0000
+retrieving revision 1.1.1.5
+diff -u -d -r1.1.1.5 create_adm.c
+--- src/create_adm.c 20 Sep 2002 02:48:59 -0000 1.1.1.5
++++ src/create_adm.c 28 Dec 2002 10:48:13 -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. */
@@ -811,7 +827,7 @@
int
Create_Admin (dir, update_dir, repository, tag, date, nonbranch, warn,
dotemplate)
-@@ -179,6 +214,20 @@
+@@ -174,6 +209,20 @@
fprintf (stderr, "%c<- Create_Admin\n",
(server_active) ? 'S' : ' ');
}
@@ -835,11 +851,60 @@
Index: src/cvs.h
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/cvs.h,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 cvs.h
---- src/cvs.h 24 Aug 2001 17:47:02 -0000 1.1.1.5
-+++ src/cvs.h 21 Apr 2002 08:45:07 -0000
-@@ -190,6 +190,33 @@
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 cvs.h
+--- src/cvs.h 19 Dec 2002 15:50:07 -0000 1.1.1.6
++++ src/cvs.h 28 Dec 2002 10:52:52 -0000
+@@ -7,6 +7,48 @@
+ */
+
+ /*
++ * Support for compiling in various RSE extension
++ */
++#ifdef RSE_PATCHES
++#define RSE_PATCH_CVSRC
++#define RSE_PATCH_CVSROOT
++#define RSE_PATCH_GLOBALOPTION
++#define RSE_PATCH_GLOBALOPTION_PARTLY
++#define RSE_PATCH_CUSTOMCMD
++#define RSE_PATCH_PROLOGEPILOG
++#define RSE_PATCH_LOCALID
++#define RSE_PATCH_CVSHEADER
++#define RSE_PATCH_NOLOCK
++#define RSE_PATCH_EXTRAPERCENT
++#define RSE_PATCH_READDNEW
++#define RSE_PATCH_CONFIGUMASK
++#define RSE_PATCH_FASTERUPDATE
++#define RSE_PATCH_LOGNAME
++#define RSE_PATCH_HISTORYFILE
++#define RSE_PATCH_IMPORTINFO
++#define RSE_PATCH_ADMININFO
++#define RSE_PATCH_HANDLE
++#define RSE_PATCH_IMPORTTOUCH
++#define RSE_PATCH_RELLOCKDIR
++#define RSE_PATCH_CVSUSER
++#define RSE_PATCH_SETXID
++#define RSE_PATCH_PSERVERD
++#define RSE_PATCH_MAPROOT
++#define RSE_PATCH_RLIST
++#define RSE_PATCH_COSMETICS
++#define RSE_PATCH_HASHFUNC
++#define RSE_PATCH_ADDFILEATTR
++#define RSE_PATCH_WILDPASSWD
++#define RSE_PATCH_CVSPID
++#define RSE_PATCH_BUGFIX
++/* problematic changes, because they break "make check" */
++#undef RSE_PATCH_COSMETICS_HARD
++#undef RSE_PATCH_MERGENOKEYWORD
++#undef RSE_PATCH_DIFFHEAD
++#undef RSE_PATCH_SMARTCONFIG
++#endif
++
++/*
+ * basic information used in all source files
+ *
+ */
+@@ -193,6 +235,33 @@
#define CVSROOTADM_WRITERS "writers"
#define CVSROOTADM_PASSWD "passwd"
#define CVSROOTADM_CONFIG "config"
@@ -873,9 +938,9 @@
#define CVSNULLREPOS "Emptydir" /* an empty directory */
-@@ -276,6 +303,10 @@
+@@ -276,6 +345,10 @@
+
#define CVSUMASK_ENV "CVSUMASK" /* Effective umask for repository */
- /* #define CVSUMASK_DFLT Set by options.h */
+#ifdef RSE_PATCH_NOLOCK
+#define CVSNOLOCK_ENV "CVSNOLOCK" /* do not create lock files */
@@ -884,7 +949,7 @@
/*
* If the beginning of the Repository matches the following string, strip it
* so that the output to the logfile does not contain a full pathname.
-@@ -366,6 +397,9 @@
+@@ -371,6 +444,9 @@
extern int use_editor;
extern int cvswrite;
extern mode_t cvsumask;
@@ -894,7 +959,7 @@
-@@ -384,6 +418,9 @@
+@@ -389,6 +465,9 @@
extern int trace; /* Show all commands */
extern int noexec; /* Don't modify disk anywhere */
@@ -904,7 +969,7 @@
extern int logoff; /* Don't write history entry */
extern int top_level_admin;
-@@ -457,6 +494,27 @@
+@@ -458,6 +537,27 @@
void root_allow_free PROTO ((void));
int root_allow_ok PROTO ((char *));
@@ -932,7 +997,7 @@
char *gca PROTO((const char *rev1, const char *rev2));
extern void check_numeric PROTO ((const char *, int, char **));
char *getcaller PROTO((void));
-@@ -560,6 +618,10 @@
+@@ -562,6 +662,10 @@
extern void expand_wild PROTO ((int argc, char **argv,
int *pargc, char ***pargv));
@@ -943,7 +1008,7 @@
#ifdef SERVER_SUPPORT
extern int cvs_casecmp PROTO ((char *, char *));
extern int fopen_case PROTO ((char *, char *, FILE **, char **));
-@@ -802,6 +864,9 @@
+@@ -804,6 +908,9 @@
NULL for add or import */
char *rev_new; /* rev number after a commit/modify,
add, or import, NULL for remove */
@@ -953,7 +1018,7 @@
};
/* Wrappers. */
-@@ -841,6 +906,13 @@
+@@ -843,6 +950,13 @@
int unedit PROTO ((int argc, char **argv));
int editors PROTO ((int argc, char **argv));
int watchers PROTO ((int argc, char **argv));
@@ -967,7 +1032,7 @@
extern int annotate PROTO ((int argc, char **argv));
extern int add PROTO ((int argc, char **argv));
extern int admin PROTO ((int argc, char **argv));
-@@ -861,6 +933,9 @@
+@@ -872,6 +986,9 @@
extern int cvsstatus PROTO((int argc, char **argv));
extern int cvstag PROTO((int argc, char **argv));
extern int version PROTO((int argc, char **argv));
@@ -980,10 +1045,10 @@
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 23 Dec 1998 15:15:00 -0000 1.1.1.2
-+++ src/cvsrc.c 16 Feb 2002 12:36:09 -0000
+retrieving revision 1.1.1.3
+diff -u -d -r1.1.1.3 cvsrc.c
+--- src/cvsrc.c 17 Jun 2002 23:39:00 -0000 1.1.1.3
++++ src/cvsrc.c 28 Dec 2002 10:48:13 -0000
@@ -12,6 +12,203 @@
#include "cvs.h"
#include "getline.h"
@@ -1275,7 +1340,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
-@@ -123,9 +382,15 @@
+@@ -120,9 +379,15 @@
if (found)
{
/* skip over command in the options line */
@@ -1294,10 +1359,10 @@
Index: src/diff.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/diff.c,v
-retrieving revision 1.1.1.4
-diff -u -d -u -3 -r1.1.1.4 diff.c
---- src/diff.c 19 Mar 2002 19:15:45 -0000 1.1.1.4
-+++ src/diff.c 21 Apr 2002 08:44:46 -0000
+retrieving revision 1.1.1.5
+diff -u -d -r1.1.1.5 diff.c
+--- src/diff.c 24 Oct 2002 18:38:37 -0000 1.1.1.5
++++ src/diff.c 28 Dec 2002 10:48:13 -0000
@@ -271,7 +271,11 @@
optind = 0;
@@ -1340,7 +1405,7 @@
case 'N':
empty_files = 1;
break;
-@@ -486,7 +505,11 @@
+@@ -487,7 +506,11 @@
char *head =
(vers->vn_rcs == NULL
? NULL
@@ -1352,7 +1417,7 @@
exists = head != NULL && !RCS_isdead(vers->srcfile, head);
if (head != NULL)
free (head);
-@@ -890,7 +913,11 @@
+@@ -891,7 +914,11 @@
if (diff_rev1 && strcmp (diff_rev1, TAG_HEAD) == 0)
use_rev1 = ((vers->vn_rcs == NULL || vers->srcfile == NULL)
? NULL
@@ -1364,7 +1429,7 @@
else
{
xvers = Version_TS (finfo, NULL, diff_rev1, diff_date1, 1, 0);
-@@ -905,7 +932,11 @@
+@@ -906,7 +933,11 @@
if (diff_rev2 && strcmp (diff_rev2, TAG_HEAD) == 0)
use_rev2 = ((vers->vn_rcs == NULL || vers->srcfile == NULL)
? NULL
@@ -1380,7 +1445,7 @@
===================================================================
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
+diff -u -d -r1.1.1.3 hash.c
--- 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 @@
@@ -1412,10 +1477,10 @@
Index: src/history.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/history.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 history.c
---- src/history.c 3 May 2001 19:35:16 -0000 1.1.1.5
-+++ src/history.c 21 Apr 2002 08:28:48 -0000
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 history.c
+--- src/history.c 24 Sep 2002 20:47:09 -0000 1.1.1.6
++++ src/history.c 28 Dec 2002 10:48:13 -0000
@@ -235,6 +235,9 @@
static char *tz_name = "+0000";
@@ -1471,10 +1536,10 @@
Index: src/import.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/import.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 import.c
---- src/import.c 19 Mar 2002 19:15:45 -0000 1.1.1.5
-+++ src/import.c 21 Apr 2002 08:38:53 -0000
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 import.c
+--- src/import.c 24 Sep 2002 20:47:09 -0000 1.1.1.6
++++ src/import.c 28 Dec 2002 10:48:13 -0000
@@ -57,6 +57,140 @@
NULL
};
@@ -1616,7 +1681,7 @@
int
import (argc, argv)
int argc;
-@@ -287,6 +421,12 @@
+@@ -290,6 +424,12 @@
error (1, 0, "attempt to import the repository");
}
@@ -1629,7 +1694,7 @@
/*
* Make all newly created directories writable. Should really use a more
* sophisticated security mechanism here.
-@@ -326,7 +466,11 @@
+@@ -329,7 +469,11 @@
"Use the following command to help the merge:");
cvs_output_tagged ("newline", NULL);
cvs_output_tagged ("newline", NULL);
@@ -1641,7 +1706,7 @@
cvs_output_tagged ("text", program_name);
if (CVSroot_cmdline != NULL)
{
-@@ -353,7 +497,11 @@
+@@ -356,7 +500,11 @@
conflicts);
(void) fprintf (logfp,
"Use the following command to help the merge:\n\n");
@@ -1653,7 +1718,7 @@
(void) fprintf (logfp, "-j%s:yesterday -j%s %s\n\n",
argv[1], argv[1], argv[0]);
}
-@@ -376,6 +524,9 @@
+@@ -379,6 +527,9 @@
li->type = T_TITLE;
li->tag = xstrdup (vbranch);
li->rev_old = li->rev_new = NULL;
@@ -1663,7 +1728,7 @@
p->data = (char *) li;
(void) addnode (ulist, p);
Update_Logfile (repository, message, logfp, ulist);
-@@ -666,7 +817,11 @@
+@@ -669,7 +820,11 @@
*/
if (add_tags (vers->srcfile, vfile, vtag, targc, targv))
retval = 1;
@@ -1967,10 +2032,10 @@
Index: src/lock.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/lock.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 lock.c
---- src/lock.c 26 Sep 2001 18:54:09 -0000 1.1.1.5
-+++ src/lock.c 21 Apr 2002 08:38:27 -0000
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 lock.c
+--- src/lock.c 24 Oct 2002 18:38:37 -0000 1.1.1.6
++++ src/lock.c 28 Dec 2002 10:48:13 -0000
@@ -403,7 +403,11 @@
(void) fprintf (stderr, "%s-> Reader_Lock(%s)\n", CLIENT_SERVER_STR,
xrepository);
@@ -1998,11 +2063,11 @@
Index: src/logmsg.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/logmsg.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 logmsg.c
---- src/logmsg.c 14 Sep 2001 17:12:10 -0000 1.1.1.5
-+++ src/logmsg.c 21 Apr 2002 08:49:19 -0000
-@@ -681,6 +681,42 @@
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 logmsg.c
+--- src/logmsg.c 20 Sep 2002 02:48:59 -0000 1.1.1.6
++++ src/logmsg.c 28 Dec 2002 10:48:14 -0000
+@@ -673,6 +673,42 @@
{
switch (*c)
{
@@ -2048,10 +2113,10 @@
Index: src/main.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/main.c,v
-retrieving revision 1.1.1.6
-diff -u -d -u -3 -r1.1.1.6 main.c
---- src/main.c 19 Mar 2002 19:15:45 -0000 1.1.1.6
-+++ src/main.c 21 Apr 2002 08:33:14 -0000
+retrieving revision 1.1.1.7
+diff -u -d -r1.1.1.7 main.c
+--- src/main.c 24 Oct 2002 18:38:37 -0000 1.1.1.7
++++ src/main.c 28 Dec 2002 10:50:11 -0000
@@ -41,6 +41,9 @@
int quiet = 0;
int trace = 0;
@@ -2562,12 +2627,12 @@
+ }
+#endif
+
- #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
-@@ -692,6 +1027,21 @@
+ #ifdef SERVER_SUPPORT
+
+ # ifdef HAVE_KERBEROS
+@@ -694,6 +1029,21 @@
}
- #endif /* HAVE_KERBEROS */
+ # endif /* HAVE_KERBEROS */
+#ifdef RSE_PATCH_PSERVERD
+ if (strcmp(command_name, "pserverd") == 0) {
@@ -2585,11 +2650,11 @@
+ }
+#endif
- #if (defined(AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI)) &&
defined(SERVER_SUPPORT)
+ # if defined (AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI)
if (strcmp (command_name, "pserver") == 0)
-@@ -716,6 +1066,11 @@
- server_active = strcmp (command_name, "server") == 0;
- #endif
+@@ -718,6 +1068,11 @@
+
+ #endif /* SERVER_SUPPORT */
+#ifdef RSE_PATCH_CVSROOT
+ if (strcmp(command_name, "root") == 0)
@@ -2599,7 +2664,7 @@
/* This is only used for writing into the history file. For
remote connections, it might be nice to have hostname
and/or remote path, on the other hand I'm not sure whether
-@@ -786,8 +1141,12 @@
+@@ -788,8 +1143,12 @@
in server mode, since the client will send the repository
directory after the connection is made. */
@@ -2612,7 +2677,7 @@
{
char *CVSADM_Root;
-@@ -843,6 +1202,54 @@
+@@ -845,6 +1204,54 @@
error (1, 0,
"CVS/Root file (if any).");
}
@@ -2667,7 +2732,7 @@
}
/* Here begins the big loop over unique cvsroot values. We
-@@ -875,6 +1282,9 @@
+@@ -877,6 +1284,9 @@
end of things. */
while (
@@ -2677,7 +2742,7 @@
#ifdef SERVER_SUPPORT
server_active ||
#endif
-@@ -886,8 +1296,12 @@
+@@ -888,8 +1298,12 @@
in server mode, since the client will send the repository
directory after the connection is made. */
@@ -2690,7 +2755,7 @@
{
/* Now we're 100% sure that we have a valid CVSROOT
variable. Parse it to see if we're supposed to do
-@@ -906,7 +1320,11 @@
+@@ -908,7 +1322,11 @@
* Check to see if the repository exists.
*/
#ifdef CLIENT_SUPPORT
@@ -2702,7 +2767,7 @@
#endif /* CLIENT_SUPPORT */
{
char *path;
-@@ -920,7 +1338,12 @@
+@@ -922,7 +1340,12 @@
{
save_errno = errno;
/* If this is "cvs init", the root need not exist yet. */
@@ -2715,7 +2780,7 @@
{
error (1, save_errno, "%s", path);
}
-@@ -956,6 +1379,9 @@
+@@ -958,6 +1381,9 @@
read_cvsrc and other such places or vice versa. That sort
of thing probably needs more thought. */
if (1
@@ -2725,7 +2790,7 @@
#ifdef SERVER_SUPPORT
&& !server_active
#endif
-@@ -986,7 +1412,49 @@
+@@ -988,7 +1414,49 @@
}
#endif
@@ -2775,7 +2840,7 @@
/* Mark this root directory as done. When the server is
active, current_root will be NULL -- don't try and
-@@ -1005,11 +1473,20 @@
+@@ -1007,6 +1475,10 @@
dellist (&root_directories);
#endif
@@ -2785,7 +2850,9 @@
+#endif
#ifdef SERVER_SUPPORT
if (server_active)
- break;
+ {
+@@ -1015,6 +1487,11 @@
+ }
#endif
} /* end of loop for cvsroot values */
+
@@ -2800,7 +2867,7 @@
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/mkmodules.c,v
retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 mkmodules.c
+diff -u -d -r1.1.1.5 mkmodules.c
--- src/mkmodules.c 7 Sep 2001 14:22:39 -0000 1.1.1.5
+++ src/mkmodules.c 21 Apr 2002 08:32:41 -0000
@@ -186,6 +186,48 @@
@@ -2896,67 +2963,13 @@
{CVSROOTADM_IGNORE,
"a %s file can be used to specify files to ignore",
NULL},
-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 27 Jan 1999 22:58:14 -0000 1.1.1.2
-+++ src/options.h.in 21 Apr 2002 08:49:36 -0000
-@@ -198,3 +198,46 @@
- #ifndef STDC_HEADERS
- extern void exit ();
- #endif
-+
-+/*
-+ * Support for compiling in various RSE extension
-+ */
-+#ifdef RSE_PATCHES
-+#define RSE_PATCH_CVSRC
-+#define RSE_PATCH_CVSROOT
-+#define RSE_PATCH_GLOBALOPTION
-+#define RSE_PATCH_GLOBALOPTION_PARTLY
-+#define RSE_PATCH_CUSTOMCMD
-+#define RSE_PATCH_PROLOGEPILOG
-+#define RSE_PATCH_LOCALID
-+#define RSE_PATCH_CVSHEADER
-+#define RSE_PATCH_NOLOCK
-+#define RSE_PATCH_EXTRAPERCENT
-+#define RSE_PATCH_READDNEW
-+#define RSE_PATCH_CONFIGUMASK
-+#define RSE_PATCH_FASTERUPDATE
-+#define RSE_PATCH_LOGNAME
-+#define RSE_PATCH_HISTORYFILE
-+#define RSE_PATCH_IMPORTINFO
-+#define RSE_PATCH_ADMININFO
-+#define RSE_PATCH_HANDLE
-+#define RSE_PATCH_IMPORTTOUCH
-+#define RSE_PATCH_RELLOCKDIR
-+#define RSE_PATCH_CVSUSER
-+#define RSE_PATCH_SETXID
-+#define RSE_PATCH_PSERVERD
-+#define RSE_PATCH_MAPROOT
-+#define RSE_PATCH_RLIST
-+#define RSE_PATCH_COSMETICS
-+#define RSE_PATCH_HASHFUNC
-+#define RSE_PATCH_ADDFILEATTR
-+#define RSE_PATCH_WILDPASSWD
-+#define RSE_PATCH_CVSPID
-+#define RSE_PATCH_BUGFIX
-+/* problematic changes, because they break "make check" */
-+#undef RSE_PATCH_COSMETICS_HARD
-+#undef RSE_PATCH_MERGENOKEYWORD
-+#undef RSE_PATCH_DIFFHEAD
-+#undef RSE_PATCH_SMARTCONFIG
-+#endif
-+
Index: src/parseinfo.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/parseinfo.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 parseinfo.c
---- src/parseinfo.c 24 Aug 2001 17:47:02 -0000 1.1.1.5
-+++ src/parseinfo.c 21 Apr 2002 08:32:19 -0000
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 parseinfo.c
+--- src/parseinfo.c 6 Dec 2002 19:09:26 -0000 1.1.1.6
++++ src/parseinfo.c 28 Dec 2002 10:48:14 -0000
@@ -11,6 +11,9 @@
#include <assert.h>
@@ -3036,11 +3049,11 @@
Index: src/rcs.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/rcs.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 rcs.c
---- src/rcs.c 19 Mar 2002 19:15:45 -0000 1.1.1.5
-+++ src/rcs.c 21 Apr 2002 08:28:49 -0000
-@@ -124,6 +124,10 @@
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 rcs.c
+--- src/rcs.c 24 Sep 2002 20:47:09 -0000 1.1.1.6
++++ src/rcs.c 28 Dec 2002 10:48:14 -0000
+@@ -127,6 +127,10 @@
static void rcs_internal_unlockfile PROTO ((FILE *, char *));
static char *rcs_lockfilename PROTO ((char *));
@@ -3159,7 +3172,7 @@
free (date);
free_value = 1;
}
-@@ -8564,3 +8614,38 @@
+@@ -8563,3 +8613,38 @@
}
return label;
}
@@ -3201,39 +3214,27 @@
Index: src/recurse.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/recurse.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 recurse.c
---- src/recurse.c 27 Jun 2001 04:20:51 -0000 1.1.1.5
-+++ src/recurse.c 21 Apr 2002 08:28:49 -0000
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 recurse.c
+--- src/recurse.c 24 Oct 2002 18:38:37 -0000 1.1.1.6
++++ src/recurse.c 28 Dec 2002 11:01:31 -0000
@@ -511,7 +511,11 @@
if (frame->flags == R_SKIP_ALL)
return (0);
+#ifdef RSE_PATCH_NOLOCK
-+ should_readlock = nolock ? 0 : frame->readlock;
++ locktype = nolock ? LOCK_NONE : frame->locktype;
+#else
- should_readlock = noexec ? 0 : frame->readlock;
+ locktype = noexec ? LOCK_NONE : frame->locktype;
+#endif
/* The fact that locks are not active here is what makes us fail to have
the
-@@ -553,7 +557,11 @@
- */
- if (server_active
- /* If there are writelocks around, we cannot pause here. */
-+#ifdef RSE_PATCH_NOLOCK
-+ && (should_readlock || nolock))
-+#else
- && (should_readlock || noexec))
-+#endif
- server_pause_check();
- #endif
-
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
+diff -u -d -r1.1.1.3 repos.c
--- 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 @@
@@ -3251,11 +3252,11 @@
Index: src/root.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/root.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 root.c
---- src/root.c 5 Jul 2001 19:11:39 -0000 1.1.1.5
-+++ src/root.c 21 Apr 2002 08:28:50 -0000
-@@ -122,6 +122,9 @@
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 root.c
+--- src/root.c 6 Dec 2002 19:10:28 -0000 1.1.1.6
++++ src/root.c 28 Dec 2002 11:02:48 -0000
+@@ -123,6 +123,9 @@
/* allocate space to return and fill it in */
strip_trailing_slashes (root);
ret = xstrdup (root);
@@ -3265,9 +3266,9 @@
out:
free (cvsadm);
free (tmp);
-@@ -267,6 +270,87 @@
-
-
+@@ -255,7 +258,86 @@
+ return 0;
+ }
+#ifdef RSE_PATCH_MAPROOT
+
@@ -3347,13 +3348,12 @@
+ }
+ return rv;
+}
-+
+
+#endif /* RSE_PATCH_MAPROOT */
-+
+
/* 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
- from the CVSROOT environment variable or from a CVS/Root file. */
-@@ -799,3 +883,472 @@
+@@ -790,5 +872,473 @@
/* NOTREACHED */
}
#endif
@@ -3362,7 +3362,7 @@
+
+#include <string.h>
+
-+#ifndef CVS_ROOT_FILE
++#ifndef CVS_ROOT_FILE
+#define CVS_ROOT_FILE ".cvsroot"
+#endif
+
@@ -3464,17 +3464,17 @@
+ return e;
+}
+
-+void
++void
+cvsroot_entry_write(
-+ FILE *fp,
++ FILE *fp,
+ cvsroot_type *e)
+{
+ if (fp != NULL && e != NULL) {
-+ fprintf(fp, "%s %s",
++ fprintf(fp, "%s %s",
+ e->nickname, e->masterpath);
-+ if (e->slavepath[0] != '\0')
++ if (e->slavepath[0] != '\0')
+ fprintf(fp, " %s", e->slavepath);
-+ if (e->syncprog[0] != '\0')
++ if (e->syncprog[0] != '\0')
+ fprintf(fp, " %s", e->syncprog);
+ fprintf(fp, "\n");
+ }
@@ -3483,8 +3483,8 @@
+
+cvsroot_type *
+cvsroot_lookup(
-+ char *by_nickname,
-+ char *by_masterpath,
++ char *by_nickname,
++ char *by_masterpath,
+ char *by_slavepath)
+{
+ char *rootfile;
@@ -3509,7 +3509,7 @@
+ return e;
+}
+
-+void
++void
+cvsroot_synchronize(
+ cvsroot_type *e,
+ int force)
@@ -3648,12 +3648,12 @@
+ int argc,
+ char **argv)
+{
-+ enum {
-+ ROOT_MODE_UNKNOWN,
-+ ROOT_MODE_EDIT_CMDLINE,
-+ ROOT_MODE_EDIT_VISUAL,
-+ ROOT_MODE_LIST,
-+ ROOT_MODE_SYNC
++ enum {
++ ROOT_MODE_UNKNOWN,
++ ROOT_MODE_EDIT_CMDLINE,
++ ROOT_MODE_EDIT_VISUAL,
++ ROOT_MODE_LIST,
++ ROOT_MODE_SYNC
+ };
+ int mode = ROOT_MODE_UNKNOWN;
+ char *rootfile;
@@ -3702,7 +3702,7 @@
+ error(1, 0, "exactly one of the -e, -E, -l or -s options have to given");
+
+ if (mode == ROOT_MODE_EDIT_CMDLINE) {
-+ if (argc < 1 || argc > 4)
++ if (argc < 1 || argc > 4)
+ error(1, 0, "option -e requires 1-4 arguments");
+ E.nickname = argv[0];
+ if (argc >= 2)
@@ -3764,7 +3764,7 @@
+ fclose(fp);
+ }
+ else if (mode == ROOT_MODE_EDIT_VISUAL) {
-+ if (argc != 0)
++ if (argc != 0)
+ error(1, 0, "option -E requires no arguments");
+ if ((rootfile = cvsroot_filename()) == NULL)
+ return 0;
@@ -3798,12 +3798,12 @@
+ fprintf(stdout, "Repository `%s':\n"
+ " Master Path: %s\n"
+ " Slave Path: %s\n"
-+ " Synchronize: %s\n",
-+ e->nickname, e->masterpath,
++ " Synchronize: %s\n",
++ e->nickname, e->masterpath,
+ e->slavepath, e->syncprog);
+ else
+ fprintf(stdout, "%s %s %s %s\n",
-+ e->nickname, e->masterpath,
++ e->nickname, e->masterpath,
+ e->slavepath, e->syncprog);
+ }
+ else if (mode == ROOT_MODE_SYNC) {
@@ -3811,7 +3811,7 @@
+ if (argc > 0)
+ error(1, 0, "repository `%s' has no slave path or sync
program defined", e->nickname);
+ }
-+ else
++ else
+ cvsroot_synchronize(e, 1);
+ }
+ }
@@ -3823,25 +3823,26 @@
+ return 0;
+}
+
-+
+#endif /* RSE_PATCH_CVSROOT */
+
+ /* vim:tabstop=8:shiftwidth=4
+ */
Index: src/sanity.sh
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/sanity.sh,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 sanity.sh
---- src/sanity.sh 17 Apr 2002 18:24:27 -0000 1.1.1.5
-+++ src/sanity.sh 21 Apr 2002 08:28:53 -0000
-@@ -104,6 +104,7 @@
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 sanity.sh
+--- src/sanity.sh 19 Dec 2002 15:38:32 -0000 1.1.1.6
++++ src/sanity.sh 28 Dec 2002 11:03:38 -0000
+@@ -106,6 +106,7 @@
# "debugger"
#set -x
+echo '[THIS PROCEDURE TAKES APPROX. 25min ON A PII/400MHz, SO BE PATIENT!]'
- echo 'This test should produce no other output than this line, and a final "OK".'
-
- # Regexp to match what CVS will call itself in output that it prints.
-@@ -8717,11 +8718,13 @@
+ 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'
+@@ -8838,11 +8839,13 @@
############################################################
# Check out the whole repository
mkdir 1; cd 1
@@ -3856,7 +3857,7 @@
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
-@@ -8741,11 +8744,13 @@
+@@ -8862,11 +8865,13 @@
############################################################
# Check out CVSROOT
mkdir 1; cd 1
@@ -3871,7 +3872,7 @@
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
-@@ -8768,11 +8773,13 @@
+@@ -8889,11 +8894,13 @@
mkdir 1; cd 1
dotest modules-3 "${testcvs} -q co somedir" ''
cd somedir
@@ -3886,7 +3887,7 @@
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
-@@ -19334,7 +19341,7 @@
+@@ -19157,7 +19164,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.
@@ -3898,10 +3899,10 @@
Index: src/server.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/server.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 server.c
---- src/server.c 19 Mar 2002 19:15:45 -0000 1.1.1.5
-+++ src/server.c 21 Apr 2002 08:28:55 -0000
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 server.c
+--- src/server.c 6 Dec 2002 19:14:59 -0000 1.1.1.6
++++ src/server.c 28 Dec 2002 10:48:17 -0000
@@ -120,6 +120,13 @@
# endif /* AUTH_SERVER_SUPPORT */
@@ -3916,7 +3917,7 @@
/* While processing requests, this buffer accumulates data to be sent to
the client, and then once we are in do_cvs_command, we use it
-@@ -736,6 +743,13 @@
+@@ -726,6 +733,13 @@
if (error_pending()) return;
@@ -3930,7 +3931,7 @@
if (!isabsolute (arg))
{
if (alloc_pending (80 + strlen (arg)))
-@@ -1156,6 +1170,9 @@
+@@ -1149,6 +1163,9 @@
char *repos;
status = buf_read_line (buf_from_net, &repos, (int *) NULL);
@@ -3940,7 +3941,7 @@
if (status == 0)
{
if (!outside_root (repos))
-@@ -2182,6 +2199,11 @@
+@@ -2175,6 +2192,11 @@
case 'n':
noexec = 1;
break;
@@ -3952,7 +3953,7 @@
case 'q':
quiet = 1;
break;
-@@ -3935,6 +3957,17 @@
+@@ -3931,6 +3953,17 @@
}
/* See server.h for description. */
@@ -3970,7 +3971,7 @@
void
server_modtime (finfo, vers_ts)
-@@ -4788,6 +4821,9 @@
+@@ -4784,6 +4817,9 @@
REQ_LINE("expand-modules", serve_expand_modules, 0),
REQ_LINE("ci", serve_ci, RQ_ESSENTIAL),
REQ_LINE("co", serve_co, RQ_ESSENTIAL),
@@ -3980,7 +3981,7 @@
REQ_LINE("update", serve_update, RQ_ESSENTIAL),
REQ_LINE("diff", serve_diff, 0),
REQ_LINE("log", serve_log, 0),
-@@ -5372,8 +5408,13 @@
+@@ -5326,8 +5362,13 @@
{
char *env;
@@ -3994,7 +3995,7 @@
(void) putenv (env);
env = xmalloc (sizeof "USER=" + strlen (username));
-@@ -5452,6 +5493,13 @@
+@@ -5406,6 +5447,13 @@
found_it = 1;
break;
}
@@ -4008,7 +4009,7 @@
}
if (ferror (fp))
error (0, errno, "cannot read %s", filename);
-@@ -5495,10 +5543,14 @@
+@@ -5449,10 +5497,14 @@
/* Okay, after this conditional chain, found_password and
host_user_tmp will have useful values: */
@@ -4023,7 +4024,7 @@
{
found_password = NULL;
host_user_tmp = NULL;
-@@ -5529,6 +5581,14 @@
+@@ -5483,6 +5535,14 @@
*host_user_ptr = xstrdup (host_user_tmp);
retval = 1;
}
@@ -4038,7 +4039,7 @@
else
{
*host_user_ptr = NULL;
-@@ -5574,7 +5634,11 @@
+@@ -5528,7 +5588,11 @@
/* host_user already set by reference, so just return. */
goto handle_return;
}
@@ -4050,7 +4051,7 @@
{
/* No cvs password found, so try /etc/passwd. */
-@@ -5616,15 +5680,30 @@
+@@ -5575,15 +5639,30 @@
if (*found_passwd)
{
/* user exists and has a password */
@@ -4081,7 +4082,7 @@
host_user = xstrdup (username);
goto handle_return;
}
-@@ -5635,7 +5714,11 @@
+@@ -5594,7 +5673,11 @@
goto handle_return;
}
}
@@ -4093,15 +4094,15 @@
{
/* Note that the message _does_ distinguish between the case in
which we check for a system password and the case in which
-@@ -5656,6 +5739,7 @@
- #endif
- exit (EXIT_FAILURE);
+@@ -5606,6 +5689,7 @@
+
+ error_exit ();
}
+#ifndef RSE_PATCH_WILDPASSWD
else
{
/* Something strange happened. We don't know what it was, but
-@@ -5663,6 +5747,7 @@
+@@ -5613,6 +5697,7 @@
host_user = NULL;
goto handle_return;
}
@@ -4109,7 +4110,7 @@
handle_return:
if (host_user)
-@@ -5802,6 +5887,10 @@
+@@ -5752,6 +5837,10 @@
strip_trailing_newlines (username);
strip_trailing_newlines (password);
@@ -4120,7 +4121,7 @@
/* ... and make sure the protocol ends on the right foot. */
/* See above comment about error handling. */
getline_safe (&tmp, &tmp_allocated, stdin, PATH_MAX);
-@@ -6637,3 +6726,520 @@
+@@ -6575,3 +6664,520 @@
cvs_output (text, 0);
}
}
@@ -4644,10 +4645,10 @@
Index: src/subr.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/subr.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 subr.c
---- src/subr.c 7 Aug 2001 15:35:32 -0000 1.1.1.5
-+++ src/subr.c 21 Apr 2002 08:28:55 -0000
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 subr.c
+--- src/subr.c 19 Apr 2002 20:39:05 -0000 1.1.1.6
++++ src/subr.c 28 Dec 2002 10:48:17 -0000
@@ -336,6 +336,22 @@
uid_t uid;
#endif
@@ -4671,7 +4672,7 @@
/* If there is a CVS username, return it. */
#ifdef AUTH_SERVER_SUPPORT
if (CVS_Username != NULL)
-@@ -797,6 +813,73 @@
+@@ -763,6 +779,73 @@
return backup_name;
}
@@ -4748,11 +4749,11 @@
Index: src/tag.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/tag.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 tag.c
---- src/tag.c 6 Jun 2001 19:43:04 -0000 1.1.1.5
-+++ src/tag.c 21 Apr 2002 08:28:55 -0000
-@@ -1295,7 +1295,11 @@
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 tag.c
+--- src/tag.c 25 Oct 2002 14:44:37 -0000 1.1.1.6
++++ src/tag.c 28 Dec 2002 10:48:17 -0000
+@@ -1300,7 +1300,11 @@
/* The tags is valid but not mentioned in val-tags. Add it. */
datum value;
@@ -4767,10 +4768,10 @@
Index: src/update.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/update.c,v
-retrieving revision 1.1.1.5
-diff -u -d -u -3 -r1.1.1.5 update.c
---- src/update.c 8 Jul 2001 20:51:46 -0000 1.1.1.5
-+++ src/update.c 21 Apr 2002 08:28:56 -0000
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 update.c
+--- src/update.c 24 Oct 2002 18:38:37 -0000 1.1.1.6
++++ src/update.c 28 Dec 2002 11:05:29 -0000
@@ -203,7 +203,11 @@
break;
case 'p':
@@ -4783,25 +4784,25 @@
break;
case 'j':
if (join_rev2)
-@@ -1809,6 +1813,17 @@
- patch can't handle that. */
- fail = 1;
- }
+@@ -1815,6 +1819,17 @@
+ patch can't handle that. */
+ fail = 1;
+ }
+#ifdef RSE_PATCH_FASTERUPDATE
-+ else {
-+ /*
-+ * Don't send a diff if just sending the entire file
-+ * would be smaller
-+ */
-+ fseek(e, 0L, SEEK_END);
-+ if (file_info->st_size < ftell(e))
-+ fail = 1;
-+ }
++ else {
++ /*
++ * Don't send a diff if just sending the entire file
++ * would be smaller...
++ */
++ fseek(e, 0L, SEEK_END);
++ if (file_info->st_size < ftell(e))
++ fail = 1;
++ }
+#endif
- fclose (e);
- }
+ fclose (e);
}
-@@ -2563,8 +2578,16 @@
+
+@@ -2581,8 +2596,16 @@
write_letter (finfo, 'C');
}
else
@@ -4818,21 +4819,20 @@
if (status != 0 && status != 1)
{
-Index: src/version.h.in
+Index: src/version.c
===================================================================
-RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/version.h.in,v
-retrieving revision 1.1.1.1
-diff -u -d -u -3 -r1.1.1.1 version.h.in
---- src/version.h.in 20 Aug 2001 17:52:53 -0000 1.1.1.1
-+++ src/version.h.in 21 Apr 2002 08:57:57 -0000
-@@ -10,6 +10,10 @@
- #ifndef VERSION_H
- #define VERSION_H 1
-
+RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/version.c,v
+retrieving revision 1.1.1.7
+diff -u -d -r1.1.1.7 version.c
+--- src/version.c 29 Apr 2002 04:25:58 -0000 1.1.1.7
++++ src/version.c 28 Dec 2002 11:09:23 -0000
+@@ -62,6 +62,9 @@
+ some idea of how long ago their version of CVS was
+ released. */
+ (void) fputs (PACKAGE_STRING, stdout);
+#ifdef RSE_PATCHES
-+#define version_string "Concurrent Versions System (CVS) @VERSION@ [RSE]"
-+#else
- #define version_string "Concurrent Versions System (CVS) @VERSION@"
++ (void) fputs (" [RSE]", stdout);
+#endif
+ (void) fputs (config_string, stdout);
- #endif /* VERSION_H */
+ #ifdef CLIENT_SUPPORT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.spec
============================================================================
$ cvs diff -u -r1.40 -r1.41 cvs.spec
--- openpkg-src/cvs/cvs.spec 20 Dec 2002 19:12:11 -0000 1.40
+++ openpkg-src/cvs/cvs.spec 28 Dec 2002 12:01:59 -0000 1.41
@@ -24,7 +24,7 @@
##
# the involved versions
-%define V_cvs 1.11.2
+%define V_cvs 1.11.3
%define V_cvslock 0.2
# optional support for applying the RSE patches
@@ -45,7 +45,7 @@
Group: SCM
License: GPL
Version: %{V_cvs}
-Release: 20021211
+Release: 20021228
# list of sources
Source0: http://www.cvshome.org/files/19/10/cvs-%{V_cvs}.tar.gz
@@ -54,7 +54,6 @@
Source3: cvs.patches.rse
Source4: cvs.patches.msvb
Source5: rc.cvs
-Patch0: cvs.patch
# build information
Prefix: %{l_prefix}
@@ -95,9 +94,6 @@
%prep
%setup0 -q -c
%setup1 -q -T -D -a 1
- ( cd cvs-%{V_cvs}
- %patch0 -p0
- )
%if "%{with_rse_patches}" == "yes"
( cd cvs-%{V_cvs}
cat %{SOURCE cvs.patches.rse} |\
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2401 -r1.2402 news.txt
--- openpkg-web/news.txt 28 Dec 2002 09:49:44 -0000 1.2401
+++ openpkg-web/news.txt 28 Dec 2002 12:01:58 -0000 1.2402
@@ -1,3 +1,4 @@
+28-Dec-2002: Upgraded package: P<cvs-1.11.3-20021228>
28-Dec-2002: Upgraded package: P<apache-1.3.27-20021228>
28-Dec-2002: Upgraded package: P<perl-tk-20021228-20021228>
28-Dec-2002: Upgraded package: P<xterm-1.72-20021228>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
