Updated with latest DAHDI and removed no longer needed patches

5 files changed, 22 insertions, 110 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1193720bfa16..1a5acef862e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by makepkg 4.2.1
+# Sun Oct  4 19:56:22 UTC 2015
 pkgbase = dahdi-tools
 	pkgdesc = DAHDI tools for Asterisk (Digium, OpenVox, Allo and Yeastar cards)
-	pkgver = 2.10.1
-	pkgrel = 3
+	pkgver = 2.10.2
+	pkgrel = 1
 	url = http://www.asterisk.org/
 	arch = i686
 	arch = x86_64
@@ -10,15 +12,11 @@ pkgbase = dahdi-tools
 	depends = libusb
 	depends = perl
 	backup = etc/dahdi/system.conf
-	source = http://downloads.asterisk.org/pub/telephony/dahdi-tools/dahdi-tools-2.10.1.tar.gz
-	source = dahdi-tools-2.10.1-allo.patch
-	source = dahdi-tools-2.10.1-openvox.patch
-	source = dahdi-tools-2.10.1-yeastar.patch
+	source = http://downloads.asterisk.org/pub/telephony/dahdi-tools/dahdi-tools-2.10.2.tar.gz
+	source = http://mirror.netcologne.de/gentoo/distfiles/gentoo-dahdi-tools-patchset-0.4.tar.bz2
 	source = dahdi-tools-2.10.1-gcc510.patch
-	sha256sums = eac80535a0fa4f61fc7ba767bbbd726e0ad769e3d22c207e75d381fe578a6c21
-	sha256sums = 5176ab6f92da173e667b5f9b7c82131173dff61ae69ed3e51c743ac955a40cde
-	sha256sums = fcc641ade28a1bd46a4c2abe45d6e19c25d08484421ddb3365bcb07f37cc183b
-	sha256sums = b420dd3d4c0f08d0a696acc545f35e2157d9a50073581497b4d4093b7a23f32f
+	sha256sums = 9e904815dedab231084c542d2d7d5dcc832ebec4b5d5d999a5d757df8b2d571a
+	sha256sums = 71642a87e566220c7e7f908adb25dadcf87ff62a23150a6e6074708fd91297b1
 	sha256sums = f14128582ee6bf9695ef3eb700c62003a5167a77a124015043c0acaee23ce653
 
 pkgname = dahdi-tools
diff --git a/PKGBUILD b/PKGBUILD
index 024e94e0dd1c..e54a34e7c985 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Maik Broemme <mbroemme@libmpq.org>
+# Contributor: Oliver Jaksch <arch-aur@com-in.de>
 pkgname="dahdi-tools"
 pkgdesc="DAHDI tools for Asterisk (Digium, OpenVox, Allo and Yeastar cards)"
-pkgver=2.10.1
-pkgrel=3
+pkgver=2.10.2
+pkgrel=1
 arch=("i686" "x86_64")
 url="http://www.asterisk.org/"
 license=("LGPLv2")
@@ -12,16 +13,12 @@ backup=(
 )
 source=(
   "http://downloads.asterisk.org/pub/telephony/dahdi-tools/${pkgname}-${pkgver}.tar.gz"
-  "dahdi-tools-2.10.1-allo.patch"
-  "dahdi-tools-2.10.1-openvox.patch"
-  "dahdi-tools-2.10.1-yeastar.patch"
+  "http://mirror.netcologne.de/gentoo/distfiles/gentoo-dahdi-tools-patchset-0.4.tar.bz2"
   "dahdi-tools-2.10.1-gcc510.patch"
 )
 sha256sums=(
-  "eac80535a0fa4f61fc7ba767bbbd726e0ad769e3d22c207e75d381fe578a6c21"
-  "5176ab6f92da173e667b5f9b7c82131173dff61ae69ed3e51c743ac955a40cde"
-  "fcc641ade28a1bd46a4c2abe45d6e19c25d08484421ddb3365bcb07f37cc183b"
-  "b420dd3d4c0f08d0a696acc545f35e2157d9a50073581497b4d4093b7a23f32f"
+  "9e904815dedab231084c542d2d7d5dcc832ebec4b5d5d999a5d757df8b2d571a"
+  "71642a87e566220c7e7f908adb25dadcf87ff62a23150a6e6074708fd91297b1"
   "f14128582ee6bf9695ef3eb700c62003a5167a77a124015043c0acaee23ce653"
 )
 
@@ -29,9 +26,12 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # enable additional drivers.
-  patch -Np1 -i "${srcdir}/dahdi-tools-2.10.1-allo.patch"
-  patch -Np1 -i "${srcdir}/dahdi-tools-2.10.1-openvox.patch"
-  patch -Np1 -i "${srcdir}/dahdi-tools-2.10.1-yeastar.patch"
+  patch -Np1 -i "${srcdir}/dahdi-tools-patchset/01-blacklist-non-digium-modules.diff"
+  patch -Np1 -i "${srcdir}/dahdi-tools-patchset/02-parallel-make.diff"
+  patch -Np1 -i "${srcdir}/dahdi-tools-patchset/03-no-hardware-fiddling.diff"
+  patch -Np1 -i "${srcdir}/dahdi-tools-patchset/04-vendorlib.diff"
+  patch -Np1 -i "${srcdir}/dahdi-tools-patchset/05-respect-ldflags.diff"
+  patch -Np1 -i "${srcdir}/dahdi-tools-patchset/06-respect-udev-rules.diff"
 
   # compile fixes for latest gcc.
   patch -Np1 -i "${srcdir}/dahdi-tools-2.10.1-gcc510.patch"
@@ -40,11 +40,12 @@ build() {
   sed 's,$(prefix)/sbin,$(prefix)/bin,' -i xpp/Makefile
 
   # compile.
-  ./configure --with-dahdi --sbindir=/usr/bin
+  ./configure --sbindir=/usr/bin
   make DESTDIR="${pkgdir}" all
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  install -D -m 0644 xpp/genconf_parameters "${pkgdir}/etc/dahdi/genconf_parameters"
 }
diff --git a/dahdi-tools-2.10.1-allo.patch b/dahdi-tools-2.10.1-allo.patch
deleted file mode 100644
index c8505a028de6..000000000000
--- a/dahdi-tools-2.10.1-allo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur dahdi-tools-2.10.0.1/xpp/perl_modules/Dahdi/Hardware/PCI.pm dahdi-tools-2.10.0.1-allo/xpp/perl_modules/Dahdi/Hardware/PCI.pm
---- dahdi-tools-2.10.0.1/xpp/perl_modules/Dahdi/Hardware/PCI.pm	2014-09-22 20:40:36.000000000 +0200
-+++ dahdi-tools-2.10.0.1-allo/xpp/perl_modules/Dahdi/Hardware/PCI.pm	2015-02-10 14:45:54.047761228 +0100
-@@ -42,6 +42,12 @@
- 	'd161:0205'		=> { DRIVER => 'wct4xxp', DESCRIPTION => 'Wildcard TE205P ' },
- 	'd161:0210'		=> { DRIVER => 'wct4xxp', DESCRIPTION => 'Wildcard TE210P ' },
- 	'd161:1820'		=> { DRIVER => 'wct4xxp', DESCRIPTION => 'Wildcard TE820 (5th Gen)' },
-+#/*CEM:*/	
-+	'1d21:1280'		=> { DRIVER => 'allo4xxp', DESCRIPTION => 'Allocard 2aCP8e (2nd Gen)' },
-+	'1d21:1240'		=> { DRIVER => 'allo4xxp', DESCRIPTION => 'Allocard 2aCP4e (2nd Gen)' },
-+	'1d21:1241'             => { DRIVER => 'allo4xxp', DESCRIPTION => 'Allocard 2aCP4 (2nd Gen)' },
-+	'1d21:1220'		=> { DRIVER => 'allo4xxp', DESCRIPTION => 'Allocard 2aCP2e (2nd Gen)' },
-+	'1d21:1210'		=> { DRIVER => 'allo4xxp', DESCRIPTION => 'Allocard 2aCP1e (2nd Gen)' },
- 
- 	# from wctdm24xxp
- 	'd161:2400'		=> { DRIVER => 'wctdm24xxp', DESCRIPTION => 'Wildcard TDM2400P' },
diff --git a/dahdi-tools-2.10.1-openvox.patch b/dahdi-tools-2.10.1-openvox.patch
deleted file mode 100644
index 8354dfc8c276..000000000000
--- a/dahdi-tools-2.10.1-openvox.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Nur dahdi-tools-2.10.0.1/xpp/perl_modules/Dahdi/Chans.pm dahdi-tools-2.10.0.1-openvox/xpp/perl_modules/Dahdi/Chans.pm
---- dahdi-tools-2.10.0.1/xpp/perl_modules/Dahdi/Chans.pm	2014-09-22 20:40:36.000000000 +0200
-+++ dahdi-tools-2.10.0.1-openvox/xpp/perl_modules/Dahdi/Chans.pm	2015-02-10 11:57:44.552502811 +0100
-@@ -154,6 +154,9 @@
- 		# AP40[124]: Aligera AP40X cards
- 		# APE40[124]: Aligera APE40X cards
- 		$type = "PRI";
-+	} elsif ($fqn =~ m{\b(D115|D130)/.*}) { 
-+		# D115: OpenVox opvxd115 
-+		$type = "PRI";
- 	} elsif ($fqn =~ m{\b(WCBRI|B4|ZTHFC\d*|ztqoz\d*)/.*}) {
- 		# WCBRI: The Digium Hx8 series cards with BRI module.
- 		# B4: The Digium wcb4xxp DAHDI driver
-@@ -198,7 +201,7 @@
- 	my $num = $self->num;
- 	my $type;
- 
--	if($fqn =~ m:WCTDM/|WRTDM/|OPVXA1200/:) {
-+	if($fqn =~ m:WCTDM/|WRTDM/|OPVXA1200/|OPVXA24XX/:) {
- 		my %maybe;
- 
- 		undef %maybe;
-diff -Nur dahdi-tools-2.10.0.1/xpp/perl_modules/Dahdi/Hardware/PCI.pm dahdi-tools-2.10.0.1-openvox/xpp/perl_modules/Dahdi/Hardware/PCI.pm
---- dahdi-tools-2.10.0.1/xpp/perl_modules/Dahdi/Hardware/PCI.pm	2014-09-22 20:40:36.000000000 +0200
-+++ dahdi-tools-2.10.0.1-openvox/xpp/perl_modules/Dahdi/Hardware/PCI.pm	2015-02-10 11:57:44.552502811 +0100
-@@ -43,6 +43,21 @@
- 	'd161:0210'		=> { DRIVER => 'wct4xxp', DESCRIPTION => 'Wildcard TE210P ' },
- 	'd161:1820'		=> { DRIVER => 'wct4xxp', DESCRIPTION => 'Wildcard TE820 (5th Gen)' },
- 
-+	# from opvxd115 
-+
-+ 	'1b74:0115'             => { DRIVER => 'opvxd115', DESCRIPTION => 'OpenVox D115P/D115E '  }, 
-+	'1b74:d130'             => { DRIVER  => 'opvxd115', DESCRIPTION  => 'OpenVox D130P/D130E ' }, 
-+	# openvox asterisk D-serial E1/T1 card
-+	'1b74:d430'		 => { DRIVER => 'wct4xxp', DESCRIPTION => 'OpenVox D430E(3rd Gen) Quad-port E1/T1 card' },
-+	'1b74:1420'		 => { DRIVER => 'wct4xxp', DESCRIPTION => 'OpenVox D420P(2nd Gen) Quad-port E1/T1 card' },
-+	'1b74:d410'		 => { DRIVER => 'wct4xxp', DESCRIPTION => 'OpenVox D410E(2nd Gen) Quad-port E1/T1 card' },
-+	'1b74:d230'		 => { DRIVER => 'wct4xxp', DESCRIPTION => 'OpenVox D230E Dual-port  E1/T1 card' },
-+	'1b74:d210'		 => { DRIVER => 'wct4xxp', DESCRIPTION => 'OpenVox D210E Dual-port  E1/T1 card' },
-+	# from opvxa24xx
-+       	'1b74:2410'     => { DRIVER => 'opvxa24xx', DESCRIPTION => 'OpenVox A2410P' },
-+ 	'1b74:1610'     => { DRIVER => 'opvxa24xx', DESCRIPTION => 'OpenVox A1610P' },
-+   	'1b74:0810'     => { DRIVER => 'opvxa24xx', DESCRIPTION => 'OpenVox A810P' },
-+
- 	# from wctdm24xxp
- 	'd161:2400'		=> { DRIVER => 'wctdm24xxp', DESCRIPTION => 'Wildcard TDM2400P' },
- 	'd161:0800'		=> { DRIVER => 'wctdm24xxp', DESCRIPTION => 'Wildcard TDM800P' },
-diff -Nur dahdi-tools-2.10.0.1/xpp/perl_modules/Dahdi/Span.pm dahdi-tools-2.10.0.1-openvox/xpp/perl_modules/Dahdi/Span.pm
---- dahdi-tools-2.10.0.1/xpp/perl_modules/Dahdi/Span.pm	2014-09-22 20:40:36.000000000 +0200
-+++ dahdi-tools-2.10.0.1-openvox/xpp/perl_modules/Dahdi/Span.pm	2015-02-10 11:57:44.552502811 +0100
-@@ -149,6 +149,8 @@
- 		'T[248]XXP \(PCI\) Card ',         # wct4xxp
- 		'WCTE43X \(PCI\) Card ',           # wcte43xp
- 		'WCTE23X \(PCI\) Card ',           # wcte43xp
-+		'D115 \(E1|T1\) Card ',       # opvxd115
-+		'D130 \(E1|T1\) Card ',       # opvxd130
- 		'R[24]T1 \(PCI\) Card',            # rxt1
- 		'Rhino R1T1 (E1)/PRA Card',        # r1t1
- 		'Rhino R1T1 (T1)/PRI Card',        # r1t1
diff --git a/dahdi-tools-2.10.1-yeastar.patch b/dahdi-tools-2.10.1-yeastar.patch
deleted file mode 100644
index 35ea372b118d..000000000000
--- a/dahdi-tools-2.10.1-yeastar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur dahdi-tools-2.10.0.1/modules.sample dahdi-tools-2.10.0.1-yeastar/modules.sample
---- dahdi-tools-2.10.0.1/modules.sample	2014-09-22 20:40:36.000000000 +0200
-+++ dahdi-tools-2.10.0.1-yeastar/modules.sample	2015-02-10 15:22:59.000000000 +0100
-@@ -61,3 +61,8 @@
- # Xorcom Astribank Devices
- xpp_usb
- 
-+# Yeastar TDM1600 : UP to 16 analog ports
-+ystdm16xx
-+# Yeastar TDM800 : UP to 8 analog ports
-+ystdm8xx
-+