OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Jan-2003 16:20:54
Branch: OPENPKG_1_0_SOLID Handle: 2003012115205300
Added files: (Branch: OPENPKG_1_0_SOLID)
openpkg-src/cvs cvs.patch
Modified files: (Branch: OPENPKG_1_0_SOLID)
openpkg-src/cvs cvs.spec
Log:
SA-2003.004-cvs; CAN-2003-0015
Summary:
Revision Changes Path
1.3.6.1 +89 -0 openpkg-src/cvs/cvs.patch
1.13.2.4 +5 -3 openpkg-src/cvs/cvs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.patch
============================================================================
$ cvs diff -u -r0 -r1.3.6.1 cvs.patch
--- /dev/null 2003-01-21 16:20:53.000000000 +0100
+++ cvs.patch 2003-01-21 16:20:54.000000000 +0100
@@ -0,0 +1,89 @@
+--- cvs-1.11.1p1/src/client.c.orig Tue Jan 21 13:42:34 2003
++++ cvs-1.11.1p1/src/client.c Tue Jan 21 13:42:43 2003
+@@ -2117,7 +2117,7 @@
+ * date. Create a dummy timestamp which will never compare
+ * equal to the timestamp of the file.
+ */
+- if (vn[0] == '\0' || vn[0] == '0' || vn[0] == '-')
++ if (vn[0] == '\0' || strcmp (vn, "0") == 0 || vn[0] == '-')
+ local_timestamp = "dummy timestamp";
+ else if (local_timestamp == NULL)
+ {
+--- cvs-1.11.1p1/src/commit.c.orig Tue Jan 21 13:42:34 2003
++++ cvs-1.11.1p1/src/commit.c Tue Jan 21 13:42:43 2003
+@@ -248,15 +248,7 @@
+ xfinfo.rcs = NULL;
+
+ vers = Version_TS (&xfinfo, NULL, saved_tag, NULL, 0, 0);
+- if (vers->ts_user == NULL
+- && vers->vn_user != NULL
+- && vers->vn_user[0] == '-')
+- /* FIXME: If vn_user is starts with "-" but ts_user is
+- non-NULL, what classify_file does is print "%s should be
+- removed and is still there". I'm not sure what it does
+- then. We probably should do the same. */
+- status = T_REMOVED;
+- else if (vers->vn_user == NULL)
++ if (vers->vn_user == NULL)
+ {
+ if (vers->ts_user == NULL)
+ error (0, 0, "nothing known about `%s'", finfo->fullname);
+@@ -266,15 +258,28 @@
+ freevers_ts (&vers);
+ return 1;
+ }
+- else if (vers->ts_user != NULL
+- && vers->vn_user != NULL
+- && vers->vn_user[0] == '0')
+- /* FIXME: If vn_user is "0" but ts_user is NULL, what classify_file
+- does is print "new-born %s has disappeared" and removes the entry.
+- We probably should do the same. */
++ if (vers->ts_user == NULL)
++ {
++ if (strcmp (vers->vn_user, "0") == 0)
++ /* This happens when one has `cvs add'ed a file, but it no
++ longer exists in the working directory at commit time.
++ FIXME: What classify_file does in this case is print
++ "new-born %s has disappeared" and removes the entry.
++ We probably should do the same. */
++ status = T_ADDED;
++ else if (vers->vn_user[0] == '-')
++ status = T_REMOVED;
++ else
++ {
++ /* FIXME: What classify_file does in this case is print
++ "%s was lost". We probably should do the same. */
++ freevers_ts (&vers);
++ return 0;
++ }
++ }
++ else if (strcmp (vers->vn_user, "0") == 0)
+ status = T_ADDED;
+- else if (vers->ts_user != NULL
+- && vers->ts_rcs != NULL
++ else if (vers->ts_rcs != NULL
+ && (args->force || strcmp (vers->ts_user, vers->ts_rcs) != 0))
+ /* If we are forcing commits, pretend that the file is
+ modified. */
+--- cvs-1.11.1p1/src/server.c.orig Tue Jan 21 13:42:34 2003
++++ cvs-1.11.1p1/src/server.c Tue Jan 21 13:42:43 2003
+@@ -977,9 +977,6 @@
+ return;
+ }
+
+- if (dir_name != NULL)
+- free (dir_name);
+-
+ dir_len = strlen (dir);
+
+ /* Check for a trailing '/'. This is not ISDIRSEP because \ in the
+@@ -994,6 +991,9 @@
+ "E protocol error: invalid directory syntax in %s", dir);
+ return;
+ }
++
++ if (dir_name != NULL)
++ free (dir_name);
+
+ dir_name = malloc (strlen (server_temp_dir) + dir_len + 40);
+ if (dir_name == NULL)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.spec
============================================================================
$ cvs diff -u -r1.13.2.3 -r1.13.2.4 cvs.spec
--- openpkg-src/cvs/cvs.spec 12 Mar 2002 15:12:52 -0000 1.13.2.3
+++ openpkg-src/cvs/cvs.spec 21 Jan 2003 15:20:53 -0000 1.13.2.4
@@ -37,13 +37,14 @@
Group: CVS
License: GPL
Version: %{V_cvs}
-Release: 1.0.1
+Release: 1.0.2
# list of sources
Source0: http://www.cvshome.org/files/19/10/cvs-%{V_cvs}.tar.gz
Source1:
ftp://riemann.iam.uni-bonn.de/pub/users/roessler/cvslock/cvslock-%{V_cvslock}.tar.gz
Source2: http://www.red-bean.com/cvs2cl/cvs2cl.pl
-Patch0: zlib.patch
+Patch0: cvs.patch
+Patch1: zlib.patch
# build information
Prefix: %{l_prefix}
@@ -74,8 +75,9 @@
%prep
%setup0 -q -c
%setup1 -q -T -D -a 1
+ %patch0 -p0
cd cvs-%{V_cvs}/zlib
- %patch0 -p1
+ %patch1 -p1
%build
( cd cvs-%{V_cvs}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
