Attachment 214560 Details for Bug 246510 – kamailio.diff

[patch] kamailio.diff

kamailio.diff (text/plain), 4.13 KB, created by Dmitry Wagin on 2020-05-16 18:17:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2020-05-16 18:17:16 UTC

Size: 4.13 KB

patch

obsolete

>Index: net/kamailio/Makefile
>===================================================================
>--- net/kamailio/Makefile	(revision 535254)
>+++ net/kamailio/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kamailio
>-PORTVERSION=	5.3.3
>+PORTVERSION=	5.3.4
> CATEGORIES=	net
> MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
> DISTNAME=	${PORTNAME}-${PORTVERSION}_src
>@@ -126,7 +126,7 @@
> .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 @@
> 	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 @@
> 	@${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>
>Index: net/kamailio/distinfo
>===================================================================
>--- net/kamailio/distinfo	(revision 535254)
>+++ net/kamailio/distinfo	(working copy)
>@@ -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 = 1589484097
>+SHA256 (kamailio-5.3.4_src.tar.gz) = a012f32e86afe8a05c1665df283167b52d80145b4118e76f05f66651079f9700
>+SIZE (kamailio-5.3.4_src.tar.gz) = 12462767
>Index: net/kamailio/files/kamailio.in
>===================================================================
>--- net/kamailio/files/kamailio.in	(revision 535254)
>+++ net/kamailio/files/kamailio.in	(working copy)
>@@ -48,7 +48,9 @@
> 
> 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()
>Index: net/kamailio/files/patch-src_Makefile.defs
>===================================================================
>--- net/kamailio/files/patch-src_Makefile.defs	(revision 535254)
>+++ net/kamailio/files/patch-src_Makefile.defs	(working copy)
>@@ -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)
>Index: net/kamailio/pkg-plist
>===================================================================
>--- net/kamailio/pkg-plist	(revision 535254)
>+++ net/kamailio/pkg-plist	(working copy)
>@@ -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

Actions: View | Diff

Attachments on bug 246510: 214560 | 215956