[Pkg-voip-commits] r7986 - in /dahdi-tools/trunk/debian: changelog patches/perl_fix_noserial patches/perl_fix_transportdir patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Jan 25 13:56:27 2010
New Revision: 7986

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7986
Log:
Patches perl_fix_noserial, perl_fix_transportdir: Fixes for some
minor perl issues.

Added:
    dahdi-tools/trunk/debian/patches/perl_fix_noserial
    dahdi-tools/trunk/debian/patches/perl_fix_transportdir
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=7986&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/changelog (original)
+++ dahdi-tools/trunk/debian/changelog Mon Jan 25 13:56:27 2010
@@ -10,8 +10,10 @@
   * Compat level 7.
   * Bump standars version to 3.8.3.0 (no change needed)
   * Udev rules are now in dahdi-linux.
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 21 Jan 2010 14:41:36 +0200
+  * Patches perl_fix_noserial, perl_fix_transportdir: Fixes for some
+    minor perl issues.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 24 Jan 2010 22:14:13 +0200
 
 dahdi-tools (1:2.2.0-1) unstable; urgency=low
 

Added: dahdi-tools/trunk/debian/patches/perl_fix_noserial
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/perl_fix_noserial?rev=7986&op=file
==============================================================================
--- dahdi-tools/trunk/debian/patches/perl_fix_noserial (added)
+++ dahdi-tools/trunk/debian/patches/perl_fix_noserial Mon Jan 25 13:56:27 2010
@@ -1,0 +1,41 @@
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Subject: [PATCH 1/2] Not all Astribanks have a 'serial' attribute. Make it optional.
+Origin: http://svn.digium.com/svn/dahdi/tools/trunk@7953
+Last-Update: 2010-01-24
+
+---
+ xpp/perl_modules/Dahdi/Hardware/USB.pm |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/xpp/perl_modules/Dahdi/Hardware/USB.pm b/xpp/perl_modules/Dahdi/Hardware/USB.pm
+index 3eb9fe6..dff25ef 100644
+--- a/xpp/perl_modules/Dahdi/Hardware/USB.pm
++++ b/xpp/perl_modules/Dahdi/Hardware/USB.pm
+@@ -121,6 +121,15 @@ sub _get_attr($) {
+ 	return $value;
+ }
+ 
++sub _get_attr_optional($$) {
++	my ($attr_file, $def_val) = $@;
++
++	eval {return _get_attr($attr_file)};
++	
++	# If we got here, _get_attr exploded. Return the default value:
++	return $def_val;
++}
++
+ sub scan_devices_sysfs($) {
+ 	my $pack = shift || die;
+ 	my @devices = ();
+@@ -137,7 +146,7 @@ sub scan_devices_sysfs($) {
+ 		my $model = $usb_ids{"$vendor:$product"};
+ 		next unless defined $model;
+ 		my $devnum = _get_attr("$_/devnum");
+-		my $serial = _get_attr("$_/serial");
++		my $serial = _get_attr_optional("$_/serial", '');
+ 		my $devname = sprintf("%03d/%03d", $busnum, $devnum);
+ 		my $d = Dahdi::Hardware::USB->new(
+ 			IS_ASTRIBANK		=> ($model->{DRIVER} eq 'xpp_usb')?1:0,
+-- 
+1.6.5
+

Added: dahdi-tools/trunk/debian/patches/perl_fix_transportdir
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/perl_fix_transportdir?rev=7986&op=file
==============================================================================
--- dahdi-tools/trunk/debian/patches/perl_fix_transportdir (added)
+++ dahdi-tools/trunk/debian/patches/perl_fix_transportdir Mon Jan 25 13:56:27 2010
@@ -1,0 +1,33 @@
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Subject: [PATCH 2/2] A better test for the Astribank transport directory
+Origin: http://svn.digium.com/svn/dahdi/tools/trunk@7954
+Last-Update: 2010-01-24
+
+* On some kernels there's no 'usb_endpoint' under the USB device's SysFS
+  node. Use 'idVendor' which is far less likely to fail.
+* Actively resolve the symlink 'transport' to its name (e.g. '1-2').
+
+
+---
+ xpp/perl_modules/Dahdi/Hardware/USB.pm |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/xpp/perl_modules/Dahdi/Hardware/USB.pm b/xpp/perl_modules/Dahdi/Hardware/USB.pm
+index dff25ef..8b84243 100644
+--- a/xpp/perl_modules/Dahdi/Hardware/USB.pm
++++ b/xpp/perl_modules/Dahdi/Hardware/USB.pm
+@@ -93,8 +93,9 @@ sub set_transport($$) {
+ 		} else {
+ 			warn "Bad USB transportdir='$transportdir' usbdev='$usbdev'\n";
+ 		}
+-	} elsif(-d "$transportdir/usb_endpoint") {
+-		$transportdir =~ m|/(\d+)-\d+$|;
++	} elsif(-f "$transportdir/idVendor" ) {
++		my $transport_link = readlink($transportdir);
++		$transport_link =~ m|/(\d+)-\d+$|;
+ 		$busnum = $1;
+ 		$devnum = readval("$transportdir/devnum");
+ 	}
+-- 
+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=7986&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/series (original)
+++ dahdi-tools/trunk/debian/patches/series Mon Jan 25 13:56:27 2010
@@ -3,3 +3,5 @@
 zaptel_perl
 echocan_oslec
 hardware_rescan
+perl_fix_noserial
+perl_fix_transportdir