[Pkg-tcltk-commits] r697 - in tcl8.3/trunk/debian: . patches

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Sat Jul 5 13:58:27 UTC 2008


Author: sgolovan-guest
Date: 2008-07-05 13:58:26 +0000 (Sat, 05 Jul 2008)
New Revision: 697

Added:
   tcl8.3/trunk/debian/patches/CVE-2007-6067.diff
Modified:
   tcl8.3/trunk/debian/changelog
   tcl8.3/trunk/debian/patches/64bit.diff
   tcl8.3/trunk/debian/patches/m4quote.diff
   tcl8.3/trunk/debian/patches/m4typo.diff
   tcl8.3/trunk/debian/patches/manpages.diff
   tcl8.3/trunk/debian/patches/non-linux.diff
   tcl8.3/trunk/debian/patches/rpath.diff
   tcl8.3/trunk/debian/patches/series
   tcl8.3/trunk/debian/patches/tclinc.diff
   tcl8.3/trunk/debian/patches/tcllibrary.diff
   tcl8.3/trunk/debian/patches/tclpackagepath.diff
   tcl8.3/trunk/debian/patches/ungets.diff
Log:
[tcl8.3]
  * Fixed CVE-2007-6067 vulnerability (The regular expression parser in TCL
    allows users to cause a denial of service (memory consumption) via a
    crafted "complex" regular expression with doubly-nested states.)
  * Set urgency to medium as this upload fixes a security bug.
  * Refreshed patches.


Modified: tcl8.3/trunk/debian/changelog
===================================================================
--- tcl8.3/trunk/debian/changelog	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/changelog	2008-07-05 13:58:26 UTC (rev 697)
@@ -1,14 +1,17 @@
-tcl8.3 (8.3.5-13) unstable; urgency=high
+tcl8.3 (8.3.5-13) unstable; urgency=medium
 
   * Fixed CVE-2007-4772 vulnerability (The regular expression parser in TCL
-    before 8.4.17 allows context-dependent attackers to cause a denial of
-    service (infinite loop) via a crafted regular expression.)
-  * Set urgency to high as this upload fixes a security bug.
+    before 8.4.17 allows attacker to cause a denial of service (infinite
+    loop) via a crafted regular expression.)
+  * Fixed CVE-2007-6067 vulnerability (The regular expression parser in TCL
+    allows users to cause a denial of service (memory consumption) via a
+    crafted "complex" regular expression with doubly-nested states.)
+  * Set urgency to medium as this upload fixes a security bug.
   * Protected quilt calls in debian/rules to make the source package
     convertible to 3.0 (quilt) format (closes: #484912).
   * Bumped standards version to 3.8.0.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 04 Jul 2008 21:35:52 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 05 Jul 2008 17:31:11 +0400
 
 tcl8.3 (8.3.5-12) unstable; urgency=low
 

Modified: tcl8.3/trunk/debian/patches/64bit.diff
===================================================================
--- tcl8.3/trunk/debian/patches/64bit.diff	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/patches/64bit.diff	2008-07-05 13:58:26 UTC (rev 697)
@@ -1,10 +1,8 @@
 Patch by John Goerzen fixes work with numbers larger than 31 bit on 64-bit
 architectures. See debian/patches/64bit for details.
 
-Index: tcl8.3-8.3.5/generic/tclObj.c
-===================================================================
---- tcl8.3-8.3.5.orig/generic/tclObj.c	2002-04-26 23:27:03.000000000 +0400
-+++ tcl8.3-8.3.5/generic/tclObj.c	2007-10-18 20:19:14.000000000 +0400
+--- tcl8.3-8.3.5.orig/generic/tclObj.c
++++ tcl8.3-8.3.5/generic/tclObj.c
 @@ -1610,7 +1610,7 @@
  	}
      }

Added: tcl8.3/trunk/debian/patches/CVE-2007-6067.diff
===================================================================
--- tcl8.3/trunk/debian/patches/CVE-2007-6067.diff	                        (rev 0)
+++ tcl8.3/trunk/debian/patches/CVE-2007-6067.diff	2008-07-05 13:58:26 UTC (rev 697)
@@ -0,0 +1,205 @@
+--- tcl8.3-8.3.5.orig/generic/regc_color.c
++++ tcl8.3-8.3.5/generic/regc_color.c
+@@ -552,12 +552,9 @@
+ 			scd->sub = NOSUB;
+ 			while ((a = cd->arcs) != NULL) {
+ 				assert(a->co == co);
+-				/* uncolorchain(cm, a); */
+-				cd->arcs = a->colorchain;
++				uncolorchain(cm, a);
+ 				a->co = sco;
+-				/* colorchain(cm, a); */
+-				a->colorchain = scd->arcs;
+-				scd->arcs = a;
++				colorchain(cm, a);
+ 			}
+ 			freecolor(cm, co);
+ 		} else {
+@@ -586,7 +583,10 @@
+ {
+ 	struct colordesc *cd = &cm->cd[a->co];
+ 
++	if (cd->arcs)
++		cd->arcs->colorchain_rev = a;
+ 	a->colorchain = cd->arcs;
++	a->colorchain_rev = NULL;
+ 	cd->arcs = a;
+ }
+ 
+@@ -600,18 +600,19 @@
+ struct arc *a;
+ {
+ 	struct colordesc *cd = &cm->cd[a->co];
+-	struct arc *aa;
++	struct arc *aa = a->colorchain_rev;
+ 
+-	aa = cd->arcs;
+-	if (aa == a)		/* easy case */
++	if (aa == NULL) {
++		assert(cd->arcs == a);
+ 		cd->arcs = a->colorchain;
+-	else {
+-		for (; aa != NULL && aa->colorchain != a; aa = aa->colorchain)
+-			continue;
+-		assert(aa != NULL);
++	} else {
++		assert(aa->colorchain == a);
+ 		aa->colorchain = a->colorchain;
+ 	}
+-	a->colorchain = NULL;	/* paranoia */
++	if (a->colorchain)
++		a->colorchain->colorchain_rev = aa;
++	a->colorchain = NULL;		/* paranoia */
++	a->colorchain_rev = NULL;
+ }
+ 
+ /*
+--- tcl8.3-8.3.5.orig/generic/regc_nfa.c
++++ tcl8.3-8.3.5/generic/regc_nfa.c
+@@ -61,11 +61,12 @@
+ 	nfa->nstates = 0;
+ 	nfa->cm = cm;
+ 	nfa->v = v;
++	nfa->size = 0;
+ 	nfa->bos[0] = nfa->bos[1] = COLORLESS;
+ 	nfa->eos[0] = nfa->eos[1] = COLORLESS;
++	nfa->parent = parent; /* must be before newfstate to ensure parent is valid */
+ 	nfa->post = newfstate(nfa, '@');	/* number 0 */
+ 	nfa->pre = newfstate(nfa, '>');		/* number 1 */
+-	nfa->parent = parent;
+ 
+ 	nfa->init = newstate(nfa);		/* may become invalid later */
+ 	nfa->final = newstate(nfa);
+@@ -88,6 +89,57 @@
+ }
+ 
+ /*
++ - too_many_states - checks if the max states exceeds the compile-time value
++ ^ static int too_many_states(struct nfa *);
++ */
++static int
++too_many_states(nfa)
++struct nfa *nfa;
++{
++	struct nfa *parent = nfa->parent;
++	size_t sz = nfa->size;
++	while (parent != NULL) {
++		sz = parent->size;
++		parent = parent->parent;
++	}
++	if (sz > REG_MAX_STATES)
++		return 1;
++	return 0;
++}
++
++/*
++ - increment_size - increases the tracked size of the NFA and its parents.
++ ^ static void increment_size(struct nfa *);
++ */
++static void
++increment_size(nfa)
++struct nfa *nfa;
++{
++	struct nfa *parent = nfa->parent;
++	nfa->size++;
++	while (parent != NULL) {
++		parent->size++;
++		parent = parent->parent;
++	}
++}
++
++/*
++ - decrement_size - increases the tracked size of the NFA and its parents.
++ ^ static void decrement_size(struct nfa *);
++ */
++static void
++decrement_size(nfa)
++struct nfa *nfa;
++{
++	struct nfa *parent = nfa->parent;
++	nfa->size--;
++	while (parent != NULL) {
++		parent->size--;
++		parent = parent->parent;
++	}
++}
++
++/*
+  - freenfa - free an entire NFA
+  ^ static VOID freenfa(struct nfa *);
+  */
+@@ -123,6 +175,11 @@
+ {
+ 	struct state *s;
+ 
++	if (too_many_states(nfa)) {
++		/* XXX: add specific error for this */
++		NERR(REG_ETOOBIG);
++		return NULL;
++	}
+ 	if (nfa->free != NULL) {
+ 		s = nfa->free;
+ 		nfa->free = s->next;
+@@ -154,6 +211,8 @@
+ 	}
+ 	s->prev = nfa->slast;
+ 	nfa->slast = s;
++	/* Track the current size and the parent size */
++	increment_size(nfa);
+ 	return s;
+ }
+ 
+@@ -221,6 +280,7 @@
+ 	s->prev = NULL;
+ 	s->next = nfa->free;	/* don't delete it, put it on the free list */
+ 	nfa->free = s;
++	decrement_size(nfa);
+ }
+ 
+ /*
+--- tcl8.3-8.3.5.orig/generic/regerrs.h
++++ tcl8.3-8.3.5/generic/regerrs.h
+@@ -16,3 +16,4 @@
+ { REG_INVARG,	"REG_INVARG",	"invalid argument to regex function" },
+ { REG_MIXED,	"REG_MIXED",	"character widths of regex and string differ" },
+ { REG_BADOPT,	"REG_BADOPT",	"invalid embedded option" },
++{ REG_ETOOBIG,	"REG_ETOOBIG",	"nfa has too many states" },
+--- tcl8.3-8.3.5.orig/generic/regex.h
++++ tcl8.3-8.3.5/generic/regex.h
+@@ -292,6 +292,7 @@
+ #define	REG_INVARG	16	/* invalid argument to regex function */
+ #define	REG_MIXED	17	/* character widths of regex and string differ */
+ #define	REG_BADOPT	18	/* invalid embedded option */
++#define	REG_ETOOBIG	19	/* nfa has too many states */
+ /* two specials for debugging and testing */
+ #define	REG_ATOI	101	/* convert error-code name to number */
+ #define	REG_ITOA	102	/* convert error-code number to name */
+--- tcl8.3-8.3.5.orig/generic/regguts.h
++++ tcl8.3-8.3.5/generic/regguts.h
+@@ -288,6 +288,7 @@
+ #	define	freechain	outchain
+ 	struct arc *inchain;	/* *to's ins chain */
+ 	struct arc *colorchain;	/* color's arc chain */
++	struct arc *colorchain_rev;	/* back-link in color's arc chain */
+ };
+ 
+ struct arcbatch {		/* for bulk allocation of arcs */
+@@ -324,6 +325,7 @@
+ 	struct colormap *cm;	/* the color map */
+ 	color bos[2];		/* colors, if any, assigned to BOS and BOL */
+ 	color eos[2];		/* colors, if any, assigned to EOS and EOL */
++	size_t size;		/* current NFA size; differs from nstates as it will be incremented by its children. */
+ 	struct vars *v;		/* simplifies compile error reporting */
+ 	struct nfa *parent;	/* parent NFA, if any */
+ };
+@@ -353,6 +355,10 @@
+ #define	ZAPCNFA(cnfa)	((cnfa).nstates = 0)
+ #define	NULLCNFA(cnfa)	((cnfa).nstates == 0)
+ 
++/* Used to limit the maximum NFA size */
++#ifndef REG_MAX_STATES
++#  define REG_MAX_STATES 100000
++#endif
+ 
+ 
+ /*

Modified: tcl8.3/trunk/debian/patches/m4quote.diff
===================================================================
--- tcl8.3/trunk/debian/patches/m4quote.diff	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/patches/m4quote.diff	2008-07-05 13:58:26 UTC (rev 697)
@@ -1,10 +1,8 @@
 Patch by Sergei Golovan fixes underquoted definitions in tcl.m4 (see
 bug #357365).
 
-Index: tcl8.3-8.3.5/unix/tcl.m4
-===================================================================
---- tcl8.3-8.3.5.orig/unix/tcl.m4	2002-10-19 00:44:46.000000000 +0400
-+++ tcl8.3-8.3.5/unix/tcl.m4	2007-10-18 20:19:22.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/tcl.m4
++++ tcl8.3-8.3.5/unix/tcl.m4
 @@ -17,7 +17,7 @@
  #				the tclConfig.sh file
  #------------------------------------------------------------------------

Modified: tcl8.3/trunk/debian/patches/m4typo.diff
===================================================================
--- tcl8.3/trunk/debian/patches/m4typo.diff	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/patches/m4typo.diff	2008-07-05 13:58:26 UTC (rev 697)
@@ -1,10 +1,8 @@
 Patch by Chris Waters fixes typo in tcl.m4. The bug is triggered by
 using bash 3.
 
-Index: tcl8.3-8.3.5/unix/configure
-===================================================================
---- tcl8.3-8.3.5.orig/unix/configure	2007-10-18 20:19:20.000000000 +0400
-+++ tcl8.3-8.3.5/unix/configure	2007-10-18 20:19:24.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/configure
++++ tcl8.3-8.3.5/unix/configure
 @@ -4767,7 +4767,7 @@
  	    # results, and the version is kept in special file).
  	
@@ -23,10 +21,8 @@
  	    fi
  	    if test "`uname -s`" = "AIX" ; then
  		system=AIX-`uname -v`.`uname -r`
-Index: tcl8.3-8.3.5/unix/tcl.m4
-===================================================================
---- tcl8.3-8.3.5.orig/unix/tcl.m4	2007-10-18 20:19:22.000000000 +0400
-+++ tcl8.3-8.3.5/unix/tcl.m4	2007-10-18 20:19:24.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/tcl.m4
++++ tcl8.3-8.3.5/unix/tcl.m4
 @@ -639,7 +639,7 @@
  	    # results, and the version is kept in special file).
  	

Modified: tcl8.3/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.3/trunk/debian/patches/manpages.diff	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/patches/manpages.diff	2008-07-05 13:58:26 UTC (rev 697)
@@ -1,10 +1,8 @@
 Patch by Mike Markley uses symlinks instead of hardlinks when installing
 manual pages.
 
-Index: tcl8.3-8.3.5/unix/mkLinks
-===================================================================
---- tcl8.3-8.3.5.orig/unix/mkLinks	2002-10-19 00:44:46.000000000 +0400
-+++ tcl8.3-8.3.5/unix/mkLinks	2007-10-18 20:19:37.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/mkLinks
++++ tcl8.3-8.3.5/unix/mkLinks
 @@ -20,6 +20,11 @@
      exit 1
  fi

Modified: tcl8.3/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.3/trunk/debian/patches/non-linux.diff	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/patches/non-linux.diff	2008-07-05 13:58:26 UTC (rev 697)
@@ -1,10 +1,8 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
-Index: tcl8.3-8.3.5/unix/configure
-===================================================================
---- tcl8.3-8.3.5.orig/unix/configure	2007-10-18 20:19:31.000000000 +0400
-+++ tcl8.3-8.3.5/unix/configure	2007-10-18 20:19:34.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/configure
++++ tcl8.3-8.3.5/unix/configure
 @@ -4772,6 +4772,9 @@
  	    if test "`uname -s`" = "AIX" ; then
  		system=AIX-`uname -v`.`uname -r`
@@ -24,10 +22,8 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
-Index: tcl8.3-8.3.5/unix/tcl.m4
-===================================================================
---- tcl8.3-8.3.5.orig/unix/tcl.m4	2007-10-18 20:19:31.000000000 +0400
-+++ tcl8.3-8.3.5/unix/tcl.m4	2007-10-18 20:19:34.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/tcl.m4
++++ tcl8.3-8.3.5/unix/tcl.m4
 @@ -646,6 +646,9 @@
  	    if test "`uname -s`" = "AIX" ; then
  		system=AIX-`uname -v`.`uname -r`

Modified: tcl8.3/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.3/trunk/debian/patches/rpath.diff	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/patches/rpath.diff	2008-07-05 13:58:26 UTC (rev 697)
@@ -1,10 +1,8 @@
 Patch by Chris Waters removes -rpath from search flags and adds -soname
 to library build options.
 
-Index: tcl8.3-8.3.5/unix/configure
-===================================================================
---- tcl8.3-8.3.5.orig/unix/configure	2007-10-18 20:19:26.000000000 +0400
-+++ tcl8.3-8.3.5/unix/configure	2007-10-18 20:19:31.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/configure
++++ tcl8.3-8.3.5/unix/configure
 @@ -5278,7 +5278,7 @@
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS="-ldl"
@@ -23,10 +21,8 @@
      RANLIB=:
  else
      case $system in
-Index: tcl8.3-8.3.5/unix/configure.in
-===================================================================
---- tcl8.3-8.3.5.orig/unix/configure.in	2007-10-18 20:19:26.000000000 +0400
-+++ tcl8.3-8.3.5/unix/configure.in	2007-10-18 20:19:31.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/configure.in
++++ tcl8.3-8.3.5/unix/configure.in
 @@ -385,7 +385,7 @@
  if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != "" ; then
      TCL_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
@@ -36,10 +32,8 @@
      RANLIB=:
  else
      case $system in
-Index: tcl8.3-8.3.5/unix/tcl.m4
-===================================================================
---- tcl8.3-8.3.5.orig/unix/tcl.m4	2007-10-18 20:19:26.000000000 +0400
-+++ tcl8.3-8.3.5/unix/tcl.m4	2007-10-18 20:19:31.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/tcl.m4
++++ tcl8.3-8.3.5/unix/tcl.m4
 @@ -960,7 +960,7 @@
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS="-ldl"

Modified: tcl8.3/trunk/debian/patches/series
===================================================================
--- tcl8.3/trunk/debian/patches/series	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/patches/series	2008-07-05 13:58:26 UTC (rev 697)
@@ -1,4 +1,5 @@
 CVE-2007-4772.diff
+CVE-2007-6067.diff
 ungets.diff
 64bit.diff
 tcllibrary.diff

Modified: tcl8.3/trunk/debian/patches/tclinc.diff
===================================================================
--- tcl8.3/trunk/debian/patches/tclinc.diff	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/patches/tclinc.diff	2008-07-05 13:58:26 UTC (rev 697)
@@ -7,10 +7,8 @@
 Also, it allows to find tclConfig.sh in /usr/share/tcltk/tcl8.3 and tkConfig.sh
 in /usr/share/tcltk/tk8.3 where they are located in Debian installation.
 
-Index: tcl8.3-8.3.5/unix/configure
-===================================================================
---- tcl8.3-8.3.5.orig/unix/configure	2007-10-19 15:44:28.000000000 +0400
-+++ tcl8.3-8.3.5/unix/configure	2007-10-19 15:44:29.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/configure
++++ tcl8.3-8.3.5/unix/configure
 @@ -6372,6 +6372,9 @@
  TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
  TCL_STUB_LIB_PATH="${libdir}/${TCL_STUB_LIB_FILE}"
@@ -29,10 +27,8 @@
  s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g
  s%@TCL_BUILD_STUB_LIB_PATH@%$TCL_BUILD_STUB_LIB_PATH%g
  s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
-Index: tcl8.3-8.3.5/unix/configure.in
-===================================================================
---- tcl8.3-8.3.5.orig/unix/configure.in	2007-10-19 15:44:26.000000000 +0400
-+++ tcl8.3-8.3.5/unix/configure.in	2007-10-19 15:44:29.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/configure.in
++++ tcl8.3-8.3.5/unix/configure.in
 @@ -481,6 +481,9 @@
  TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
  TCL_STUB_LIB_PATH="${libdir}/${TCL_STUB_LIB_FILE}"
@@ -51,10 +47,8 @@
  AC_SUBST(TCL_BUILD_STUB_LIB_SPEC)
  AC_SUBST(TCL_BUILD_STUB_LIB_PATH)
  
-Index: tcl8.3-8.3.5/unix/tclConfig.sh.in
-===================================================================
---- tcl8.3-8.3.5.orig/unix/tclConfig.sh.in	2002-10-19 00:44:46.000000000 +0400
-+++ tcl8.3-8.3.5/unix/tclConfig.sh.in	2007-10-19 15:44:29.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/tclConfig.sh.in
++++ tcl8.3-8.3.5/unix/tclConfig.sh.in
 @@ -110,12 +110,16 @@
  
  # String to pass to linker to pick up the Tcl library from its
@@ -99,10 +93,8 @@
  
  # Path to the Tcl stub library in the install directory.
  TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
-Index: tcl8.3-8.3.5/unix/tcl.m4
-===================================================================
---- tcl8.3-8.3.5.orig/unix/tcl.m4	2007-10-19 15:44:28.000000000 +0400
-+++ tcl8.3-8.3.5/unix/tcl.m4	2007-10-19 15:44:29.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/tcl.m4
++++ tcl8.3-8.3.5/unix/tcl.m4
 @@ -61,6 +61,7 @@
  		for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \

Modified: tcl8.3/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.3/trunk/debian/patches/tcllibrary.diff	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/patches/tcllibrary.diff	2008-07-05 13:58:26 UTC (rev 697)
@@ -1,7 +1,5 @@
-Index: tcl8.3-8.3.5/library/init.tcl
-===================================================================
---- tcl8.3-8.3.5.orig/library/init.tcl	2002-07-02 21:09:35.000000000 +0400
-+++ tcl8.3-8.3.5/library/init.tcl	2007-10-18 20:19:17.000000000 +0400
+--- tcl8.3-8.3.5.orig/library/init.tcl
++++ tcl8.3-8.3.5/library/init.tcl
 @@ -49,7 +49,7 @@
  namespace eval tcl {
      variable Dir

Modified: tcl8.3/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.3/trunk/debian/patches/tclpackagepath.diff	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/patches/tclpackagepath.diff	2008-07-05 13:58:26 UTC (rev 697)
@@ -2,10 +2,8 @@
 without adding /usr/lib to it. It helps to put the policy compliant value to
 ::tcl_pkgPath variable and to TCL_PACKAGE_PATH variable in tclConfig.sh.
 
-Index: tcl8.3-8.3.5/unix/configure
-===================================================================
---- tcl8.3-8.3.5.orig/unix/configure	2002-10-19 00:44:46.000000000 +0400
-+++ tcl8.3-8.3.5/unix/configure	2007-10-18 20:19:20.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/configure
++++ tcl8.3-8.3.5/unix/configure
 @@ -6344,9 +6344,9 @@
  #--------------------------------------------------------------------
  
@@ -18,10 +16,8 @@
  fi
  
  #--------------------------------------------------------------------
-Index: tcl8.3-8.3.5/unix/configure.in
-===================================================================
---- tcl8.3-8.3.5.orig/unix/configure.in	2002-10-19 00:44:46.000000000 +0400
-+++ tcl8.3-8.3.5/unix/configure.in	2007-10-18 20:19:20.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/configure.in
++++ tcl8.3-8.3.5/unix/configure.in
 @@ -453,9 +453,9 @@
  #--------------------------------------------------------------------
  

Modified: tcl8.3/trunk/debian/patches/ungets.diff
===================================================================
--- tcl8.3/trunk/debian/patches/ungets.diff	2008-07-04 17:36:41 UTC (rev 696)
+++ tcl8.3/trunk/debian/patches/ungets.diff	2008-07-05 13:58:26 UTC (rev 697)
@@ -1,10 +1,8 @@
 Patch by Dmitry Astapov fixes Tcl_Ungets when unicode channels are used.
 (See bug #100672)
 
-Index: tcl8.3-8.3.5/generic/tclIO.c
-===================================================================
---- tcl8.3-8.3.5.orig/generic/tclIO.c	2002-03-02 08:00:59.000000000 +0300
-+++ tcl8.3-8.3.5/generic/tclIO.c	2007-10-18 20:19:08.000000000 +0400
+--- tcl8.3-8.3.5.orig/generic/tclIO.c
++++ tcl8.3-8.3.5/generic/tclIO.c
 @@ -4559,7 +4559,7 @@
  
      bufPtr = AllocChannelBuffer(len);




More information about the Pkg-tcltk-commits mailing list