Attachment 208523 Details for Bug 241429 – kamailio.diff

[patch] kamailio.diff

kamailio.diff (text/plain), 7.69 KB, created by Dmitry Wagin on 2019-10-23 09:36:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2019-10-23 09:36:55 UTC

Size: 7.69 KB

patch

obsolete

>Index: net/kamailio/Makefile
>===================================================================
>--- net/kamailio/Makefile	(revision 514886)
>+++ net/kamailio/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kamailio
>-PORTVERSION=	5.2.4
>-PORTREVISION=	2
>+PORTVERSION=	5.3.0
> CATEGORIES=	net
> MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
> DISTNAME=	${PORTNAME}-${PORTVERSION}_src
>@@ -45,12 +44,12 @@
> 		KAMAILIO_GROUP=${KAMAILIO_GROUP} \
> 		KAMAILIO_RUNDIR=${KAMAILIO_RUNDIR}
> 
>-OPTIONS_GROUP=		DATABASE_DRIVERS KEMI
>-OPTIONS_GROUP_KEMI=	LUAJIT PYTHON3
>+OPTIONS_GROUP=		DATABASE_DRIVERS KEMI_LANGS
> OPTIONS_GROUP_DATABASE_DRIVERS=	MYSQL PGSQL UNIXODBC
>-OPTIONS_DEFINE=		DATABASE DIALPLAN DOCS PERL PRESENCE RADIUS \
>+OPTIONS_GROUP_KEMI_LANGS=	LUAJIT PYTHON3
>+OPTIONS_DEFINE=		DATABASE DIALPLAN DOCS KEMIX PERL PRESENCE RADIUS \
> 			SCTP TLS WEBSOCKET
>-OPTIONS_DEFAULT=	MYSQL PRESENCE RADIUS TLS
>+#OPTIONS_DEFAULT=	MYSQL PRESENCE RADIUS TLS
> OPTIONS_SUB=		YES
> 
> DATABASE_DRIVERS_DESC=	Database drivers
>@@ -70,14 +69,19 @@
> UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
> UNIXODBC_VARS=		EXTRA_MODULES+=db_unixodbc
> 
>-KEMI_DESC=		Kamailio Embedded Interface
>+KEMIX_DESC=		Core KEMI Functions
>+KEMIX_VARS=		EXTRA_MODULES+=kemix
> 
>+KEMI_LANGS_DESC=	Kamailio Embedded Interface Interpreters
>+
> LUAJIT_DESC=		Execute embedded Lua scripts
>+LUAJIT_IMPLIES=		KEMIX
> LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
> LUAJIT_MAKE_ARGS=	LUAJIT=yes
> LUAJIT_VARS=		EXTRA_MODULES+=app_lua
> 
> PYTHON3_DESC=		Execute embedded Python3 scripts
>+PYTHON3_IMPLIES=	KEMIX
> PYTHON3_MAKE_ARGS=	PYTHON3=${PYTHON_CMD}
> PYTHON3_VARS=		EXTRA_MODULES+=app_python3
> 
>@@ -122,7 +126,7 @@
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} '499s|$$(run_prefix)/$$(run_dir)|${KAMAILIO_RUNDIR}|' \
>+	${REINPLACE_CMD} '551s|$$(run_prefix)/$$(run_dir)|${KAMAILIO_RUNDIR}|' \
> 		${WRKSRC}/src/Makefile.defs
> 
> post-patch-DOCS-off:
>@@ -139,8 +143,8 @@
> 
> post-install:
> 	@${RMDIR} ${STAGEDIR}${DATADIR} || true
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kamailio/*.so.1
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kamailio/modules/*.so
>+	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so' -exec ${STRIP_CMD} {} +
>+	@${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}
>Index: net/kamailio/distinfo
>===================================================================
>--- net/kamailio/distinfo	(revision 514886)
>+++ net/kamailio/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1566543570
>-SHA256 (kamailio-5.2.4_src.tar.gz) = 484488879fa3c790bbd940bb81bac90639f4dccfc1c2b4e75db38f65d4020393
>-SIZE (kamailio-5.2.4_src.tar.gz) = 12305527
>+TIMESTAMP = 1571491417
>+SHA256 (kamailio-5.3.0_src.tar.gz) = 1bf948620a4036fa473659d3969d5d3887dd25bd2ad20a1ac451ecadaaca447e
>+SIZE (kamailio-5.3.0_src.tar.gz) = 12429451
>Index: net/kamailio/files/patch-src_Makefile.defs
>===================================================================
>--- net/kamailio/files/patch-src_Makefile.defs	(revision 514886)
>+++ net/kamailio/files/patch-src_Makefile.defs	(working copy)
>@@ -1,6 +1,6 @@
>---- src/Makefile.defs.orig	2019-08-14 09:43:03 UTC
>+--- src/Makefile.defs.orig	2019-10-17 11:30:50 UTC
> +++ src/Makefile.defs
>-@@ -208,7 +208,7 @@ YACC := $(shell echo "$${YACC}")
>+@@ -245,7 +245,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 \
>-@@ -222,7 +222,7 @@ MKTAGS=ctags
>+@@ -259,7 +259,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' \
>-@@ -392,7 +392,7 @@ LIBDIR ?=
>+@@ -444,7 +444,7 @@ LIBDIR ?=
>  ifeq ($(LIBDIR),)
>  ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
>  ifeq ($(ARCHBSZ),64b)
>@@ -27,7 +27,7 @@
>  else
>  	LIBDIR = lib
>  endif
>-@@ -1736,7 +1736,7 @@ ifeq ($(YACC),)
>+@@ -1818,7 +1818,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 514886)
>+++ net/kamailio/pkg-plist	(working copy)
>@@ -93,6 +93,7 @@
> %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.pipelimit
> %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.prefix_route
> %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.registrar
>+%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.secfilter
> %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.sipcapture
> %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.siptrace
> %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.speeddial
>@@ -131,6 +132,7 @@
> %%DATABASE%%lib/kamailio/modules/pipelimit.so
> %%DATABASE%%lib/kamailio/modules/prefix_route.so
> %%DATABASE%%lib/kamailio/modules/registrar.so
>+%%DATABASE%%lib/kamailio/modules/secfilter.so
> %%DATABASE%%lib/kamailio/modules/sipcapture.so
> %%DATABASE%%lib/kamailio/modules/siptrace.so
> %%DATABASE%%lib/kamailio/modules/speeddial.so
>@@ -141,6 +143,8 @@
> %%DATABASE%%lib/kamailio/modules/usrloc.so
> %%DIALPLAN%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.dialplan
> %%DIALPLAN%%lib/kamailio/modules/dialplan.so
>+%%KEMIX%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.kemix
>+%%KEMIX%%lib/kamailio/modules/kemix.so
> %%LUAJIT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.app_lua
> %%LUAJIT%%lib/kamailio/modules/app_lua.so
> %%MYSQL%%%%DATADIR%%/mysql/acc-create.sql
>@@ -158,7 +162,7 @@
> %%MYSQL%%%%DATADIR%%/mysql/group-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/htable-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/imc-create.sql
>-%%MYSQL%%%%DATADIR%%/mysql/ims_charging_create.sql
>+%%MYSQL%%%%DATADIR%%/mysql/ims_charging-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/ims_dialog-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/ims_usrloc_pcscf-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/ims_usrloc_scscf-create.sql
>@@ -177,6 +181,7 @@
> %%MYSQL%%%%DATADIR%%/mysql/rtpengine-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/rtpproxy-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/sca-create.sql
>+%%MYSQL%%%%DATADIR%%/mysql/secfilter-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/siptrace-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/speeddial-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/standard-create.sql
>@@ -246,6 +251,7 @@
> %%PGSQL%%%%DATADIR%%/postgres/rtpengine-create.sql
> %%PGSQL%%%%DATADIR%%/postgres/rtpproxy-create.sql
> %%PGSQL%%%%DATADIR%%/postgres/sca-create.sql
>+%%PGSQL%%%%DATADIR%%/postgres/secfilter-create.sql
> %%PGSQL%%%%DATADIR%%/postgres/siptrace-create.sql
> %%PGSQL%%%%DATADIR%%/postgres/speeddial-create.sql
> %%PGSQL%%%%DATADIR%%/postgres/standard-create.sql
>@@ -348,6 +354,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.tsilo
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.uac_redirect
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.xhttp
>+%%PORTDOCS%%%%DOCSDIR%%/modules/README.xhttp_prom
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.xhttp_rpc
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.xlog
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.xprint
>@@ -401,6 +408,7 @@
> %%TLS%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.tls
> %%TLS%%@sample %%ETCDIR%%/tls.cfg.sample
> %%TLS%%lib/kamailio/modules/tls.so
>+%%TLS%%lib/kamailio/openssl_mutex_shared/openssl_mutex_shared.so
> %%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_unixodbc
> %%UNIXODBC%%lib/kamailio/modules/db_unixodbc.so
> %%WEBSOCKET%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.websocket
>@@ -504,6 +512,7 @@
> lib/kamailio/modules/tsilo.so
> lib/kamailio/modules/uac_redirect.so
> lib/kamailio/modules/xhttp.so
>+lib/kamailio/modules/xhttp_prom.so
> lib/kamailio/modules/xhttp_rpc.so
> lib/kamailio/modules/xlog.so
> lib/kamailio/modules/xprint.so

Actions: View | Diff

Attachments on bug 241429: 208523 | 208524