main/asterisk: security upgrade to 11.5.1

AST-2013-004: Remote Crash From Late Arriving SIP ACK With SDP
AST-2013-005: Remote Crash when Invalid SDP is sent in SIP Request

also cherry-pick all packaging fixes from master

1 files changed, 43 insertions, 13 deletions

diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index f1a41e948d..46cce3b923 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=11.4.0
+pkgver=11.5.1
 pkgrel=0
 pkgdesc="Asterisk: A Module Open Source PBX System"
 pkgusers="asterisk"
@@ -13,12 +13,14 @@ depends=
 makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev
         postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev tar
         freetds-dev openssl-dev lua-dev alsa-lib-dev spandsp-dev tiff-dev
-        libresample sqlite-dev wget speex-dev libogg-dev bluez-dev"
+        libresample sqlite-dev wget speex-dev libogg-dev bluez-dev curl-dev
+        libedit-dev libsrtp-dev util-linux-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
         $pkgname-tds $pkgname-fax $pkgname-sample-config:sample
         $pkgname-sounds-moh:sound_moh $pkgname-sounds-en:sound_en
-        $pkgname-mobile"
+        $pkgname-mobile $pkgname-curl:_curl $pkgname-srtp $pkgname-dahdi
+        $pkgname-speex $pkgname-alsa"
 
 _download="http://downloads.asterisk.org/pub/telephony/asterisk/releases"
 _z=${pkgver##*.}
@@ -65,16 +67,27 @@ prepare() {
 
 build() {
         cd "$_builddir"
-        SHA1SUM="$PWD"/build_tools/sha1sum-sh ./configure --prefix=/usr \
+        SHA1SUM="$PWD"/build_tools/sha1sum-sh ./configure \
+                --build=$CBUILD \
+                --host=$CHOST \
+                --prefix=/usr \
                 --sysconfdir=/etc \
                 --mandir=/usr/share/man \
                 --infodir=/usr/share/info \
                 --libdir=/usr/lib \
                 --localstatedir=/var \
-                --disable-xmldoc --with-gsm=internal \
-                --without-iconv --with-popt --with-z --with-newt \
-                --with-unixodbc --with-postgres --with-tds \
-                --with-dahdi --with-pri --with-tonezone \
+                --disable-xmldoc \
+                --with-gsm=internal \
+                --without-iconv \
+                --with-popt \
+                --with-z \
+                --with-newt \
+                --with-unixodbc \
+                --with-postgres \
+                --with-tds \
+                --with-dahdi \
+                --with-pri \
+                --with-tonezone \
                 --with-resample \
                 --with-sqlite3 \
                 --with-speex \
@@ -82,6 +95,9 @@ build() {
                 --without-x11 \
                 --with-spandsp \
                 --with-bluetooth \
+                --with-libcurl \
+                --with-libedit \
+                --with-srtp \
                 || return 1
 
         # and figure out which modules to build
@@ -89,12 +105,12 @@ build() {
         make menuselect.makeopts
         # enable chan_mobile
         sed -i -e '/^MENUSELECT_ADDONS=/s/chan_mobile//' menuselect.makeopts
-        make ASTCFLAGS="$CFLAGS" ASTLDFLAGS="$LDFLAGS" || return 1
+        make ASTCFLAGS="$CFLAGS" ASTLDFLAGS="$LDFLAGS" LDCONFIG_FLAGS="-n" || return 1
 }
 
 package() {
         cd "$_builddir"
-        make -j1 DESTDIR="$pkgdir" install
+        make -j1 DESTDIR="$pkgdir" LDCONFIG_FLAGS="-n" install
 
         install -d "$pkgdir"/var/run/asterisk
         install -d "$pkgdir"/var/lib/asterisk
@@ -168,6 +184,17 @@ mobile() {
         _find_and_move '*_mobile*'
 }
 
+_curl() {
+        depends=
+        install=
+        _find_and_move '*_curl*'
+}
+
+srtp() { _find_and_move '*_srtp*'; }
+dahdi() { _find_and_move '*_dahdi*'; }
+speex() { _find_and_move '*_speex*'; }
+alsa() { _find_and_move '*_alsa*'; }
+
 sample() {
         arch="noarch"
         pkgdesc="Sample configuration files for asterisk"
@@ -198,7 +225,8 @@ sound_en() {
         chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
 }
 
-md5sums="f2654567261f194f537bd2fbb97c9117  asterisk-11.4.0.tar.gz
+md5sums="34ca88eeb50580823ec6e38d4c0ad0dc  asterisk-11.5.0.tar.gz
+58a724b620c5a9d9e92029e229b189e6  asterisk-11.5.1-patch.gz
 837fc3bc835699462a8d2a7a16b9b6a3  100-uclibc-daemon.patch
 6e1129e30c4fd2c25c86c81685a485a9  101-caps-uclibc.patch
 bc6713f5434e07b79d3afdd155461d72  ASTERISK-18995.patch
@@ -207,7 +235,8 @@ bc6713f5434e07b79d3afdd155461d72  ASTERISK-18995.patch
 74cd25a5638a94ef51e9f4ede2fd28f2  asterisk.initd
 ed31d7ba37bcf8b0346dcf8593c395f0  asterisk.confd
 3e65172275684373e1a25c8a11224411  asterisk.logrotate"
-sha256sums="081ba8de5f349ff23de8e000d8cda38a2ca34858174e9379b2662a732557e9d4  asterisk-11.4.0.tar.gz
+sha256sums="a82c1ddd9fb1d98f0dab6e0255a127fb7c7eaa687b3d515182458244062b4194  asterisk-11.5.0.tar.gz
+e742cc28cd160ba2bf8af6733ff0940316b0dc8e2b1163edbd404d8178522579  asterisk-11.5.1-patch.gz
 6f56ea997513c10fa39835e8dd11fbfb4ec0bb23f4b771963e56691b15a5c003  100-uclibc-daemon.patch
 c2ef786e9a8082fe8ba7b4eb2f130925cb823d100ec567909ad465c279e335bf  101-caps-uclibc.patch
 7a7140156ae7fc7e833035db1e428db8d90159579cd2678c4b5cc829ded47485  ASTERISK-18995.patch
@@ -216,7 +245,8 @@ d657634d4c96f42ac1a8b7103104185e8cd9d5a59e5214cc1658e01805975ce8  ASTERISK-19109
 13bcc98f2a78d4dd41e810232979eb83044e9166302bfb5b971315f2a82af36f  asterisk.initd
 d221148583b57f9c37d7160f2493f0d204ad11f7abb17e3a3534e108ad5452d7  asterisk.confd
 77b253b6db71460acf9a51e87ad4c8582027a46db01a4c50fb048bada58c19d1  asterisk.logrotate"
-sha512sums="482ad6a252d8b660b01b5eb5d9cdff86289a8eb8bdc7f69f150441a612b6e0a3652ad237bfbbecc38602fa9b888d7dc8aa9011b23fbeb442ff93d3129eea773b  asterisk-11.4.0.tar.gz
+sha512sums="595d6c2ecbbc9a057ff601c4337fff276eae089d58d97036f9a676686dfe3b2cbaf8739f2f788416bb947a97465100cbf261030c3d17175025eec25761f0cd58  asterisk-11.5.0.tar.gz
+b9a3dedc0d8b93ae252539e94249d3dcb011d2f8562fc7eef12004def396b6b0de7a19dc77574e26cf2231e38d4758242b27d0ea4efe5c4a14de7d35610f4659  asterisk-11.5.1-patch.gz
 24a0d3c0ae86117ead8d2e35fc9a5945e04b9f80f3baf122337c8361c015e5ad904c206579962aefe3eb35a1fbf269515228ae5f34a801d7725d73dc235cf831  100-uclibc-daemon.patch
 601681b9a33e77b33a0393a494c4140aa6c1f174c514093242a4081661bb7f78b6af867100996c97f3bf12e8dd10873dd3e116b61e2a0e04832f4ee470664368  101-caps-uclibc.patch
 42b2385d88e72473fe34c63e1be8cdf7f37688649fe5bf033b5ba17627008b771aec8f0a583e9ad483a20f9e1f7c33922cb42bf5b73adc68aa43fd46c5da1daa  ASTERISK-18995.patch