[Pkg-tcltk-commits] r497 - in tk8.5/trunk/debian: . patches

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-02-05 19:52:45 +0000 (Tue, 05 Feb 2008)
New Revision: 497

Added:
   tk8.5/trunk/debian/tk8.5.lintian-override
Removed:
   tk8.5/trunk/debian/patches/CVE-2006-4484.diff
Modified:
   tk8.5/trunk/debian/changelog
   tk8.5/trunk/debian/patches/series
   tk8.5/trunk/debian/rules
   tk8.5/trunk/debian/tk8.5.dirs
Log:
[tk8.5]
  * New upstream release.
  * Overridden lintian warning package-name-doesnt-match-sonames since tk8.5
    package contains not only a library, and it's unreasonable to split it
    into smaller parts.


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2008-02-05 19:52:14 UTC (rev 496)
+++ tk8.5/trunk/debian/changelog	2008-02-05 19:52:45 UTC (rev 497)
@@ -1,8 +1,11 @@
-tk8.5 (8.5.0-4) UNRELEASED; urgency=low
+tk8.5 (8.5.1-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Overridden lintian warning package-name-doesnt-match-sonames since tk8.5
+    package contains not only a library, and it's unreasonable to split it
+    into smaller parts.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon,  4 Feb 2008 23:37:11 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Tue, 05 Feb 2008 20:38:38 +0300
 
 tk8.5 (8.5.0-3) unstable; urgency=high
 

Deleted: tk8.5/trunk/debian/patches/CVE-2006-4484.diff
===================================================================
--- tk8.5/trunk/debian/patches/CVE-2006-4484.diff	2008-02-05 19:52:14 UTC (rev 496)
+++ tk8.5/trunk/debian/patches/CVE-2006-4484.diff	2008-02-05 19:52:45 UTC (rev 497)
@@ -1,22 +0,0 @@
-Patch by upstream fixes vulnerability similar to
-CVE-2006-4484 an unknown impact via a GIF file with input_code_size greater
-than MAX_LWZ_BITS, which triggers an overflow when initializing the table
-array.
-
-Index: tk8.5-8.5.0/generic/tkImgGIF.c
-===================================================================
---- tk8.4-8.5.0.orig/generic/tkImgGIF.c
-+++ tk8.4-8.5.0/generic/tkImgGIF.c
-@@ -826,6 +826,12 @@
- 		Tcl_PosixError(interp), (char *) NULL);
- 	return TCL_ERROR;
-     }
-+
-+    if (initialCodeSize > MAX_LWZ_BITS) {
-+	Tcl_SetResult(interp, "malformed image", TCL_STATIC);
-+	return TCL_ERROR;
-+    }
-+
-     if (transparent != -1) {
- 	cmap[transparent][CM_RED] = 0;
- 	cmap[transparent][CM_GREEN] = 0;

Modified: tk8.5/trunk/debian/patches/series
===================================================================
--- tk8.5/trunk/debian/patches/series	2008-02-05 19:52:14 UTC (rev 496)
+++ tk8.5/trunk/debian/patches/series	2008-02-05 19:52:45 UTC (rev 497)
@@ -1,4 +1,3 @@
-CVE-2006-4484.diff
 tklibrary.diff
 tkprivate.diff
 confsearch.diff

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2008-02-05 19:52:14 UTC (rev 496)
+++ tk8.5/trunk/debian/rules	2008-02-05 19:52:45 UTC (rev 497)
@@ -153,6 +153,8 @@
 	rm -f debian/tk$(v)/usr/share/doc/tk$(v)/examples/license.terms
 	dh_installmenu -a
 	dh_installchangelogs -a ChangeLog
+	install -m 644 debian/tk$(v).lintian-override \
+		debian/tk$(v)/usr/share/lintian/overrides/tk$(v)
 	dh_fixperms -a
 	dh_strip -a
 	dh_compress -a -Xusr/share/doc/tk$(v)/examples/
@@ -169,8 +171,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tk8.5_8.5.0.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk8.5.0-src.tar.gz
+	wget -O tk8.5_8.5.1.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk8.5.1-src.tar.gz
 
 .PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
 

Modified: tk8.5/trunk/debian/tk8.5.dirs
===================================================================
--- tk8.5/trunk/debian/tk8.5.dirs	2008-02-05 19:52:14 UTC (rev 496)
+++ tk8.5/trunk/debian/tk8.5.dirs	2008-02-05 19:52:45 UTC (rev 497)
@@ -1 +1 @@
-usr/share
+usr/share/lintian/overrides

Added: tk8.5/trunk/debian/tk8.5.lintian-override
===================================================================
--- tk8.5/trunk/debian/tk8.5.lintian-override	                        (rev 0)
+++ tk8.5/trunk/debian/tk8.5.lintian-override	2008-02-05 19:52:45 UTC (rev 497)
@@ -0,0 +1 @@
+tk8.5: package-name-doesnt-match-sonames