net/kamailio: 4.2.2 -> 4.2.3

Changes:
http://www.kamailio.org/pub/kamailio/4.2.3/ChangeLog

Adds PRESENCE option and additional modules are integrated in the build.

Submitted by:	Euan Thoms <euan@potensol.com>

6 files changed, 78 insertions, 48 deletions

diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
index aad292612c39..1c39148fa164 100644
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@@ -3,8 +3,7 @@
 #
 
 PORTNAME=	kamailio
-PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTVERSION=	4.2.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_src
@@ -15,7 +14,8 @@ COMMENT=	Very fast and configurable open source SIP proxy
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+		libxml2.so:${PORTSDIR}/textproc/libxml2 \
+		libcurl.so:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
 USES=		gmake shebangfix readline
@@ -30,11 +30,12 @@ USE_RC_SUBR=	kamailio
 USERS=		kamailio
 GROUPS=		kamailio
 
-OPTIONS_DEFINE=	DOCS MYSQL PGSQL RADIUS JITSI JABBER TLS UNIXODBC
-OPTIONS_DEFAULT=	MYSQL RADIUS JABBER TLS
+OPTIONS_DEFINE=	DOCS MYSQL PGSQL RADIUS JITSI JABBER TLS UNIXODBC PRESENCE
+OPTIONS_DEFAULT=MYSQL RADIUS JABBER TLS PRESENCE
 OPTIONS_SUB=	YES
 
 JITSI_DESC=	VoIP Frontend GUI via Jitsi
+PRESENCE_DESC=	Presence support
 
 MYSQL_USE=	mysql=yes
 PGSQL_USES=	pgsql
@@ -49,12 +50,14 @@ TLS_USE=		OPENSSL=yes
 BUILD_DEPENDS+=	clang33:${PORTSDIR}/lang/clang33
 .endif
 
+DEFAULT_GROUP_INCLUDE=	standard standard-dep
+
 .if ${PORT_OPTIONS:MMYSQL}
-EXTRA_MODULES+=	db_mysql
+EXTRA_GROUPS+=	mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-EXTRA_MODULES+=	db_postgres
+EXTRA_GROUPS+=	postgres
 .endif
 
 .if ${PORT_OPTIONS:MUNIXODBC}
@@ -62,7 +65,7 @@ EXTRA_MODULES+=	db_unixodbc
 .endif
 
 .if ${PORT_OPTIONS:MRADIUS}
-EXTRA_MODULES+=	auth_radius group_radius uri_radius
+EXTRA_GROUPS+=	radius
 .endif
 
 .if ${PORT_OPTIONS:MJABBER}
@@ -73,8 +76,12 @@ EXTRA_MODULES+=	jabber
 EXTRA_MODULES+=	tls
 .endif
 
+.if ${PORT_OPTIONS:MPRESENCE}
+EXTRA_GROUPS+=	presence
+.endif
+
 .if !empty (EXTRA_MODULES)
-MAKE_ARGS=	include_modules="${EXTRA_MODULES}"
+MAKE_ARGS+=	group_include="${DEFAULT_GROUP_INCLUDE} ${EXTRA_GROUPS}" include_modules="${EXTRA_MODULES}"
 .endif
 
 post-patch:
@@ -120,12 +127,18 @@ post-stage:
 	prefix_route speeddial registrar mtree uid_avp_db \
 	xlog sipt siptrace qos pdb xprint auth_radius \
 	sanity uid_gflags db_text sdpops sipcapture \
-	tsilo nosip rtpengine jsonrpc-s
+	tsilo nosip rtpengine jsonrpc-s \
+        presence presence_conference presence_dialog presence_dialoginfo \
+        presence_mwi \
+        presence_profile presence_reginfo presence_xml pua_bla \
+        pua_dialoginfo pua_mi pua_reginfo pua_usrloc rls \
+        acc_radius misc_radius peering pua pua_xmpp xcap_client xcap_server
 	@if [ -e ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/${i}.so ]; then \
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/${i}.so; \
 	fi
 .endfor
 
+
 # Strip libraries in lib/kamailio
 	@${ECHO_CMD} "Stripping libraries in ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/"
 
diff --git a/net/kamailio/distinfo b/net/kamailio/distinfo
index c8e5a541de9c..c35d152a623d 100644
--- a/net/kamailio/distinfo
+++ b/net/kamailio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kamailio-4.2.2_src.tar.gz) = 10fb05cdc8a5223e5b0a8faf2b24819c60b40f232809c621569eda3e620f0ee5
-SIZE (kamailio-4.2.2_src.tar.gz) = 11148160
+SHA256 (kamailio-4.2.3_src.tar.gz) = 7dbbca4a515778d3e903380adcc49f727ddc4853238cb905e14c811a5671ed80
+SIZE (kamailio-4.2.2_src.tar.gz) = 11160883
diff --git a/net/kamailio/files/patch-ip_addr_h b/net/kamailio/files/patch-ip_addr_h
new file mode 100644
index 000000000000..5fc44d9c8e7a
--- /dev/null
+++ b/net/kamailio/files/patch-ip_addr_h
@@ -0,0 +1,13 @@
+--- ip_addr.h.orig      2015-02-08 08:55:12.465621472 +0800
++++ ip_addr.h   2015-02-08 08:57:10.297609516 +0800
+@@ -59,6 +59,10 @@
+ enum comp_methods { COMP_NONE, COMP_SIGCOMP, COMP_SERGZ };
+ #endif
+ 
++#ifndef INADDR_LOOPBACK
++#define INADDR_LOOPBACK                (long) 0x7F000001
++#endif
++
+ 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-modules__pipelimit__pipelimit.c b/net/kamailio/files/patch-modules__pipelimit__pipelimit.c
deleted file mode 100644
index 91136ab1ab77..000000000000
--- a/net/kamailio/files/patch-modules__pipelimit__pipelimit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/pipelimit/pipelimit.c.orig	2015-01-11 11:02:38.000000000 +0100
-+++ modules/pipelimit/pipelimit.c	2015-01-11 11:02:48.000000000 +0100
-@@ -192,7 +192,7 @@
- int get_num_cpus() {
- 	int count = 0;
- 
--#if defined (__OS_darwin) || defined (__OS_freebsd)
-+#if defined (__OS_darwin)
-     int nm[2];
-     size_t len;
- 
diff --git a/net/kamailio/files/patch-modules__ratelimit__ratelimit.c b/net/kamailio/files/patch-modules__ratelimit__ratelimit.c
deleted file mode 100644
index bca6f639b9e5..000000000000
--- a/net/kamailio/files/patch-modules__ratelimit__ratelimit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/ratelimit/ratelimit.c.orig	2015-01-11 11:06:53.000000000 +0100
-+++ modules/ratelimit/ratelimit.c	2015-01-11 11:06:58.000000000 +0100
-@@ -303,7 +303,7 @@
- int get_num_cpus() {
- 	int count = 0;
- 
--#if defined (__OS_darwin) || defined (__OS_freebsd)
-+#if defined (__OS_darwin)
-     int nm[2];
-     size_t len;
- 
diff --git a/net/kamailio/pkg-plist b/net/kamailio/pkg-plist
index 9b717bd30ca6..c281faa4b606 100644
--- a/net/kamailio/pkg-plist
+++ b/net/kamailio/pkg-plist
@@ -72,7 +72,6 @@ lib/kamailio/modules/cnxcc.so
 lib/kamailio/modules/corex.so
 lib/kamailio/modules/counters.so
 lib/kamailio/modules/ctl.so
-lib/kamailio/modules/db2_ops.so
 lib/kamailio/modules/db_cluster.so
 lib/kamailio/modules/db_flatstore.so
 %%MYSQL%%lib/kamailio/modules/db_mysql.so
@@ -152,14 +151,8 @@ lib/kamailio/modules/tm.so
 lib/kamailio/modules/tmrec.so
 lib/kamailio/modules/tmx.so
 lib/kamailio/modules/topoh.so
-lib/kamailio/modules/tsilo.so
 lib/kamailio/modules/uac.so
 lib/kamailio/modules/uac_redirect.so
-lib/kamailio/modules/uid_auth_db.so
-lib/kamailio/modules/uid_avp_db.so
-lib/kamailio/modules/uid_domain.so
-lib/kamailio/modules/uid_gflags.so
-lib/kamailio/modules/uid_uri_db.so
 lib/kamailio/modules/uri_db.so
 lib/kamailio/modules/userblacklist.so
 lib/kamailio/modules/usrloc.so
@@ -342,7 +335,6 @@ lib/kamailio/modules/xprint.so
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.corex
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.counters
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.ctl
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.db2_ops
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.db_cluster
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.db_flatstore
 %%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/modules/README.db_mysql
@@ -422,14 +414,8 @@ lib/kamailio/modules/xprint.so
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.tmrec
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.tmx
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.topoh
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.tsilo
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.uac
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.uac_redirect
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.uid_auth_db
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.uid_avp_db
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.uid_domain
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.uid_gflags
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.uid_uri_db
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.uri_db
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.userblacklist
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.usrloc
@@ -442,3 +428,43 @@ man/man8/kamailio.8.gz
 man/man8/kamcmd.8.gz
 man/man8/kamctl.8.gz
 man/man8/kamdbctl.8.gz
+%%RADIUS%%lib/kamailio/modules/acc_radius.so
+%%RADIUS%%lib/kamailio/modules/misc_radius.so
+%%RADIUS%%lib/kamailio/modules/peering.so
+%%PRESENCE%%lib/kamailio/modules/pua.so
+%%PRESENCE%%lib/kamailio/modules/pua_xmpp.so
+%%PRESENCE%%lib/kamailio/modules/xcap_client.so
+%%PRESENCE%%lib/kamailio/modules/xcap_server.so
+%%PRESENCE%%lib/kamailio/modules/presence.so
+%%PRESENCE%%lib/kamailio/modules/presence_conference.so
+%%PRESENCE%%lib/kamailio/modules/presence_dialoginfo.so
+%%PRESENCE%%lib/kamailio/modules/presence_mwi.so
+%%PRESENCE%%lib/kamailio/modules/presence_profile.so
+%%PRESENCE%%lib/kamailio/modules/presence_reginfo.so
+%%PRESENCE%%lib/kamailio/modules/presence_xml.so
+%%PRESENCE%%lib/kamailio/modules/pua_bla.so
+%%PRESENCE%%lib/kamailio/modules/pua_dialoginfo.so
+%%PRESENCE%%lib/kamailio/modules/pua_mi.so
+%%PRESENCE%%lib/kamailio/modules/pua_reginfo.so
+%%PRESENCE%%lib/kamailio/modules/pua_usrloc.so
+%%PRESENCE%%lib/kamailio/modules/rls.so
+%%PORTDOCS%%%%RADIUS%%%%DOCSDIR%%/modules/README.acc_radius
+%%PORTDOCS%%%%RADIUS%%%%DOCSDIR%%/modules/README.misc_radius
+%%PORTDOCS%%%%RADIUS%%%%DOCSDIR%%/modules/README.peering
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_xmpp
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.xcap_client
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.xcap_server
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_conference
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_dialoginfo
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_mwi
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_profile
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_reginfo
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_xml
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_bla
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_dialoginfo
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_mi
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_reginfo
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_usrloc
+%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.rls