From owner-svn-ports-branches@freebsd.org Sun May 6 12:56:02 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 145C4FB9872; Sun, 6 May 2018 12:56:02 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B39826E32E; Sun, 6 May 2018 12:56:01 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A920950A3; Sun, 6 May 2018 12:56:01 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w46Cu1WH053574; Sun, 6 May 2018 12:56:01 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w46Cu0Zu053558; Sun, 6 May 2018 12:56:00 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201805061256.w46Cu0Zu053558@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 6 May 2018 12:56:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469214 - in branches/2018Q2/net/kamailio: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in branches/2018Q2/net/kamailio: . files X-SVN-Commit-Revision: 469214 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2018 12:56:02 -0000 Author: pi Date: Sun May 6 12:55:59 2018 New Revision: 469214 URL: https://svnweb.freebsd.org/changeset/ports/469214 Log: MFH: r469180 net/kamailio: update 5.0.1 -> 5.1.3 - lots of changes PR: 227677 Submitted by: Ben Hood Relnotes: https://www.kamailio.org/w/kamailio-v5-1-0-release-notes/ https://www.kamailio.org/pub/kamailio/5.1.3/ChangeLog https://www.kamailio.org/pub/kamailio/5.1.2/ChangeLog https://www.kamailio.org/pub/kamailio/5.1.1/ChangeLog https://www.kamailio.org/pub/kamailio/5.1.0/ChangeLog https://www.kamailio.org/pub/kamailio/5.0.6/ChangeLog Security: CVE-2018-8828 Approved by: ports-secteam (riggs) Modified: branches/2018Q2/net/kamailio/Makefile branches/2018Q2/net/kamailio/distinfo branches/2018Q2/net/kamailio/files/patch-src_Makefile branches/2018Q2/net/kamailio/files/patch-src_Makefile.defs branches/2018Q2/net/kamailio/files/patch-src_core_ip__addr.h branches/2018Q2/net/kamailio/files/patch-src_main.c branches/2018Q2/net/kamailio/files/patch-src_modules_ctl_ctl.c branches/2018Q2/net/kamailio/files/patch-src_modules_ctl_ctl__defaults.h branches/2018Q2/net/kamailio/files/patch-src_modules_db__berkeley_Makefile branches/2018Q2/net/kamailio/files/patch-src_modules_db__oracle_Makefile branches/2018Q2/net/kamailio/files/patch-src_modules_db__sqlite_Makefile branches/2018Q2/net/kamailio/files/patch-src_modules_tls_Makefile branches/2018Q2/net/kamailio/files/patch-src_modules_tls_sip-router__cert.sh branches/2018Q2/net/kamailio/files/patch-src_modules_websocket_ws__frame.c branches/2018Q2/net/kamailio/files/patch-utils_kamctl_Makefile branches/2018Q2/net/kamailio/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/net/kamailio/Makefile ============================================================================== --- branches/2018Q2/net/kamailio/Makefile Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/Makefile Sun May 6 12:55:59 2018 (r469214) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= kamailio -PORTVERSION= 5.0.1 -PORTREVISION= 1 +PORTVERSION= 5.1.3 + CATEGORIES= net MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}_src Modified: branches/2018Q2/net/kamailio/distinfo ============================================================================== --- branches/2018Q2/net/kamailio/distinfo Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/distinfo Sun May 6 12:55:59 2018 (r469214) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492762108 -SHA256 (kamailio-5.0.1_src.tar.gz) = b26a719a3c1fccb717e6bb009601ccbad32c5c5b6569e2a322fe12cd7d5b7c00 -SIZE (kamailio-5.0.1_src.tar.gz) = 11614011 +TIMESTAMP = 1525555079 +SHA256 (kamailio-5.1.3_src.tar.gz) = b2266e15ec8ffa62be66b44989155f26a31d137f06f81fb3841aad8315315a14 +SIZE (kamailio-5.1.3_src.tar.gz) = 12015322 Modified: branches/2018Q2/net/kamailio/files/patch-src_Makefile ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_Makefile Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_Makefile Sun May 6 12:55:59 2018 (r469214) @@ -1,4 +1,4 @@ ---- src/Makefile.orig 2017-04-21 12:46:05 UTC +--- src/Makefile.orig 2018-03-01 16:24:06 UTC +++ src/Makefile @@ -34,7 +34,7 @@ err_fail?=1 # whether or not to install $(MAIN_NAME).cfg or just $(MAIN_NAME).cfg.default @@ -9,7 +9,7 @@ #extra modules to exclude skip_modules?= -@@ -649,7 +649,7 @@ sunpkg: +@@ -651,7 +651,7 @@ sunpkg: .PHONY: install install: mk_params="compile_for_install=yes" install: install-bin install-every-module install-cfg \ @@ -18,18 +18,3 @@ .PHONY: dbinstall dbinstall: -@@ -764,10 +764,10 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) - fi ; \ - fi ; \ - : ; done; true -- @# radius dictionary -- @$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) -- @$(INSTALL_CFG) ../etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir) -- @echo "config files installed" -+ # radius dictionary -+ $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME).sample -+ $(INSTALL_CFG) ../etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME).sample -+ echo "config files installed" - - install-bin: $(bin_prefix)/$(bin_dir) $(NAME) - $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) Modified: branches/2018Q2/net/kamailio/files/patch-src_Makefile.defs ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_Makefile.defs Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_Makefile.defs Sun May 6 12:55:59 2018 (r469214) @@ -1,4 +1,4 @@ ---- src/Makefile.defs.orig 2017-04-21 13:52:06 UTC +--- src/Makefile.defs.orig 2018-03-01 16:24:11 UTC +++ src/Makefile.defs @@ -208,7 +208,7 @@ YACC := $(shell echo "$${YACC}") @@ -18,7 +18,7 @@ RPAREN=) CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\ sed -e 's/([^$(RPAREN)]*)//g' \ -@@ -386,7 +386,7 @@ LIBDIR ?= +@@ -390,7 +390,7 @@ LIBDIR ?= ifeq ($(LIBDIR),) ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/') ifeq ($(ARCHBSZ),64b) @@ -27,7 +27,7 @@ else LIBDIR = lib endif -@@ -460,7 +460,7 @@ doxygen_dir=doc/doxygen +@@ -464,7 +464,7 @@ doxygen_dir=doc/doxygen BASEDIR ?= $(DESTDIR) basedir = $(BASEDIR) @@ -36,7 +36,7 @@ runbasedir = $(RUNBASEDIR) # install location -@@ -1722,7 +1722,7 @@ ifeq ($(YACC),) +@@ -1743,7 +1743,7 @@ ifeq ($(YACC),) endif YACC_FLAGS=-d -b core/cfg # on solaris add -lxnet (e.g. LIBS= -lxnet) Modified: branches/2018Q2/net/kamailio/files/patch-src_core_ip__addr.h ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_core_ip__addr.h Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_core_ip__addr.h Sun May 6 12:55:59 2018 (r469214) @@ -1,6 +1,6 @@ ---- src/core/ip_addr.h.orig 2017-04-21 12:46:05 UTC +--- src/core/ip_addr.h.orig 2018-03-01 16:24:06 UTC +++ src/core/ip_addr.h -@@ -49,6 +49,10 @@ enum sip_protos { PROTO_NONE, PROTO_UDP, PROTO_TCP, PR +@@ -49,6 +49,10 @@ enum sip_protos { PROTO_NONE, PROTO_UDP, enum comp_methods { COMP_NONE, COMP_SIGCOMP, COMP_SERGZ }; #endif @@ -8,6 +8,6 @@ +#define INADDR_LOOPBACK (u_int32_t)0x7f000001 +#endif + - struct ip_addr{ - unsigned int af; /* address family: AF_INET6 or AF_INET */ - unsigned int len; /* address len, 16 or 4 */ + typedef struct ip_addr { + unsigned int af; /* address family: AF_INET6 or AF_INET */ + unsigned int len; /* address len, 16 or 4 */ Modified: branches/2018Q2/net/kamailio/files/patch-src_main.c ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_main.c Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_main.c Sun May 6 12:55:59 2018 (r469214) @@ -1,4 +1,4 @@ ---- src/main.c.orig 2017-04-21 12:46:05 UTC +--- src/main.c.orig 2018-03-01 16:24:07 UTC +++ src/main.c @@ -362,7 +362,7 @@ int received_dns = 0; int sr_auto_aliases=1; Modified: branches/2018Q2/net/kamailio/files/patch-src_modules_ctl_ctl.c ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_modules_ctl_ctl.c Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_modules_ctl_ctl.c Sun May 6 12:55:59 2018 (r469214) @@ -1,6 +1,6 @@ ---- src/modules/ctl/ctl.c.orig 2017-04-21 13:48:39 UTC +--- src/modules/ctl/ctl.c.orig 2018-03-01 16:24:09 UTC +++ src/modules/ctl/ctl.c -@@ -238,8 +238,7 @@ static int mod_init(void) +@@ -240,8 +240,7 @@ static int mod_init(void) return -1; } strcpy(ctl_socket_path, DEFAULT_CTL_SOCKET_PROTO); Modified: branches/2018Q2/net/kamailio/files/patch-src_modules_ctl_ctl__defaults.h ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_modules_ctl_ctl__defaults.h Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_modules_ctl_ctl__defaults.h Sun May 6 12:55:59 2018 (r469214) @@ -1,4 +1,4 @@ ---- src/modules/ctl/ctl_defaults.h.orig 2017-04-21 12:46:05 UTC +--- src/modules/ctl/ctl_defaults.h.orig 2018-03-01 16:24:09 UTC +++ src/modules/ctl/ctl_defaults.h @@ -13,7 +13,7 @@ #define DEFAULT_CTL_SOCKET_NAME NAME "_ctl" Modified: branches/2018Q2/net/kamailio/files/patch-src_modules_db__berkeley_Makefile ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_modules_db__berkeley_Makefile Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_modules_db__berkeley_Makefile Sun May 6 12:55:59 2018 (r469214) @@ -1,4 +1,4 @@ ---- src/modules/db_berkeley/Makefile.orig 2017-04-21 12:46:05 UTC +--- src/modules/db_berkeley/Makefile.orig 2018-03-01 16:24:09 UTC +++ src/modules/db_berkeley/Makefile @@ -25,7 +25,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio Modified: branches/2018Q2/net/kamailio/files/patch-src_modules_db__oracle_Makefile ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_modules_db__oracle_Makefile Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_modules_db__oracle_Makefile Sun May 6 12:55:59 2018 (r469214) @@ -1,6 +1,6 @@ ---- src/modules/db_oracle/Makefile.orig 2017-04-21 12:46:05 UTC +--- src/modules/db_oracle/Makefile.orig 2018-03-01 16:24:09 UTC +++ src/modules/db_oracle/Makefile -@@ -70,7 +70,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) +@@ -19,7 +19,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-oracle-scripts: $(bin_prefix)/$(bin_dir) Modified: branches/2018Q2/net/kamailio/files/patch-src_modules_db__sqlite_Makefile ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_modules_db__sqlite_Makefile Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_modules_db__sqlite_Makefile Sun May 6 12:55:59 2018 (r469214) @@ -1,4 +1,4 @@ ---- src/modules/db_sqlite/Makefile.orig 2017-04-21 12:46:06 UTC +--- src/modules/db_sqlite/Makefile.orig 2018-03-01 16:24:09 UTC +++ src/modules/db_sqlite/Makefile @@ -22,7 +22,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio Modified: branches/2018Q2/net/kamailio/files/patch-src_modules_tls_Makefile ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_modules_tls_Makefile Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_modules_tls_Makefile Sun May 6 12:55:59 2018 (r469214) @@ -1,4 +1,4 @@ ---- src/modules/tls/Makefile.orig 2017-04-21 12:46:06 UTC +--- src/modules/tls/Makefile.orig 2018-03-01 16:24:10 UTC +++ src/modules/tls/Makefile @@ -8,6 +8,8 @@ include ../../Makefile.defs auto_gen= Modified: branches/2018Q2/net/kamailio/files/patch-src_modules_tls_sip-router__cert.sh ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_modules_tls_sip-router__cert.sh Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_modules_tls_sip-router__cert.sh Sun May 6 12:55:59 2018 (r469214) @@ -1,4 +1,4 @@ ---- src/modules/tls/sip-router_cert.sh.orig 2017-04-21 12:46:06 UTC +--- src/modules/tls/sip-router_cert.sh.orig 2018-03-01 16:24:10 UTC +++ src/modules/tls/sip-router_cert.sh @@ -197,5 +197,6 @@ if [ $? != 0 ] ; then else Modified: branches/2018Q2/net/kamailio/files/patch-src_modules_websocket_ws__frame.c ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-src_modules_websocket_ws__frame.c Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-src_modules_websocket_ws__frame.c Sun May 6 12:55:59 2018 (r469214) @@ -1,4 +1,4 @@ ---- src/modules/websocket/ws_frame.c.orig 2017-04-21 12:46:06 UTC +--- src/modules/websocket/ws_frame.c.orig 2018-03-01 16:24:10 UTC +++ src/modules/websocket/ws_frame.c @@ -29,7 +29,7 @@ #ifdef EMBEDDED_UTF8_DECODE Modified: branches/2018Q2/net/kamailio/files/patch-utils_kamctl_Makefile ============================================================================== --- branches/2018Q2/net/kamailio/files/patch-utils_kamctl_Makefile Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/files/patch-utils_kamctl_Makefile Sun May 6 12:55:59 2018 (r469214) @@ -1,4 +1,4 @@ ---- utils/kamctl/Makefile.orig 2017-04-21 12:46:06 UTC +--- utils/kamctl/Makefile.orig 2018-03-01 16:24:11 UTC +++ utils/kamctl/Makefile @@ -8,6 +8,8 @@ else kamctltmpdir = $(basedir) Modified: branches/2018Q2/net/kamailio/pkg-plist ============================================================================== --- branches/2018Q2/net/kamailio/pkg-plist Sun May 6 12:50:35 2018 (r469213) +++ branches/2018Q2/net/kamailio/pkg-plist Sun May 6 12:55:59 2018 (r469214) @@ -2,12 +2,10 @@ sbin/kamailio sbin/kamcmd sbin/kamctl sbin/kamdbctl -@sample etc/kamailio/dictionary.kamailio.sample -@sample etc/kamailio/kamailio-advanced.cfg.sample -@sample etc/kamailio/kamailio-basic.cfg.sample @sample etc/kamailio/kamailio.cfg.sample @sample etc/kamailio/kamctlrc.sample %%TLS%%@sample etc/kamailio/tls.cfg.sample +%%ETCDIR%%/dictionary.kamailio lib/kamailio/libprint.so lib/kamailio/libprint.so.1 lib/kamailio/libsrdb1.so @@ -32,9 +30,11 @@ lib/kamailio/kamctl/kamdbctl.base %%PGSQL%%lib/kamailio/kamctl/kamdbctl.pgsql %%MYSQL%%lib/kamailio/kamctl/dbtextdb/dbtextdb.py %%MYSQL%%lib/kamailio/modules/acc.so +lib/kamailio/modules/acc_diameter.so %%MYSQL%%lib/kamailio/modules/alias_db.so lib/kamailio/modules/app_jsdt.so %%PERL%%lib/kamailio/modules/app_perl.so +lib/kamailio/modules/app_sqlang.so lib/kamailio/modules/async.so lib/kamailio/modules/auth.so %%MYSQL%%lib/kamailio/modules/auth_db.so @@ -46,6 +46,7 @@ lib/kamailio/modules/avp.so lib/kamailio/modules/benchmark.so lib/kamailio/modules/blst.so lib/kamailio/modules/call_control.so +lib/kamailio/modules/call_obj.so %%MYSQL%%lib/kamailio/modules/cfg_db.so lib/kamailio/modules/cfg_rpc.so lib/kamailio/modules/cfgt.so @@ -70,12 +71,14 @@ lib/kamailio/modules/dmq_usrloc.so lib/kamailio/modules/domainpolicy.so %%MYSQL%%lib/kamailio/modules/drouting.so lib/kamailio/modules/enum.so +lib/kamailio/modules/evrexec.so lib/kamailio/modules/exec.so %%MYSQL%%lib/kamailio/modules/group.so %%MYSQL%%lib/kamailio/modules/htable.so %%MYSQL%%lib/kamailio/modules/imc.so lib/kamailio/modules/ipops.so lib/kamailio/modules/jsonrpcs.so +lib/kamailio/modules/keepalive.so lib/kamailio/modules/kex.so lib/kamailio/modules/log_custom.so lib/kamailio/modules/malloc_test.so @@ -116,6 +119,7 @@ lib/kamailio/modules/sca.so lib/kamailio/modules/sdpops.so lib/kamailio/modules/seas.so %%MYSQL%%lib/kamailio/modules/sipcapture.so +lib/kamailio/modules/sipdump.so lib/kamailio/modules/sipt.so %%MYSQL%%lib/kamailio/modules/siptrace.so lib/kamailio/modules/siputils.so @@ -335,11 +339,13 @@ lib/kamailio/modules/xprint.so %%PGSQL%%%%DATADIR%%/postgres/purple-create.sql %%PGSQL%%%%DATADIR%%/postgres/registrar-create.sql %%PGSQL%%%%DATADIR%%/postgres/rls-create.sql +%%PGSQL%%%%DATADIR%%/postgres/rtpengine-create.sql %%PGSQL%%%%DATADIR%%/postgres/rtpproxy-create.sql %%PGSQL%%%%DATADIR%%/postgres/sca-create.sql %%PGSQL%%%%DATADIR%%/postgres/siptrace-create.sql %%PGSQL%%%%DATADIR%%/postgres/speeddial-create.sql %%PGSQL%%%%DATADIR%%/postgres/standard-create.sql +%%PGSQL%%%%DATADIR%%/postgres/topos-create.sql %%PGSQL%%%%DATADIR%%/postgres/uac-create.sql %%PGSQL%%%%DATADIR%%/postgres/uid_auth_db-create.sql %%PGSQL%%%%DATADIR%%/postgres/uid_avp_db-create.sql