6 files changed, 22 insertions, 63 deletions

diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
index c912129000e3..113bb0daa9a6 100644
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@@ -1,7 +1,7 @@
 # Created by: Oliver Mahmoudi <olivermahmoudi@gmail.com>
 
 PORTNAME=	kamailio
-PORTVERSION=	5.5.3
+PORTVERSION=	5.5.4
 CATEGORIES=	net
 MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_src
@@ -12,9 +12,6 @@ COMMENT=	Very fast and configurable open source SIP proxy
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:ftp/curl \
-		libexpat.so:textproc/expat2 \
-		libxml2.so:textproc/libxml2
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		compiler:c11 cpe gmake ncurses pkgconfig python:3.5+ readline \
@@ -43,7 +40,8 @@ USERS=		${KAMAILIO_USER}
 GROUPS=		${KAMAILIO_GROUP}
 
 OPTIONS_DEFINE=			DATABASE DIALPLAN DOCS EVAPI JWT KAFKA LWSC \
-				MQTT PERL PRESENCE RADIUS SCTP SECSIPID TLS WEBSOCKET
+				MQTT OUTBOUND PERL PHONENUM PRESENCE RADIUS \
+				SCTP SECSIPID TLS WEBSOCKET
 OPTIONS_DEFAULT=		MYSQL PRESENCE RADIUS SQLITE TLS
 OPTIONS_GROUP=			DATABASE_DRIVERS KEMI_LANGS
 OPTIONS_GROUP_DATABASE_DRIVERS=	MYSQL PGSQL SQLITE UNIXODBC
@@ -60,6 +58,8 @@ KEMI_LANGS_DESC=	Kamailio Embedded Interface Interpreters
 LUAJIT_DESC=		Execute embedded Lua scripts
 LWSC_DESC=		Websocket client connector using libwebsockets
 MQTT_DESC=		MQTT connector for bi-directional publish-subscribe communication
+OUTBOUND_DESC=		SIP Outbound support
+PHONENUM_DESC=		Phone number lookup and normalization using libphonenumber
 PRESENCE_DESC=		Presence support
 PYTHON3_DESC=		Execute embedded Python3 scripts
 SCTP_DESC=		SCTP support
@@ -95,6 +95,8 @@ MYSQL_IMPLIES=	DATABASE
 MYSQL_USES=	mysql
 MYSQL_VARS=	EXTRA_GROUPS+=mysql
 
+OUTBOUND_VARS=	EXTRA_MODULES+=outbound
+
 PERL_USES=	perl5
 PERL_MAKE_ENV=	PERLCCOPTS="`perl -MExtUtils::Embed -e ccopts`" \
 		PERLLDOPTS="`perl -MExtUtils::Embed -e ldopts`" \
@@ -105,7 +107,12 @@ PGSQL_IMPLIES=	DATABASE
 PGSQL_USES=	pgsql
 PGSQL_VARS=	EXTRA_GROUPS+=postgres
 
-PRESENCE_VARS=	EXTRA_GROUPS+=presence
+PHONENUM_LIB_DEPENDS=	libphonenumber.so:devel/libphonenumber
+PHONENUM_VARS=		EXTRA_MODULES+=phonenum
+
+PRESENCE_LIB_DEPENDS=	libcurl.so:ftp/curl \
+			libxml2.so:textproc/libxml2
+PRESENCE_VARS=		EXTRA_GROUPS+=presence
 
 PYTHON3_USES=		gettext-runtime
 PYTHON3_MAKE_ARGS=	PYTHON3=${PYTHON_CMD}
@@ -136,7 +143,8 @@ WEBSOCKET_VARS=		EXTRA_MODULES+=websocket
 
 DEFAULT_GROUPS=	standard
 
-CFG_ARGS+=	run_target="${KAMAILIO_RUNDIR}"
+CFG_ARGS+=	LIBDIR="lib" \
+		run_target="${KAMAILIO_RUNDIR}"
 
 .if !empty (EXTRA_GROUPS)
 CFG_ARGS+=	group_include="${DEFAULT_GROUPS} ${EXTRA_GROUPS}"
diff --git a/net/kamailio/distinfo b/net/kamailio/distinfo
index 7cf6abc1c8d6..3a852c38b7e8 100644
--- a/net/kamailio/distinfo
+++ b/net/kamailio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639646808
-SHA256 (kamailio-5.5.3_src.tar.gz) = 6af30eabdbaa79dbbf7c21b1201f350a39c816010fca60e27cbb9de4589a4324
-SIZE (kamailio-5.5.3_src.tar.gz) = 12782163
+TIMESTAMP = 1645470840
+SHA256 (kamailio-5.5.4_src.tar.gz) = 991d081abc6ee2efdbdb85ee7398f8812f2bdb9ab30ccf9ae0ace6562943860a
+SIZE (kamailio-5.5.4_src.tar.gz) = 12794910
diff --git a/net/kamailio/files/patch-src_Makefile.defs b/net/kamailio/files/patch-src_Makefile.defs
deleted file mode 100644
index 3ead40a4c385..000000000000
--- a/net/kamailio/files/patch-src_Makefile.defs
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.defs.orig	2021-05-05 13:55:36 UTC
-+++ src/Makefile.defs
-@@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}")
- 
- # find compiler name & version
- ifeq ($(CC),)
--	CC=gcc
-+	CC=clang
- endif
- LD= $(CC)
- CC_LONGVER:=$(shell if  $(CC) -v 2>/dev/null; then \
-@@ -271,7 +271,7 @@ MKTAGS=ctags
- #find-out the compiler's name
- 
- ifneq (,$(findstring gcc, $(CC_LONGVER)))
--	CC_NAME=gcc
-+	CC_NAME=clang
- 	RPAREN=)
- 	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version 2>/dev/null|head -n 1|\
- 				sed  -e 's/([^$(RPAREN)]*)//g' \
-@@ -458,7 +458,7 @@ LIBDIR ?=
- ifeq ($(LIBDIR),)
- ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
- ifeq ($(ARCHBSZ),64b)
--	LIBDIR = lib64
-+	LIBDIR = lib
- else
- 	LIBDIR = lib
- endif
diff --git a/net/kamailio/files/patch-src_core_ip__addr.h b/net/kamailio/files/patch-src_core_ip__addr.h
deleted file mode 100644
index a03e884d3476..000000000000
--- a/net/kamailio/files/patch-src_core_ip__addr.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/core/ip_addr.h.orig	2021-05-05 13:55:35 UTC
-+++ src/core/ip_addr.h
-@@ -51,6 +51,10 @@ typedef enum sip_protos { PROTO_NONE, PROTO_UDP, PROTO
- typedef enum comp_methods { COMP_NONE, COMP_SIGCOMP, COMP_SERGZ } comp_methods_t;
- #endif
- 
-+#ifndef INADDR_LOOPBACK
-+#define INADDR_LOOPBACK         (u_int32_t)0x7f000001
-+#endif
-+
- typedef struct ip_addr {
- 	unsigned int af;	/* address family: AF_INET6 or AF_INET */
- 	unsigned int len;	/* address len, 16 or 4 */
diff --git a/net/kamailio/files/patch-src_modules_websocket_ws__frame.c b/net/kamailio/files/patch-src_modules_websocket_ws__frame.c
deleted file mode 100644
index d941aabb6176..000000000000
--- a/net/kamailio/files/patch-src_modules_websocket_ws__frame.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- #include "utf8_decode.h"
- #else
--#include <unistr.h>
-+//#include <unistr.h>
- #endif
- 
- #include "../../core/events.h"
diff --git a/net/kamailio/pkg-plist b/net/kamailio/pkg-plist
index ba321642f519..ad5d056d06aa 100644
--- a/net/kamailio/pkg-plist
+++ b/net/kamailio/pkg-plist
@@ -208,6 +208,8 @@
 %%MYSQL%%lib/kamailio/kamctl/kamctl.mysql
 %%MYSQL%%lib/kamailio/kamctl/kamdbctl.mysql
 %%MYSQL%%lib/kamailio/modules/db_mysql.so
+%%OUTBOUND%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.outbound
+%%OUTBOUND%%lib/kamailio/modules/outbound.so
 %%PERL%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.app_perl
 %%PERL%%lib/kamailio/modules/app_perl.so
 %%PERL%%lib/kamailio/perl/Kamailio.pm
@@ -230,6 +232,8 @@
 %%PERL%%lib/kamailio/perl/Kamailio/VDB/Result.pm
 %%PERL%%lib/kamailio/perl/Kamailio/VDB/VTab.pm
 %%PERL%%lib/kamailio/perl/Kamailio/VDB/Value.pm
+%%PHONENUM%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.phonenum
+%%PHONENUM%%lib/kamailio/modules/phonenum.so
 %%PGSQL%%%%DATADIR%%/postgres/acc-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/alias_db-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/auth_db-create.sql