Source: ttt
Version: 1.7-3.4
Severity: grave
Tags: patch
Justification: renders package unusable

Dear Maintainer,

Recently we switched to Tcl/Tk 8.6 in blt, one of the packages ttt depends on.
This means ttt has to switch as well. I've prepared a patch which does that
and fixes immediate segfault in tttviewer. If you don't mind I could NMU it.

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.14-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u ttt-1.7/debian/control ttt-1.7/debian/control
--- ttt-1.7/debian/control
+++ ttt-1.7/debian/control
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Thomas Scheffczyk <thomas.scheffc...@verwaltung.uni-mainz.de>
-Build-Depends: debhelper (>= 6.0.0), autotools-dev, tcl8.5-dev, tk8.5-dev, blt-dev, libpcap-dev
+Build-Depends: debhelper (>= 6.0.0), autotools-dev, tcl-dev, tk-dev, blt-dev, libpcap-dev
 Standards-Version: 3.7.2.2
 
 Package: ttt
diff -u ttt-1.7/debian/rules ttt-1.7/debian/rules
--- ttt-1.7/debian/rules
+++ ttt-1.7/debian/rules
@@ -14,6 +14,7 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+EXTRA_CFLAGS = -DUSE_INTERP_RESULT
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -35,7 +36,7 @@
             cp -f /usr/share/misc/config.guess cf/config.guess )
 	
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-		    --with-tcl=/usr/lib/tcl8.5 --with-tk=/usr/lib/tk8.5
+		    --with-tcl=/usr/lib --with-tk=/usr/lib
 
  
 build-arch:  config.status build-arch-stamp
@@ -43,7 +44,7 @@
 	dh_testdir
 
 	# Add here command to compile/build the package.
-	$(MAKE)
+	$(MAKE) EXTRA_CFLAGS=$(EXTRA_CFLAGS)
 
 	touch build-arch-stamp
 
@@ -65,7 +66,7 @@
 	dh_testdir
 	dh_testroot
 	# 2003-04-14 Extended rm command to make sure that all build 
-        # stamps are deleted. Original comand was "rm -f build-stamp"
+	# stamps are deleted. Original comand was "rm -f build-stamp"
 	rm -f build-*stamp 
 
 	# Add here commands to clean up after the build process.
diff -u ttt-1.7/debian/changelog ttt-1.7/debian/changelog
--- ttt-1.7/debian/changelog
+++ ttt-1.7/debian/changelog
@@ -1,3 +1,14 @@
+ttt (1.7-3.5) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build with Tcl/Tk 8.6 to make the package work with newer BLT package.
+  * Define USE_INTERP_RESULT macro to allow the usage of deprecated
+    interp->result field.
+  * Added missing includes into viewer.c to declare exit(), strcpy(),
+    bzero() and inet_ntoa() functions to prevent immediate segfault.
+
+ -- Sergei Golovan <sgolo...@debian.org>  Sat, 05 Jul 2014 16:25:45 +0400
+
 ttt (1.7-3.4) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- ttt-1.7.orig/viewer.c
+++ ttt-1.7/viewer.c
@@ -17,11 +17,15 @@
    shared by tttview and ttttextview but TTT_TEXT flag is set for
    ttttextview. */
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
 #include <netdb.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include "ttt.h"
 #include "ttt_node.h"

Reply via email to