Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kamailio-4.x: update to 4.4.6

Browse source 
Signed-off-by: Jiri Slachta <jiri@slachta.eu>
This commit is contained in:
Jiri Slachta 2017-08-13 20:44:16 +02:00
parent cf7b805fbe
commit 2f190f1b2a
4 changed files with 11 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/kamailio-4.x/Makefile
View file

@ -10,12 +10,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=kamailio4 PKG_NAME:=kamailio4
PKG_VERSION:=4.4.5 PKG_VERSION:=4.4.6
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/ PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
PKG_HASH:=fd7ced2268b4fbc7763b415341a05034eaff68a666cbf7507c707ac9199c3012 PKG_HASH:=
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+

16
net/kamailio-4.x/patches/050-fix-kamailio-utils.patch
View file

@ -8,7 +8,7 @@
# #
--- a/utils/kamctl/kamctlrc --- a/utils/kamctl/kamctlrc
+++ b/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc
@@ -145,3 +145,6 @@ @@ -148,3 +148,6 @@
## Extra start options - default is: not set ## Extra start options - default is: not set
# example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64" # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"
# STARTOPTIONS= # STARTOPTIONS=
@ -25,7 +25,7 @@
# #
--- a/utils/kamctl/kamdbctl.base --- a/utils/kamctl/kamdbctl.base
+++ b/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base
@@ -33,18 +33,18 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TAB @@ -33,19 +33,19 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TAB
# Used by dbtext and db_berkeley to define tables to be created, used by # Used by dbtext and db_berkeley to define tables to be created, used by
# postgres to do the grants # postgres to do the grants
@ -41,11 +41,13 @@
-EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy -EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
- carrierroute carrier_name domain_name carrierfailureroute userblacklist - carrierroute carrier_name domain_name carrierfailureroute userblacklist
- globalblacklist htable purplemap uacreg pl_pipes mtree mtrees - globalblacklist htable purplemap uacreg pl_pipes mtree mtrees
- sca_subscriptions mohqcalls mohqueues rtpproxy dr_gateways dr_rules
+EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy \ +EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy \
+ carrierroute carrier_name domain_name carrierfailureroute userblacklist \ + carrierroute carrier_name domain_name carrierfailureroute userblacklist \
+ globalblacklist htable purplemap uacreg pl_pipes mtree mtrees \ + globalblacklist htable purplemap uacreg pl_pipes mtree mtrees \
sca_subscriptions mohqcalls mohqueues rtpproxy} + sca_subscriptions mohqcalls mohqueues rtpproxy dr_gateways dr_rules \
-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap dr_gw_lists}
-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
+PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \ +PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \
pua rls_presentity rls_watchers} 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
@ -53,7 +55,7 @@
uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs} uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
# SQL definitions # SQL definitions
@@ -68,17 +68,17 @@ GREP=${GREP:-grep} @@ -69,17 +69,17 @@ GREP=${GREP:-grep}
SED=${SED:-sed} SED=${SED:-sed}
# define what modules should be installed # define what modules should be installed
@ -66,9 +68,9 @@
PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls} PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls}
-EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute -EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
- userblacklist htable purple uac pipelimit mtree sca mohqueue - drouting userblacklist htable purple uac pipelimit mtree sca mohqueue
+EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \ +EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \
+ userblacklist htable purple uac pipelimit mtree sca mohqueue \ + drouting userblacklist htable purple uac pipelimit mtree sca mohqueue \
rtpproxy} rtpproxy}
-DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags -DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags

10
net/kamailio-4.x/patches/110-include-sys-time-h-in-ld_session-h.patch
View file

@ -1,10 +0,0 @@
--- a/modules/ldap/ld_session.h
+++ b/modules/ldap/ld_session.h
@@ -28,6 +28,7 @@
#ifndef LD_SESSION_H
#define LD_SESSION_H
+#include <sys/time.h>
#include <ldap.h>
#include "iniparser.h"

10
net/kamailio-4.x/patches/111-include-sys-time-h-in-kamcmd-c.patch
View file

@ -1,10 +0,0 @@
--- a/utils/kamcmd/kamcmd.c
+++ b/utils/kamcmd/kamcmd.c
@@ -43,6 +43,7 @@
#include <errno.h>
#include <ctype.h> /* isprint */
#include <sys/socket.h>
+#include <sys/time.h> /* struct timeval */
#include <sys/un.h> /* unix sock*/
#include <netinet/in.h> /* udp sock */
#include <sys/uio.h> /* writev */