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 21:26:10
Branch: HEAD Handle: 2002122820260801
Modified files:
openpkg-re/vcheck vc.cvs
openpkg-src/cvs cvs.patches.rse cvs.spec
openpkg-web news.txt
Log:
upgrade to CVS 1.11.4; upgrade cvs2cl to 2.44
Summary:
Revision Changes Path
1.4 +1 -1 openpkg-re/vcheck/vc.cvs
1.7 +38 -38 openpkg-src/cvs/cvs.patches.rse
1.42 +2 -1 openpkg-src/cvs/cvs.spec
1.2405 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.cvs
============================================================================
$ cvs diff -u -r1.3 -r1.4 vc.cvs
--- openpkg-re/vcheck/vc.cvs 28 Dec 2002 12:01:58 -0000 1.3
+++ openpkg-re/vcheck/vc.cvs 28 Dec 2002 20:26:08 -0000 1.4
@@ -2,7 +2,7 @@
}
prog cvs = {
- version = 1.11.3
+ version = 1.11.4
url = http://ccvs.cvshome.org/servlets/ProjectDownloadList
regex = cvs-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.patches.rse
============================================================================
$ cvs diff -u -r1.6 -r1.7 cvs.patches.rse
--- openpkg-src/cvs/cvs.patches.rse 28 Dec 2002 12:01:59 -0000 1.6
+++ openpkg-src/cvs/cvs.patches.rse 28 Dec 2002 20:26:09 -0000 1.7
@@ -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.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
+retrieving revision 1.1.1.7
+diff -u -d -r1.1.1.7 admin.c
+--- src/admin.c 28 Dec 2002 18:01:30 -0000 1.1.1.7
++++ src/admin.c 28 Dec 2002 20:14:05 -0000
@@ -139,6 +139,161 @@
dat->av[dat->ac++] = newelt;
}
@@ -655,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.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
+retrieving revision 1.1.1.7
+diff -u -d -r1.1.1.7 client.c
+--- src/client.c 28 Dec 2002 18:01:30 -0000 1.1.1.7
++++ src/client.c 28 Dec 2002 20:14:06 -0000
@@ -104,6 +104,9 @@
int status PROTO((int argc, char **argv));
int tag PROTO((int argc, char **argv));
@@ -736,10 +736,10 @@
Index: src/commit.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/commit.c,v
-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
+retrieving revision 1.1.1.7
+diff -u -d -r1.1.1.7 commit.c
+--- src/commit.c 28 Dec 2002 18:01:30 -0000 1.1.1.7
++++ src/commit.c 28 Dec 2002 20:14:06 -0000
@@ -308,6 +308,9 @@
data->type = status;
data->tag = xstrdup (vers->tag);
@@ -851,10 +851,10 @@
Index: src/cvs.h
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/cvs.h,v
-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
+retrieving revision 1.1.1.7
+diff -u -d -r1.1.1.7 cvs.h
+--- src/cvs.h 28 Dec 2002 18:01:30 -0000 1.1.1.7
++++ src/cvs.h 28 Dec 2002 20:14:06 -0000
@@ -7,6 +7,48 @@
*/
@@ -1359,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.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
+retrieving revision 1.1.1.6
+diff -u -d -r1.1.1.6 diff.c
+--- src/diff.c 28 Dec 2002 18:01:30 -0000 1.1.1.6
++++ src/diff.c 28 Dec 2002 20:14:06 -0000
@@ -271,7 +271,11 @@
optind = 0;
@@ -2032,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.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
+retrieving revision 1.1.1.7
+diff -u -d -r1.1.1.7 lock.c
+--- src/lock.c 28 Dec 2002 18:01:30 -0000 1.1.1.7
++++ src/lock.c 28 Dec 2002 20:14:06 -0000
@@ -403,7 +403,11 @@
(void) fprintf (stderr, "%s-> Reader_Lock(%s)\n", CLIENT_SERVER_STR,
xrepository);
@@ -3214,18 +3214,18 @@
Index: src/recurse.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/recurse.c,v
-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
+retrieving revision 1.1.1.7
+diff -u -d -r1.1.1.7 recurse.c
+--- src/recurse.c 28 Dec 2002 18:01:30 -0000 1.1.1.7
++++ src/recurse.c 28 Dec 2002 20:14:37 -0000
@@ -511,7 +511,11 @@
if (frame->flags == R_SKIP_ALL)
return (0);
+#ifdef RSE_PATCH_NOLOCK
-+ locktype = nolock ? LOCK_NONE : frame->locktype;
++ locktype = nolock ? CVS_LOCK_NONE : frame->locktype;
+#else
- locktype = noexec ? LOCK_NONE : frame->locktype;
+ locktype = noexec ? CVS_LOCK_NONE : frame->locktype;
+#endif
/* The fact that locks are not active here is what makes us fail to have
@@ -4749,10 +4749,10 @@
Index: src/tag.c
===================================================================
RCS file: /e/ossp/pkg/tool/cvs/cvs/cvs/src/tag.c,v
-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
+retrieving revision 1.1.1.7
+diff -u -d -r1.1.1.7 tag.c
+--- src/tag.c 28 Dec 2002 18:01:30 -0000 1.1.1.7
++++ src/tag.c 28 Dec 2002 20:14:07 -0000
@@ -1300,7 +1300,11 @@
/* The tags is valid but not mentioned in val-tags. Add it. */
datum value;
@@ -4768,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.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
+retrieving revision 1.1.1.7
+diff -u -d -r1.1.1.7 update.c
+--- src/update.c 28 Dec 2002 18:01:30 -0000 1.1.1.7
++++ src/update.c 28 Dec 2002 20:14:07 -0000
@@ -203,7 +203,11 @@
break;
case 'p':
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 cvs.spec
--- openpkg-src/cvs/cvs.spec 28 Dec 2002 12:01:59 -0000 1.41
+++ openpkg-src/cvs/cvs.spec 28 Dec 2002 20:26:09 -0000 1.42
@@ -24,7 +24,7 @@
##
# the involved versions
-%define V_cvs 1.11.3
+%define V_cvs 1.11.4
%define V_cvslock 0.2
# optional support for applying the RSE patches
@@ -147,6 +147,7 @@
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
)
%{l_shtool} install -c -m 755 \
+ -e 's;#!/usr/bin/perl;#!%{l_prefix}/bin/perl;' \
%{SOURCE cvs2cl.pl} $RPM_BUILD_ROOT%{l_prefix}/bin/cvs2cl
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%if "%{with_rse_patches}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2404 -r1.2405 news.txt
--- openpkg-web/news.txt 28 Dec 2002 19:12:05 -0000 1.2404
+++ openpkg-web/news.txt 28 Dec 2002 20:26:08 -0000 1.2405
@@ -1,3 +1,4 @@
+28-Dec-2002: Upgraded package: P<cvs-1.11.4-20021228>
28-Dec-2002: Upgraded package: P<vim-6.1.267-20021228>
28-Dec-2002: Upgraded package: P<perl-mail-20021228-20021228>
28-Dec-2002: Upgraded package: P<cvs-1.11.3-20021228>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
