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: 11-Dec-2003 22:28:43
Branch: HEAD Handle: 2003121121284003
Modified files:
openpkg-re/vcheck vc.cvs
openpkg-src/cvs cvs.patch.rse cvs.spec
openpkg-web news.txt
Log:
upgrading package: cvs 1.12.3 -> 1.12.4
Summary:
Revision Changes Path
1.11 +1 -1 openpkg-re/vcheck/vc.cvs
1.5 +34 -34 openpkg-src/cvs/cvs.patch.rse
1.76 +2 -2 openpkg-src/cvs/cvs.spec
1.7736 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.cvs
============================================================================
$ cvs diff -u -r1.10 -r1.11 vc.cvs
--- openpkg-re/vcheck/vc.cvs 5 Dec 2003 20:46:04 -0000 1.10
+++ openpkg-re/vcheck/vc.cvs 11 Dec 2003 21:28:40 -0000 1.11
@@ -2,7 +2,7 @@
}
prog cvs = {
- version = 1.12.3
+ version = 1.12.4
url = http://ccvs.cvshome.org/servlets/ProjectDownloadList
regex = cvs-(__VER__)\.tar\.bz2
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.patch.rse
============================================================================
$ cvs diff -u -r1.4 -r1.5 cvs.patch.rse
--- openpkg-src/cvs/cvs.patch.rse 5 Dec 2003 20:46:06 -0000 1.4
+++ openpkg-src/cvs/cvs.patch.rse 11 Dec 2003 21:28:43 -0000 1.5
@@ -335,10 +335,10 @@
Index: src/admin.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/admin.c,v
-retrieving revision 1.1.1.10
-diff -u -d -r1.1.1.10 admin.c
---- src/admin.c 21 Oct 2003 21:04:04 -0000 1.1.1.10
-+++ src/admin.c 27 Oct 2003 19:26:04 -0000
+retrieving revision 1.1.1.11
+diff -u -d -r1.1.1.11 admin.c
+--- src/admin.c 9 Dec 2003 19:38:36 -0000 1.1.1.11
++++ src/admin.c 11 Dec 2003 21:04:09 -0000
@@ -137,6 +137,160 @@
dat->av[dat->ac++] = newelt;
}
@@ -502,7 +502,7 @@
{
@@ -513,6 +667,20 @@
- lock_tree_for_write (argc, argv, 0, W_LOCAL, 0);
+ lock_tree_promotably (argc, argv, 0, W_LOCAL, 0);
+#ifdef RSE_PATCH_ADMININFO
+ /* allow `CVSROOT/CVSROOT/admininfo' filters to check whether the
@@ -519,8 +519,8 @@
+#endif
+
err = start_recursion
- ( admin_fileproc, (FILESDONEPROC) NULL, admin_dirproc,
- (DIRLEAVEPROC) NULL, (void *) &admin_data,
+ (admin_fileproc, NULL, admin_dirproc,
+ NULL, &admin_data,
Index: src/buffer.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/buffer.c,v
@@ -677,10 +677,10 @@
Index: src/commit.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/commit.c,v
-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
+retrieving revision 1.1.1.13
+diff -u -d -r1.1.1.13 commit.c
+--- src/commit.c 9 Dec 2003 19:38:58 -0000 1.1.1.13
++++ src/commit.c 11 Dec 2003 21:04:10 -0000
@@ -291,6 +291,9 @@
data->type = status;
data->tag = xstrdup (vers->tag);
@@ -792,10 +792,10 @@
Index: src/cvs.h
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/cvs.h,v
-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
+retrieving revision 1.1.1.12
+diff -u -d -r1.1.1.12 cvs.h
+--- src/cvs.h 8 Dec 2003 19:43:00 -0000 1.1.1.12
++++ src/cvs.h 11 Dec 2003 21:04:10 -0000
@@ -7,6 +7,45 @@
*/
@@ -876,7 +876,7 @@
#define CVSNULLREPOS "Emptydir" /* an empty directory */
-@@ -440,6 +506,27 @@
+@@ -442,6 +508,27 @@
void root_allow_free (void);
int root_allow_ok (char *);
@@ -904,7 +904,7 @@
char *gca (const char *rev1, const char *rev2);
void check_numeric (const char *, int, char **);
char *getcaller (void);
-@@ -556,6 +643,10 @@
+@@ -559,6 +646,10 @@
void expand_wild (int argc, char **argv,
int *pargc, char ***pargv);
@@ -915,7 +915,7 @@
#ifdef SERVER_SUPPORT
int cvs_casecmp (const char *, const char *);
int fopen_case (char *, char *, FILE **, char **);
-@@ -803,6 +894,9 @@
+@@ -806,6 +897,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 @@
};
/* Wrappers. */
-@@ -842,6 +936,13 @@
+@@ -845,6 +939,13 @@
int unedit (int argc, char **argv);
int editors (int argc, char **argv);
int watchers (int argc, char **argv);
@@ -939,7 +939,7 @@
int annotate (int argc, char **argv);
int add (int argc, char **argv);
int admin (int argc, char **argv);
-@@ -871,6 +972,9 @@
+@@ -874,6 +975,9 @@
int cvsstatus (int argc, char **argv);
int cvstag (int argc, char **argv);
int version (int argc, char **argv);
@@ -3544,10 +3544,10 @@
Index: src/sanity.sh
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/sanity.sh,v
-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
+retrieving revision 1.1.1.11
+diff -u -d -r1.1.1.11 sanity.sh
+--- src/sanity.sh 9 Dec 2003 17:40:07 -0000 1.1.1.11
++++ src/sanity.sh 11 Dec 2003 21:04:12 -0000
@@ -391,6 +391,7 @@
# "debugger"
#set -x
@@ -3598,7 +3598,7 @@
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
-@@ -21840,7 +21847,7 @@
+@@ -21839,7 +21846,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.
@@ -3610,10 +3610,10 @@
Index: src/server.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/server.c,v
-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
+retrieving revision 1.1.1.12
+diff -u -d -r1.1.1.12 server.c
+--- src/server.c 9 Dec 2003 16:38:05 -0000 1.1.1.12
++++ src/server.c 11 Dec 2003 21:04:13 -0000
@@ -112,6 +112,16 @@
# endif /* AUTH_SERVER_SUPPORT */
@@ -3655,7 +3655,7 @@
if (status == 0)
{
if (!outside_root (repos))
-@@ -3808,6 +3828,17 @@
+@@ -3813,6 +3833,17 @@
}
/* See server.h for description. */
@@ -3673,7 +3673,7 @@
void
server_modtime (struct file_info *finfo, Vers_TS *vers_ts)
-@@ -4541,6 +4572,9 @@
+@@ -4546,6 +4577,9 @@
REQ_LINE("expand-modules", serve_expand_modules, 0),
REQ_LINE("ci", serve_ci, RQ_ESSENTIAL),
REQ_LINE("co", serve_co, RQ_ESSENTIAL),
@@ -3683,7 +3683,7 @@
REQ_LINE("update", serve_update, RQ_ESSENTIAL),
REQ_LINE("diff", serve_diff, 0),
REQ_LINE("log", serve_log, 0),
-@@ -5179,8 +5213,13 @@
+@@ -5194,8 +5228,13 @@
{
char *env;
@@ -3697,7 +3697,7 @@
(void) putenv (env);
env = xmalloc (sizeof "USER=" + strlen (username));
-@@ -5712,6 +5751,10 @@
+@@ -5727,6 +5766,10 @@
|| !strip_trailing_newlines (password))
error (1, 0, "Maximum line length exceeded during authentication.");
@@ -3708,7 +3708,7 @@
/* ... and make sure the protocol ends on the right foot. */
/* See above comment about error handling. */
getnline( &tmp, &tmp_allocated, PATH_MAX, stdin );
-@@ -6422,3 +6465,517 @@
+@@ -6437,3 +6480,517 @@
cvs_output (text, 0);
}
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.spec
============================================================================
$ cvs diff -u -r1.75 -r1.76 cvs.spec
--- openpkg-src/cvs/cvs.spec 5 Dec 2003 20:46:06 -0000 1.75
+++ openpkg-src/cvs/cvs.spec 11 Dec 2003 21:28:43 -0000 1.76
@@ -24,7 +24,7 @@
##
# the involved versions
-%define V_cvs 1.12.3
+%define V_cvs 1.12.4
%define V_cvslock 0.2
# package information
@@ -37,7 +37,7 @@
Group: SCM
License: GPL
Version: %{V_cvs}
-Release: 20031205
+Release: 20031211
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7735 -r1.7736 news.txt
--- openpkg-web/news.txt 11 Dec 2003 20:55:32 -0000 1.7735
+++ openpkg-web/news.txt 11 Dec 2003 21:28:41 -0000 1.7736
@@ -1,3 +1,4 @@
+11-Dec-2003: Upgraded package: P<cvs-1.12.4-20031211>
11-Dec-2003: Upgraded package: P<abiword-2.0.2-20031211>
11-Dec-2003: Upgraded package: P<perl-curses-20031211-20031211>
11-Dec-2003: Upgraded package: P<perl-tk-20031211-20031211>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
