Updated with latest DAHDI and Linux Kernel

2 files changed, 18 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26e23006b023..fd92b87bd98c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 4.2.1
-# Sun Oct  4 20:24:45 UTC 2015
+# Fri Jan 29 23:25:49 UTC 2016
 pkgbase = dahdi-tools
 	pkgdesc = DAHDI tools for Asterisk (Digium, OpenVox, Allo and Yeastar cards)
-	pkgver = 2.10.2
-	pkgrel = 2
+	pkgver = 2.11.0
+	pkgrel = 1
 	url = http://www.asterisk.org/
 	arch = i686
 	arch = x86_64
@@ -13,12 +13,10 @@ pkgbase = dahdi-tools
 	depends = perl
 	backup = etc/dahdi/genconf_parameters
 	backup = etc/dahdi/system.conf
-	source = http://downloads.asterisk.org/pub/telephony/dahdi-tools/dahdi-tools-2.10.2.tar.gz
+	source = http://downloads.asterisk.org/pub/telephony/dahdi-tools/dahdi-tools-2.11.0.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 = 9e904815dedab231084c542d2d7d5dcc832ebec4b5d5d999a5d757df8b2d571a
+	sha256sums = 0075b34c698fea6be8f1bf0738953225caad0e37c831b95ef368b908217241e1
 	sha256sums = 71642a87e566220c7e7f908adb25dadcf87ff62a23150a6e6074708fd91297b1
-	sha256sums = f14128582ee6bf9695ef3eb700c62003a5167a77a124015043c0acaee23ce653
 
 pkgname = dahdi-tools
 
diff --git a/PKGBUILD b/PKGBUILD
index 66c71da104c2..6934eb41c978 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # 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.2
-pkgrel=2
+pkgver=2.11.0
+pkgrel=1
 arch=("i686" "x86_64")
 url="http://www.asterisk.org/"
 license=("LGPLv2")
@@ -15,12 +15,10 @@ backup=(
 source=(
   "http://downloads.asterisk.org/pub/telephony/dahdi-tools/${pkgname}-${pkgver}.tar.gz"
   "http://mirror.netcologne.de/gentoo/distfiles/gentoo-dahdi-tools-patchset-0.4.tar.bz2"
-  "dahdi-tools-2.10.1-gcc510.patch"
 )
 sha256sums=(
-  "9e904815dedab231084c542d2d7d5dcc832ebec4b5d5d999a5d757df8b2d571a"
+  "0075b34c698fea6be8f1bf0738953225caad0e37c831b95ef368b908217241e1"
   "71642a87e566220c7e7f908adb25dadcf87ff62a23150a6e6074708fd91297b1"
-  "f14128582ee6bf9695ef3eb700c62003a5167a77a124015043c0acaee23ce653"
 )
 
 build() {
@@ -28,26 +26,23 @@ build() {
 
   # enable additional drivers.
   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"
-
-  # fix wrong installation paths.
-  sed 's,/lib/udev,/etc/lib/udev,' -i xpp/Makefile
-  sed 's,$(prefix)/sbin,$(prefix)/bin,' -i xpp/Makefile
 
   # compile.
-  ./configure --sbindir=/usr/bin
+  unset CFLAGS
+  unset LDFLAGS
+  ./configure --sbindir=/usr/bin --with-udevrules=/usr/lib/udev/rules.d
   make DESTDIR="${pkgdir}" all
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # install.
   make DESTDIR="${pkgdir}" install
   install -D -m 0644 xpp/genconf_parameters "${pkgdir}/etc/dahdi/genconf_parameters"
+
+  # cleanup installation.
+  cp "${pkgdir}/etc/dahdi/system.conf.sample" "${pkgdir}/etc/dahdi/system.conf"
+  mv "${pkgdir}/usr/lib/udev/rules.d/xpp.rules" "${pkgdir}/usr/lib/udev/rules.d/98-xpp.rules"
+  rm "${pkgdir}/usr/lib/udev/rules.d/dahdi.rules"
 }