[Pkg-voip-commits] r1896 - in zaptel/trunk/debian: . patches
Tzafrir Cohen
tzafrir-guest at costa.debian.org
Fri Jun 16 09:06:46 UTC 2006
Author: tzafrir-guest
Date: 2006-06-16 09:06:42 +0000 (Fri, 16 Jun 2006)
New Revision: 1896
Modified:
zaptel/trunk/debian/changelog
zaptel/trunk/debian/patches/bristuff.dpatch
Log:
new version of bristuff: 0.3.0-PRE-1q
Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog 2006-06-16 08:48:38 UTC (rev 1895)
+++ zaptel/trunk/debian/changelog 2006-06-16 09:06:42 UTC (rev 1896)
@@ -1,3 +1,9 @@
+zaptel (1:1.2.6-3) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Fri, 16 Jun 2006 11:38:55 +0300
+
zaptel (1:1.2.6-2) unstable; urgency=high
* Urgency high as this is blocking a security fix for asterisk [CVE-2006-2898]
Modified: zaptel/trunk/debian/patches/bristuff.dpatch
===================================================================
--- zaptel/trunk/debian/patches/bristuff.dpatch 2006-06-16 08:48:38 UTC (rev 1895)
+++ zaptel/trunk/debian/patches/bristuff.dpatch 2006-06-16 09:06:42 UTC (rev 1896)
@@ -3,12 +3,12 @@
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: The zapbri modules (cwain, qozap, zaphfc, ztgsm) and zaptel.patch from
-## DP: the bristuff patch by Klaus-Peter Junghanns. Version 0.3.0-PRE1p
+## DP: the bristuff patch by Klaus-Peter Junghanns. Version 0.3.0-PRE1q
@DPATCH@
-diff -urNad zaptel-1.2.5/cwain/cwain.c /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/cwain.c
---- zaptel-1.2.5/cwain/cwain.c 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/cwain.c 2006-04-25 16:38:17.000000000 +0300
+diff -urNad zaptel-1.2.6/cwain/cwain.c /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/cwain.c
+--- zaptel-1.2.6/cwain/cwain.c 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/cwain.c 2006-04-25 22:15:34.000000000 +0300
@@ -0,0 +1,1629 @@
+/*
+ * cwain.c - Zaptel driver for the Junghanns.NET E1 card
@@ -461,7 +461,7 @@
+static int cwain_fifo_rx(struct zt_cwain *cwaintmp, char fifo) {
+ int chan;
+ unsigned int data;
-+ int len,i,f,flen;
++ int len,i,f,flen = 0;
+ unsigned short z1=1,z2=1;
+ unsigned short oz1=0,oz2=0;
+ int mumbojumbo=0;
@@ -1639,9 +1639,9 @@
+#ifdef MODULE_LICENSE
+MODULE_LICENSE("GPL");
+#endif
-diff -urNad zaptel-1.2.5/cwain/cwain.h /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/cwain.h
---- zaptel-1.2.5/cwain/cwain.h 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/cwain.h 2006-03-31 13:58:41.000000000 +0300
+diff -urNad zaptel-1.2.6/cwain/cwain.h /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/cwain.h
+--- zaptel-1.2.6/cwain/cwain.h 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/cwain.h 2006-03-31 13:58:41.000000000 +0300
@@ -0,0 +1,245 @@
+#define cwain_FIFO_SIZE 128
+#define cwain_DFIFO_SIZE 4096
@@ -1888,9 +1888,9 @@
+#define CLKDEL_TE 0xe /* CLKDEL in TE mode */
+#define CLKDEL_NT 0xc /* CLKDEL in NT mode */
+
-diff -urNad zaptel-1.2.5/cwain/LICENSE /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/LICENSE
---- zaptel-1.2.5/cwain/LICENSE 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/LICENSE 2005-09-26 09:59:05.000000000 +0300
+diff -urNad zaptel-1.2.6/cwain/LICENSE /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/LICENSE
+--- zaptel-1.2.6/cwain/LICENSE 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/LICENSE 2005-09-26 09:59:05.000000000 +0300
@@ -0,0 +1,341 @@
+
+ GNU GENERAL PUBLIC LICENSE
@@ -2233,9 +2233,9 @@
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
-diff -urNad zaptel-1.2.5/cwain/Makefile /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/Makefile
---- zaptel-1.2.5/cwain/Makefile 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/Makefile 2006-02-10 12:28:37.000000000 +0200
+diff -urNad zaptel-1.2.6/cwain/Makefile /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/Makefile
+--- zaptel-1.2.6/cwain/Makefile 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/Makefile 2006-02-10 12:28:37.000000000 +0200
@@ -0,0 +1,90 @@
+KINCLUDES = /usr/src/linux/include
+BRISTUFFBASE = $(shell dirname `pwd`)
@@ -2327,14 +2327,14 @@
+
+unload:
+ rmmod cwain zaptel
-diff -urNad zaptel-1.2.5/cwain/TODO /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/TODO
---- zaptel-1.2.5/cwain/TODO 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/TODO 2005-09-26 09:59:05.000000000 +0300
+diff -urNad zaptel-1.2.6/cwain/TODO /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/TODO
+--- zaptel-1.2.6/cwain/TODO 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/TODO 2005-09-26 09:59:05.000000000 +0300
@@ -0,0 +1 @@
+
-diff -urNad zaptel-1.2.5/cwain/zapata.conf /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/zapata.conf
---- zaptel-1.2.5/cwain/zapata.conf 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/zapata.conf 2006-04-10 12:56:05.000000000 +0300
+diff -urNad zaptel-1.2.6/cwain/zapata.conf /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/zapata.conf
+--- zaptel-1.2.6/cwain/zapata.conf 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/zapata.conf 2006-04-10 12:56:05.000000000 +0300
@@ -0,0 +1,32 @@
+;
+; Zapata telephony interface
@@ -2368,9 +2368,9 @@
+group = 1
+channel => 1-15,17-31
+
-diff -urNad zaptel-1.2.5/cwain/zapata.conf.doubleE1 /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/zapata.conf.doubleE1
---- zaptel-1.2.5/cwain/zapata.conf.doubleE1 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/zapata.conf.doubleE1 2006-04-10 12:56:25.000000000 +0300
+diff -urNad zaptel-1.2.6/cwain/zapata.conf.doubleE1 /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/zapata.conf.doubleE1
+--- zaptel-1.2.6/cwain/zapata.conf.doubleE1 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/zapata.conf.doubleE1 2006-04-10 12:56:25.000000000 +0300
@@ -0,0 +1,35 @@
+;
+; Zapata telephony interface
@@ -2407,9 +2407,9 @@
+group = 2
+channel => 32-46,48-62
+
-diff -urNad zaptel-1.2.5/cwain/zaptel.conf /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/zaptel.conf
---- zaptel-1.2.5/cwain/zaptel.conf 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/zaptel.conf 2005-10-27 11:26:41.000000000 +0200
+diff -urNad zaptel-1.2.6/cwain/zaptel.conf /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/zaptel.conf
+--- zaptel-1.2.6/cwain/zaptel.conf 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/zaptel.conf 2005-10-27 11:26:41.000000000 +0200
@@ -0,0 +1,11 @@
+loadzone=nl
+defaultzone=nl
@@ -2422,9 +2422,9 @@
+bchan=17-31
+
+
-diff -urNad zaptel-1.2.5/cwain/zaptel.conf.doubleE1 /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/zaptel.conf.doubleE1
---- zaptel-1.2.5/cwain/zaptel.conf.doubleE1 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/cwain/zaptel.conf.doubleE1 2006-04-05 23:16:12.000000000 +0300
+diff -urNad zaptel-1.2.6/cwain/zaptel.conf.doubleE1 /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/zaptel.conf.doubleE1
+--- zaptel-1.2.6/cwain/zaptel.conf.doubleE1 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/cwain/zaptel.conf.doubleE1 2006-04-05 23:16:12.000000000 +0300
@@ -0,0 +1,14 @@
+loadzone=nl
+defaultzone=nl
@@ -2440,9 +2440,9 @@
+bchan=32-46
+dchan=47
+bchan=48-62
-diff -urNad zaptel-1.2.5/qozap/LICENSE /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/LICENSE
---- zaptel-1.2.5/qozap/LICENSE 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/LICENSE 2006-02-22 20:41:09.000000000 +0200
+diff -urNad zaptel-1.2.6/qozap/LICENSE /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/LICENSE
+--- zaptel-1.2.6/qozap/LICENSE 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/LICENSE 2006-02-22 20:41:09.000000000 +0200
@@ -0,0 +1,341 @@
+
+ GNU GENERAL PUBLIC LICENSE
@@ -2785,9 +2785,9 @@
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
-diff -urNad zaptel-1.2.5/qozap/Makefile /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/Makefile
---- zaptel-1.2.5/qozap/Makefile 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/Makefile 2006-02-22 20:41:09.000000000 +0200
+diff -urNad zaptel-1.2.6/qozap/Makefile /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/Makefile
+--- zaptel-1.2.6/qozap/Makefile 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/Makefile 2006-02-22 20:41:09.000000000 +0200
@@ -0,0 +1,91 @@
+KINCLUDES = /usr/src/linux/include
+BRISTUFFBASE = $(shell dirname `pwd`)
@@ -2880,9 +2880,9 @@
+
+installlinux24:
+ install -D -m 644 qozap.o $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/qozap.o
-diff -urNad zaptel-1.2.5/qozap/qozap.c /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/qozap.c
---- zaptel-1.2.5/qozap/qozap.c 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/qozap.c 2006-04-25 16:37:39.000000000 +0300
+diff -urNad zaptel-1.2.6/qozap/qozap.c /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/qozap.c
+--- zaptel-1.2.6/qozap/qozap.c 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/qozap.c 2006-04-25 16:37:39.000000000 +0300
@@ -0,0 +1,1545 @@
+/*
+ * qozap.c - Zaptel driver for the quadBRI PCI ISDN card
@@ -4429,9 +4429,9 @@
+#ifdef MODULE_LICENSE
+MODULE_LICENSE("GPL");
+#endif
-diff -urNad zaptel-1.2.5/qozap/qozap.h /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/qozap.h
---- zaptel-1.2.5/qozap/qozap.h 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/qozap.h 2006-02-22 20:41:09.000000000 +0200
+diff -urNad zaptel-1.2.6/qozap/qozap.h /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/qozap.h
+--- zaptel-1.2.6/qozap/qozap.h 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/qozap.h 2006-02-22 20:41:09.000000000 +0200
@@ -0,0 +1,239 @@
+#define qoz_SPANS 8
+#define qoz_FIFO_SIZE 128
@@ -4672,9 +4672,9 @@
+#define qoz_T4 1
+
+
-diff -urNad zaptel-1.2.5/qozap/TODO /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/TODO
---- zaptel-1.2.5/qozap/TODO 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/TODO 2006-02-22 20:41:09.000000000 +0200
+diff -urNad zaptel-1.2.6/qozap/TODO /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/TODO
+--- zaptel-1.2.6/qozap/TODO 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/TODO 2006-02-22 20:41:09.000000000 +0200
@@ -0,0 +1,9 @@
+- native-native bridging
+- onchip dtmf
@@ -4685,9 +4685,9 @@
+
+t4 (500ms) layer 1 down/up
+
-diff -urNad zaptel-1.2.5/qozap/zapata.conf /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/zapata.conf
---- zaptel-1.2.5/qozap/zapata.conf 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/zapata.conf 2006-04-10 12:56:52.000000000 +0300
+diff -urNad zaptel-1.2.6/qozap/zapata.conf /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/zapata.conf
+--- zaptel-1.2.6/qozap/zapata.conf 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/zapata.conf 2006-04-10 12:56:52.000000000 +0300
@@ -0,0 +1,51 @@
+;
+; Zapata telephony interface
@@ -4740,9 +4740,9 @@
+; S/T port 4
+channel => 10-11
+
-diff -urNad zaptel-1.2.5/qozap/zapata.conf.octoBRI /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/zapata.conf.octoBRI
---- zaptel-1.2.5/qozap/zapata.conf.octoBRI 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/zapata.conf.octoBRI 2006-04-10 12:57:02.000000000 +0300
+diff -urNad zaptel-1.2.6/qozap/zapata.conf.octoBRI /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/zapata.conf.octoBRI
+--- zaptel-1.2.6/qozap/zapata.conf.octoBRI 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/zapata.conf.octoBRI 2006-04-10 12:57:02.000000000 +0300
@@ -0,0 +1,67 @@
+;
+; Zapata telephony interface
@@ -4811,9 +4811,9 @@
+; S/T port 8
+channel => 22-23
+
-diff -urNad zaptel-1.2.5/qozap/zaptel.conf /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/zaptel.conf
---- zaptel-1.2.5/qozap/zaptel.conf 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/zaptel.conf 2006-02-22 20:41:09.000000000 +0200
+diff -urNad zaptel-1.2.6/qozap/zaptel.conf /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/zaptel.conf
+--- zaptel-1.2.6/qozap/zaptel.conf 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/zaptel.conf 2006-02-22 20:41:09.000000000 +0200
@@ -0,0 +1,18 @@
+loadzone=nl
+defaultzone=nl
@@ -4833,9 +4833,9 @@
+bchan=10,11
+dchan=12
+
-diff -urNad zaptel-1.2.5/qozap/zaptel.conf.octoBRI /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/zaptel.conf.octoBRI
---- zaptel-1.2.5/qozap/zaptel.conf.octoBRI 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/qozap/zaptel.conf.octoBRI 2006-02-22 20:41:09.000000000 +0200
+diff -urNad zaptel-1.2.6/qozap/zaptel.conf.octoBRI /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/zaptel.conf.octoBRI
+--- zaptel-1.2.6/qozap/zaptel.conf.octoBRI 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/qozap/zaptel.conf.octoBRI 2006-02-22 20:41:09.000000000 +0200
@@ -0,0 +1,30 @@
+loadzone=nl
+defaultzone=nl
@@ -4867,9 +4867,9 @@
+bchan=22,23
+dchan=24
+
-diff -urNad zaptel-1.2.5/zaphfc/LICENSE /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/LICENSE
---- zaptel-1.2.5/zaphfc/LICENSE 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/LICENSE 2003-08-19 04:24:43.000000000 +0300
+diff -urNad zaptel-1.2.6/zaphfc/LICENSE /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/LICENSE
+--- zaptel-1.2.6/zaphfc/LICENSE 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/LICENSE 2003-08-19 04:24:43.000000000 +0300
@@ -0,0 +1,341 @@
+
+ GNU GENERAL PUBLIC LICENSE
@@ -5212,9 +5212,9 @@
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
-diff -urNad zaptel-1.2.5/zaphfc/Makefile /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/Makefile
---- zaptel-1.2.5/zaphfc/Makefile 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/Makefile 2006-02-09 11:11:05.000000000 +0200
+diff -urNad zaptel-1.2.6/zaphfc/Makefile /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/Makefile
+--- zaptel-1.2.6/zaphfc/Makefile 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/Makefile 2006-02-09 11:11:05.000000000 +0200
@@ -0,0 +1,118 @@
+KINCLUDES = /usr/src/linux/include
+BRISTUFFBASE = $(shell dirname `pwd`)
@@ -5334,9 +5334,9 @@
+installlinux24:
+ install -D -m 644 zaphfc.o $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/zaphfc.o
+
-diff -urNad zaptel-1.2.5/zaphfc/zapata.conf /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/zapata.conf
---- zaptel-1.2.5/zaphfc/zapata.conf 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/zapata.conf 2005-02-26 19:24:32.000000000 +0200
+diff -urNad zaptel-1.2.6/zaphfc/zapata.conf /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/zapata.conf
+--- zaptel-1.2.6/zaphfc/zapata.conf 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/zapata.conf 2005-02-26 19:24:32.000000000 +0200
@@ -0,0 +1,38 @@
+;
+; Zapata telephony interface
@@ -5376,9 +5376,9 @@
+group = 1
+context=demo
+channel => 1-2
-diff -urNad zaptel-1.2.5/zaphfc/zaphfc.c /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/zaphfc.c
---- zaptel-1.2.5/zaphfc/zaphfc.c 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/zaphfc.c 2006-04-25 16:38:47.000000000 +0300
+diff -urNad zaptel-1.2.6/zaphfc/zaphfc.c /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/zaphfc.c
+--- zaptel-1.2.6/zaphfc/zaphfc.c 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/zaphfc.c 2006-04-25 16:38:47.000000000 +0300
@@ -0,0 +1,1155 @@
+/*
+ * zaphfc.c - Zaptel driver for HFC-S PCI A based ISDN BRI cards
@@ -6535,9 +6535,9 @@
+#ifdef MODULE_LICENSE
+MODULE_LICENSE("GPL");
+#endif
-diff -urNad zaptel-1.2.5/zaphfc/zaphfc.h /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/zaphfc.h
---- zaptel-1.2.5/zaphfc/zaphfc.h 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/zaphfc.h 2005-02-27 00:30:32.000000000 +0200
+diff -urNad zaptel-1.2.6/zaphfc/zaphfc.h /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/zaphfc.h
+--- zaptel-1.2.6/zaphfc/zaphfc.h 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/zaphfc.h 2005-02-27 00:30:32.000000000 +0200
@@ -0,0 +1,289 @@
+/*
+ * zaphfc.h - Zaptel driver for HFC-S PCI A based ISDN BRI cards
@@ -6828,9 +6828,9 @@
+/* tune this */
+#define hfc_BCHAN_BUFFER 8
+#define hfc_MAX_CARDS 8
-diff -urNad zaptel-1.2.5/zaphfc/zaptel.conf /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/zaptel.conf
---- zaptel-1.2.5/zaphfc/zaptel.conf 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/zaphfc/zaptel.conf 2004-03-24 16:35:12.000000000 +0200
+diff -urNad zaptel-1.2.6/zaphfc/zaptel.conf /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/zaptel.conf
+--- zaptel-1.2.6/zaphfc/zaptel.conf 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/zaphfc/zaptel.conf 2004-03-24 16:35:12.000000000 +0200
@@ -0,0 +1,8 @@
+# hfc-s pci a span definition
+# most of the values should be bogus because we are not really zaptel
@@ -6840,9 +6840,9 @@
+span=1,1,3,ccs,ami
+bchan=1-2
+dchan=3
-diff -urNad zaptel-1.2.5/zaptel.c /tmp/dpep.EwSg5a/zaptel-1.2.5/zaptel.c
---- zaptel-1.2.5/zaptel.c 2005-12-17 04:04:05.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/zaptel.c 2006-05-09 20:55:56.000000000 +0300
+diff -urNad zaptel-1.2.6/zaptel.c /tmp/dpep.KTFxyR/zaptel-1.2.6/zaptel.c
+--- zaptel-1.2.6/zaptel.c 2005-12-17 04:04:05.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/zaptel.c 2006-06-16 11:44:13.000000000 +0300
@@ -4913,11 +4913,40 @@
*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
}
@@ -6956,9 +6956,9 @@
} else {
/* Not HDLC */
memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-diff -urNad zaptel-1.2.5/zaptel.h /tmp/dpep.EwSg5a/zaptel-1.2.5/zaptel.h
---- zaptel-1.2.5/zaptel.h 2005-12-17 04:04:05.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/zaptel.h 2006-05-09 20:55:56.000000000 +0300
+diff -urNad zaptel-1.2.6/zaptel.h /tmp/dpep.KTFxyR/zaptel-1.2.6/zaptel.h
+--- zaptel-1.2.6/zaptel.h 2005-12-17 04:04:05.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/zaptel.h 2006-06-16 11:44:13.000000000 +0300
@@ -994,6 +994,13 @@
int do_ppp_error;
struct sk_buff_head ppp_rq;
@@ -6993,9 +6993,9 @@
struct zt_span {
spinlock_t lock;
void *pvt; /* Private stuff */
-diff -urNad zaptel-1.2.5/zconfig.h /tmp/dpep.EwSg5a/zaptel-1.2.5/zconfig.h
---- zaptel-1.2.5/zconfig.h 2005-11-29 20:42:08.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/zconfig.h 2006-05-09 20:55:56.000000000 +0300
+diff -urNad zaptel-1.2.6/zconfig.h /tmp/dpep.KTFxyR/zaptel-1.2.6/zconfig.h
+--- zaptel-1.2.6/zconfig.h 2005-11-29 20:42:08.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/zconfig.h 2006-06-16 11:44:13.000000000 +0300
@@ -152,4 +152,10 @@
*/
/* #define FXSFLASH */
@@ -7007,9 +7007,9 @@
+#define CONFIG_ZAPATA_BRI_DCHANS
+
#endif
-diff -urNad zaptel-1.2.5/ztgsm/LICENSE /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/LICENSE
---- zaptel-1.2.5/ztgsm/LICENSE 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/LICENSE 2006-04-10 12:22:33.000000000 +0300
+diff -urNad zaptel-1.2.6/ztgsm/LICENSE /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/LICENSE
+--- zaptel-1.2.6/ztgsm/LICENSE 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/LICENSE 2006-04-10 12:22:33.000000000 +0300
@@ -0,0 +1,341 @@
+
+ GNU GENERAL PUBLIC LICENSE
@@ -7352,9 +7352,9 @@
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
-diff -urNad zaptel-1.2.5/ztgsm/Makefile /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/Makefile
---- zaptel-1.2.5/ztgsm/Makefile 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/Makefile 2006-04-10 12:23:31.000000000 +0300
+diff -urNad zaptel-1.2.6/ztgsm/Makefile /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/Makefile
+--- zaptel-1.2.6/ztgsm/Makefile 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/Makefile 2006-04-10 12:23:31.000000000 +0300
@@ -0,0 +1,53 @@
+KINCLUDES = /usr/src/linux/include
+BRISTUFFBASE = $(shell dirname `pwd`)
@@ -7409,9 +7409,9 @@
+
+installlinux24: all
+ install -D -m 644 ztgsm.o $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/ztgsm.o
-diff -urNad zaptel-1.2.5/ztgsm/zapata.conf.duoGSM /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zapata.conf.duoGSM
---- zaptel-1.2.5/ztgsm/zapata.conf.duoGSM 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zapata.conf.duoGSM 2006-04-10 13:30:26.000000000 +0300
+diff -urNad zaptel-1.2.6/ztgsm/zapata.conf.duoGSM /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zapata.conf.duoGSM
+--- zaptel-1.2.6/ztgsm/zapata.conf.duoGSM 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zapata.conf.duoGSM 2006-04-10 13:30:26.000000000 +0300
@@ -0,0 +1,23 @@
+[channels]
+txgain = -10.0
@@ -7436,9 +7436,9 @@
+
+;channel => 3
+
-diff -urNad zaptel-1.2.5/ztgsm/zapata.conf.quadGSM /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zapata.conf.quadGSM
---- zaptel-1.2.5/ztgsm/zapata.conf.quadGSM 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zapata.conf.quadGSM 2006-04-10 13:30:13.000000000 +0300
+diff -urNad zaptel-1.2.6/ztgsm/zapata.conf.quadGSM /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zapata.conf.quadGSM
+--- zaptel-1.2.6/ztgsm/zapata.conf.quadGSM 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zapata.conf.quadGSM 2006-04-10 13:30:13.000000000 +0300
@@ -0,0 +1,36 @@
+[channels]
+txgain = -10.0
@@ -7476,9 +7476,9 @@
+;pin=1234
+
+;channel => 7
-diff -urNad zaptel-1.2.5/ztgsm/zapata.conf.unoGSM /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zapata.conf.unoGSM
---- zaptel-1.2.5/ztgsm/zapata.conf.unoGSM 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zapata.conf.unoGSM 2006-04-10 13:30:41.000000000 +0300
+diff -urNad zaptel-1.2.6/ztgsm/zapata.conf.unoGSM /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zapata.conf.unoGSM
+--- zaptel-1.2.6/ztgsm/zapata.conf.unoGSM 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zapata.conf.unoGSM 2006-04-10 13:30:41.000000000 +0300
@@ -0,0 +1,15 @@
+[channels]
+txgain = -10.0
@@ -7495,9 +7495,9 @@
+;pin=1234
+
+;channel => 1
-diff -urNad zaptel-1.2.5/ztgsm/zaptel.conf.duoGSM /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zaptel.conf.duoGSM
---- zaptel-1.2.5/ztgsm/zaptel.conf.duoGSM 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zaptel.conf.duoGSM 2006-04-10 13:26:59.000000000 +0300
+diff -urNad zaptel-1.2.6/ztgsm/zaptel.conf.duoGSM /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zaptel.conf.duoGSM
+--- zaptel-1.2.6/ztgsm/zaptel.conf.duoGSM 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zaptel.conf.duoGSM 2006-04-10 13:26:59.000000000 +0300
@@ -0,0 +1,11 @@
+loadzone=nl
+defaultzone=nl
@@ -7510,9 +7510,9 @@
+bchan=1,3
+dchan=2,4
+
-diff -urNad zaptel-1.2.5/ztgsm/zaptel.conf.quadGSM /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zaptel.conf.quadGSM
---- zaptel-1.2.5/ztgsm/zaptel.conf.quadGSM 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zaptel.conf.quadGSM 2006-04-10 13:27:04.000000000 +0300
+diff -urNad zaptel-1.2.6/ztgsm/zaptel.conf.quadGSM /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zaptel.conf.quadGSM
+--- zaptel-1.2.6/ztgsm/zaptel.conf.quadGSM 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zaptel.conf.quadGSM 2006-04-10 13:27:04.000000000 +0300
@@ -0,0 +1,13 @@
+loadzone=nl
+defaultzone=nl
@@ -7527,9 +7527,9 @@
+bchan=1,3,5,7
+dchan=2,4,6,8
+
-diff -urNad zaptel-1.2.5/ztgsm/zaptel.conf.unoGSM /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zaptel.conf.unoGSM
---- zaptel-1.2.5/ztgsm/zaptel.conf.unoGSM 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/zaptel.conf.unoGSM 2006-04-10 13:27:20.000000000 +0300
+diff -urNad zaptel-1.2.6/ztgsm/zaptel.conf.unoGSM /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zaptel.conf.unoGSM
+--- zaptel-1.2.6/ztgsm/zaptel.conf.unoGSM 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/zaptel.conf.unoGSM 2006-04-10 13:27:20.000000000 +0300
@@ -0,0 +1,10 @@
+loadzone=nl
+defaultzone=nl
@@ -7541,9 +7541,9 @@
+bchan=1
+dchan=2
+
-diff -urNad zaptel-1.2.5/ztgsm/ztgsm.c /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/ztgsm.c
---- zaptel-1.2.5/ztgsm/ztgsm.c 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/ztgsm.c 2006-04-25 16:48:02.000000000 +0300
+diff -urNad zaptel-1.2.6/ztgsm/ztgsm.c /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/ztgsm.c
+--- zaptel-1.2.6/ztgsm/ztgsm.c 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/ztgsm.c 2006-04-25 16:48:02.000000000 +0300
@@ -0,0 +1,1133 @@
+/*
+ * ztgsm.c - Zaptel driver for the uno/duo/quad GSM PCI cards
@@ -8678,9 +8678,9 @@
+#ifdef MODULE_LICENSE
+MODULE_LICENSE("GPL");
+#endif
-diff -urNad zaptel-1.2.5/ztgsm/ztgsm.h /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/ztgsm.h
---- zaptel-1.2.5/ztgsm/ztgsm.h 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/ztgsm/ztgsm.h 2006-04-10 12:22:33.000000000 +0300
+diff -urNad zaptel-1.2.6/ztgsm/ztgsm.h /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/ztgsm.h
+--- zaptel-1.2.6/ztgsm/ztgsm.h 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/ztgsm/ztgsm.h 2006-04-10 12:22:33.000000000 +0300
@@ -0,0 +1,133 @@
+#define ztgsm_RX_MAX 1000
+#define ztgsm_FIFO_SIZE 16
@@ -8815,9 +8815,9 @@
+#define ztgsm_PCM_VECTOR_CFG ztgsm_IO_BASE + (4 * 0x35)
+
+
-diff -urNad zaptel-1.2.5/ztpty.c /tmp/dpep.EwSg5a/zaptel-1.2.5/ztpty.c
---- zaptel-1.2.5/ztpty.c 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.EwSg5a/zaptel-1.2.5/ztpty.c 2006-05-09 20:55:56.000000000 +0300
+diff -urNad zaptel-1.2.6/ztpty.c /tmp/dpep.KTFxyR/zaptel-1.2.6/ztpty.c
+--- zaptel-1.2.6/ztpty.c 1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.KTFxyR/zaptel-1.2.6/ztpty.c 2006-06-16 11:44:13.000000000 +0300
@@ -0,0 +1,112 @@
+#include <stdio.h>
+#include <stdlib.h>
More information about the Pkg-voip-commits
mailing list