aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teras <timo.teras@iki.fi>2009-11-28 02:50:40 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2010-01-14 09:40:44 +0000
commit4939975b82b37f28a0bb1abe7a3ec733772188ae (patch)
treec3fb749b0305add0ec8e607c69007822e1aa7f2b
parent806ec05e217ad080784c75f9ee4d1b956d4646d2 (diff)
downloadaports-4939975b82b37f28a0bb1abe7a3ec733772188ae.tar.bz2
aports-4939975b82b37f28a0bb1abe7a3ec733772188ae.tar.xz
main/asterisk: upgrade to 1.6.0.18
update some patches, and remove the libpri checks from autoconfig.ac since they seem to be bogus. (cherry picked from commit d6f5aa5145cb1e4e2afc119b543cb9bb3579b8c8)
-rw-r--r--main/asterisk/101-caps-uclibc.patch20
-rw-r--r--main/asterisk/APKBUILD10
2 files changed, 16 insertions, 14 deletions
diff --git a/main/asterisk/101-caps-uclibc.patch b/main/asterisk/101-caps-uclibc.patch
index 1acf87f34f..bb32d1ece1 100644
--- a/main/asterisk/101-caps-uclibc.patch
+++ b/main/asterisk/101-caps-uclibc.patch
@@ -1,17 +1,17 @@
---- asterisk-1.6.0-beta7.1/configure.ac.orig 2008-04-04 07:31:06 +0000
-+++ asterisk-1.6.0-beta7.1/configure.ac 2008-04-04 07:36:14 +0000
-@@ -522,9 +522,11 @@
+--- asterisk-1.6.0.18/configure.ac.orig Mon Oct 26 23:13:28 2009
++++ asterisk-1.6.0.18/configure.ac Fri Nov 27 21:42:36 2009
+@@ -627,9 +627,11 @@
AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
--if test "x${host_os}" = "xlinux-gnu" ; then
+-if test "x${OSARCH}" = "xlinux-gnu" ; then
- AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
-fi
-+case "${host_os}" in
-+ linux*)
++case "${OSARCH}" in
++ linux*)
+ AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
-+ ;;
-+esac
++ ;;
++esac
+
+ AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h])
- # BSD might not have exp2, and/or log2
- AST_EXT_LIB_CHECK([EXP2L], [m], [exp2l])
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index e9591379ea..87d8b6caed 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
-pkgver=1.6.0.15
-pkgrel=2
+pkgver=1.6.0.18
+pkgrel=1
pkgdesc="Asterisk: A Module Open Source PBX System"
url="http://www.asterisk.org/"
license="GPL"
@@ -19,6 +19,7 @@ source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.g
102-gsm-pic.patch
103-rundir.patch
201-incomplete.patch
+ 301-libpri-autoconf.patch
asterisk.initd
asterisk.confd
asterisk.logrotate"
@@ -88,12 +89,13 @@ tds() {
_find_and_move '*_tds*'
}
-md5sums="d319f52d8d1d70f69583901e56720c30 asterisk-1.6.0.15.tar.gz
+md5sums="b8bb4379fb4fde3ed705eb82999081b8 asterisk-1.6.0.18.tar.gz
b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch
-929f740db7043b4553544ebcc7315c91 101-caps-uclibc.patch
+6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch
97b39fd9777a2521d4f9f095482b7ac2 102-gsm-pic.patch
5008f51c737ec91f5047519bc9f25b85 103-rundir.patch
57825b74526187075ff7cb6816c55467 201-incomplete.patch
+5771a5ab34b187dbfe8e23950b04213b 301-libpri-autoconf.patch
0ce3219e05f55af884a7dc6b99c2b276 asterisk.initd
ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd
3e65172275684373e1a25c8a11224411 asterisk.logrotate"