aboutsummaryrefslogtreecommitdiffstats
path: root/main/asterisk
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2010-10-25 15:59:10 +0300
committerTimo Teräs <timo.teras@iki.fi>2010-10-26 11:57:04 +0300
commitbd673b51a11aa7d915ff838469a033c7130b8ea9 (patch)
tree4d1c99adb23733d72950c44e63afe54406bb0f7d /main/asterisk
parent8f1d0eb69d7e2fa11ec47f62a87d1f5efa6477b1 (diff)
downloadaports-bd673b51a11aa7d915ff838469a033c7130b8ea9.tar.bz2
aports-bd673b51a11aa7d915ff838469a033c7130b8ea9.tar.xz
main/asterisk: update to 1.8.0
Also add new subpackages: - sounds-moh: for default music-on-hold music - sounds-en: core english prompts And move http documentation to asterisk-doc.
Diffstat (limited to 'main/asterisk')
-rw-r--r--main/asterisk/500-issue18119.patch22
-rw-r--r--main/asterisk/APKBUILD48
2 files changed, 41 insertions, 29 deletions
diff --git a/main/asterisk/500-issue18119.patch b/main/asterisk/500-issue18119.patch
deleted file mode 100644
index 97ea61b628..0000000000
--- a/main/asterisk/500-issue18119.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: channels/chan_sip.c
-===================================================================
---- a/channels/chan_sip.c (Revision 291226)
-+++ b/channels/chan_sip.c (Arbeitskopie)
-@@ -18329,8 +18329,6 @@
- if (r->call)
- r->call = dialog_unref(r->call, "unsetting registry->call pointer-- case 200");
- p->registry = registry_unref(p->registry, "unref registry entry p->registry");
-- /* Let this one hang around until we have all the responses */
-- sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
- /* p->needdestroy = 1; */
-
- /* set us up for re-registering
-@@ -18374,6 +18372,8 @@
- expires_ms -= EXPIRY_GUARD_SECS * 1000;
- if (sipdebug)
- ast_log(LOG_NOTICE, "Outbound Registration: Expiry for %s is %d sec (Scheduling reregistration in %d s)\n", r->hostname, expires, expires_ms/1000);
-+ /* Let this one hang around until we have all the responses */
-+ sip_scheddestroy(p, (expires_ms > ((p->timer_t1 != 0) ? p->timer_t1 : global_t1) * 64) ? DEFAULT_TRANS_TIMEOUT : (expires_ms - 1000));
-
- r->refresh= (int) expires_ms / 1000;
-
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index e931f6b99e..081f18e116 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.2.13
-pkgrel=1
+pkgver=1.8.0
+pkgrel=0
pkgdesc="Asterisk: A Module Open Source PBX System"
url="http://www.asterisk.org/"
license="GPL"
@@ -13,12 +13,12 @@ makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev
libresample sqlite-dev wget"
install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-install"
subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
- $pkgname-tds $pkgname-fax $pkgname-sample-config:sample $pkgname-sqlite"
+ $pkgname-tds $pkgname-fax $pkgname-sample-config:sample $pkgname-sqlite
+ $pkgname-sounds-moh:sound_moh $pkgname-sounds-en:sound_en"
source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz
100-uclibc-daemon.patch
101-caps-uclibc.patch
400-bug-227.patch
- 500-issue18119.patch
asterisk.initd
asterisk.confd
asterisk.logrotate"
@@ -74,6 +74,16 @@ package() {
"$pkgdir"/etc/logrotate.d/$pkgname
}
+_move_dir() {
+ for DIR in "$@"; do
+ local dest=`dirname "$subpkgdir/$DIR"`
+ echo mkdir -p $dest
+ mkdir -p "$dest"
+ echo mv "$pkgdir"/$DIR $dest
+ mv "$pkgdir"/"$DIR" "$dest"
+ done
+}
+
_find_and_move() {
local pattern="$1"
cd "$pkgdir" || return 1
@@ -84,6 +94,16 @@ _find_and_move() {
done
}
+doc() {
+ default_doc
+ _move_dir var/lib/asterisk/static-http/docs
+}
+
+dev() {
+ default_dev
+ depends="asterisk"
+}
+
pgsql() {
depends=
install=
@@ -117,14 +137,28 @@ fax() {
sample() {
pkgdesc="Sample configuration files for asterisk"
cd "$_builddir"
- make samples DESTDIR="$subpkgdir"
+ mkdir -p "$subpkgdir"/var/lib/asterisk/phoneprov
+ make -j1 samples DESTDIR="$subpkgdir"
+}
+
+sound_moh() {
+ pkgdesc="Default on-hold music files for asterisk"
+ depends=
+ install=
+ _move_dir var/lib/asterisk/moh
+}
+
+sound_en() {
+ pkgdesc="English sound files for asterisk"
+ depends=
+ install=
+ _move_dir var/lib/asterisk/sounds/en
}
-md5sums="1e184a4d9301e2e4b9de3bc98b507d4f asterisk-1.6.2.13.tar.gz
+md5sums="83203b43aaf12f36bdc953d6b04d18a4 asterisk-1.8.0.tar.gz
b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch
6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch
79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch
-f104ec9a337fb77c67c65aedad75fa0f 500-issue18119.patch
0ce3219e05f55af884a7dc6b99c2b276 asterisk.initd
ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd
3e65172275684373e1a25c8a11224411 asterisk.logrotate"