aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-06-17 09:37:35 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-06-17 09:37:35 +0000
commitde55133bd1474e9684c2b288e2ccfd89a7535afc (patch)
treef31afb1b9f1b700f9a55908530d4615a0f98fcaf
parente7659c5301c5528eea5fd8201177a4463faee9b8 (diff)
downloadaports-de55133bd1474e9684c2b288e2ccfd89a7535afc.tar.bz2
aports-de55133bd1474e9684c2b288e2ccfd89a7535afc.tar.xz
main/asterisk: fix permission escalation (AST-2014-006 CVE-2014-4046)
fixes #3046
-rw-r--r--main/asterisk/APKBUILD25
-rw-r--r--main/asterisk/AST-2014-006-11.6.diff17
2 files changed, 21 insertions, 21 deletions
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 8923da7d1a..efbf3b4c0a 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
pkgver=11.6.1
-pkgrel=0
+pkgrel=1
pkgdesc="Asterisk: A Module Open Source PBX System"
pkgusers="asterisk"
pkggroups="asterisk"
@@ -31,6 +31,7 @@ done
source="$_download/asterisk-$_xy.0.tar.gz
$_patches
+ AST-2014-006-11.6.diff
100-uclibc-daemon.patch
101-caps-uclibc.patch
ASTERISK-18995.patch
@@ -49,6 +50,7 @@ prepare() {
cd "$_builddir"
for i in $source; do
case $i in
+ *.diff) msg "$i"; patch -p0 -i "$srcdir"/$i || return 1;;
*.patch) msg "$i"; patch -p1 -i "$srcdir"/$i || return 1;;
*-patch.gz) msg "${i##*/}"; gunzip < "$srcdir"/${i##*/} | patch -p0 || return 1;;
esac
@@ -198,6 +200,7 @@ sound_en() {
md5sums="698acb491e20990e87bbbcf1462c8538 asterisk-11.6.0.tar.gz
23b7d9325fdd1827c2414f40e818087d asterisk-11.6.1-patch.gz
+10b1acf7b1d176e67263a566f672ca1f AST-2014-006-11.6.diff
837fc3bc835699462a8d2a7a16b9b6a3 100-uclibc-daemon.patch
6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch
bc6713f5434e07b79d3afdd155461d72 ASTERISK-18995.patch
@@ -206,23 +209,3 @@ bc6713f5434e07b79d3afdd155461d72 ASTERISK-18995.patch
74cd25a5638a94ef51e9f4ede2fd28f2 asterisk.initd
ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd
3e65172275684373e1a25c8a11224411 asterisk.logrotate"
-sha256sums="80aa523bdaab71ce419022d8c851aaeda718dc5bbf5fe8cb99786da546dd8cee asterisk-11.6.0.tar.gz
-86e738f2f9cf9debe7c59feca44d99752627df789804678df84bd430c7b5cdca asterisk-11.6.1-patch.gz
-6f56ea997513c10fa39835e8dd11fbfb4ec0bb23f4b771963e56691b15a5c003 100-uclibc-daemon.patch
-c2ef786e9a8082fe8ba7b4eb2f130925cb823d100ec567909ad465c279e335bf 101-caps-uclibc.patch
-7a7140156ae7fc7e833035db1e428db8d90159579cd2678c4b5cc829ded47485 ASTERISK-18995.patch
-d657634d4c96f42ac1a8b7103104185e8cd9d5a59e5214cc1658e01805975ce8 ASTERISK-19109.patch
-1f822e618554e9962fe4599975bdcc24413e087dbd7ea4ce0305ecb7ea9bef94 ASTERISK-20527.patch
-13bcc98f2a78d4dd41e810232979eb83044e9166302bfb5b971315f2a82af36f asterisk.initd
-d221148583b57f9c37d7160f2493f0d204ad11f7abb17e3a3534e108ad5452d7 asterisk.confd
-77b253b6db71460acf9a51e87ad4c8582027a46db01a4c50fb048bada58c19d1 asterisk.logrotate"
-sha512sums="8f7bc0428f45ab32ba03a3e047fa95da2ab04eb701b0262c393aef1ce618df45b360a59f5d84939309ab3f68284ceb8a59eef94901e897cd688d8a3296b27886 asterisk-11.6.0.tar.gz
-d52b20c3ac2959a84b1879c4a697c36b46982538126b3bff1efbb0986a6eba906bab66b1b72a48ab6d21238778e0369d49f923451e0f200455a0430acca867c0 asterisk-11.6.1-patch.gz
-24a0d3c0ae86117ead8d2e35fc9a5945e04b9f80f3baf122337c8361c015e5ad904c206579962aefe3eb35a1fbf269515228ae5f34a801d7725d73dc235cf831 100-uclibc-daemon.patch
-601681b9a33e77b33a0393a494c4140aa6c1f174c514093242a4081661bb7f78b6af867100996c97f3bf12e8dd10873dd3e116b61e2a0e04832f4ee470664368 101-caps-uclibc.patch
-42b2385d88e72473fe34c63e1be8cdf7f37688649fe5bf033b5ba17627008b771aec8f0a583e9ad483a20f9e1f7c33922cb42bf5b73adc68aa43fd46c5da1daa ASTERISK-18995.patch
-a9a0a4199291a6ef5ebdf07daee07293d96a16a38116f6afdea61d68b167235d63b5a54e3ae45b7e11be0b9dc82863fdced1ad45110dcac29b353ddcc1d6337a ASTERISK-19109.patch
-6edd8e0a1dce326aadf659c8bf8ed34083e8247b6c0f032d097c77df25feb93107375ba505e9076c084fe80676336d6c863e04c3c6808a850e24257fd7a7702d ASTERISK-20527.patch
-e29477aa57d88fedc96d13751f68f302d3892c70b5ea5b5a8cc85d0439335fc1a6847648447b443a074c0877718f23295e3752056a108301d340d1e2919465b1 asterisk.initd
-ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed asterisk.confd
-7591d2faf539d05d9ee4e431c78a5e20686721fd79221ad94dffeeaff9282220b09cb9aec214bd7a8d12affaec0276c9c91e6e21af8b6712c0a9502b60b02f2b asterisk.logrotate"
diff --git a/main/asterisk/AST-2014-006-11.6.diff b/main/asterisk/AST-2014-006-11.6.diff
new file mode 100644
index 0000000000..453896a80e
--- /dev/null
+++ b/main/asterisk/AST-2014-006-11.6.diff
@@ -0,0 +1,17 @@
+Index: apps/app_mixmonitor.c
+===================================================================
+--- apps/app_mixmonitor.c (revision 415841)
++++ apps/app_mixmonitor.c (revision 415842)
+@@ -1376,9 +1376,9 @@
+ ast_cli_register_multiple(cli_mixmonitor, ARRAY_LEN(cli_mixmonitor));
+ res = ast_register_application_xml(app, mixmonitor_exec);
+ res |= ast_register_application_xml(stop_app, stop_mixmonitor_exec);
+- res |= ast_manager_register_xml("MixMonitorMute", 0, manager_mute_mixmonitor);
+- res |= ast_manager_register_xml("MixMonitor", 0, manager_mixmonitor);
+- res |= ast_manager_register_xml("StopMixMonitor", 0, manager_stop_mixmonitor);
++ res |= ast_manager_register_xml("MixMonitorMute", EVENT_FLAG_SYSTEM | EVENT_FLAG_CALL, manager_mute_mixmonitor);
++ res |= ast_manager_register_xml("MixMonitor", EVENT_FLAG_SYSTEM, manager_mixmonitor);
++ res |= ast_manager_register_xml("StopMixMonitor", EVENT_FLAG_SYSTEM | EVENT_FLAG_CALL, manager_stop_mixmonitor);
+
+ return res;
+ }