aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-08-28 15:08:35 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-08-28 15:17:29 +0000
commitbdc4adb6fd829f6c9abfa6b5cb5cb22b399d2b4c (patch)
tree7adfef25a94e4fe35eb92e182c2205a45b5faad7
parentf537d52c17bde504e1d1f785f1d389b808d372ba (diff)
downloadaports-bdc4adb6fd829f6c9abfa6b5cb5cb22b399d2b4c.tar.gz
aports-bdc4adb6fd829f6c9abfa6b5cb5cb22b399d2b4c.tar.bz2
aports-bdc4adb6fd829f6c9abfa6b5cb5cb22b399d2b4c.tar.xz
main/kamailio: add app_lua_sr to kamailio-lua
Since 5.3.0 we also need app_lua_sr. https://www.kamailio.org/wiki/install/upgrade/5.2.x-to-5.3.0#upgraded_modules Also backport patch for fix build.
-rw-r--r--main/kamailio/APKBUILD12
-rw-r--r--main/kamailio/jsonrcc-use-extern-not-to-declare-global-variables-many-times.patch63
2 files changed, 67 insertions, 8 deletions
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 23fbd50ec2..f90bf91cb2 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -5,7 +5,7 @@
pkgname=kamailio
pkgver=5.3.4
-pkgrel=0
+pkgrel=1
# If building from a git snapshot, specify the gitcommit
# If building a proper release, leave gitcommit blank
@@ -32,6 +32,7 @@ makedepends="bison db-dev flex freeradius-client-dev expat-dev
linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev
ruby-dev libmaxminddb-dev libunistring-dev"
source="kamailio-${pkgver}$_suffix.tar.gz::https://github.com/kamailio/kamailio/archive/$_gitcommit.tar.gz
+ jsonrcc-use-extern-not-to-declare-global-variables-many-times.patch
kamailio.initd
"
@@ -126,9 +127,6 @@ _mod_list_utils="utils http_client"
# - async http_async_client
_mod_list_http_async="http_async_client"
-# - modules depending on purple library
-_mod_list_purple="purple"
-
# - modules depending on memcache library
_mod_list_memcached="memcached"
@@ -159,7 +157,7 @@ _mod_list_presence="presence presence_conference presence_dialoginfo \
rls xcap_client xcap_server"
# - modules depending on lua library
-_mod_list_lua="app_lua"
+_mod_list_lua="app_lua app_lua_sr"
# - modules depending on perl library
_mod_list_perl="app_perl db_perlvdb"
@@ -202,9 +200,6 @@ _mod_list_osp="osp"
# - modules depending on java library
_mod_list_java="app_java"
-# - modules depending on iptables library
-_mod_list_iptrtpproxy="iptrtpproxy"
-
# - modules depending on gzip library
_mod_list_gzcompress="gzcompress"
@@ -539,4 +534,5 @@ sipdump() {
}
sha512sums="ed242b6d63e1559ddb9336928e6c52c9242ca67a838f97a32ff30e6a0bc9f271e2f173bad315d64ae6d353b7ce7ced2a85c55bcc41a466e3b6403f487f876f7f kamailio-5.3.4.tar.gz
+98a8fd556cc0c0b1af3da236ea67690f57fd063e24468e5dc3f33a4b0b61f8a6a464117d6bad83b6ac257eb1cd9f328c172e789d42174c15272aaf5aaa922028 jsonrcc-use-extern-not-to-declare-global-variables-many-times.patch
0c87bfb78481568c03e603049eb8597a90d24ae2941fc81694181b2326fa9db89fbddaaa3cf08c7bc2f5fa0e7ffac4cf4e2d010d08c4faa6cf6df98593432539 kamailio.initd"
diff --git a/main/kamailio/jsonrcc-use-extern-not-to-declare-global-variables-many-times.patch b/main/kamailio/jsonrcc-use-extern-not-to-declare-global-variables-many-times.patch
new file mode 100644
index 0000000000..3b3ffdf8ca
--- /dev/null
+++ b/main/kamailio/jsonrcc-use-extern-not-to-declare-global-variables-many-times.patch
@@ -0,0 +1,63 @@
+From bc9baca2229d09b912a51a2e64ead79f709d45fd Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda@gmail.com>
+Date: Sat, 7 Mar 2020 13:24:37 +0100
+Subject: [PATCH] jsonrcc: use extern not to declare global variables many
+ times
+
+---
+ src/modules/jsonrpcc/jsonrpc_io.c | 2 +-
+ src/modules/jsonrpcc/jsonrpc_request.c | 2 +-
+ src/modules/jsonrpcc/jsonrpc_request.h | 2 +-
+ src/modules/jsonrpcc/jsonrpcc_mod.c | 1 +
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/jsonrpcc/jsonrpc_io.c b/src/modules/jsonrpcc/jsonrpc_io.c
+index ebb93348ba..81627659fb 100644
+--- a/src/modules/jsonrpcc/jsonrpc_io.c
++++ b/src/modules/jsonrpcc/jsonrpc_io.c
+@@ -58,7 +58,7 @@ struct jsonrpc_server_group {
+ struct jsonrpc_server_group *next_group;
+ };
+
+-struct tm_binds tmb;
++extern struct tm_binds tmb;
+
+ struct jsonrpc_server_group *server_group;
+
+diff --git a/src/modules/jsonrpcc/jsonrpc_request.c b/src/modules/jsonrpcc/jsonrpc_request.c
+index d2321e5f37..63af54dfe1 100644
+--- a/src/modules/jsonrpcc/jsonrpc_request.c
++++ b/src/modules/jsonrpcc/jsonrpc_request.c
+@@ -29,7 +29,7 @@
+ #include "jsonrpc_io.h"
+
+
+-struct tm_binds tmb;
++extern struct tm_binds tmb;
+ static char *shm_strdup(str *src);
+
+ int memory_error() {
+diff --git a/src/modules/jsonrpcc/jsonrpc_request.h b/src/modules/jsonrpcc/jsonrpc_request.h
+index 16114d9aa7..49cfdb46c1 100644
+--- a/src/modules/jsonrpcc/jsonrpc_request.h
++++ b/src/modules/jsonrpcc/jsonrpc_request.h
+@@ -26,6 +26,6 @@
+
+ int jsonrpc_request(struct sip_msg* msg, char* method, char* params, char* cb_route, char* err_route, char* cb_pv);
+ int jsonrpc_notification(struct sip_msg* msg, char* method, char* params);
+-int cmd_pipe;
++extern int cmd_pipe;
+
+ #endif /* _JSONRPC_REQUEST_H_ */
+diff --git a/src/modules/jsonrpcc/jsonrpcc_mod.c b/src/modules/jsonrpcc/jsonrpcc_mod.c
+index c5d067b733..062b5b4096 100644
+--- a/src/modules/jsonrpcc/jsonrpcc_mod.c
++++ b/src/modules/jsonrpcc/jsonrpcc_mod.c
+@@ -49,6 +49,7 @@ int fixup_pvar_shm(void** param, int param_no);
+
+ char *servers_param;
+ int pipe_fds[2] = {-1,-1};
++int cmd_pipe = -1;
+
+ extern int _jsonrpcc_max_conn_retry; /* max retries to connect */
+