[Pkg-cvs-commits] r29 - /trunk/patches/94_parseopts

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

Author: 93sam
Date: Fri Aug 18 23:13:35 2006
New Revision: 29

URL: http://svn.debian.org/wsvn/?sc=1&rev=29
Log:
Folded in fixes from 94_rcsbuf_crashfix

Modified:
    trunk/patches/94_parseopts

Modified: trunk/patches/94_parseopts
URL: http://svn.debian.org/wsvn/trunk/patches/94_parseopts?rev=29&op=diff
==============================================================================
--- trunk/patches/94_parseopts (original)
+++ trunk/patches/94_parseopts Fri Aug 18 23:13:35 2006
@@ -1,8 +1,6 @@
-# Patch from OpenBSD to support an "options" file
-# Author unknown
 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-02-27 10:13:15.000000000 +0800
-+++ cvs-1.12.13/src/cvs.h	2006-02-27 10:13:17.000000000 +0800
+--- cvs-1.12.13-old/src/cvs.h	2006-08-19 00:05:38.000000000 +0100
++++ cvs-1.12.13/src/cvs.h	2006-08-19 00:05:41.000000000 +0100
 @@ -177,6 +177,7 @@
  #define	CVSROOTADM_LOGINFO	"loginfo"
  #define	CVSROOTADM_MODULES	"modules"
@@ -20,9 +18,9 @@ diff -ruN cvs-1.12.13-old/src/cvs.h cvs-
  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-02-27 10:13:15.000000000 +0800
-+++ cvs-1.12.13/src/main.c	2006-02-27 10:23:31.000000000 +0800
-@@ -1103,6 +1103,8 @@
+--- cvs-1.12.13-old/src/main.c	2006-08-19 00:05:38.000000000 +0100
++++ cvs-1.12.13/src/main.c	2006-08-19 00:08:14.000000000 +0100
+@@ -1108,6 +1108,8 @@
  		   CVSROOT/config file to fix the broken one!  */
  		if (config) free_config (config);
  		config = parse_config (current_parsed_root->directory, NULL);
@@ -31,7 +29,7 @@ diff -ruN cvs-1.12.13-old/src/main.c cvs
  
  		/* Can set TMPDIR in the environment if necessary now, since
  		 * if it was set in config, we now know it.
-@@ -1477,5 +1479,63 @@
+@@ -1482,5 +1484,63 @@
      exit (EXIT_FAILURE);
  }
  
@@ -73,14 +71,14 @@ diff -ruN cvs-1.12.13-old/src/main.c cvs
 +                char *rcs_localid;
 +
 +                rcs_localid = buf + 4;
-+                RCS_setlocalid(path, NULL, NULL, rcs_localid);
++                RCS_setlocalid(path, 0, &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
@@ -96,9 +94,9 @@ diff -ruN cvs-1.12.13-old/src/main.c cvs
  /* vim:tabstop=8:shiftwidth=4
   */
 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-02-27 10:13:15.000000000 +0800
-+++ cvs-1.12.13/src/server.c	2006-02-27 10:13:17.000000000 +0800
-@@ -982,6 +982,9 @@
+--- cvs-1.12.13-old/src/server.c	2006-08-19 00:05:38.000000000 +0100
++++ cvs-1.12.13/src/server.c	2006-08-19 00:05:41.000000000 +0100
+@@ -985,6 +985,9 @@
  		     config->MaxCompressionLevel);
      }