[Pkg-voip-commits] r2518 - in zaptel/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2006-10-09 02:59:41 +0000 (Mon, 09 Oct 2006)
New Revision: 2518

Added:
   zaptel/trunk/debian/patches/dbug391840.dpatch
Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
Log:
* debian/rules patch from Robert Millan
  - the package doesn't compile  (Closes: #390903)
* add debian/patches/dbug391840.dpatch
  - ztcfg segfaults because of -O4 (Closes: #391840)

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-10-09 02:52:10 UTC (rev 2517)
+++ zaptel/trunk/debian/changelog	2006-10-09 02:59:41 UTC (rev 2518)
@@ -7,9 +7,12 @@
     anywhere, though).
 
   [ Mark Purcell ]
-  * the package doesn't compile  (Closes: #390903)
+  * debian/rules patch from Robert Millan
+    - the package doesn't compile  (Closes: #390903)
+  * add debian/patches/dbug391840.dpatch
+    - ztcfg segfaults because of -O4 (Closes: #391840)
 
- -- Mark Purcell <msp at debian.org>  Mon,  9 Oct 2006 09:40:48 +1000
+ -- Mark Purcell <msp at debian.org>  Mon,  9 Oct 2006 12:58:32 +1000
 
 zaptel (1:1.2.9.1.dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2006-10-09 02:52:10 UTC (rev 2517)
+++ zaptel/trunk/debian/patches/00list	2006-10-09 02:59:41 UTC (rev 2518)
@@ -14,3 +14,4 @@
 Makefile_vzaphfc.dpatch
 zaptelh_14
 wct4xxp-dfsg.dpatch
+dbug391840.dpatch

Added: zaptel/trunk/debian/patches/dbug391840.dpatch
===================================================================
--- zaptel/trunk/debian/patches/dbug391840.dpatch	                        (rev 0)
+++ zaptel/trunk/debian/patches/dbug391840.dpatch	2006-10-09 02:59:41 UTC (rev 2518)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## dbug391840.dpatch by  <msp at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes: Bug#391840: ztcfg segfaults because of -O4
+## DP: http://bugs.debian.org/391840
+
+ at DPATCH@
+diff -urNad zaptel-1.2.9.1.dfsg~/debian/rules zaptel-1.2.9.1.dfsg/debian/rules
+--- zaptel-1.2.9.1.dfsg~/debian/rules	2006-10-09 12:52:10.000000000 +1000
++++ zaptel-1.2.9.1.dfsg/debian/rules	2006-10-09 12:56:32.000000000 +1000
+@@ -12,6 +12,8 @@
+ 
+ -include /usr/share/dpatch/dpatch.make
+ 
++export CFLAGS += -fno-inline-functions
++
+ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ 	CFLAGS += -g
+ endif
+diff -urNad zaptel-1.2.9.1.dfsg~/ztcfg.c zaptel-1.2.9.1.dfsg/ztcfg.c
+--- zaptel-1.2.9.1.dfsg~/ztcfg.c	2006-02-01 13:33:54.000000000 +1100
++++ zaptel-1.2.9.1.dfsg/ztcfg.c	2006-10-09 12:56:32.000000000 +1000
+@@ -929,6 +929,8 @@
+ 			if (ind_ioctl(x,fd,ZT_RADIO_GETPARAM,&p) == -1)
+ 				error("Cannot get number of tones for channel %d\n",x);
+ 			n = p.data;
++			if (n > NUM_TONES)
++				error("Too many tones for channel %d: %d\n",x,n);
+ 			p.radpar = ZT_RADPAR_INITTONE;
+ 			if (ind_ioctl(x,fd,ZT_RADIO_SETPARAM,&p) == -1)
+ 				error("Cannot init tones for channel %d\n",x);


Property changes on: zaptel/trunk/debian/patches/dbug391840.dpatch
___________________________________________________________________
Name: svn:executable
   + *