diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-08-05 10:27:30 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-08-05 10:29:00 +0300 |
| commit | fefcf952631344c8587a697b64eb9054fb61f0d8 (patch) | |
| tree | 69d9b504477a4e6f80f8069a875d10b04ab109b9 /main/asterisk | |
| parent | a10cef9f0e308630f4b1e93d63fa892c1ae0b6b5 (diff) | |
| download | aports-fefcf952631344c8587a697b64eb9054fb61f0d8.tar.bz2 aports-fefcf952631344c8587a697b64eb9054fb61f0d8.tar.xz | |
main/asterisk: fix pbx_lua symbol exports
revert incorrect fix for ASTERISK-23818
Diffstat (limited to 'main/asterisk')
| -rw-r--r-- | main/asterisk/APKBUILD | 6 | ||||
| -rw-r--r-- | main/asterisk/ASTERISK-23818.patch | 15 |
2 files changed, 20 insertions, 1 deletions
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 390591f471..d390f63b8c 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk pkgver=12.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="Asterisk: A Module Open Source PBX System" pkgusers="asterisk" pkggroups="asterisk" @@ -44,6 +44,7 @@ source="$_download/asterisk-$_xy.0.tar.gz ASTERISK-18995.patch ASTERISK-19109.patch ASTERISK-20527.patch + ASTERISK-23818.patch asterisk.initd asterisk.confd asterisk.logrotate" @@ -252,6 +253,7 @@ b4211313aae31efa8c3c1931ba47dbf9 musl-includes.patch bc6713f5434e07b79d3afdd155461d72 ASTERISK-18995.patch 8499917c1476953cdc2f5c94c0581775 ASTERISK-19109.patch 676ca42ee1859d8a7bae4345ede5eb89 ASTERISK-20527.patch +6a6d84ad4df329e210dc7360c8bebdac ASTERISK-23818.patch 74cd25a5638a94ef51e9f4ede2fd28f2 asterisk.initd ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd 3e65172275684373e1a25c8a11224411 asterisk.logrotate" @@ -265,6 +267,7 @@ a5205ed44b57a72934baf8cde543ddb179f277494181818905110bfdcccfe7d9 musl-mutex-ini 7a7140156ae7fc7e833035db1e428db8d90159579cd2678c4b5cc829ded47485 ASTERISK-18995.patch 8970797d4812a751968c0db83816fe2bc05c8b01dba7f64f21c197807528d234 ASTERISK-19109.patch 1f822e618554e9962fe4599975bdcc24413e087dbd7ea4ce0305ecb7ea9bef94 ASTERISK-20527.patch +0d94dc1e1ba0eaee8e2e17bc0ecd63d0bff5526dcdbd0894ee3584e96bdfd760 ASTERISK-23818.patch 13bcc98f2a78d4dd41e810232979eb83044e9166302bfb5b971315f2a82af36f asterisk.initd d221148583b57f9c37d7160f2493f0d204ad11f7abb17e3a3534e108ad5452d7 asterisk.confd 77b253b6db71460acf9a51e87ad4c8582027a46db01a4c50fb048bada58c19d1 asterisk.logrotate" @@ -278,6 +281,7 @@ f72c2e04de80d3ed9ce841308101383a1655e6da7a3c888ad31fffe63d1280993e08aefcf8e63831 42b2385d88e72473fe34c63e1be8cdf7f37688649fe5bf033b5ba17627008b771aec8f0a583e9ad483a20f9e1f7c33922cb42bf5b73adc68aa43fd46c5da1daa ASTERISK-18995.patch 875dcd976b82b554157c5539df6fae0082b072c81d4db12827d1fc41c00e8dc0118b3bf7359f30e3b49051de27a85394ff30d08e62cde811a7c197b41f1f313a ASTERISK-19109.patch 6edd8e0a1dce326aadf659c8bf8ed34083e8247b6c0f032d097c77df25feb93107375ba505e9076c084fe80676336d6c863e04c3c6808a850e24257fd7a7702d ASTERISK-20527.patch +10d56739531b8a923c2090257159932b15d91c9881f432dd30e9129fdd430c2164f0e9549ac0249eb64ca8800ecbbdad8347eecbaf1862e3f39b0a61610a4904 ASTERISK-23818.patch e29477aa57d88fedc96d13751f68f302d3892c70b5ea5b5a8cc85d0439335fc1a6847648447b443a074c0877718f23295e3752056a108301d340d1e2919465b1 asterisk.initd ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed asterisk.confd 7591d2faf539d05d9ee4e431c78a5e20686721fd79221ad94dffeeaff9282220b09cb9aec214bd7a8d12affaec0276c9c91e6e21af8b6712c0a9502b60b02f2b asterisk.logrotate" diff --git a/main/asterisk/ASTERISK-23818.patch b/main/asterisk/ASTERISK-23818.patch new file mode 100644 index 0000000000..917bac839a --- /dev/null +++ b/main/asterisk/ASTERISK-23818.patch @@ -0,0 +1,15 @@ +This reverts ASTERISK-23818 as the fix causes lua modules to break. +Note sent upstrean and hopefully they fix it in more proper way. + +diff -ru asterisk-12.4.0.orig/pbx/pbx_lua.c asterisk-12.4.0/pbx/pbx_lua.c +--- asterisk-12.4.0.orig/pbx/pbx_lua.c 2014-08-04 15:11:22.000000000 -0300 ++++ asterisk-12.4.0/pbx/pbx_lua.c 2014-08-05 10:25:35.092623642 -0300 +@@ -1672,7 +1672,7 @@ + return AST_MODULE_LOAD_SUCCESS; + } + +-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Lua PBX Switch", ++AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Lua PBX Switch", + .load = load_module, + .unload = unload_module, + .reload = reload, |