[Pkg-voip-commits] r7997 - in /dahdi-tools/trunk/debian: changelog patches/astribank_allow_ignoreend patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sun Jan 31 11:31:54 2010
New Revision: 7997

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7997
Log:
Patch astribank_allow_ignoreend: an extra missing patch from upstream. 

Added:
    dahdi-tools/trunk/debian/patches/astribank_allow_ignoreend
Modified:
    dahdi-tools/trunk/debian/changelog
    dahdi-tools/trunk/debian/patches/series

Modified: dahdi-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/changelog?rev=7997&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/changelog (original)
+++ dahdi-tools/trunk/debian/changelog Sun Jan 31 11:31:54 2010
@@ -13,8 +13,9 @@
   * Patches perl_fix_noserial, perl_fix_transportdir: Fixes for some
     minor perl issues.
   * Add the missing ${misc:Depends}, as per lintian. 
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 25 Jan 2010 15:56:50 +0200
+  * Patch astribank_allow_ignoreend: an extra missing patch from upstream. 
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 31 Jan 2010 13:28:23 +0200
 
 dahdi-tools (1:2.2.0-1) unstable; urgency=low
 

Added: dahdi-tools/trunk/debian/patches/astribank_allow_ignoreend
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/astribank_allow_ignoreend?rev=7997&op=file
==============================================================================
--- dahdi-tools/trunk/debian/patches/astribank_allow_ignoreend (added)
+++ dahdi-tools/trunk/debian/patches/astribank_allow_ignoreend Sun Jan 31 11:31:54 2010
@@ -1,0 +1,53 @@
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Date: Tue, 12 Jan 2010 19:05:40 +0000
+Subject: xpp: ignore everything after the end of the license stanza
+Origin: http://svn.digium.com/svn/dahdi/tools/branches/2.2@7901
+
+Patch merged into branch 2.2 from trunk slightly too late to make it into
+2.2.1 . Should be part of any future release.
+
+---
+ xpp/astribank_allow.c |   13 +++++++++----
+ 1 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/xpp/astribank_allow.c b/xpp/astribank_allow.c
+index ec60d4a..b68c3a2 100644
+--- a/xpp/astribank_allow.c
++++ b/xpp/astribank_allow.c
+@@ -199,7 +199,7 @@ static int read_from_file(struct eeprom_table *eeprom_table, struct capabilities
+ 	 * 1: read Version, goto 2. if not version line then error.
+ 	 * 2: after BEGIN line. split line into key:value. if line is Data:, goto 3.
+ 	 * 3: read binary data. if line is END_LICENSE_BLOCK goto 4.
+-	 * 4: END_LICENSE_BLOCK - if not EOF - error. otherwise exit loop and success.
++	 * 4: END_LICENSE_BLOCK - ignore lines.
+ 	 */
+ 	while (fgets(buf, 256, f) != NULL) {
+ 		lineno++;
+@@ -210,7 +210,12 @@ static int read_from_file(struct eeprom_table *eeprom_table, struct capabilities
+ 		}
+ 		line = trim(buf);
+ 		if (line == NULL) {
+-			ERR("Line %d: Empty line\n", lineno);
++ 			if (state > 0 && state < 4) {
++				ERR("Line %d: Empty line\n", lineno);
++				return -1;
++			}
++			else
++				continue;
+ 		}
+ 		switch (state) {
+ 			case 0:
+@@ -259,8 +264,8 @@ static int read_from_file(struct eeprom_table *eeprom_table, struct capabilities
+ 				}
+ 				break;
+ 			case 4:
+-				ERR("Extra data after license end block\n");
+-				return -1;
++				break;
++
+ 		}
+ 	}
+ 	if (state != 4) {
+-- 
+1.6.5
+

Modified: dahdi-tools/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/series?rev=7997&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/series (original)
+++ dahdi-tools/trunk/debian/patches/series Sun Jan 31 11:31:54 2010
@@ -5,3 +5,4 @@
 hardware_rescan
 perl_fix_noserial
 perl_fix_transportdir
+astribank_allow_ignoreend