net/kamailio: update 5.3.3 -> 5.3.5, submitter becomes maintainer

PR:		246510
Submitted by:	Dmitry Wagin <dmitry.wagin@ya.ru>
Relnotes:	https://www.kamailio.org/pub/kamailio/5.3.4/ChangeLog
		https://www.kamailio.org/pub/kamailio/5.3.5/ChangeLog

5 files changed, 15 insertions, 14 deletions

diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
index 23c9e4f46f40..5d81418df1b9 100644
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	kamailio
-PORTVERSION=	5.3.3
+PORTVERSION=	5.3.5
 CATEGORIES=	net
 MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_src
 
-MAINTAINER=	pi@FreeBSD.org
+MAINTAINER=	dmitry.wagin@ya.ru
 COMMENT=	Very fast and configurable open source SIP proxy
 
 LICENSE=	GPLv2
@@ -126,7 +126,7 @@ CFG_ARGS+=	include_modules="${EXTRA_MODULES}"
 .endif
 
 post-patch:
-	${REINPLACE_CMD} '554s|$$(run_prefix)/$$(run_dir)|${KAMAILIO_RUNDIR}|' \
+	${REINPLACE_CMD} '563s|run_target = $$(run_prefix)/$$(run_dir)|run_target = ${KAMAILIO_RUNDIR}|' \
 		${WRKSRC}/src/Makefile.defs
 
 post-patch-DOCS-off:
@@ -137,7 +137,6 @@ pre-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CFG_ARGS} cfg
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${KAMAILIO_RUNDIR}
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
 	@(cd ${STAGEDIR}${ETCDIR}; for i in `${FIND} . -type f`; do ${MV} $$i $$i.sample; done)
 
@@ -147,6 +146,5 @@ post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so.1' -exec ${STRIP_CMD} {} +
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamailio
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamcmd
-	@${ECHO_CMD} "@dir(${KAMAILIO_USER},${KAMAILIO_GROUP},750) ${KAMAILIO_RUNDIR}" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/net/kamailio/distinfo b/net/kamailio/distinfo
index 70012180ad4f..b721aef69f98 100644
--- a/net/kamailio/distinfo
+++ b/net/kamailio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1584945539
-SHA256 (kamailio-5.3.3_src.tar.gz) = 2443f8aad3584b009b51948dc41982060b9ffc76be8016aa4e7de25b83be5b0a
-SIZE (kamailio-5.3.3_src.tar.gz) = 12447194
+TIMESTAMP = 1593173267
+SHA256 (kamailio-5.3.5_src.tar.gz) = 5e192a03a936a5a51f3b8363dfa5b15d350c3590cc7548609156b554bc6d0e94
+SIZE (kamailio-5.3.5_src.tar.gz) = 12480234
diff --git a/net/kamailio/files/kamailio.in b/net/kamailio/files/kamailio.in
index e069a771d4fd..7fbbeab8fbad 100644
--- a/net/kamailio/files/kamailio.in
+++ b/net/kamailio/files/kamailio.in
@@ -48,7 +48,9 @@ extra_commands="configtest"
 
 kamailio_start_precmd()
 {
-	install -d -m 0750 -o ${kamailio_user} -g ${kamailio_group} "%%KAMAILIO_RUNDIR%%"
+	if [ ! -d "%%KAMAILIO_RUNDIR%%" ]; then
+		install -d -m 0750 -o ${kamailio_user} -g ${kamailio_group} "%%KAMAILIO_RUNDIR%%"
+	fi
 }
 
 kamailio_checkconfig()
diff --git a/net/kamailio/files/patch-src_Makefile.defs b/net/kamailio/files/patch-src_Makefile.defs
index 218c8af3ca7d..0ae9cb50204f 100644
--- a/net/kamailio/files/patch-src_Makefile.defs
+++ b/net/kamailio/files/patch-src_Makefile.defs
@@ -1,6 +1,6 @@
---- src/Makefile.defs.orig	2019-10-17 11:30:50 UTC
+--- src/Makefile.defs.orig	2020-05-06 13:20:45 UTC
 +++ src/Makefile.defs
-@@ -245,7 +245,7 @@ YACC := $(shell echo "$${YACC}")
+@@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}")
  
  # find compiler name & version
  ifeq ($(CC),)
@@ -9,7 +9,7 @@
  endif
  LD= $(CC)
  CC_LONGVER:=$(shell if  $(CC) -v 2>/dev/null; then \
-@@ -259,7 +259,7 @@ MKTAGS=ctags
+@@ -271,7 +271,7 @@ MKTAGS=ctags
  #find-out the compiler's name
  
  ifneq (,$(findstring gcc, $(CC_LONGVER)))
@@ -18,7 +18,7 @@
  	RPAREN=)
  	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\
  				sed  -e 's/([^$(RPAREN)]*)//g' \
-@@ -444,7 +444,7 @@ LIBDIR ?=
+@@ -456,7 +456,7 @@ LIBDIR ?=
  ifeq ($(LIBDIR),)
  ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
  ifeq ($(ARCHBSZ),64b)
@@ -27,7 +27,7 @@
  else
  	LIBDIR = lib
  endif
-@@ -1818,7 +1818,7 @@ ifeq ($(YACC),)
+@@ -1830,7 +1830,7 @@ ifeq ($(YACC),)
  endif
  YACC_FLAGS=-d -b core/cfg
  # on solaris add -lxnet (e.g. LIBS= -lxnet)
diff --git a/net/kamailio/pkg-plist b/net/kamailio/pkg-plist
index a76bf8122470..f1631c43f214 100644
--- a/net/kamailio/pkg-plist
+++ b/net/kamailio/pkg-plist
@@ -47,6 +47,7 @@
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/rtpengine
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/rtpproxy
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/sca_subscriptions
+%%DATABASE%%%%DATADIR%%/dbtext/kamailio/secfilter
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/silo
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/sip_trace
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/speed_dial