mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-04 20:06:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/kamailio upgrade to 4.4.0

Browse Source
This commit is contained in:
Nathan Angelacos 2016-04-01 12:14:54 +00:00 committed by Natanael Copa
parent 4a113e5c2a
commit beebea4215
4 changed files with 71 additions and 2825 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2794
main/kamailio/0002-mohqueue-v0-12.patch
View File

File diff suppressed because it is too large Load Diff

13
main/kamailio/0003-kamdbctl-backslash.patch
View File

@ -1,5 +1,5 @@
diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base
index bb74810..20780ef 100644
index 3daf457..b60413c 100644
--- a/utils/kamctl/kamdbctl.base
+++ b/utils/kamctl/kamdbctl.base
@@ -33,18 +33,18 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TABLES:-ask}
@ -14,17 +14,16 @@ index bb74810..20780ef 100644
+ grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber \
+ location location_attrs re_grp trusted address missed_calls \
+ usr_preferences aliases silo dialog dialog_vars dispatcher dialplan \
acc_cdrs}
acc_cdrs topos_d topos_t}
-EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
- carrierroute carrier_name domain_name carrierfailureroute userblacklist
- globalblacklist htable purplemap uacreg pl_pipes mtree mtrees
- sca_subscriptions mohqcalls mohqueues rtpproxy}
-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
+EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy \
+ carrierroute carrier_name domain_name carrierfailureroute userblacklist \
+ globalblacklist htable purplemap uacreg pl_pipes mtree mtrees \
+ sca_subscriptions mohqcalls mohqueues rtpproxy}
+PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \
sca_subscriptions mohqcalls mohqueues rtpproxy}
-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
+PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \
pua rls_presentity rls_watchers}
-DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs
+DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs \
@ -39,7 +38,7 @@ index bb74810..20780ef 100644
- permissions registrar usrloc msilo alias_db uri_db speeddial
+STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group \
+ permissions registrar usrloc msilo alias_db uri_db speeddial \
avpops auth_db pdt dialog dispatcher dialplan}
avpops auth_db pdt dialog dispatcher dialplan topos}
PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls}

30
main/kamailio/0004-remove-spurious-execinfo.patch Normal file
View File

@ -0,0 +1,30 @@
diff --git a/modules/ims_dialog/dlg_hash.c b/modules/ims_dialog/dlg_hash.c
index 26817ac..0f340b0 100644
--- a/modules/ims_dialog/dlg_hash.c
+++ b/modules/ims_dialog/dlg_hash.c
@@ -17,7 +17,8 @@
#include "dlg_profile.h"
#include "dlg_handlers.h"
#include "dlg_db_handler.h"
-#include <execinfo.h>
+
+// #include <execinfo.h>
#define MAX_LDG_LOCKS 2048
#define MIN_LDG_LOCKS 2
@@ -70,6 +71,7 @@ static int dlg_hash_size_out = 4096;
}\
}while(0)
+#ifdef ALPINE_SUPPORTS_BACKTRACE
inline static int backtrace2str(char* buf, int size)
{
void* bt[32];
@@ -87,6 +89,7 @@ inline static int backtrace2str(char* buf, int size)
}
return 0;
}
+#endif
/*!
* \brief Initialize the global dialog table

59
main/kamailio/APKBUILD
View File

@ -12,7 +12,7 @@ _giturl="git://github.com/$pkgname/$pkgname.git"
_gittag=HEAD
pkgver=4.3.5
pkgver=4.4.0
pkgrel=0
[ -z "${_gitcommit}" ] && _suffix="_src" || _suffix="-${_gitcommit}"
@ -28,7 +28,7 @@ makedepends="bison flex expat-dev postgresql-dev pcre-dev mariadb-dev
libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev
lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev
jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev
hiredis-dev libmaxminddb-dev"
hiredis-dev libmaxminddb-dev libunistring-dev"
install="$pkgname.pre-install $pkgname.pre-upgrade"
# See Makefile.groups for the list of recommended modules for
@ -44,17 +44,17 @@ install="$pkgname.pre-install $pkgname.pre-upgrade"
# Remove db_text from _mod_list_db because we create a separate dbtext package
#
# - basic used modules, with no extra dependency (widespread usage)
_mod_list_basic="avp async auth benchmark blst cfg_rpc cfgutils corex counters \
_mod_list_basic="avp async auth benchmark blst cfg_rpc cfgt cfgutils corex counters \
ctl debugger diversion enum exec gzcompress ipops kex mangler \
maxfwd mediaproxy mi_datagram mi_fifo mi_rpc mqueue \
nat_traversal nathelper path pike pv ratelimit rr rtimer \
rtpproxy sanity sdpops siputils sl statistics textops \
textopsx tm tmx topoh xlog rtpengine stun sipt"
rtpproxy sanity sdpops siputils sl smsops statsc statistics \
textops textopsx tm tmx topoh topos xlog rtpengine stun sipt"
# - extra used modules, with no extra dependency
_mod_list_extras="auth_diameter call_control cnxcc dmq domainpolicy msrp pdb \
qos sca seas sms sst timer tmrec tsilo uac_redirect xhttp \
xhttp_rpc xprint nosip dmq_usrloc statsd rtjson tcpops \
_mod_list_extras="auth_diameter call_control cnxcc dmq domainpolicy log_custom \
msrp pdb qos sca seas sms sst timer tmrec tsilo uac_redirect \
xhttp xhttp_rpc xprint nosip dmq_usrloc statsd rtjson tcpops \
auth_xkeys"
# - common modules depending on database
@ -114,7 +114,10 @@ _mod_list_carrierroute="carrierroute"
_mod_list_berkeley="db_berkeley"
# - modules depending on curl library
_mod_list_utils="utils"
_mod_list_utils="utils http_client"
# - async http_async_client
_mod_list_async_client="http_async_client"
# - modules depending on purple library
_mod_list_purple="purple"
@ -123,7 +126,7 @@ _mod_list_purple="purple"
_mod_list_memcached="memcached"
# - modules depending on openssl library
_mod_list_tls="auth_identity tls"
_mod_list_tls="auth_identity crypto tls"
# - modules depending on openssl library
_mod_list_outbound="outbound"
@ -176,7 +179,7 @@ _mod_list_redis="ndb_redis"
_mod_list_mono="app_mono"
# - modules related to IMS extensions
_mod_list_ims="cdp cdp_avp dialog_ng ims_auth ims_isc ims_icscf ims_qos \
_mod_list_ims="cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos \
ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \
ims_usrloc_scscf ims_charging"
@ -222,7 +225,8 @@ for _i in db postgres sqlite dbtext mysql \
cpl xml unixodbc snmpstats xmpp carrierroute \
ldap utils tls presence lua ims outbound debugger \
extras json websocket authephemeral \
uuid ev memcached redis geoip2 jansson; do
uuid ev memcached redis geoip2 jansson \
http_async_client; do
subpackages="$subpackages $pkgname-$_i"
eval "_modules=\"\$_modules \$_mod_list_$_i\""
@ -230,8 +234,8 @@ done
source="http://www.kamailio.org/pub/kamailio/$pkgver/src/${pkgname}-${pkgver}${_suffix}.tar.gz
0001-musl-fixes.patch
0002-mohqueue-v0-12.patch
0003-kamdbctl-backslash.patch
0004-remove-spurious-execinfo.patch
kamailio.cfg
kamailio.initd
"
@ -296,12 +300,13 @@ build() {
DESTDIR="$pkgdir" \
cfg_prefix="$pkgdir" \
cfg
make all EMBEDDED_UTF8_DECODE=1 || return 1
make EMBEDDED_UTF8_DECODE=1 STUN=1 \
all || return 1
}
package() {
cd "$_builddir"
make -j1 install EMBEDDED_UTF8_DECODE=1 || return 1
make -j1 install || return 1
# move default config to -doc package and use our own default config
@ -497,21 +502,27 @@ redis() {
"$_mod_list_redis"
}
md5sums="117e08e69a973cc0c0d63662d2f47109 kamailio-4.3.5_src.tar.gz
http_async_client() {
_generic_pkg "Asynchronous HTTP queries support" \
"$_mod_list_http_async_client"
}
md5sums="e9fa206f67346a6b01c015d76ec2db9d kamailio-4.4.0_src.tar.gz
18863791d386659eae6ef0c82a2517ae 0001-musl-fixes.patch
324ce879bceac05b30aa9466bb74916d 0002-mohqueue-v0-12.patch
fe8f61c73264cd1c360f3876f664464d 0003-kamdbctl-backslash.patch
8c83bc9102a77711e30dcac6e9bba534 0003-kamdbctl-backslash.patch
e613ef3611f9a5091ce05084daf9c9a5 0004-remove-spurious-execinfo.patch
299706d97e30a4f0d9b4c873df422866 kamailio.cfg
39dc9355fa7d8fec425d3b17c2fb26e0 kamailio.initd"
sha256sums="2c8c963a2cd0c997c66ccc65b8d5de01fd7f4b6b6053bcf10bf746d814b313d5 kamailio-4.3.5_src.tar.gz
sha256sums="96b5aaac7980f21b022609846e85b2e4244f39b053d22a5e5f7efe5120cdf2b4 kamailio-4.4.0_src.tar.gz
254ea5d4699417aec49e1aae45398a802067a8967060f2a469e278779d876d22 0001-musl-fixes.patch
93e8ed5bbe16535286ab4cb586caf01cdf11f405492d36271108333210f0c58b 0002-mohqueue-v0-12.patch
46026949a3a367ebaf0c8a7d1ffeeaa3dc67588c94dd8d558991a54996877c1f 0003-kamdbctl-backslash.patch
9aa3b9afea6f0d2d8d306c2f7d093cb846189285e560ce3c62fa2ec2f3d461fe 0003-kamdbctl-backslash.patch
fb9c13dd3cd5cd07cf7599cf6688c46739334a18ade64f8bf44f84fb179e8409 0004-remove-spurious-execinfo.patch
8b742ff710ef67ff59ec07a260690ebcdda24fb6f0b7b64dc50433a1bacf99f2 kamailio.cfg
ba928fa914feea2b95b8c659832e3fbea25eb6ac1ce56e4c23ff58c09f1ec3b8 kamailio.initd"
sha512sums="73b28c0c8bfa8998091c6a40d74c5be057e1d8ad9838ac073bd8769fbf93448daf695040b49c432b87a38725a6debb3bd89a1080554e1f88e6fe8e305b535a87 kamailio-4.3.5_src.tar.gz
sha512sums="3a0df08c705df822f41e96a88cfdaba33db9c8cb3d38c12d858e2f99d5ead1c94a967033cce7e5119f2df64e2d34c383cdb7bf43f4ac52c61cf0323d9b70bf3b kamailio-4.4.0_src.tar.gz
32c8e723ee858b24a3bd1313537e9348bdd895e709041d52199b7d2c4054565f3f8d203458b5a7bd5f4b09a782a972cf87f931de5bb8199e6f9786a3c9bfb3ba 0001-musl-fixes.patch
782e70cd6c17f37ca613b05c86a2ddca71b1f0d58361345ddecede2743de65095f058916e049db98e4033b937bcb7a94df77f4b5e1a78e1346d07c8d22dd51d5 0002-mohqueue-v0-12.patch
d96600f1047eac65c0eba34030baa26ee6ee953434ae5808b203cba979fbed616289d40fc588939222371d832f54cbda0a5e8ba9baa16913363e204490758167 0003-kamdbctl-backslash.patch
b71457ee4badf2c1848f4ea86afddfd2be2383791e559f5758fd8502d87e434f0149485eb1c33722d111999508b81b0acb56c9dcb462b6522a5f4cbfae05dfde 0003-kamdbctl-backslash.patch
d962f7bb7fe5c0747dff050d4c2d74f16eedba903a3347b3f86b42e5d7778f5f8b973a6134fd6714c0a62189bc475396e8225db3468390f6e1a84fc1d44f0d87 0004-remove-spurious-execinfo.patch
c1abf69b48847dc8c7ab0d11ef9adb531aa4635f9d44db6933981edc5a47df374664fb24867b19aa64abbcc9777bf1cd0360d9aea54e27b081065928c61e0f0b kamailio.cfg
cd6e3b677d803cd78561ad14d9b2589fd35ad0096f48047fdcb4ddc7d9103871357efba3b350946844cb53dbb081210746421fc420c22ac845b90251168a628e kamailio.initd"