diff options
| author | Jiri Slachta <jiri.slachta@gmail.com> | 2018-01-15 20:14:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 20:14:36 +0100 |
| commit | 2d67eab1ec114e1d45fcd2577d65c6925729fb0a (patch) | |
| tree | fdf3972d8b4abeefac56c0509d4de8e06ee84e6a | |
| parent | c65d6a9f767ddd2db4b03815b11fec0d3524bfa8 (diff) | |
| parent | ced26e82ba0e7f394aa91b4346abafa678ca96d5 (diff) | |
Merge pull request #239 from micmac1/kamailio-for-15.05
Kamailio for 15.05
| -rw-r--r-- | net/kamailio-3.x/Makefile | 2 | ||||
| -rw-r--r-- | net/kamailio-3.x/patches/150-CVE-2016-2385.patch | 22 | ||||
| -rw-r--r-- | net/kamailio-4.x/Makefile | 6 |
3 files changed, 26 insertions, 4 deletions
diff --git a/net/kamailio-3.x/Makefile b/net/kamailio-3.x/Makefile index 1020992..3290dce 100644 --- a/net/kamailio-3.x/Makefile +++ b/net/kamailio-3.x/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kamailio3 PKG_VERSION:=3.3.7 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/ PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz diff --git a/net/kamailio-3.x/patches/150-CVE-2016-2385.patch b/net/kamailio-3.x/patches/150-CVE-2016-2385.patch new file mode 100644 index 0000000..eb7fbe3 --- /dev/null +++ b/net/kamailio-3.x/patches/150-CVE-2016-2385.patch @@ -0,0 +1,22 @@ +--- a/modules_k/seas/encode_msg.c ++++ b/modules_k/seas/encode_msg.c +@@ -158,6 +158,7 @@ int encode_msg(struct sip_msg *msg,char + + if(len < MAX_ENCODED_MSG + MAX_MESSAGE_LEN) + return -1; ++ + if(parse_headers(msg,HDR_EOH_F,0)<0){ + myerror="in parse_headers"; + goto error; +@@ -266,6 +267,11 @@ int encode_msg(struct sip_msg *msg,char + /*j+=k;*/ + /*pkg_free(payload2);*/ + /*now we copy the actual message after the headers-meta-section*/ ++ ++ if(len < j + msg->len + 1) { ++ LM_ERR("not enough space to encode sip message\n"); ++ return -1; ++ } + memcpy(&payload[j],msg->buf,msg->len); + LM_DBG("msglen = %d,msg starts at %d\n",msg->len,j); + j=htons(j); diff --git a/net/kamailio-4.x/Makefile b/net/kamailio-4.x/Makefile index 6a1d280..bdeaf66 100644 --- a/net/kamailio-4.x/Makefile +++ b/net/kamailio-4.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kamailio4 PKG_VERSION:=4.4.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/ PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz @@ -33,7 +33,7 @@ define Package/kamailio4/Default CATEGORY:=Network SUBMENU:=Telephony URL:=http://www.kamailio.org/ - DEPENDS:=$(ICONV_DEPENDS) +libncurses +libpthread +libreadline +libxml2 +hiredis + DEPENDS:=$(ICONV_DEPENDS) +libncurses +libpthread +libreadline +libxml2 endef define Package/kamailio4 @@ -126,7 +126,7 @@ $(eval $(call BuildKamailio4Module,benchmark,Config benchmark,,)) $(eval $(call BuildKamailio4Module,cfgutils,Config utilities,,)) $(eval $(call BuildKamailio4Module,cfg_db,Load core and module parameters from database,,+kamailio4-mod-db-sqlite)) $(eval $(call BuildKamailio4Module,cfg_rpc,Update core and module parameters at runtime via RPC interface,,)) -$(eval $(call BuildKamailio4Module,cnxcc,Limit call duration,,+kamailio4-mod-dialog +libhiredis +libevent2)) +$(eval $(call BuildKamailio4Module,cnxcc,Limit call duration,,@BROKEN +kamailio4-mod-dialog +libhiredis +libevent2)) # hiredis not available on Chaos Calmer $(eval $(call BuildKamailio4Module,corex,Legacy functions,,)) $(eval $(call BuildKamailio4Module,ctl,BINRPC transport interface,,)) $(eval $(call BuildKamailio4Module,db_flatstore,Fast writing-only text database-backed,,)) |