Update to vanilla 3.1.0, fix build.

2 files changed, 29 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6934eb41c978..57c826eb2a0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,38 @@
-# Maintainer: Maik Broemme <mbroemme@libmpq.org>
+# Maintainer: <software+aur@disavowed.jp>
 # Contributor: Oliver Jaksch <arch-aur@com-in.de>
 pkgname="dahdi-tools"
 pkgdesc="DAHDI tools for Asterisk (Digium, OpenVox, Allo and Yeastar cards)"
-pkgver=2.11.0
+pkgver=3.1.0
 pkgrel=1
 arch=("i686" "x86_64")
 url="http://www.asterisk.org/"
 license=("LGPLv2")
-depends=("dahdi-linux" "libusb" "perl")
+depends=("libusb" "perl") # remove dahdi-linux until that package is fixed
 backup=(
   "etc/dahdi/genconf_parameters"
   "etc/dahdi/system.conf"
 )
 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"
+  "https://downloads.asterisk.org/pub/telephony/dahdi-tools/dahdi-tools-3.1.0.tar.gz"
+  "patch-xpp_mpptalk.c"
 )
 sha256sums=(
-  "0075b34c698fea6be8f1bf0738953225caad0e37c831b95ef368b908217241e1"
-  "71642a87e566220c7e7f908adb25dadcf87ff62a23150a6e6074708fd91297b1"
+  "ea852ebd274ee1cc90ff5e4ac84261b0b787b1a74e8b76ad659bc9ec4f77e67e"
+  "0e965748c679f99c21123338e3371a5d88737d4a128349bdfea3c278ab15de79"
 )
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  for i in `ls "${srcdir}"/patch-*`; do patch -p0 -i "${i}"; done
 
-  # enable additional drivers.
-  patch -Np1 -i "${srcdir}/dahdi-tools-patchset/01-blacklist-non-digium-modules.diff"
+  # bootstrap.sh is broken, so do this manually
+  rm -rf autom4te*.cache
+  aclocal && \
+	autoheader && \
+	libtoolize --force --copy && \
+	automake --include-deps --add-missing --foreign --copy && \
+	autoconf
 
-  # compile.
-  unset CFLAGS
-  unset LDFLAGS
   ./configure --sbindir=/usr/bin --with-udevrules=/usr/lib/udev/rules.d
   make DESTDIR="${pkgdir}" all
 }
@@ -42,7 +45,7 @@ package() {
   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"
+  #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"
 }
diff --git a/patch-xpp_mpptalk.c b/patch-xpp_mpptalk.c
new file mode 100644
index 000000000000..618db67fd8cf
--- /dev/null
+++ b/patch-xpp_mpptalk.c
@@ -0,0 +1,11 @@
+--- xpp/mpptalk.c~	2021-05-20 09:04:43.500432617 +0900
++++ xpp/mpptalk.c	2021-05-20 09:05:02.303614427 +0900
+@@ -208,7 +208,7 @@
+ 	);
+ 
+ 
+-union XTALK_PDATA(MPP) {
++static union XTALK_PDATA(MPP) {
+ 		MEMBER(MPP, STATUS_GET);
+ 		MEMBER(MPP, STATUS_GET_REPLY);
+ 		MEMBER(MPP, EEPROM_SET);