From 4f5198fce0e790d87f8a503f50be2e6d18cf52e6 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Wed, 21 Mar 2018 20:21:45 +0100 Subject: [PATCH] kamailio-4.x: bump to version 4.4.7 - changed source URL to https - refreshed patches - removed upstreamed patch - upstream says that between 4.4.0 and 4.4.7 the "configuration file and database schema compatibility is preserved" - includes bug fixes, also for security issues in tmx (CVE-2018-8828) and lcr, details: https://www.kamailio.org/w/2018/03/kamailio-security-announcement-tmx-lcr/ Signed-off-by: Sebastian Kemper --- net/kamailio-4.x/Makefile | 8 ++++---- .../patches/050-fix-kamailio-utils.patch | 16 +++++++++------- .../110-include-sys-time-h-in-ld_session-h.patch | 10 ---------- 3 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 net/kamailio-4.x/patches/110-include-sys-time-h-in-ld_session-h.patch diff --git a/net/kamailio-4.x/Makefile b/net/kamailio-4.x/Makefile index f7ab242..f16a64c 100644 --- a/net/kamailio-4.x/Makefile +++ b/net/kamailio-4.x/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2016 OpenWrt.org +# Copyright (C) 2016 - 2018 OpenWrt.org # Copyright (C) 2013-2016 CESNET,z.s.p.o. # # This is free software, licensed under the GNU General Public License v2. @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kamailio4 -PKG_VERSION:=4.4.0 +PKG_VERSION:=4.4.7 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/ +PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/ PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz -PKG_MD5SUM:=e9fa206f67346a6b01c015d76ec2db9d +PKG_MD5SUM:=76d5ce257da9ee89fd66b697cb674260 PKG_USE_MIPS16:=0 PKG_LICENSE:=GPL-2.0+ diff --git a/net/kamailio-4.x/patches/050-fix-kamailio-utils.patch b/net/kamailio-4.x/patches/050-fix-kamailio-utils.patch index 2ea697a..6a61431 100644 --- a/net/kamailio-4.x/patches/050-fix-kamailio-utils.patch +++ b/net/kamailio-4.x/patches/050-fix-kamailio-utils.patch @@ -8,7 +8,7 @@ # --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc -@@ -147,3 +147,6 @@ +@@ -148,3 +148,6 @@ ## Extra start options - default is: not set # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64" # STARTOPTIONS= @@ -25,7 +25,7 @@ # --- a/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 # postgres to do the grants @@ -41,11 +41,13 @@ -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 dr_gateways dr_rules +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 dr_gateways dr_rules \ + dr_gw_lists} +-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 @@ -53,7 +55,7 @@ uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs} # SQL definitions -@@ -68,17 +68,17 @@ GREP=${GREP:-grep} +@@ -69,17 +69,17 @@ GREP=${GREP:-grep} SED=${SED:-sed} # define what modules should be installed @@ -66,9 +68,9 @@ PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls} -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 \ -+ userblacklist htable purple uac pipelimit mtree sca mohqueue \ ++ drouting userblacklist htable purple uac pipelimit mtree sca mohqueue \ rtpproxy} -DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags diff --git a/net/kamailio-4.x/patches/110-include-sys-time-h-in-ld_session-h.patch b/net/kamailio-4.x/patches/110-include-sys-time-h-in-ld_session-h.patch deleted file mode 100644 index 2fc156e..0000000 --- a/net/kamailio-4.x/patches/110-include-sys-time-h-in-ld_session-h.patch +++ /dev/null @@ -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 - #include - - #include "iniparser.h" -- 2.30.2