SOURCES: zaptel-bristuff.patch, zaptel-sangoma.patch - changed file paths s...

[hawk]

Author: hawk                         Date: Sun May 25 12:13:28 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- changed file paths so it applies on zaptel 1.4.10.1, but should be updated
  or at least reviewed... from where this patch was taken?

---- Files affected:
SOURCES:
   zaptel-bristuff.patch (1.3 -> 1.4) , zaptel-sangoma.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/zaptel-bristuff.patch
diff -u SOURCES/zaptel-bristuff.patch:1.3 SOURCES/zaptel-bristuff.patch:1.4
--- SOURCES/zaptel-bristuff.patch:1.3	Sat Feb  9 18:19:40 2008
+++ SOURCES/zaptel-bristuff.patch	Sun May 25 14:13:22 2008
@@ -16558,9 +16558,9 @@
 +span=1,1,3,ccs,ami
 +bchan=1-2
 +dchan=3
-diff -urN zaptel-1.4.8.org/zaptel-base.c zaptel-1.4.8/zaptel-base.c
---- zaptel-1.4.8.org/zaptel-base.c	2008-01-12 05:07:30.000000000 +0100
-+++ zaptel-1.4.8/zaptel-base.c	2008-02-09 17:57:33.978583652 +0100
+diff -urN zaptel-1.4.8.org/kernel/zaptel-base.c zaptel-1.4.8/zaptel-base.c
+--- zaptel-1.4.8.org/kernel/zaptel-base.c	2008-01-12 05:07:30.000000000 +0100
++++ zaptel-1.4.8/kernel/zaptel-base.c	2008-02-09 17:57:33.978583652 +0100
 @@ -136,6 +136,7 @@
  EXPORT_SYMBOL(zt_qevent_lock);
  EXPORT_SYMBOL(zt_hooksig);
@@ -16718,9 +16718,9 @@
  			} else {
  				/* Not HDLC */
  				memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-diff -urN zaptel-1.4.8.org/zaptel.h zaptel-1.4.8/zaptel.h
---- zaptel-1.4.8.org/zaptel.h	2008-01-09 18:17:07.000000000 +0100
-+++ zaptel-1.4.8/zaptel.h	2008-02-09 17:57:33.961916185 +0100
+diff -urN zaptel-1.4.8.org/kernel/zaptel.h zaptel-1.4.8/zaptel.h
+--- zaptel-1.4.8.org/kernel/zaptel.h	2008-01-09 18:17:07.000000000 +0100
++++ zaptel-1.4.8/kernel/zaptel.h	2008-02-09 17:57:33.961916185 +0100
 @@ -1266,6 +1266,13 @@
  	int do_ppp_error;
  	struct sk_buff_head ppp_rq;
@@ -16767,9 +16767,9 @@
  /* Initialize a tone state */
  void zt_init_tone_state(struct zt_tone_state *ts, struct zt_tone *zt);
  
-diff -urN zaptel-1.4.8.org/zconfig.h zaptel-1.4.8/zconfig.h
---- zaptel-1.4.8.org/zconfig.h	2008-01-11 22:35:18.000000000 +0100
-+++ zaptel-1.4.8/zconfig.h	2008-02-09 17:57:07.433977978 +0100
+diff -urN zaptel-1.4.8.org/kernel/zconfig.h zaptel-1.4.8/zconfig.h
+--- zaptel-1.4.8.org/kernel/zconfig.h	2008-01-11 22:35:18.000000000 +0100
++++ zaptel-1.4.8/kernel/zconfig.h	2008-02-09 17:57:07.433977978 +0100
 @@ -189,4 +189,10 @@
   */
  #define ZAPTEL_SYNC_TICK

================================================================
Index: SOURCES/zaptel-sangoma.patch
diff -u SOURCES/zaptel-sangoma.patch:1.2 SOURCES/zaptel-sangoma.patch:1.3
--- SOURCES/zaptel-sangoma.patch:1.2	Thu May  3 13:13:49 2007
+++ SOURCES/zaptel-sangoma.patch	Sun May 25 14:13:23 2008
@@ -1,6 +1,6 @@
-diff -Nur zaptel-1.4.2.1.org/zaptel-base.c zaptel-1.4.2.1/zaptel-base.c
---- zaptel-1.4.2.1.org/zaptel-base.c	2007-04-25 17:36:17.000000000 +0200
-+++ zaptel-1.4.2.1/zaptel-base.c	2007-05-03 13:10:43.000000000 +0200
+diff -Nur zaptel-1.4.2.1.org/kernel/zaptel-base.c zaptel-1.4.2.1/zaptel-base.c
+--- zaptel-1.4.2.1.org/kernel/zaptel-base.c	2007-04-25 17:36:17.000000000 +0200
++++ zaptel-1.4.2.1/kernel/zaptel-base.c	2007-05-03 13:10:43.000000000 +0200
 @@ -1916,6 +1916,11 @@
  		} else {
  			if (copy_from_user(chan->writebuf[res], usrbuf, amnt))
@@ -13,9 +13,9 @@
  			chan->writen[res] = amnt;
  		}
  		chan->writeidx[res] = 0;
-diff -Nur zaptel-1.4.2.1.org/zaptel.h zaptel-1.4.2.1/zaptel.h
---- zaptel-1.4.2.1.org/zaptel.h	2007-04-24 20:32:49.000000000 +0200
-+++ zaptel-1.4.2.1/zaptel.h	2007-05-03 13:10:43.000000000 +0200
+diff -Nur zaptel-1.4.2.1.org/kernel/zaptel.h zaptel-1.4.2.1/zaptel.h
+--- zaptel-1.4.2.1.org/kernel/zaptel.h	2007-04-24 20:32:49.000000000 +0200
++++ zaptel-1.4.2.1/kernel/zaptel.h	2007-05-03 13:10:43.000000000 +0200
 @@ -633,6 +633,11 @@
   *  60-80 are reserved for private drivers
   *  80-85 are reserved for dynamic span stuff
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/zaptel-bristuff.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/zaptel-sangoma.patch?r1=1.2&r2=1.3&f=u