[Pkg-cvs-commits] r27 - in /trunk: changelog patches/94_rcsbuf_crash

[93sam at users.alioth.debian.org]

Author: 93sam
Date: Wed Aug 16 23:06:25 2006
New Revision: 27

URL: http://svn.debian.org/wsvn/?sc=1&rev=27
Log:
Add 94_rcsbuf_crash: parse old-style tag= and tagexpand=
options in the options files properly, don't crash!


Added:
    trunk/patches/94_rcsbuf_crash
Modified:
    trunk/changelog

Modified: trunk/changelog
URL: http://svn.debian.org/wsvn/trunk/changelog?rev=27&op=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Wed Aug 16 23:06:25 2006
@@ -13,6 +13,10 @@ cvs (1:1.12.13-4) unstable; urgency=low
     + Add pt.po for Portuguese translation of debconf messages,
       thanks to Miguel Figueiredo and Ricardo Silva.
       (Closes: #381742)
+  [ Steve McIntyre ]
+  * debian/patches:
+    + Add 94_rcsbuf_crash: parse old-style tag= and tagexpand=
+      options in the options files properly, don't crash!
 
  -- Zak B. Elep <zakame at spunge.org>  Mon, 14 Aug 2006 23:33:09 +0800
 

Added: trunk/patches/94_rcsbuf_crash
URL: http://svn.debian.org/wsvn/trunk/patches/94_rcsbuf_crash?rev=27&op=file
==============================================================================
--- trunk/patches/94_rcsbuf_crash (added)
+++ trunk/patches/94_rcsbuf_crash Wed Aug 16 23:06:25 2006
@@ -0,0 +1,64 @@
+diff -ruN cvs-1.12.13-old/src/cvs.h cvs-1.12.13/src/cvs.h
+--- cvs-1.12.13-old/src/cvs.h	2006-08-16 23:59:17.000000000 +0100
++++ cvs-1.12.13/src/cvs.h	2006-08-16 23:59:31.000000000 +0100
+@@ -507,7 +507,7 @@
+ char *strcat_filename_onto_homedir (const char *, const char *);
+ char *cvs_temp_name (void);
+ FILE *cvs_temp_file (char **filename);
+-void parseopts (const char *root);
++void parseopts (const char *root, struct config *config);
+ 
+ int ls (int argc, char *argv[]);
+ int unlink_file (const char *f);
+diff -ruN cvs-1.12.13-old/src/main.c cvs-1.12.13/src/main.c
+--- cvs-1.12.13-old/src/main.c	2006-08-16 23:59:17.000000000 +0100
++++ cvs-1.12.13/src/main.c	2006-08-16 23:59:31.000000000 +0100
+@@ -1104,7 +1104,7 @@
+ 		if (config) free_config (config);
+ 		config = parse_config (current_parsed_root->directory, NULL);
+ 		/* Now is a convenient time to read CVSROOT/options */
+-		parseopts(current_parsed_root->directory);
++		parseopts(current_parsed_root->directory, config);
+ 
+ 		/* Can set TMPDIR in the environment if necessary now, since
+ 		 * if it was set in config, we now know it.
+@@ -1480,8 +1480,9 @@
+ }
+ 
+ void
+-parseopts(root)
++parseopts(root, config)
+     const char *root;
++    struct config *config;
+ {
+     char path[PATH_MAX];
+     int save_errno;
+@@ -1517,14 +1518,14 @@
+                 char *rcs_localid;
+ 
+                 rcs_localid = buf + 4;
+-                RCS_setlocalid(path, NULL, NULL, rcs_localid);
++                RCS_setlocalid(path, NULL, &config->keywords, rcs_localid);
+             }
+             if (!strncmp(buf, "tagexpand=", 10)) {
+                 char *what;
+                 char *rcs_incexc;
+ 
+                 rcs_incexc = buf + 10;
+-                RCS_setincexc(NULL, rcs_incexc);
++                RCS_setincexc(&config->keywords, rcs_incexc);
+             }
+             /*
+              * OpenBSD has a "umask=" and "dlimit=" command, we silently
+diff -ruN cvs-1.12.13-old/src/server.c cvs-1.12.13/src/server.c
+--- cvs-1.12.13-old/src/server.c	2006-08-16 23:59:17.000000000 +0100
++++ cvs-1.12.13/src/server.c	2006-08-16 23:59:31.000000000 +0100
+@@ -983,7 +983,7 @@
+     }
+ 
+     /* Now is a good time to read CVSROOT/options too. */
+-    parseopts(current_parsed_root->directory);
++    parseopts(current_parsed_root->directory, config);
+ 
+     path = xmalloc (strlen (current_parsed_root->directory)
+ 		   + sizeof (CVSROOTADM)