main/dahdi-tools: upgrade to 2.3.0

2 files changed, 17 insertions, 17 deletions

diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index 247826c313..51db40378d 100644
--- a/main/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
@@ -15,8 +15,8 @@ _realname=dahdi-linux
 
 pkgname=${_realname}-${_flavor}
 pkgver=$pkgver
-_dahdiver=2.2.0.2
-_mypkgrel=2
+_dahdiver=2.3.0.1
+_mypkgrel=0
 pkgrel=$(( $_kpkgrel + $_mypkgrel ))
 pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver"
 url="http://www.asterisk.org"
@@ -32,9 +32,6 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna
         dahdi-bri_dchan.patch
         dahdi-zaphfc.patch
         zaphfc-dahdi-flortz.diff
-        dahdi-linux-2.2.0-hfc-4s.patch
-        dahdi-2.6.31.patch
-        dahdi-2.2.0.2-driver_data-2.6.32.patch
         "
 
 prepare() {
@@ -70,11 +67,8 @@ dev() {
         ln -s /usr/include "$dir"/include
 }
 
-md5sums="1f932729ad28f2f028afcf2cc5ccf7ba  dahdi-linux-2.2.0.2.tar.gz
+md5sums="ac454f91d7e1267655ecd698832da414  dahdi-linux-2.3.0.1.tar.gz
 c78fb8d80f9efdffd950297c88ff9273  dahdi-depmod.patch
 4b41a82ff390ac64c08092c5a3eab6a8  dahdi-bri_dchan.patch
 a822c092f0548cd13f5e8d8cba053af6  dahdi-zaphfc.patch
-291c5c44c86ab02443a742415461ddca  zaphfc-dahdi-flortz.diff
-68dfe17a49cca15ae439fd83f4ccfbc5  dahdi-linux-2.2.0-hfc-4s.patch
-bd5e7457ee8f37c10ed7ec383995e4fa  dahdi-2.6.31.patch
-7f9452ef37385e03e05147081d6951a1  dahdi-2.2.0.2-driver_data-2.6.32.patch"
+291c5c44c86ab02443a742415461ddca  zaphfc-dahdi-flortz.diff"
diff --git a/main/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD
index dbb82aab67..4d561678e9 100644
--- a/main/dahdi-tools/APKBUILD
+++ b/main/dahdi-tools/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=dahdi-tools
-pkgver=2.2.0
-pkgrel=1
+pkgver=2.3.0
+pkgrel=0
 pkgdesc="Digium Asterisk Hardware Device Interface management utilities"
 url="http://www.asterisk.org"
 license="GPL"
@@ -14,19 +14,25 @@ subpackages="$pkgname-doc $pkgname-dev"
 source="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/$pkgname-$pkgver.tar.gz
         $pkgname.initd"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 build() {
-        cd "$srcdir/$pkgname-$pkgver"
+        cd "$_builddir"
 
         ./configure --prefix=/usr \
                 --sysconfdir=/etc \
                 --mandir=/usr/share/man \
-                --infodir=/usr/share/info
-        sed -i -e 's/$(CC) $(LDFLAGS) -o $@ $^/$(CC) $^ $(LDFLAGS) -o $@/' Makefile
+                --infodir=/usr/share/info \
+                || return 1
+        sed -i -e 's/$(CC) $(LDFLAGS) -o $@ $^/$(CC) $^ $(LDFLAGS) -o $@/' \
+                Makefile
         make || return 1
-        make -j1 DESTDIR="$pkgdir" install
+}
 
+package() {
+        cd "$_builddir"
+        make -j1 DESTDIR="$pkgdir" install
         install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/dahdi
 }
 
-md5sums="a018f452f3851a312ff51705ac44de37  dahdi-tools-2.2.0.tar.gz
+md5sums="6c9e2da70e4503e4d93f1ad0c83e61af  dahdi-tools-2.3.0.tar.gz
 d9702271dba6ff250f4d9a252f4dbf4c  dahdi-tools.initd"