Commit 376261ca authored by Timo Teräs's avatar Timo Teräs

main/asterisk: upgrade to 13.3.1

rebase libcap patch, and add speexdsp-dev dependency due to
recent package split.
parent b22b9862
......@@ -2,7 +2,7 @@
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
pkgver=13.2.0
pkgver=13.3.1
pkgrel=0
pkgdesc="Asterisk: A Module Open Source PBX System"
pkgusers="asterisk"
......@@ -11,11 +11,13 @@ url="http://www.asterisk.org/"
arch="all"
license="GPL2"
depends=
makedepends="autoconf automake libtool tar wget ncurses-dev popt-dev newt-dev
zlib-dev pjproject-dev jansson-dev libedit-dev dahdi-tools-dev libpri-dev
sqlite-dev postgresql-dev unixodbc-dev freetds-dev openssl-dev lua-dev
alsa-lib-dev spandsp-dev tiff-dev libresample speex-dev libogg-dev
bluez-dev curl-dev libsrtp-dev util-linux-dev mariadb-dev bsd-compat-headers"
makedepends="autoconf automake libtool tar wget bsd-compat-headers
ncurses-dev popt-dev newt-dev zlib-dev libedit-dev tiff-dev curl-dev
openssl-dev lua-dev libcap-dev jansson-dev util-linux-dev
sqlite-dev postgresql-dev unixodbc-dev freetds-dev mariadb-dev
alsa-lib-dev pjproject-dev dahdi-tools-dev libpri-dev libsrtp-dev
spandsp-dev libresample speex-dev speexdsp-dev libogg-dev
bluez-dev"
install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
$pkgname-tds $pkgname-fax $pkgname-sample-config:sample
......@@ -247,9 +249,10 @@ sound_en() {
chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
}
md5sums="36033a5faa2f0f9ac3bc34b799e823a2 asterisk-13.2.0.tar.gz
md5sums="95b4850668b8880e6c4bfefae4fb427c asterisk-13.3.0.tar.gz
608f55942e82194a742634ddfd03cd2e asterisk-13.3.1-patch.gz
126dd4fba66f4cf9aa94dfd7034e0ec4 asterisk-addon-mp3-r201.patch.gz
a66f192623276530eeb6d722ee35bee9 musl-libcap.patch
9a2444cd3d06f394e06a1e90ef508420 musl-libcap.patch
1147c81ac5e49c36a5d264019480bec0 musl-includes.patch
9b3e6cb75464a6ef4c40d191bdfdf7ea musl-glob-compat.patch
10b84632764a6f05ec9973c31f5e82fb musl-outofmem-handling.patch
......@@ -260,9 +263,10 @@ ba0944d05570a1076f826807598c5752 ASTERISK-19109.patch
74cd25a5638a94ef51e9f4ede2fd28f2 asterisk.initd
ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd
3e65172275684373e1a25c8a11224411 asterisk.logrotate"
sha256sums="bcef6b30cf7bb1943b12939a4dc98a53f837a8f7ef564fe44cf73ea87e114a9b asterisk-13.2.0.tar.gz
sha256sums="88b1eaab1b2d45722f89f51e1fa47883a8fab283bc1dc2ffd7d7c6a0e4411d57 asterisk-13.3.0.tar.gz
5e9fbd1b1e3ee0790fee65bc01e790cdfed8b01683eff99110d0a262d97a0740 asterisk-13.3.1-patch.gz
d32a5a695cee1699011d0e9ad02eb43af612def06f92017627194099edf98e3f asterisk-addon-mp3-r201.patch.gz
ba8334d855191af3fa662931244b6fea4ffc9eec84e40e1a52d6b3c0186d2005 musl-libcap.patch
1cd2405504ffddf0473d69849825bdf87a1029818bf4800707d82f2b0efd4899 musl-libcap.patch
354596949399ac38f245e03a0833ca4cf6aa664e28ef92d79715c654465aa5fe musl-includes.patch
c6a5c32646b767f09ebffccc49cac6a4ff9181498499e4453300775e75284b52 musl-glob-compat.patch
235b9c339793c02d1d80ac37d308cf14dc3e86fe8ccbe757e9855b186d9c164b musl-outofmem-handling.patch
......@@ -273,9 +277,10 @@ d3f1304ddcce48f2c09cb81e924052f7eb2d36829aa1a0bf6a2e0be476333ee7 ASTERISK-18995
13bcc98f2a78d4dd41e810232979eb83044e9166302bfb5b971315f2a82af36f asterisk.initd
d221148583b57f9c37d7160f2493f0d204ad11f7abb17e3a3534e108ad5452d7 asterisk.confd
77b253b6db71460acf9a51e87ad4c8582027a46db01a4c50fb048bada58c19d1 asterisk.logrotate"
sha512sums="9d9aa611552ca856a5d4a7437b60bf6b43b1168e24d3e8be51740fa833c6e56c672071687acc452f23072f98064d64a76ed50139d326c0d1ccdbe8de45118e42 asterisk-13.2.0.tar.gz
sha512sums="2751608b35e21f4ea8d9b053a8dcaaf532bd16d7a1105550c1d44ea121a700ee1499e1fcf864a08d8103a2de433caccfbb7ae6e666f82760b981082a1f3ce0a7 asterisk-13.3.0.tar.gz
7591c244e9971bbc76669e19b155e983461789fed8213e27b6f085b7b95c8a6d50a07aa28cc54672c4b6d46a939070bd18d929795f7a4279f0adc4947b15adfe asterisk-13.3.1-patch.gz
aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz
d30d1be03cbc637f1d05e6897efa2e1fae560ac2c48124a9636c5ff390c81b8c07cf9cef6d930e71eb59cb932f234284a0390487ec257e0fa45ec11d294c106c musl-libcap.patch
8826ab6b7d17f3b3292854b4c35f4b51dc456484e4325f743821b5d6099bfe59810f43c173d011c4cb018c2de789462403b6f378492e37293bc4bbff643c4448 musl-libcap.patch
7eb3c1f3207d8f7c58fbc3b30e7b9193e7498da09d53d7e907f3d9d79ffc86fa6f83b593dc4c1b0007d7e62565cb8618dc415d1a9ee61affa10e6a64b146967a musl-includes.patch
edf65eba44e8f1f0e78671aba312bcff2090134cf94e89ebb4b6beef7b2d57b24381ae9511cbf9fffe6b555e695a3dbe2cedcd04f1d237df822fa742bd5092ac musl-glob-compat.patch
7cbbad2c16d89b0b4ea45257a44c25ea96ca6ecb1f5bf7707656dfa3957cae34d1dca404b3d62baca8b55cea6f9fa39819bef48a1f4dad0124da95d6c80a294e musl-outofmem-handling.patch
......
......@@ -15,27 +15,14 @@ diff -ru asterisk-12.4.0.orig/configure.ac asterisk-12.4.0/configure.ac
AST_C_DEFINE_CHECK([DAHDI], [DAHDI_RESET_COUNTERS], [dahdi/user.h], [230])
AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DEFAULT_MTU_MRU], [dahdi/user.h], [220])
diff -ru asterisk-12.4.0.orig/main/Makefile asterisk-12.4.0/main/Makefile
--- asterisk-12.4.0.orig/main/Makefile 2014-08-06 08:53:33.000000000 -0300
+++ asterisk-12.4.0/main/Makefile 2014-08-06 09:07:59.210630841 -0300
@@ -1,4 +1,3 @@
-#
# Asterisk -- An open source telephony toolkit.
#
# Makefile to build main Asterisk binary
@@ -40,14 +39,12 @@
AST_LIBS+=$(URIPARSER_LIB)
AST_LIBS+=$(UUID_LIB)
--- asterisk-13.3.1/main/Makefile.orig 2015-04-07 05:29:42.561354397 +0000
+++ asterisk-13.3.1/main/Makefile 2015-04-07 05:30:11.421884787 +0000
@@ -42,7 +42,7 @@
AST_LIBS+=$(CRYPT_LIB)
+AST_LIBS+=$(CAP_LIB)
AST_LIBS+=$(AST_CLANG_BLOCKS_LIBS)
ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc kfreebsd-gnu),)
-ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc kfreebsd-gnu),)
+ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-musl kfreebsd-gnu),)
ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
AST_LIBS+=-ldl
endif
- ifneq (x$(CAP_LIB),x)
- AST_LIBS+=$(CAP_LIB)
- endif
AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm -lresolv
else
AST_LIBS+=$(EDITLINE_LIB) -lm
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment