update to kamailio 3.2.3, mostly from Roman Kravchuk (taking maintainer,

previous maintainer ok).

telephony/kamailio/Makefile

@@ -1,31 +1,23 @@
-# $OpenBSD: Makefile,v 1.16 2011/11/03 07:40:20 jasper Exp $
+# $OpenBSD:
 
 COMMENT-main =		mature and flexible open source SIP server
 
 SHARED_ONLY =		Yes
 
-VERSION =		1.5.4
-DISTNAME =		kamailio-${VERSION}-tls_src
+VERSION =		3.2.3
+DISTNAME =		kamailio-${VERSION}_src
 PKGNAME-main =		kamailio-${VERSION}
-REVISION-main =		2
 PKGNAME-mysql =		kamailio-mysql-${VERSION}
-REVISION-mysql =	0
 PKGNAME-postgresql =	kamailio-postgresql-${VERSION}
-REVISION-postgresql =	0
-#PKGNAME-radius =	kamailio-radius-${VERSION}		TODO
 PKGNAME-ldap =		kamailio-ldap-${VERSION}
-REVISION-ldap =		0
 PKGNAME-xmlrpc =	kamailio-xmlrpc-${VERSION}
-REVISION-xmlrpc =	0
 PKGNAME-carrierroute =	kamailio-carrierroute-${VERSION}
-REVISION-carrierroute =	1
 PKGNAME-snmpstats =	kamailio-snmpstats-${VERSION}
-REVISION-snmpstats =	1
 PKGNAME-perl =		kamailio-perl-${VERSION}
-REVISION-perl =		1
+#PKGNAME-radius =	kamailio-radius-${VERSION}	TODO
 
 CATEGORIES =		telephony
-MAINTAINER =		Don Jackson <port-pkg-maint@clark-communications.com>
+MAINTAINER =		Roman Kravchuk <kravchuk.kp@gmail.com>
 
 HOMEPAGE =		http://www.kamailio.org/
 
@@ -35,22 +27,31 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-MAKE_ENV =		CC=${CC} FREERADIUS=1 LDFLAGS="${LDFLAGS} -pthread"
+SHARED_LIBS =		kcore	0.0	# 1.0
+SHARED_LIBS +=		kmi	0.0	# 1.0
+SHARED_LIBS +=		ser_cds	0.0	# 0.1
+SHARED_LIBS +=		srdb1	0.0	# 1.0
+SHARED_LIBS +=		srdb2	0.0	# 1.0
+SHARED_LIBS +=		trie	0.0	# 1.0
+
+MAKE_ENV =		CC="${CC}" LDFLAGS="${LDFLAGS} -pthread" QUIET=verbose
 
 MASTER_SITES =		http://www.kamailio.org/pub/kamailio/${VERSION}/src/
-WRKDIST =		${WRKDIR}/kamailio-${VERSION}-tls
+WRKDIST =		${WRKDIR}/kamailio-${VERSION}
 
 MODULES =		devel/gettext
-WANTLIB-main =		c crypto curl db expat pcre pthread ssl xml2
+WANTLIB-main =		c crypto curl db expat pcre pthread ssl xml2 \
+			idn ncurses readline z ${MODGETTEXT_WANTLIB}
 LIB_DEPENDS-main =	net/curl \
 			databases/db/v4 \
 			devel/pcre \
-			textproc/libxml,-main,no_python
+			textproc/libxml,-main,no_python \
+			${MODGETTEXT_LIB_DEPENDS}
 
 KAMAILIO_MODULES =	cpl-c db_berkeley dialplan jabber lcr \
 			presence presence_dialoginfo presence_mwi presence_xml \
 			pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp \
-			regex rls seas utils xcap_client xmpp
+			regex rls seas utils xcap_client xmpp tls
 
 FLAVOR ?=
 MULTI_PACKAGES =	-main
@@ -59,14 +60,20 @@ USE_GMAKE =		Yes
 USE_GROFF =		Yes
 NO_REGRESS =		Yes
 
-MAKE_FLAGS =	TLS=1 \
+MAKE_FLAGS =	FLAVOUR=kamailio \
 		LIBDIR=lib \
 		PREFIX=${TRUEPREFIX} \
 		BASEDIR=${WRKINST} \
 		cfg-prefix=${WRKINST} \
-		cfg-target=${SYSCONFDIR}/kamailio/ \
-		cfg-dir=${TRUEPREFIX}/share/examples/kamailio/ \
-		include_modules="${KAMAILIO_MODULES}"
+		SYSCONFDIR=${SYSCONFDIR} \
+		C_INCLUDES="-I${LOCALBASE}/include" \
+		include_modules="${KAMAILIO_MODULES}" \
+		LIBkcore_VERSION=${LIBkcore_VERSION} \
+		LIBkmi_VERSION=${LIBkmi_VERSION} \
+		LIBser_cds_VERSION=${LIBser_cds_VERSION} \
+		LIBsrdb1_VERSION=${LIBsrdb1_VERSION} \
+		LIBsrdb2_VERSION=${LIBsrdb2_VERSION} \
+		LIBtrie_VERSION=${LIBtrie_VERSION}
 
 PSEUDO_FLAVORS +=	no_postgresql
 .if !${FLAVOR:L:Mno_postgresql}
@@ -82,20 +89,10 @@ PSEUDO_FLAVORS +=	no_mysql
 MULTI_PACKAGES +=	-mysql
 COMMENT-mysql =		kamailio mysql module
 KAMAILIO_MODULES +=	db_mysql
-WANTLIB-mysql =		crypto m mysqlclient ssl z
+WANTLIB-mysql =		crypto m ssl z mysqlclient
 LIB_DEPENDS-mysql =	databases/mysql,-main
 .endif
 
-# TODO
-#PSEUDO_FLAVORS +=	no_radius
-#.if !${FLAVOR:L:Mno_radius}
-#MULTI_PACKAGES +=	-radius
-#COMMENT-radius =	kamailio RADIUS modules
-#KAMAILIO_MODULES +=	auth_radius misc_radius peering
-#WANTLIB-radius =	freeradius-client
-#LIB_DEPENDS-radius =	net/freeradius-client
-#.endif
-
 PSEUDO_FLAVORS +=	no_ldap
 .if !${FLAVOR:L:Mno_ldap}
 MULTI_PACKAGES +=	-ldap
@@ -130,9 +127,9 @@ PSEUDO_FLAVORS +=	no_carrierroute
 MULTI_PACKAGES +=	-carrierroute
 COMMENT-carrierroute =	kamailio carrierroute module
 KAMAILIO_MODULES +=	carrierroute
-WANTLIB-carrierroute =	confuse
-LIB_DEPENDS-carrierroute = devel/libconfuse
-RUN_DEPENDS-carrierroute = ${MODGETTEXT_RUN_DEPENDS}
+WANTLIB-carrierroute =	confuse ${MODGETTEXT_WANTLIB}
+LIB_DEPENDS-carrierroute = devel/libconfuse \
+			${MODGETTEXT_LIB_DEPENDS}
 .endif
 
 PSEUDO_FLAVORS +=	no_perl
@@ -145,13 +142,23 @@ LIB_DEPENDS-perl =
 RUN_DEPENDS-perl =	databases/p5-ldap
 .endif
 
+# TODO
+#PSEUDO_FLAVORS +=	no_radius
+#.if !${FLAVOR:L:Mno_radius}
+#MULTI_PACKAGES +=	-radius
+#COMMENT-radius =	kamailio RADIUS modules
+#KAMAILIO_MODULES +=	auth_radius misc_radius peering
+#WANTLIB-radius =	freeradius-client
+#LIB_DEPENDS-radius =	net/freeradius-client
+#.endif
+
 .for i in ${MULTI_PACKAGES:S/-main//}
 FULLPKGNAME$i ?=	kamailio$i-${VERSION}
 RUN_DEPENDS$i +=	kamailio-${VERSION}:telephony/kamailio
 .endfor
 
 pre-configure:
-	@perl -pi -e '$$. == 1 && s,#!/bin/bash,#!/bin/sh,;' \
-	    -e 's,exit -1,exit 255,' ${WRKSRC}/scripts/kam*
+	@perl -pi -e 's,#!/bin/bash,#!/bin/sh,;' \
+	    -e 's,exit -1,exit 255,' ${WRKSRC}/utils/kamctl/kam*
 
 .include <bsd.port.mk>

telephony/kamailio/distinfo

@@ -1,5 +1,5 @@
-MD5 (kamailio-1.5.4-tls_src.tar.gz) = VvR1LOqnE6ubQnxPvkLlcw==
-RMD160 (kamailio-1.5.4-tls_src.tar.gz) = i2iLm8DP+TYTt0kyU10G3kArrqk=
-SHA1 (kamailio-1.5.4-tls_src.tar.gz) = SeNvNcg7zHSiyR95w6cOfSEDjuA=
-SHA256 (kamailio-1.5.4-tls_src.tar.gz) = 5CWhZ0+yZ0DP5a6MbtjNf4zMiEMUYkhafLCgrV3f0cA=
-SIZE (kamailio-1.5.4-tls_src.tar.gz) = 3568416
+MD5 (kamailio-3.2.3_src.tar.gz) = Jzbdj0y0WkA5bga5GE0y6g==
+RMD160 (kamailio-3.2.3_src.tar.gz) = lKT1l14dOyySKXvZE1yaC1x2y3k=
+SHA1 (kamailio-3.2.3_src.tar.gz) = eQqNTbDXXa/heMr3vIlIqoEifys=
+SHA256 (kamailio-3.2.3_src.tar.gz) = ZzJTuz7C8MzLoPzdyMk7OkHaSh9jtSIHNu40jVyj0TE=
+SIZE (kamailio-3.2.3_src.tar.gz) = 7227846

telephony/kamailio/patches/patch-Makefile_defs

@@ -0,0 +1,45 @@
+$OpenBSD: patch-Makefile_defs,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- Makefile.defs.orig	Tue Jan 31 16:47:59 2012
++++ Makefile.defs	Tue Feb  7 00:05:46 2012
+@@ -422,7 +422,7 @@ endif
+ endif
+ 
+ # dirs
+-cfg_dir = etc/$(MAIN_NAME)/
++cfg_dir = share/examples/$(MAIN_NAME)/
+ bin_dir = sbin/
+ share_dir = share/$(MAIN_NAME)/
+ # lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s, lib/$(MAIN_NAME)/modules-k
+@@ -504,7 +504,7 @@ data_prefix = $(basedir)$(prefix)
+ 
+ 
+ # target dirs for various stuff
+-cfg_target = $(prefix)/$(cfg_dir)
++cfg_target = $(SYSCONFDIR)/$(MAIN_NAME)/
+ bin_target = $(prefix)/$(bin_dir)
+ #modules_target = $(prefix)/$(modules_dir)
+ lib_target = $(prefix)/$(lib_dir)
+@@ -940,7 +940,7 @@ ifeq	($(ARCH), x86_64)
+ ifeq		($(CC_NAME), gcc)
+ 				C_DEFS+=-DCC_GCC_LIKE_ASM
+ 				#common stuff
+-				CFLAGS=-g -O9 -funroll-loops  -Wcast-align $(PROFILE)
++				CFLAGS=
+ 			#if gcc 4.5+
+ 			# don't add '-mtune=$(CPU)' - gcc failure
+ ifeq			($(CC_SHORTVER), 4.5+)
+@@ -954,12 +954,8 @@ else
+ 			#if gcc 4.2+
+ ifeq			($(CC_SHORTVER), 4.2+)
+ $(call				set_if_empty,CPU,opteron)
+-					CFLAGS+=-m64 -minline-all-stringops \
+-							-falign-loops \
+-							-ftree-vectorize \
+-							-fno-strict-overflow \
+-							-mtune=$(CPU)
+-					LDFLAGS+=-m64
++					CFLAGS+=
++					LDFLAGS+=
+ else
+ 			#if gcc 4.0+
+ ifeq			($(CC_SHORTVER), 4.x)

telephony/kamailio/patches/patch-Makefile_libs

@@ -0,0 +1,64 @@
+$OpenBSD: patch-Makefile_libs,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- Makefile.libs.orig	Tue Jan 31 16:47:40 2012
++++ Makefile.libs	Tue Feb  7 00:57:41 2012
+@@ -57,14 +57,20 @@ ifeq ($(OS), darwin)
+ 	NAME_LD_FLAGS= -compatibility_version $(MAJOR_VER).$(MINOR_VER) \
+ 					-current_version $(MAJOR_VER).$(MINOR_VER).$(BUGFIX_VER) \
+ 					-install_name $(LIB_INSTALL_NAME)
+-
+ else
++ifeq ($(OS), openbsd)
++	LIB_NAME:=$(LIB_PREFIX)$(NAME)$(LIB_SUFFIX).$(OBSD_VER)
++	LIB_RUNTIME_NAME:=$(LIB_PREFIX)$(NAME)$(LIB_SUFFIX).$(OBSD_VER)
++	NAME_LD_FLAGS= $(LIB_SONAME)$(LIB_RUNTIME_NAME)
++	LIBINAME_F:=
++else
+ 	LIB_NAME:=$(LIB_PREFIX)$(NAME)$(LIB_SUFFIX).$(MAJOR_VER).$(MINOR_VER)
+ 	LIB_RUNTIME_NAME:=$(LIB_PREFIX)$(NAME)$(LIB_SUFFIX).$(MAJOR_VER)
+ 	LIB_LINK_NAME:=$(LIB_PREFIX)$(NAME)$(LIB_SUFFIX)
+ 	NAME_LD_FLAGS= $(LIB_SONAME)$(LIB_RUNTIME_NAME)
+ 	LIBINAME_F:=
+ endif
++endif
+ 
+ ifeq	($(strip $(compile_for_install)),yes)
+ 	LIB_INSTALL_NAME:=$(lib_target)/$(LIB_RUNTIME_NAME)
+@@ -111,14 +117,18 @@ endif
+ $(NAME): $(LIB_RUNTIME_NAME) $(LIB_LINK_NAME) $(LIBINAME_F)
+ 
+ $(LIB_RUNTIME_NAME):
++ifneq ($(OS), openbsd)
+ 	-@ln -s $(LIB_NAME) $(LIB_RUNTIME_NAME)
++endif
+ 
+ $(LIB_LINK_NAME):
+ ifeq ($(OS), freebsd)
+ 	-@ln -s $(LIB_RUNTIME_NAME) $(LIB_LINK_NAME)
+ else
++ifneq ($(OS), openbsd)
+ 	-@ln -s $(LIB_NAME) $(LIB_LINK_NAME)
+ endif
++endif
+ 
+ .PHONY: link_clean
+ link_clean:
+@@ -144,14 +154,18 @@ ifeq ($(OS), freebsd)
+ 	rm -f $(lib_prefix)/$(lib_dir)/$(LIB_LINK_NAME)
+ 	cd $(lib_prefix)/$(lib_dir) ; ln -s $(LIB_RUNTIME_NAME) $(LIB_LINK_NAME)
+ else
++ifeq ($(OS), openbsd)
+ 	$(INSTALL_TOUCH) $(lib_prefix)/$(lib_dir)/$(LIB_NAME)
+ 	$(INSTALL_LIB) $(LIB_NAME) $(lib_prefix)/$(lib_dir)
++else
++	$(INSTALL_TOUCH) $(lib_prefix)/$(lib_dir)/$(LIB_NAME)
++	$(INSTALL_LIB) $(LIB_NAME) $(lib_prefix)/$(lib_dir)
+ 	rm -f $(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME) \
+ 			$(lib_prefix)/$(lib_dir)/$(LIB_LINK_NAME) 
+ 	cd $(lib_prefix)/$(lib_dir) ; ln -s $(LIB_NAME) $(LIB_RUNTIME_NAME) 
+ 	cd $(lib_prefix)/$(lib_dir) ; ln -s $(LIB_NAME) $(LIB_LINK_NAME) 
+ endif
+-
++endif
+ 
+ .PHONY:install-if-newer
+ install-if-newer: $(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME)

telephony/kamailio/patches/patch-cfg_y

@@ -0,0 +1,11 @@
+$OpenBSD: patch-cfg_y,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- cfg.y.orig	Sat Apr 21 16:48:37 2012
++++ cfg.y	Sat Apr 21 16:49:33 2012
+@@ -111,6 +111,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+ #include <arpa/inet.h>
+ #include <string.h>

telephony/kamailio/patches/patch-etc_kamailio_cfg

@@ -1,13 +1,13 @@
-$OpenBSD: patch-etc_kamailio_cfg,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
---- etc/kamailio.cfg.orig	Wed Apr 29 14:58:51 2009
-+++ etc/kamailio.cfg	Wed May 13 12:31:58 2009
-@@ -63,6 +63,9 @@ log_facility=LOG_LOCAL0
+$OpenBSD: patch-etc_kamailio_cfg,v 1.2 2012/04/22 21:44:24 sthen Exp $
+--- etc/kamailio.cfg.orig	Fri Feb  3 15:02:24 2012
++++ etc/kamailio.cfg	Fri Feb  3 15:02:44 2012
+@@ -143,6 +143,9 @@ log_facility=LOG_LOCAL0
  fork=yes
  children=4
  
 +user="_kamailio"
 +group="_kamailio"
 +
- /* uncomment the following lines to enable debugging */
- #debug=6
- #fork=no
+ /* uncomment the next line to disable TCP (default on) */
+ #disable_tcp=yes
+ 

telephony/kamailio/patches/patch-lib_cds_Makefile

@@ -0,0 +1,11 @@
+$OpenBSD: patch-lib_cds_Makefile,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- lib/cds/Makefile.orig	Mon Feb  6 23:54:56 2012
++++ lib/cds/Makefile	Mon Feb  6 23:55:18 2012
+@@ -8,6 +8,7 @@ NAME:=ser_cds
+ MAJOR_VER=0
+ MINOR_VER=1
+ BUGFIX_VER=0
++OBSD_VER=$(LIBser_cds_VERSION)
+ DEFS+=-DSER
+ INCLUDES= -I$(CURDIR)/.. -I$(CURDIR)/../..
+ LIBS=

telephony/kamailio/patches/patch-lib_kcore_Makefile

@@ -0,0 +1,11 @@
+$OpenBSD: patch-lib_kcore_Makefile,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- lib/kcore/Makefile.orig	Mon Feb  6 23:55:58 2012
++++ lib/kcore/Makefile	Mon Feb  6 23:56:16 2012
+@@ -4,6 +4,7 @@ NAME:=kcore
+ MAJOR_VER=1
+ MINOR_VER=0
+ BUGFIX_VER=0
++OBSD_VER=$(LIBkcore_VERSION)
+ LIBS=
+ 
+ include ../../Makefile.libs

telephony/kamailio/patches/patch-lib_kmi_Makefile

@@ -0,0 +1,11 @@
+$OpenBSD: patch-lib_kmi_Makefile,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- lib/kmi/Makefile.orig	Mon Feb  6 23:56:26 2012
++++ lib/kmi/Makefile	Mon Feb  6 23:56:41 2012
+@@ -4,6 +4,7 @@ NAME:=kmi
+ MAJOR_VER=1
+ MINOR_VER=0
+ BUGFIX_VER=0
++OBSD_VER=$(LIBkmi_VERSION)
+ ## comment next line for using internal pkg malloc with MI
+ ## - when MI_SYSTEM_MALLOC is defined, OS malloc is used
+ DEFS+= -DMI_SYSTEM_MALLOC

telephony/kamailio/patches/patch-lib_srdb1_Makefile

@@ -0,0 +1,11 @@
+$OpenBSD: patch-lib_srdb1_Makefile,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- lib/srdb1/Makefile.orig	Mon Feb  6 23:57:05 2012
++++ lib/srdb1/Makefile	Mon Feb  6 23:57:20 2012
+@@ -4,6 +4,7 @@ NAME:=srdb1
+ MAJOR_VER=1
+ MINOR_VER=0
+ BUGFIX_VER=0
++OBSD_VER=$(LIBsrdb1_VERSION)
+ LIBS=
+ 
+ include ../../Makefile.libs

telephony/kamailio/patches/patch-lib_srdb2_Makefile

@@ -0,0 +1,11 @@
+$OpenBSD: patch-lib_srdb2_Makefile,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- lib/srdb2/Makefile.orig	Mon Feb  6 23:57:35 2012
++++ lib/srdb2/Makefile	Mon Feb  6 23:57:50 2012
+@@ -4,6 +4,7 @@ NAME:=srdb2
+ MAJOR_VER=1
+ MINOR_VER=0
+ BUGFIX_VER=0
++OBSD_VER=$(LIBsrdb2_VERSION)
+ LIBS=
+ 
+ include ../../Makefile.libs

telephony/kamailio/patches/patch-lib_trie_Makefile

@@ -0,0 +1,11 @@
+$OpenBSD: patch-lib_trie_Makefile,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- lib/trie/Makefile.orig	Mon Feb  6 23:58:05 2012
++++ lib/trie/Makefile	Mon Feb  6 23:58:18 2012
+@@ -4,6 +4,7 @@ NAME:=trie
+ MAJOR_VER=1
+ MINOR_VER=0
+ BUGFIX_VER=0
++OBSD_VER=$(LIBtrie_VERSION)
+ LIBS=
+ 
+ include ../../Makefile.libs

telephony/kamailio/patches/patch-modules_auth_auth_mod_c

@@ -0,0 +1,43 @@
+$OpenBSD: patch-modules_auth_auth_mod_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules/auth/auth_mod.c.orig	Thu Apr 19 15:10:24 2012
++++ modules/auth/auth_mod.c	Sun Apr 22 04:07:24 2012
+@@ -79,6 +79,9 @@ static int mod_init(void);
+  */
+ int w_consume_credentials(struct sip_msg* msg, char* s1, char* s2);
+ 
++int w_auth_challenge(struct sip_msg *msg, str *realm, int flags,
++		int hftype);
++
+ static int pv_proxy_authenticate(struct sip_msg* msg, char* realm,
+ 		char *passwd, char *flags);
+ static int pv_www_authenticate(struct sip_msg* msg, char* realm,
+@@ -635,6 +638,11 @@ static int auth_send_reply(struct sip_msg *msg, int co
+  */
+ int auth_challenge(struct sip_msg *msg, str *realm, int flags, int hftype)
+ {
++    return w_auth_challenge(msg, realm, flags, hftype);
++}
++
++int w_auth_challenge(struct sip_msg *msg, str *realm, int flags, int hftype)
++{
+     int ret, stale;
+     str hf = {0, 0};
+ 	struct qp *qop = NULL;
+@@ -706,7 +714,7 @@ static int proxy_challenge(struct sip_msg *msg, char* 
+ 		goto error;
+ 	}
+ 
+-	return auth_challenge(msg, &srealm, vflags, HDR_PROXYAUTH_T);
++	return w_auth_challenge(msg, &srealm, vflags, HDR_PROXYAUTH_T);
+ 
+ error:
+ 	if(!(vflags&4)) {
+@@ -739,7 +747,7 @@ static int www_challenge(struct sip_msg *msg, char* re
+ 		goto error;
+ 	}
+ 
+-	return auth_challenge(msg, &srealm, vflags, HDR_AUTHORIZATION_T);
++	return w_auth_challenge(msg, &srealm, vflags, HDR_AUTHORIZATION_T);
+ 
+ error:
+ 	if(!(vflags&4)) {

telephony/kamailio/patches/patch-modules_carrierroute_Makefile

@@ -1,9 +1,9 @@
-$OpenBSD: patch-modules_carrierroute_Makefile,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
---- modules/carrierroute/Makefile.orig	Wed May 13 19:28:11 2009
-+++ modules/carrierroute/Makefile	Wed May 13 19:28:42 2009
-@@ -17,8 +17,8 @@ ifeq ($(BUILDER),)
- 	CONFUSELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \
- 		-L/opt/lib -lconfuse
+$OpenBSD: patch-modules_carrierroute_Makefile,v 1.2 2012/04/22 21:44:24 sthen Exp $
+--- modules/carrierroute/Makefile.orig	Fri Feb  3 16:14:17 2012
++++ modules/carrierroute/Makefile	Fri Feb  3 16:14:53 2012
+@@ -23,8 +23,8 @@ ifeq ($(BUILDER),)
+ 		CONFUSELIBS = $(shell pkg-config --libs libconfuse)
+ 	endif
  else
 -		CONFUSEDEFS = $(shell confuse-config --cflags)
 -		CONFUSELIBS = $(shell confuse-config --libs)

telephony/kamailio/patches/patch-modules_db_berkeley_Makefile

@@ -0,0 +1,25 @@
+$OpenBSD: patch-modules_db_berkeley_Makefile,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules/db_berkeley/Makefile.orig	Tue Jan 31 16:47:40 2012
++++ modules/db_berkeley/Makefile	Fri Feb  3 15:24:29 2012
+@@ -11,10 +11,10 @@ NAME=db_berkeley.so
+ # extra debug messages
+ # -DBDB_EXTRA_DEBUG is optional
+ DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
+-	-I$(SYSBASE)/include
++	-I$(SYSBASE)/include -I$(LOCALBASE)/include/db4
+ 
+ 
+-LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb
++LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -L$(LOCALBASE)/lib/db4 -ldb
+ 
+ SERLIBPATH=../../lib
+ SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/kmi/kmi
+@@ -25,7 +25,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
+ # extra install for kamailio
+ 
+ install-berkeley-scripts: $(bin_prefix)/$(bin_dir)
+-		BERKELEYDBON=yes make -C ../../utils/kamctl/ install-modules
++		BERKELEYDBON=yes $(MAKE) -C ../../utils/kamctl/ install-modules
+ 
+ install-scripts: install-berkeley-scripts
+ 

telephony/kamailio/patches/patch-modules_db_mysql_my_cmd_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-modules_db_mysql_my_cmd_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules/db_mysql/my_cmd.c.orig	Sun Apr 22 22:25:29 2012
++++ modules/db_mysql/my_cmd.c	Sun Apr 22 22:25:57 2012
+@@ -47,6 +47,7 @@
+ #include "../../ut.h"
+ #include "../../dprint.h"
+ 
++#include <sys/types.h>
+ #include <strings.h>
+ #include <stdio.h>
+ #include <time.h>  /*strptime, XOPEN issue must be >=4 */

telephony/kamailio/patches/patch-modules_db_postgres_Makefile

@@ -0,0 +1,12 @@
+$OpenBSD: patch-modules_db_postgres_Makefile,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules/db_postgres/Makefile.orig	Fri Feb  3 15:08:40 2012
++++ modules/db_postgres/Makefile	Fri Feb  3 15:09:06 2012
+@@ -40,7 +40,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
+ # extra install for kamailio
+ 
+ install-pgsql-scripts: $(bin_prefix)/$(bin_dir)
+-		PGSQLON=yes make -C ../../utils/kamctl/ install-modules
++		PGSQLON=yes $(MAKE) -C ../../utils/kamctl/ install-modules
+ 
+ install-scripts: install-pgsql-scripts
+ 

telephony/kamailio/patches/patch-modules_ipops_ipops_mod_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-modules_ipops_ipops_mod_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules/ipops/ipops_mod.c.orig	Sun Apr 22 22:26:19 2012
++++ modules/ipops/ipops_mod.c	Sun Apr 22 22:26:33 2012
+@@ -37,6 +37,9 @@
+  * The ipops module provide IPv4 and IPv6 operations.
+  */
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

telephony/kamailio/patches/patch-modules_k_mi_datagram_datagram_fnc_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-modules_k_mi_datagram_datagram_fnc_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules_k/mi_datagram/datagram_fnc.c.orig	Sun Apr 22 22:28:35 2012
++++ modules_k/mi_datagram/datagram_fnc.c	Sun Apr 22 22:28:41 2012
+@@ -32,6 +32,9 @@
+  */
+ 
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <fcntl.h>

telephony/kamailio/patches/patch-modules_k_nat_traversal_nat_traversal_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-modules_k_nat_traversal_nat_traversal_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules_k/nat_traversal/nat_traversal.c.orig	Sun Apr 22 22:28:08 2012
++++ modules_k/nat_traversal/nat_traversal.c	Sun Apr 22 22:28:15 2012
+@@ -28,6 +28,8 @@
+ #include <errno.h>
+ #include <time.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+ #include "../../sr_module.h"

telephony/kamailio/patches/patch-modules_k_seas_seas_action_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-modules_k_seas_seas_action_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules_k/seas/seas_action.c.orig	Sun Apr 22 22:27:41 2012
++++ modules_k/seas/seas_action.c	Sun Apr 22 22:28:02 2012
+@@ -25,6 +25,9 @@
+  *
+  */
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <arpa/inet.h>

telephony/kamailio/patches/patch-modules_k_seas_seas_h

@@ -0,0 +1,13 @@
+$OpenBSD: patch-modules_k_seas_seas_h,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules_k/seas/seas.h.orig	Sun Apr 22 22:14:38 2012
++++ modules_k/seas/seas.h	Sun Apr 22 22:15:57 2012
+@@ -21,6 +21,9 @@
+ 
+ #ifndef _SEAS_H
+ #define _SEAS_H
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+ #include "../../str.h"/*str*/

telephony/kamailio/patches/patch-modules_k_snmpstats_Makefile

@@ -0,0 +1,12 @@
+$OpenBSD: patch-modules_k_snmpstats_Makefile,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules_k/snmpstats/Makefile.orig	Fri Feb  3 23:09:20 2012
++++ modules_k/snmpstats/Makefile	Fri Feb  3 23:10:29 2012
+@@ -27,7 +27,7 @@ SERLIBPATH=../../lib
+ SER_LIBS+=$(SERLIBPATH)/kcore/kcore
+ include ../../Makefile.modules
+ 
+-install_module_custom:
++install-scripts:
+ 	echo "installing mibs ..."
+ 	mkdir -p $(INSTALLMIBDIR)
+ 	$(INSTALL_CFG) mibs/OPENSER* $(INSTALLMIBDIR)

telephony/kamailio/patches/patch-modules_lcr_lcr_mod_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-modules_lcr_lcr_mod_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules/lcr/lcr_mod.c.orig	Sun Apr 22 22:24:08 2012
++++ modules/lcr/lcr_mod.c	Sun Apr 22 22:24:28 2012
+@@ -55,6 +55,9 @@
+  * least cost rules). Each such instance has its own LCR identifier.
+  */
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

telephony/kamailio/patches/patch-modules_mediaproxy_mediaproxy_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-modules_mediaproxy_mediaproxy_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules/mediaproxy/mediaproxy.c.orig	Sun Apr 22 22:26:56 2012
++++ modules/mediaproxy/mediaproxy.c	Sun Apr 22 22:27:32 2012
+@@ -19,6 +19,9 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>

telephony/kamailio/patches/patch-modules_misc_radius_functions_c

@@ -1,14 +0,0 @@
-$OpenBSD: patch-modules_misc_radius_functions_c,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
---- modules/misc_radius/functions.c.orig	Wed May 13 21:20:09 2009
-+++ modules/misc_radius/functions.c	Wed May 13 21:20:18 2009
-@@ -34,6 +34,10 @@
- /* Array for extra attribute values */
- static str val_arr[MAX_EXTRA];
- 
-+#ifndef UINT4
-+#define UINT4 uint32_t
-+#endif
-+
- /* Extract one reply item value to AVP flags, name and value */
- static inline int extract_avp(VALUE_PAIR* vp, unsigned short *flags,
- 			      int_str *name, int_str *value)

telephony/kamailio/patches/patch-modules_perl_Makefile

@@ -1,15 +0,0 @@
-$OpenBSD: patch-modules_perl_Makefile,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
---- modules/perl/Makefile.orig	Thu Oct 23 12:04:58 2008
-+++ modules/perl/Makefile	Mon Nov  3 21:33:22 2008
-@@ -5,6 +5,11 @@
- # 
- # WARNING: do not run this directly, it should be run by the master Makefile
- 
-+# Force inclusion due to bug in gmake 3.81 on OpenBSD which causes the 
-+# "export" command to fail when the variable name contains hyphens. (!)
-+ifeq ($(OS),openbsd)
-+	makefile_defs=0
-+endif
- include ../../Makefile.defs
- auto_gen=
- NAME=perl.so

telephony/kamailio/patches/patch-modules_s_eval_eval_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-modules_s_eval_eval_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules_s/eval/eval.c.orig	Fri Feb  3 14:41:50 2012
++++ modules_s/eval/eval.c	Fri Feb  3 14:42:00 2012
+@@ -30,6 +30,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
++#include <stdint.h>
+ #include "../../route.h"
+ #include "../../sr_module.h"
+ #include "../../mem/mem.h"

telephony/kamailio/patches/patch-modules_s_ldap_ld_con_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-modules_s_ldap_ld_con_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules_s/ldap/ld_con.c.orig	Sun Apr 22 22:29:03 2012
++++ modules_s/ldap/ld_con.c	Sun Apr 22 22:30:13 2012
+@@ -37,6 +37,7 @@
+ #include "../../dprint.h"
+ #include "../../ut.h"
+ 
++#define LDAP_DEPRECATED
+ #include <ldap.h>
+ #include <stdlib.h>
+ #include <string.h>

telephony/kamailio/patches/patch-modules_s_permissions_im_hash_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-modules_s_permissions_im_hash_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules_s/permissions/im_hash.c.orig	Sun Apr 22 22:16:10 2012
++++ modules_s/permissions/im_hash.c	Sun Apr 22 22:16:22 2012
+@@ -28,6 +28,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include "../../str.h"
+ #include "../../ut.h"

telephony/kamailio/patches/patch-modules_sipcapture_sipcapture_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-modules_sipcapture_sipcapture_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules/sipcapture/sipcapture.c.orig	Fri Feb  3 14:37:04 2012
++++ modules/sipcapture/sipcapture.c	Fri Feb  3 14:37:49 2012
+@@ -48,6 +48,7 @@
+ #ifndef __USE_BSD
+ #define __USE_BSD  /* on linux use bsd version of iphdr (more portable) */
+ #endif /* __USE_BSD */
++#include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+ #define __FAVOR_BSD /* on linux use bsd version of udphdr (more portable) */
+ #include <netinet/udp.h>

telephony/kamailio/patches/patch-modules_tls_tls_mod_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-modules_tls_tls_mod_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- modules/tls/tls_mod.c.orig	Sun Apr 22 22:24:56 2012
++++ modules/tls/tls_mod.c	Sun Apr 22 22:25:04 2012
+@@ -47,6 +47,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include "../../locking.h"
+ #include "../../sr_module.h"

telephony/kamailio/patches/patch-sched_yield_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-sched_yield_h,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- sched_yield.h.orig	Fri Feb  3 15:23:17 2012
++++ sched_yield.h	Fri Feb  3 15:23:35 2012
+@@ -35,7 +35,7 @@
+ #else
+ #include <unistd.h>
+ 	/* fake sched_yield */
+-#ifndef sched_yield()
++#ifndef sched_yield
+ 	#define sched_yield()	sleep(0)
+ #endif
+ #endif

telephony/kamailio/patches/patch-scripts_kamctl

@@ -1,21 +0,0 @@
-$OpenBSD: patch-scripts_kamctl,v 1.2 2009/09/12 09:42:04 sthen Exp $
---- scripts/kamctl.orig	Tue Jul 14 15:48:56 2009
-+++ scripts/kamctl	Sat Sep 12 09:04:33 2009
-@@ -56,7 +56,7 @@ fi
- if [ -f "$MYLIBDIR/kamctl.base" ]; then
- 	. "$MYLIBDIR/kamctl.base"
- else
--	echo -e "Cannot load core functions '$MYLIBDIR/kamctl.base' - exiting ...\n"
-+	printf "Cannot load core functions '$MYLIBDIR/kamctl.base' - exiting ...\n"
- 	exit -1
- fi
- 
-@@ -1795,7 +1795,7 @@ openser_stop() {
- options_ping() {
- 	myhost=`get_my_host`
- 	require_ctlengine
--	CMD="t_uac_dlg OPTIONS \"$1\" \".\" \".\" \"From:daemon@$myhost"$'\r\n'"To:<$1>"$'\r\n'"Contact:daemon@$myhost"$'\r\n'"\""
-+	CMD="t_uac_dlg OPTIONS \"$1\" \".\" \".\" \"From:daemon@$myhost"$(printf '\r\n')"To:<$1>"$(printf '\r\n')"Contact:daemon@$myhost"$(printf '\r\n')"\""
- 	RET=`$CTLCMD $CMD | head -1`
- 	print_status $RET
- }

telephony/kamailio/patches/patch-timer_c

@@ -0,0 +1,30 @@
+$OpenBSD: patch-timer_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- timer.c.orig	Sun Feb  5 00:24:53 2012
++++ timer.c	Sun Feb  5 00:33:11 2012
+@@ -337,7 +337,7 @@ again:
+ 				strerror(errno), errno);
+ 		goto error;
+ 	}
+-#ifdef __OS_darwin
++#if defined(__OS_darwin) ||  defined(__OpenBSD__)
+ 	/* workaround for darwin sigwait bug, see slow_timer_main() for more
+ 	   info (or grep __OS_darwin) */
+ 	/* keep in sync wih main.c: sig_usr() - signals we are interested in */
+@@ -1090,7 +1090,7 @@ ticks_t get_ticks()
+  *   -it  increments *s_idx (at the end it will be == *t_idx)
+  *   -all list operations are protected by the "slow" timer lock
+  */
+-#ifdef __OS_darwin
++#if defined(__OS_darwin) || defined(__OpenBSD__)
+ extern void sig_usr(int signo);
+ #endif
+ 
+@@ -1120,7 +1120,7 @@ void slow_timer_main()
+ 		}
+ #ifdef USE_SIGWAIT
+ 	if (sig!=SLOW_TIMER_SIG){
+-#ifdef __OS_darwin
++#if defined(__OS_darwin) || defined(__OpenBSD__)
+ 		/* on darwin sigwait is buggy: it will cause extreme slow down
+ 		   on signal delivery for the signals it doesn't wait on
+ 		   (on darwin 8.8.0, g4 1.5Ghz I've measured a 36s delay!).

telephony/kamailio/patches/patch-tls_tls_init_c

@@ -1,17 +0,0 @@
-$OpenBSD: patch-tls_tls_init_c,v 1.1 2010/10/04 08:46:51 sthen Exp $
-
-fix for openssl 1.0
-
---- tls/tls_init.c.orig	Sun Oct  3 23:42:58 2010
-+++ tls/tls_init.c	Sun Oct  3 23:43:44 2010
-@@ -536,8 +536,8 @@ static int check_for_krb(void)
- 	if (xx==NULL)
- 		return -1;
- 
--	for( j=0 ; j<M_sk_num(xx->cipher_list) ; j++) {
--		SSL_CIPHER *yy = (SSL_CIPHER*)M_sk_value(xx->cipher_list,j);
-+	for( j=0 ; j<sk_SSL_CIPHER_num(xx->cipher_list) ; j++) {
-+		SSL_CIPHER *yy = sk_SSL_CIPHER_value(xx->cipher_list,j);
- 		if ( yy->id>=SSL3_CK_KRB5_DES_64_CBC_SHA &&
- 		 yy->id<=SSL3_CK_KRB5_RC4_40_MD5 ) {
- 			LM_INFO("KRB5 cipher %s found\n", yy->name);

telephony/kamailio/patches/patch-utils_kamctl_kamctl

@@ -0,0 +1,21 @@
+$OpenBSD: patch-utils_kamctl_kamctl,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- utils/kamctl/kamctl.orig	Fri Feb  3 16:43:07 2012
++++ utils/kamctl/kamctl	Fri Feb  3 16:44:20 2012
+@@ -56,7 +56,7 @@ fi
+ if [ -f "$MYLIBDIR/kamctl.base" ]; then
+ 	. "$MYLIBDIR/kamctl.base"
+ else
+-	echo -e "Cannot load core functions '$MYLIBDIR/kamctl.base' - exiting ...\n"
++	printf "Cannot load core functions '$MYLIBDIR/kamctl.base' - exiting ...\n"
+ 	exit -1
+ fi
+ 
+@@ -1648,7 +1648,7 @@ openser_stop() {
+ options_ping() {
+ 	myhost=`get_my_host`
+ 	require_ctlengine
+-	CMD="t_uac_dlg OPTIONS \"$1\" \".\" \".\" \"From:sip:daemon@$myhost"$'\r\n'"To:<$1>"$'\r\n'"Contact:sip:daemon@$myhost"$'\r\n'"\""
++	CMD="t_uac_dlg OPTIONS \"$1\" \".\" \".\" \"From:sip:daemon@$myhost"$(printf '\r\n')"To:<$1>"$'\r\n'"Contact:sip:daemon@$myhost"$(printf '\r\n')"\""
+ 	RET=`$CTLCMD $CMD | head -1`
+ 	print_status $RET
+ }

telephony/kamailio/patches/patch-utils_kamctl_kamctl_base

@@ -1,7 +1,7 @@
-$OpenBSD: patch-scripts_kamdbctl_base,v 1.1 2009/09/12 09:42:04 sthen Exp $
---- scripts/kamdbctl.base.orig	Fri Sep 11 23:40:47 2009
-+++ scripts/kamdbctl.base	Fri Sep 11 23:42:25 2009
-@@ -134,7 +134,7 @@ credentials()
+$OpenBSD: patch-utils_kamctl_kamctl_base,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- utils/kamctl/kamctl.base.orig	Fri Feb  3 16:44:39 2012
++++ utils/kamctl/kamctl.base	Fri Feb  3 16:45:54 2012
+@@ -462,7 +462,7 @@ EOF
  mdbg() {
  	if [ "0$VERBOSE" -ne 0 ] ; then
  		if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -10,7 +10,7 @@ $OpenBSD: patch-scripts_kamdbctl_base,v 1.1 2009/09/12 09:42:04 sthen Exp $
  		else
  			echo "$1"
  		fi
-@@ -143,7 +143,7 @@ mdbg() {
+@@ -471,7 +471,7 @@ mdbg() {
  
  mwarn() {
  	if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -19,7 +19,7 @@ $OpenBSD: patch-scripts_kamdbctl_base,v 1.1 2009/09/12 09:42:04 sthen Exp $
  	else
  		echo "** WARNING: $1"
  	fi
-@@ -151,7 +151,7 @@ mwarn() {
+@@ -479,7 +479,7 @@ mwarn() {
  
  minfo() {
  	if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -28,7 +28,7 @@ $OpenBSD: patch-scripts_kamdbctl_base,v 1.1 2009/09/12 09:42:04 sthen Exp $
  	else
  		echo "** INFO: $1"
  	fi
-@@ -159,7 +159,7 @@ minfo() {
+@@ -487,7 +487,7 @@ minfo() {
  
  mecho() {
  	if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -37,7 +37,7 @@ $OpenBSD: patch-scripts_kamdbctl_base,v 1.1 2009/09/12 09:42:04 sthen Exp $
  	else
  		echo "$1"
  	fi
-@@ -167,7 +167,7 @@ mecho() {
+@@ -495,7 +495,7 @@ mecho() {
  
  merr() {
  	if [ -t 1 -a -z "$NOHLPRINT" ] ; then

telephony/kamailio/patches/patch-utils_kamctl_kamctlrc

@@ -1,7 +1,16 @@
-$OpenBSD: patch-scripts_kamctlrc,v 1.2 2009/09/12 09:42:04 sthen Exp $
---- scripts/kamctlrc.orig	Tue Jul 14 15:48:56 2009
-+++ scripts/kamctlrc	Fri Sep 11 23:39:57 2009
-@@ -135,8 +135,12 @@
+$OpenBSD: patch-utils_kamctl_kamctlrc,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- utils/kamctl/kamctlrc.orig	Fri Feb  3 16:46:23 2012
++++ utils/kamctl/kamctlrc	Fri Feb  3 16:47:08 2012
+@@ -61,7 +61,7 @@
+ 
+ 
+ # Program to calculate a message-digest fingerprint 
+-# MD5="md5sum"
++MD5="md5"
+ 
+ # awk tool
+ # AWK="awk"
+@@ -137,8 +137,11 @@
  
  ## OPENSER START Options
  ## PID file path - default is: /var/run/kamailio.pid
@@ -14,4 +23,3 @@ $OpenBSD: patch-scripts_kamctlrc,v 1.2 2009/09/12 09:42:04 sthen Exp $
 +
 +# Disable colour highlighting at the terminal
 +NOHLPRINT=1
-+

telephony/kamailio/patches/patch-utils_kamctl_kamdbctl

@@ -1,6 +1,6 @@
-$OpenBSD: patch-scripts_kamdbctl,v 1.3 2010/08/30 21:48:38 sthen Exp $
---- scripts/kamdbctl.orig	Tue Feb  2 19:12:20 2010
-+++ scripts/kamdbctl	Mon Aug 16 20:42:55 2010
+$OpenBSD: patch-utils_kamctl_kamdbctl,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- utils/kamctl/kamdbctl.orig	Fri Feb  3 16:47:27 2012
++++ utils/kamctl/kamdbctl	Fri Feb  3 16:47:46 2012
 @@ -51,7 +51,7 @@ fi
  if [ -f "$MYLIBDIR/kamdbctl.base" ]; then
  	. "$MYLIBDIR/kamdbctl.base"

telephony/kamailio/patches/patch-utils_kamctl_kamdbctl_base

@@ -1,7 +1,7 @@
-$OpenBSD: patch-scripts_kamctl_base,v 1.1 2009/09/12 09:42:04 sthen Exp $
---- scripts/kamctl.base.orig	Sat Sep 12 09:04:42 2009
-+++ scripts/kamctl.base	Sat Sep 12 09:05:05 2009
-@@ -522,7 +522,7 @@ USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_htable"
+$OpenBSD: patch-utils_kamctl_kamdbctl_base,v 1.1 2012/04/22 21:44:24 sthen Exp $
+--- utils/kamctl/kamdbctl.base.orig	Sat Apr 21 16:59:04 2012
++++ utils/kamctl/kamdbctl.base	Sat Apr 21 18:45:41 2012
+@@ -136,7 +136,7 @@ credentials()
  mdbg() {
  	if [ "0$VERBOSE" -ne 0 ] ; then
  		if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -10,7 +10,7 @@ $OpenBSD: patch-scripts_kamctl_base,v 1.1 2009/09/12 09:42:04 sthen Exp $
  		else
  			echo "$1"
  		fi
-@@ -531,7 +531,7 @@ mdbg() {
+@@ -145,7 +145,7 @@ mdbg() {
  
  mwarn() {
  	if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -19,7 +19,7 @@ $OpenBSD: patch-scripts_kamctl_base,v 1.1 2009/09/12 09:42:04 sthen Exp $
  	else
  		echo "** WARNING: $1"
  	fi
-@@ -539,7 +539,7 @@ mwarn() {
+@@ -153,7 +153,7 @@ mwarn() {
  
  minfo() {
  	if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -28,7 +28,7 @@ $OpenBSD: patch-scripts_kamctl_base,v 1.1 2009/09/12 09:42:04 sthen Exp $
  	else
  		echo "** INFO: $1"
  	fi
-@@ -547,7 +547,7 @@ minfo() {
+@@ -161,7 +161,7 @@ minfo() {
  
  mecho() {
  	if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -37,7 +37,7 @@ $OpenBSD: patch-scripts_kamctl_base,v 1.1 2009/09/12 09:42:04 sthen Exp $
  	else
  		echo "$1"
  	fi
-@@ -555,7 +555,7 @@ mecho() {
+@@ -169,7 +169,7 @@ mecho() {
  
  merr() {
  	if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -46,3 +46,15 @@ $OpenBSD: patch-scripts_kamctl_base,v 1.1 2009/09/12 09:42:04 sthen Exp $
  	else
  		echo "** ERROR: $1"
  	fi
+@@ -195,8 +195,8 @@ get_answer ()
+     else
+         ANSWER=${value}
+     fi
+-    ANSWER=${ANSWER:0:1}
+-    ANSWER=${ANSWER/Y/y}
+-    ANSWER=${ANSWER/N/n}
++    ANSWER=`echo ${ANSWER} | cut -c1`
++    ANSWER=`echo ${ANSWER} | sed 's/Y/y/'`
++    ANSWER=`echo ${ANSWER} | sed 's/N/n/'`
+ }
+ 

telephony/kamailio/pkg/DESCR-radius

@@ -1 +0,0 @@
-kamailio RADIUS modules

telephony/kamailio/pkg/MESSAGE-main

@@ -1,8 +0,0 @@
-To have kamailio start at boot time, you have to adapt
-${SYSCONFDIR}/kamailio/kamailio.cfg and insert the following
-into /etc/rc.local.
-
-if [ -x ${PREFIX}/sbin/kamctl ]; then
-        install -d -o _kamailio /var/run/kamailio
-        echo -n ' kamailio';   ${PREFIX}/sbin/kamctl start
-fi

telephony/kamailio/pkg/PLIST-carrierroute

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST-carrierroute,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
+@comment $OpenBSD: PLIST-carrierroute,v 1.2 2012/04/22 21:44:24 sthen Exp $
 lib/kamailio/modules/carrierroute.so
-share/doc/kamailio/README.carrierroute
+share/doc/kamailio/modules/README.carrierroute

telephony/kamailio/pkg/PLIST-ldap

@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST-ldap,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
-lib/kamailio/modules/h350.so
-lib/kamailio/modules/ldap.so
-share/doc/kamailio/README.h350
-share/doc/kamailio/README.ldap
+@comment $OpenBSD: PLIST-ldap,v 1.2 2012/04/22 21:44:24 sthen Exp $
+lib/kamailio/modules_k/h350.so
+lib/kamailio/modules_k/ldap.so
+lib/kamailio/modules_s/ldap.so
+share/doc/kamailio/modules_k/README.h350
+share/doc/kamailio/modules_k/README.ldap
+share/doc/kamailio/modules_s/README.ldap

telephony/kamailio/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2012/04/22 21:44:24 sthen Exp $
 @newgroup _kamailio:628
 @newuser _kamailio:628:628:daemon:Kamailio:/nonexistent:/sbin/nologin
 lib/kamailio/
@@ -10,222 +10,323 @@ lib/kamailio/kamctl/kamctl.ctlbase
 lib/kamailio/kamctl/kamctl.db_berkeley
 lib/kamailio/kamctl/kamctl.dbtext
 lib/kamailio/kamctl/kamctl.fifo
+lib/kamailio/kamctl/kamctl.ser
+lib/kamailio/kamctl/kamctl.ser_mi
 lib/kamailio/kamctl/kamctl.sqlbase
 lib/kamailio/kamctl/kamctl.unixsock
 lib/kamailio/kamctl/kamdbctl.base
 lib/kamailio/kamctl/kamdbctl.db_berkeley
 lib/kamailio/kamctl/kamdbctl.dbtext
+@lib lib/kamailio/libkcore.so.${LIBkcore_VERSION}
+@lib lib/kamailio/libkmi.so.${LIBkmi_VERSION}
+@lib lib/kamailio/libser_cds.so.${LIBser_cds_VERSION}
+@lib lib/kamailio/libsrdb1.so.${LIBsrdb1_VERSION}
+@lib lib/kamailio/libsrdb2.so.${LIBsrdb2_VERSION}
+@lib lib/kamailio/libtrie.so.${LIBtrie_VERSION}
 lib/kamailio/modules/
-lib/kamailio/modules/acc.so
-lib/kamailio/modules/alias_db.so
+lib/kamailio/modules/async.so
 lib/kamailio/modules/auth.so
-lib/kamailio/modules/auth_db.so
-lib/kamailio/modules/auth_diameter.so
 lib/kamailio/modules/avpops.so
-lib/kamailio/modules/benchmark.so
-lib/kamailio/modules/cfgutils.so
-lib/kamailio/modules/cpl-c.so
+lib/kamailio/modules/blst.so
+lib/kamailio/modules/cfg_db.so
+lib/kamailio/modules/cfg_rpc.so
+lib/kamailio/modules/counters.so
+lib/kamailio/modules/ctl.so
 lib/kamailio/modules/db_berkeley.so
 lib/kamailio/modules/db_flatstore.so
-lib/kamailio/modules/db_text.so
-lib/kamailio/modules/dialog.so
+lib/kamailio/modules/debugger.so
 lib/kamailio/modules/dialplan.so
-lib/kamailio/modules/dispatcher.so
-lib/kamailio/modules/diversion.so
-lib/kamailio/modules/domain.so
-lib/kamailio/modules/domainpolicy.so
 lib/kamailio/modules/enum.so
-lib/kamailio/modules/exec.so
-lib/kamailio/modules/group.so
-lib/kamailio/modules/htable.so
-lib/kamailio/modules/imc.so
-lib/kamailio/modules/jabber.so
+lib/kamailio/modules/ipops.so
 lib/kamailio/modules/lcr.so
-lib/kamailio/modules/maxfwd.so
+lib/kamailio/modules/malloc_test.so
+lib/kamailio/modules/matrix.so
 lib/kamailio/modules/mediaproxy.so
-lib/kamailio/modules/mi_datagram.so
-lib/kamailio/modules/mi_fifo.so
-lib/kamailio/modules/msilo.so
-lib/kamailio/modules/nat_traversal.so
-lib/kamailio/modules/nathelper.so
-lib/kamailio/modules/path.so
-lib/kamailio/modules/pdt.so
-lib/kamailio/modules/permissions.so
-lib/kamailio/modules/pike.so
-lib/kamailio/modules/presence.so
-lib/kamailio/modules/presence_dialoginfo.so
-lib/kamailio/modules/presence_mwi.so
-lib/kamailio/modules/presence_xml.so
-lib/kamailio/modules/pua.so
-lib/kamailio/modules/pua_bla.so
-lib/kamailio/modules/pua_dialoginfo.so
-lib/kamailio/modules/pua_mi.so
-lib/kamailio/modules/pua_usrloc.so
-lib/kamailio/modules/pua_xmpp.so
-lib/kamailio/modules/pv.so
-lib/kamailio/modules/qos.so
+lib/kamailio/modules/mi_rpc.so
+lib/kamailio/modules/mqueue.so
+lib/kamailio/modules/mtree.so
+lib/kamailio/modules/pdb.so
+lib/kamailio/modules/pipelimit.so
+lib/kamailio/modules/prefix_route.so
 lib/kamailio/modules/ratelimit.so
-lib/kamailio/modules/regex.so
-lib/kamailio/modules/registrar.so
-lib/kamailio/modules/rls.so
-lib/kamailio/modules/rr.so
-lib/kamailio/modules/rtimer.so
+lib/kamailio/modules/rtpproxy.so
 lib/kamailio/modules/sanity.so
-lib/kamailio/modules/seas.so
-lib/kamailio/modules/siptrace.so
-lib/kamailio/modules/siputils.so
+lib/kamailio/modules/sdpops.so
+lib/kamailio/modules/sipcapture.so
 lib/kamailio/modules/sl.so
 lib/kamailio/modules/sms.so
-lib/kamailio/modules/speeddial.so
-lib/kamailio/modules/sqlops.so
-lib/kamailio/modules/sst.so
-lib/kamailio/modules/statistics.so
-lib/kamailio/modules/textops.so
-lib/kamailio/modules/tlsops.so
+lib/kamailio/modules/textopsx.so
+lib/kamailio/modules/tls.so
 lib/kamailio/modules/tm.so
-lib/kamailio/modules/uac.so
-lib/kamailio/modules/uac_redirect.so
-lib/kamailio/modules/uri_db.so
-lib/kamailio/modules/userblacklist.so
-lib/kamailio/modules/usrloc.so
+lib/kamailio/modules/topoh.so
 lib/kamailio/modules/utils.so
-lib/kamailio/modules/xcap_client.so
-lib/kamailio/modules/xlog.so
-lib/kamailio/modules/xmpp.so
+lib/kamailio/modules/xhttp.so
+lib/kamailio/modules_k/
+lib/kamailio/modules_k/acc.so
+lib/kamailio/modules_k/alias_db.so
+lib/kamailio/modules_k/auth_db.so
+lib/kamailio/modules_k/auth_diameter.so
+lib/kamailio/modules_k/benchmark.so
+lib/kamailio/modules_k/call_control.so
+lib/kamailio/modules_k/cfgutils.so
+lib/kamailio/modules_k/cpl-c.so
+lib/kamailio/modules_k/db_text.so
+lib/kamailio/modules_k/dialog.so
+lib/kamailio/modules_k/dispatcher.so
+lib/kamailio/modules_k/diversion.so
+lib/kamailio/modules_k/dmq.so
+lib/kamailio/modules_k/domain.so
+lib/kamailio/modules_k/domainpolicy.so
+lib/kamailio/modules_k/drouting.so
+lib/kamailio/modules_k/exec.so
+lib/kamailio/modules_k/group.so
+lib/kamailio/modules_k/htable.so
+lib/kamailio/modules_k/imc.so
+lib/kamailio/modules_k/kex.so
+lib/kamailio/modules_k/maxfwd.so
+lib/kamailio/modules_k/mi_datagram.so
+lib/kamailio/modules_k/mi_fifo.so
+lib/kamailio/modules_k/msilo.so
+lib/kamailio/modules_k/nat_traversal.so
+lib/kamailio/modules_k/nathelper.so
+lib/kamailio/modules_k/p_usrloc.so
+lib/kamailio/modules_k/path.so
+lib/kamailio/modules_k/pdt.so
+lib/kamailio/modules_k/permissions.so
+lib/kamailio/modules_k/pike.so
+lib/kamailio/modules_k/presence.so
+lib/kamailio/modules_k/presence_dialoginfo.so
+lib/kamailio/modules_k/presence_mwi.so
+lib/kamailio/modules_k/presence_xml.so
+lib/kamailio/modules_k/pua.so
+lib/kamailio/modules_k/pua_bla.so
+lib/kamailio/modules_k/pua_dialoginfo.so
+lib/kamailio/modules_k/pua_mi.so
+lib/kamailio/modules_k/pua_usrloc.so
+lib/kamailio/modules_k/pua_xmpp.so
+lib/kamailio/modules_k/pv.so
+lib/kamailio/modules_k/qos.so
+lib/kamailio/modules_k/regex.so
+lib/kamailio/modules_k/registrar.so
+lib/kamailio/modules_k/rls.so
+lib/kamailio/modules_k/rr.so
+lib/kamailio/modules_k/rtimer.so
+lib/kamailio/modules_k/seas.so
+lib/kamailio/modules_k/siptrace.so
+lib/kamailio/modules_k/siputils.so
+lib/kamailio/modules_k/speeddial.so
+lib/kamailio/modules_k/sqlops.so
+lib/kamailio/modules_k/sst.so
+lib/kamailio/modules_k/statistics.so
+lib/kamailio/modules_k/textops.so
+lib/kamailio/modules_k/tmx.so
+lib/kamailio/modules_k/uac.so
+lib/kamailio/modules_k/uac_redirect.so
+lib/kamailio/modules_k/uri_db.so
+lib/kamailio/modules_k/userblacklist.so
+lib/kamailio/modules_k/usrloc.so
+lib/kamailio/modules_k/xcap_client.so
+lib/kamailio/modules_k/xlog.so
+lib/kamailio/modules_k/xmpp.so
+lib/kamailio/modules_s/
+lib/kamailio/modules_s/acc_db.so
+lib/kamailio/modules_s/acc_syslog.so
+lib/kamailio/modules_s/auth_db.so
+lib/kamailio/modules_s/avp.so
+lib/kamailio/modules_s/avp_db.so
+lib/kamailio/modules_s/cpl-c.so
+lib/kamailio/modules_s/db_ops.so
+lib/kamailio/modules_s/dialog.so
+lib/kamailio/modules_s/dispatcher.so
+lib/kamailio/modules_s/diversion.so
+lib/kamailio/modules_s/domain.so
+lib/kamailio/modules_s/eval.so
+lib/kamailio/modules_s/exec.so
+lib/kamailio/modules_s/fifo.so
+lib/kamailio/modules_s/gflags.so
+lib/kamailio/modules_s/maxfwd.so
+lib/kamailio/modules_s/msilo.so
+lib/kamailio/modules_s/nathelper.so
+lib/kamailio/modules_s/options.so
+lib/kamailio/modules_s/pdt.so
+lib/kamailio/modules_s/permissions.so
+lib/kamailio/modules_s/pike.so
+lib/kamailio/modules_s/print.so
+lib/kamailio/modules_s/registrar.so
+lib/kamailio/modules_s/rr.so
+lib/kamailio/modules_s/speeddial.so
+lib/kamailio/modules_s/textops.so
+lib/kamailio/modules_s/timer.so
+lib/kamailio/modules_s/uac.so
+lib/kamailio/modules_s/uri.so
+lib/kamailio/modules_s/uri_db.so
+lib/kamailio/modules_s/usrloc.so
+lib/kamailio/modules_s/xlog.so
 @man man/man5/kamailio.cfg.5
 @man man/man8/kamailio.8
 @man man/man8/kamctl.8
 @man man/man8/kamdbctl.8
-@man man/man8/kamunix.8
 @bin sbin/kamailio
 @bin sbin/kambdb_recover
 sbin/kamctl
 sbin/kamdbctl
-@bin sbin/kamunix
+@bin sbin/sercmd
 share/doc/kamailio/
 share/doc/kamailio/AUTHORS
 share/doc/kamailio/INSTALL
 share/doc/kamailio/NEWS
 share/doc/kamailio/README
 share/doc/kamailio/README-MODULES
-share/doc/kamailio/README.acc
-share/doc/kamailio/README.alias_db
-share/doc/kamailio/README.auth
-share/doc/kamailio/README.auth_db
-share/doc/kamailio/README.auth_diameter
-share/doc/kamailio/README.avpops
-share/doc/kamailio/README.benchmark
-share/doc/kamailio/README.cfgutils
-share/doc/kamailio/README.cpl-c
-share/doc/kamailio/README.db_berkeley
-share/doc/kamailio/README.db_flatstore
-share/doc/kamailio/README.db_text
-share/doc/kamailio/README.dialog
-share/doc/kamailio/README.dialplan
-share/doc/kamailio/README.dispatcher
-share/doc/kamailio/README.diversion
-share/doc/kamailio/README.domain
-share/doc/kamailio/README.domainpolicy
-share/doc/kamailio/README.enum
-share/doc/kamailio/README.exec
-share/doc/kamailio/README.group
-share/doc/kamailio/README.htable
-share/doc/kamailio/README.imc
-share/doc/kamailio/README.jabber
-share/doc/kamailio/README.lcr
-share/doc/kamailio/README.maxfwd
-share/doc/kamailio/README.mediaproxy
-share/doc/kamailio/README.mi_datagram
-share/doc/kamailio/README.mi_fifo
-share/doc/kamailio/README.msilo
-share/doc/kamailio/README.nat_traversal
-share/doc/kamailio/README.nathelper
-share/doc/kamailio/README.path
-share/doc/kamailio/README.pdt
-share/doc/kamailio/README.permissions
-share/doc/kamailio/README.pike
-share/doc/kamailio/README.presence
-share/doc/kamailio/README.presence_dialoginfo
-share/doc/kamailio/README.presence_mwi
-share/doc/kamailio/README.presence_xml
-share/doc/kamailio/README.pua
-share/doc/kamailio/README.pua_bla
-share/doc/kamailio/README.pua_dialoginfo
-share/doc/kamailio/README.pua_mi
-share/doc/kamailio/README.pua_usrloc
-share/doc/kamailio/README.pua_xmpp
-share/doc/kamailio/README.pv
-share/doc/kamailio/README.qos
-share/doc/kamailio/README.ratelimit
-share/doc/kamailio/README.regex
-share/doc/kamailio/README.registrar
-share/doc/kamailio/README.rls
-share/doc/kamailio/README.rr
-share/doc/kamailio/README.rtimer
-share/doc/kamailio/README.sanity
-share/doc/kamailio/README.seas
-share/doc/kamailio/README.siptrace
-share/doc/kamailio/README.siputils
-share/doc/kamailio/README.sl
-share/doc/kamailio/README.sms
-share/doc/kamailio/README.speeddial
-share/doc/kamailio/README.sqlops
-share/doc/kamailio/README.sst
-share/doc/kamailio/README.statistics
-share/doc/kamailio/README.textops
-share/doc/kamailio/README.tlsops
-share/doc/kamailio/README.tm
-share/doc/kamailio/README.uac
-share/doc/kamailio/README.uac_redirect
-share/doc/kamailio/README.uri_db
-share/doc/kamailio/README.userblacklist
-share/doc/kamailio/README.usrloc
-share/doc/kamailio/README.utils
-share/doc/kamailio/README.xcap_client
-share/doc/kamailio/README.xlog
-share/doc/kamailio/README.xmpp
+share/doc/kamailio/modules/
+share/doc/kamailio/modules/README.async
+share/doc/kamailio/modules/README.auth
+share/doc/kamailio/modules/README.avpops
+share/doc/kamailio/modules/README.blst
+share/doc/kamailio/modules/README.cfg_db
+share/doc/kamailio/modules/README.cfg_rpc
+share/doc/kamailio/modules/README.counters
+share/doc/kamailio/modules/README.ctl
+share/doc/kamailio/modules/README.db_berkeley
+share/doc/kamailio/modules/README.db_flatstore
+share/doc/kamailio/modules/README.debugger
+share/doc/kamailio/modules/README.dialplan
+share/doc/kamailio/modules/README.enum
+share/doc/kamailio/modules/README.ipops
+share/doc/kamailio/modules/README.lcr
+share/doc/kamailio/modules/README.malloc_test
+share/doc/kamailio/modules/README.matrix
+share/doc/kamailio/modules/README.mediaproxy
+share/doc/kamailio/modules/README.mi_rpc
+share/doc/kamailio/modules/README.mqueue
+share/doc/kamailio/modules/README.mtree
+share/doc/kamailio/modules/README.pdb
+share/doc/kamailio/modules/README.pipelimit
+share/doc/kamailio/modules/README.prefix_route
+share/doc/kamailio/modules/README.ratelimit
+share/doc/kamailio/modules/README.rtpproxy
+share/doc/kamailio/modules/README.sanity
+share/doc/kamailio/modules/README.sdpops
+share/doc/kamailio/modules/README.sipcapture
+share/doc/kamailio/modules/README.sl
+share/doc/kamailio/modules/README.sms
+share/doc/kamailio/modules/README.textopsx
+share/doc/kamailio/modules/README.tls
+share/doc/kamailio/modules/README.tm
+share/doc/kamailio/modules/README.topoh
+share/doc/kamailio/modules/README.utils
+share/doc/kamailio/modules/README.xhttp
+share/doc/kamailio/modules_k/
+share/doc/kamailio/modules_k/README.acc
+share/doc/kamailio/modules_k/README.alias_db
+share/doc/kamailio/modules_k/README.auth_db
+share/doc/kamailio/modules_k/README.auth_diameter
+share/doc/kamailio/modules_k/README.benchmark
+share/doc/kamailio/modules_k/README.call_control
+share/doc/kamailio/modules_k/README.cfgutils
+share/doc/kamailio/modules_k/README.cpl-c
+share/doc/kamailio/modules_k/README.db_text
+share/doc/kamailio/modules_k/README.dialog
+share/doc/kamailio/modules_k/README.dispatcher
+share/doc/kamailio/modules_k/README.diversion
+share/doc/kamailio/modules_k/README.dmq
+share/doc/kamailio/modules_k/README.domain
+share/doc/kamailio/modules_k/README.domainpolicy
+share/doc/kamailio/modules_k/README.drouting
+share/doc/kamailio/modules_k/README.exec
+share/doc/kamailio/modules_k/README.group
+share/doc/kamailio/modules_k/README.htable
+share/doc/kamailio/modules_k/README.imc
+share/doc/kamailio/modules_k/README.kex
+share/doc/kamailio/modules_k/README.maxfwd
+share/doc/kamailio/modules_k/README.mi_datagram
+share/doc/kamailio/modules_k/README.mi_fifo
+share/doc/kamailio/modules_k/README.msilo
+share/doc/kamailio/modules_k/README.nat_traversal
+share/doc/kamailio/modules_k/README.nathelper
+share/doc/kamailio/modules_k/README.p_usrloc
+share/doc/kamailio/modules_k/README.path
+share/doc/kamailio/modules_k/README.pdt
+share/doc/kamailio/modules_k/README.permissions
+share/doc/kamailio/modules_k/README.pike
+share/doc/kamailio/modules_k/README.presence
+share/doc/kamailio/modules_k/README.presence_dialoginfo
+share/doc/kamailio/modules_k/README.presence_mwi
+share/doc/kamailio/modules_k/README.presence_xml
+share/doc/kamailio/modules_k/README.pua
+share/doc/kamailio/modules_k/README.pua_bla
+share/doc/kamailio/modules_k/README.pua_dialoginfo
+share/doc/kamailio/modules_k/README.pua_mi
+share/doc/kamailio/modules_k/README.pua_usrloc
+share/doc/kamailio/modules_k/README.pua_xmpp
+share/doc/kamailio/modules_k/README.pv
+share/doc/kamailio/modules_k/README.qos
+share/doc/kamailio/modules_k/README.regex
+share/doc/kamailio/modules_k/README.registrar
+share/doc/kamailio/modules_k/README.rls
+share/doc/kamailio/modules_k/README.rr
+share/doc/kamailio/modules_k/README.rtimer
+share/doc/kamailio/modules_k/README.seas
+share/doc/kamailio/modules_k/README.siptrace
+share/doc/kamailio/modules_k/README.siputils
+share/doc/kamailio/modules_k/README.speeddial
+share/doc/kamailio/modules_k/README.sqlops
+share/doc/kamailio/modules_k/README.sst
+share/doc/kamailio/modules_k/README.statistics
+share/doc/kamailio/modules_k/README.textops
+share/doc/kamailio/modules_k/README.tmx
+share/doc/kamailio/modules_k/README.uac
+share/doc/kamailio/modules_k/README.uac_redirect
+share/doc/kamailio/modules_k/README.uri_db
+share/doc/kamailio/modules_k/README.userblacklist
+share/doc/kamailio/modules_k/README.usrloc
+share/doc/kamailio/modules_k/README.xcap_client
+share/doc/kamailio/modules_k/README.xlog
+share/doc/kamailio/modules_k/README.xmpp
+share/doc/kamailio/modules_s/
+share/doc/kamailio/modules_s/README.acc_syslog
+share/doc/kamailio/modules_s/README.auth_db
+share/doc/kamailio/modules_s/README.avp
+share/doc/kamailio/modules_s/README.avp_db
+share/doc/kamailio/modules_s/README.cpl-c
+share/doc/kamailio/modules_s/README.db_ops
+share/doc/kamailio/modules_s/README.dispatcher
+share/doc/kamailio/modules_s/README.diversion
+share/doc/kamailio/modules_s/README.domain
+share/doc/kamailio/modules_s/README.eval
+share/doc/kamailio/modules_s/README.exec
+share/doc/kamailio/modules_s/README.fifo
+share/doc/kamailio/modules_s/README.gflags
+share/doc/kamailio/modules_s/README.maxfwd
+share/doc/kamailio/modules_s/README.msilo
+share/doc/kamailio/modules_s/README.nathelper
+share/doc/kamailio/modules_s/README.options
+share/doc/kamailio/modules_s/README.pdt
+share/doc/kamailio/modules_s/README.permissions
+share/doc/kamailio/modules_s/README.pike
+share/doc/kamailio/modules_s/README.print
+share/doc/kamailio/modules_s/README.registrar
+share/doc/kamailio/modules_s/README.rr
+share/doc/kamailio/modules_s/README.speeddial
+share/doc/kamailio/modules_s/README.textops
+share/doc/kamailio/modules_s/README.timer
+share/doc/kamailio/modules_s/README.uac
+share/doc/kamailio/modules_s/README.uri
+share/doc/kamailio/modules_s/README.uri_db
+share/doc/kamailio/modules_s/README.usrloc
+share/doc/kamailio/modules_s/README.xlog
 share/examples/kamailio/
 @sample ${SYSCONFDIR}/kamailio/
+@comment share/examples/kamailio/dictionary.kamailio
+share/examples/kamailio/kamailio-selfsigned.key
+@sample ${SYSCONFDIR}/kamailio/kamailio-selfsigned.key
+share/examples/kamailio/kamailio-selfsigned.pem
+@sample ${SYSCONFDIR}/kamailio/kamailio-selfsigned.pem
 share/examples/kamailio/kamailio.cfg
 @sample ${SYSCONFDIR}/kamailio/kamailio.cfg
 share/examples/kamailio/kamctlrc
 @sample ${SYSCONFDIR}/kamailio/kamctlrc
-share/examples/kamailio/tls/
-@sample ${SYSCONFDIR}/kamailio/tls/
-share/examples/kamailio/tls/README
-@sample ${SYSCONFDIR}/kamailio/tls/README
-share/examples/kamailio/tls/ca.conf
-@sample ${SYSCONFDIR}/kamailio/tls/ca.conf
-share/examples/kamailio/tls/request.conf
-@sample ${SYSCONFDIR}/kamailio/tls/request.conf
-share/examples/kamailio/tls/rootCA/
-@sample ${SYSCONFDIR}/kamailio/tls/rootCA/
-share/examples/kamailio/tls/rootCA/cacert.pem
-@sample ${SYSCONFDIR}/kamailio/tls/rootCA/cacert.pem
-share/examples/kamailio/tls/rootCA/certs/
-@sample ${SYSCONFDIR}/kamailio/tls/rootCA/certs/
-share/examples/kamailio/tls/rootCA/certs/01.pem
-@sample ${SYSCONFDIR}/kamailio/tls/rootCA/certs/01.pem
-share/examples/kamailio/tls/rootCA/index.txt
-@sample ${SYSCONFDIR}/kamailio/tls/rootCA/index.txt
-share/examples/kamailio/tls/rootCA/private/
-@sample ${SYSCONFDIR}/kamailio/tls/rootCA/private/
-share/examples/kamailio/tls/rootCA/private/cakey.pem
-@sample ${SYSCONFDIR}/kamailio/tls/rootCA/private/cakey.pem
-share/examples/kamailio/tls/rootCA/serial
-@sample ${SYSCONFDIR}/kamailio/tls/rootCA/serial
-share/examples/kamailio/tls/user/
-@sample ${SYSCONFDIR}/kamailio/tls/user/
-share/examples/kamailio/tls/user.conf
-@sample ${SYSCONFDIR}/kamailio/tls/user.conf
-share/examples/kamailio/tls/user/user-calist.pem
-@sample ${SYSCONFDIR}/kamailio/tls/user/user-calist.pem
-share/examples/kamailio/tls/user/user-cert.pem
-@sample ${SYSCONFDIR}/kamailio/tls/user/user-cert.pem
-share/examples/kamailio/tls/user/user-cert_req.pem
-@sample ${SYSCONFDIR}/kamailio/tls/user/user-cert_req.pem
-share/examples/kamailio/tls/user/user-privkey.pem
-@sample ${SYSCONFDIR}/kamailio/tls/user/user-privkey.pem
+share/examples/kamailio/tls.cfg
+@sample ${SYSCONFDIR}/kamailio/tls.cfg
 share/kamailio/
 share/kamailio/db_berkeley/
 share/kamailio/db_berkeley/kamailio/
@@ -239,21 +340,31 @@ share/kamailio/db_berkeley/kamailio/carrierroute
 share/kamailio/db_berkeley/kamailio/cpl
 share/kamailio/db_berkeley/kamailio/dbaliases
 share/kamailio/db_berkeley/kamailio/dialog
+share/kamailio/db_berkeley/kamailio/dialog_vars
 share/kamailio/db_berkeley/kamailio/dialplan
 share/kamailio/db_berkeley/kamailio/dispatcher
 share/kamailio/db_berkeley/kamailio/domain
 share/kamailio/db_berkeley/kamailio/domain_name
 share/kamailio/db_berkeley/kamailio/domainpolicy
+share/kamailio/db_berkeley/kamailio/dr_gateways
+share/kamailio/db_berkeley/kamailio/dr_groups
+share/kamailio/db_berkeley/kamailio/dr_gw_lists
+share/kamailio/db_berkeley/kamailio/dr_rules
 share/kamailio/db_berkeley/kamailio/globalblacklist
 share/kamailio/db_berkeley/kamailio/grp
-share/kamailio/db_berkeley/kamailio/gw
 share/kamailio/db_berkeley/kamailio/htable
 share/kamailio/db_berkeley/kamailio/imc_members
 share/kamailio/db_berkeley/kamailio/imc_rooms
-share/kamailio/db_berkeley/kamailio/lcr
+share/kamailio/db_berkeley/kamailio/lcr_gw
+share/kamailio/db_berkeley/kamailio/lcr_rule
+share/kamailio/db_berkeley/kamailio/lcr_rule_target
 share/kamailio/db_berkeley/kamailio/location
+share/kamailio/db_berkeley/kamailio/matrix
 share/kamailio/db_berkeley/kamailio/missed_calls
+share/kamailio/db_berkeley/kamailio/mtree
+share/kamailio/db_berkeley/kamailio/mtrees
 share/kamailio/db_berkeley/kamailio/pdt
+share/kamailio/db_berkeley/kamailio/pl_pipes
 share/kamailio/db_berkeley/kamailio/presentity
 share/kamailio/db_berkeley/kamailio/pua
 share/kamailio/db_berkeley/kamailio/purplemap
@@ -265,6 +376,7 @@ share/kamailio/db_berkeley/kamailio/sip_trace
 share/kamailio/db_berkeley/kamailio/speed_dial
 share/kamailio/db_berkeley/kamailio/subscriber
 share/kamailio/db_berkeley/kamailio/trusted
+share/kamailio/db_berkeley/kamailio/uacreg
 share/kamailio/db_berkeley/kamailio/uri
 share/kamailio/db_berkeley/kamailio/userblacklist
 share/kamailio/db_berkeley/kamailio/usr_preferences
@@ -283,21 +395,31 @@ share/kamailio/dbtext/kamailio/carrierroute
 share/kamailio/dbtext/kamailio/cpl
 share/kamailio/dbtext/kamailio/dbaliases
 share/kamailio/dbtext/kamailio/dialog
+share/kamailio/dbtext/kamailio/dialog_vars
 share/kamailio/dbtext/kamailio/dialplan
 share/kamailio/dbtext/kamailio/dispatcher
 share/kamailio/dbtext/kamailio/domain
 share/kamailio/dbtext/kamailio/domain_name
 share/kamailio/dbtext/kamailio/domainpolicy
+share/kamailio/dbtext/kamailio/dr_gateways
+share/kamailio/dbtext/kamailio/dr_groups
+share/kamailio/dbtext/kamailio/dr_gw_lists
+share/kamailio/dbtext/kamailio/dr_rules
 share/kamailio/dbtext/kamailio/globalblacklist
 share/kamailio/dbtext/kamailio/grp
-share/kamailio/dbtext/kamailio/gw
 share/kamailio/dbtext/kamailio/htable
 share/kamailio/dbtext/kamailio/imc_members
 share/kamailio/dbtext/kamailio/imc_rooms
-share/kamailio/dbtext/kamailio/lcr
+share/kamailio/dbtext/kamailio/lcr_gw
+share/kamailio/dbtext/kamailio/lcr_rule
+share/kamailio/dbtext/kamailio/lcr_rule_target
 share/kamailio/dbtext/kamailio/location
+share/kamailio/dbtext/kamailio/matrix
 share/kamailio/dbtext/kamailio/missed_calls
+share/kamailio/dbtext/kamailio/mtree
+share/kamailio/dbtext/kamailio/mtrees
 share/kamailio/dbtext/kamailio/pdt
+share/kamailio/dbtext/kamailio/pl_pipes
 share/kamailio/dbtext/kamailio/presentity
 share/kamailio/dbtext/kamailio/pua
 share/kamailio/dbtext/kamailio/purplemap
@@ -309,6 +431,7 @@ share/kamailio/dbtext/kamailio/sip_trace
 share/kamailio/dbtext/kamailio/speed_dial
 share/kamailio/dbtext/kamailio/subscriber
 share/kamailio/dbtext/kamailio/trusted
+share/kamailio/dbtext/kamailio/uacreg
 share/kamailio/dbtext/kamailio/uri
 share/kamailio/dbtext/kamailio/userblacklist
 share/kamailio/dbtext/kamailio/usr_preferences
@@ -317,3 +440,4 @@ share/kamailio/dbtext/kamailio/watchers
 share/kamailio/dbtext/kamailio/xcap
 @comment share/snmp/
 @comment share/snmp/mibs/
+@rcscript ${RCDIR}/kamailio

telephony/kamailio/pkg/PLIST-mysql

@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST-mysql,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
+@comment $OpenBSD: PLIST-mysql,v 1.2 2012/04/22 21:44:24 sthen Exp $
 lib/kamailio/kamctl/kamctl.mysql
 lib/kamailio/kamctl/kamdbctl.mysql
 lib/kamailio/modules/db_mysql.so
-share/doc/kamailio/README.db_mysql
+share/doc/kamailio/modules/README.db_mysql
 share/kamailio/mysql/
 share/kamailio/mysql/acc-create.sql
 share/kamailio/mysql/alias_db-create.sql
@@ -15,13 +15,17 @@ share/kamailio/mysql/dialplan-create.sql
 share/kamailio/mysql/dispatcher-create.sql
 share/kamailio/mysql/domain-create.sql
 share/kamailio/mysql/domainpolicy-create.sql
+share/kamailio/mysql/drouting-create.sql
 share/kamailio/mysql/group-create.sql
 share/kamailio/mysql/htable-create.sql
 share/kamailio/mysql/imc-create.sql
 share/kamailio/mysql/lcr-create.sql
+share/kamailio/mysql/matrix-create.sql
 share/kamailio/mysql/msilo-create.sql
+share/kamailio/mysql/mtree-create.sql
 share/kamailio/mysql/pdt-create.sql
 share/kamailio/mysql/permissions-create.sql
+share/kamailio/mysql/pipelimit-create.sql
 share/kamailio/mysql/presence-create.sql
 share/kamailio/mysql/purple-create.sql
 share/kamailio/mysql/registrar-create.sql
@@ -29,6 +33,7 @@ share/kamailio/mysql/rls-create.sql
 share/kamailio/mysql/siptrace-create.sql
 share/kamailio/mysql/speeddial-create.sql
 share/kamailio/mysql/standard-create.sql
+share/kamailio/mysql/uac-create.sql
 share/kamailio/mysql/uri_db-create.sql
 share/kamailio/mysql/userblacklist-create.sql
 share/kamailio/mysql/usrloc-create.sql

telephony/kamailio/pkg/PLIST-perl

@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST-perl,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
-lib/kamailio/modules/perl.so
-lib/kamailio/modules/perlvdb.so
+@comment $OpenBSD: PLIST-perl,v 1.2 2012/04/22 21:44:24 sthen Exp $
+lib/kamailio/modules_k/perl.so
+lib/kamailio/modules_k/perlvdb.so
 lib/kamailio/perl/
 lib/kamailio/perl/OpenSER/
 lib/kamailio/perl/OpenSER.pm
@@ -27,5 +27,5 @@ lib/kamailio/perl/OpenSER/VDB/ReqCond.pm
 lib/kamailio/perl/OpenSER/VDB/Result.pm
 lib/kamailio/perl/OpenSER/VDB/VTab.pm
 lib/kamailio/perl/OpenSER/VDB/Value.pm
-share/doc/kamailio/README.perl
-share/doc/kamailio/README.perlvdb
+share/doc/kamailio/modules_k/README.perl
+share/doc/kamailio/modules_k/README.perlvdb

telephony/kamailio/pkg/PLIST-postgresql

@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST-postgresql,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
+@comment $OpenBSD: PLIST-postgresql,v 1.2 2012/04/22 21:44:24 sthen Exp $
 lib/kamailio/kamctl/kamctl.pgsql
 lib/kamailio/kamctl/kamdbctl.pgsql
 lib/kamailio/modules/db_postgres.so
-share/doc/kamailio/README.db_postgres
+share/doc/kamailio/modules/README.db_postgres
 share/kamailio/postgres/
 share/kamailio/postgres/acc-create.sql
 share/kamailio/postgres/alias_db-create.sql
@@ -15,13 +15,17 @@ share/kamailio/postgres/dialplan-create.sql
 share/kamailio/postgres/dispatcher-create.sql
 share/kamailio/postgres/domain-create.sql
 share/kamailio/postgres/domainpolicy-create.sql
+share/kamailio/postgres/drouting-create.sql
 share/kamailio/postgres/group-create.sql
 share/kamailio/postgres/htable-create.sql
 share/kamailio/postgres/imc-create.sql
 share/kamailio/postgres/lcr-create.sql
+share/kamailio/postgres/matrix-create.sql
 share/kamailio/postgres/msilo-create.sql
+share/kamailio/postgres/mtree-create.sql
 share/kamailio/postgres/pdt-create.sql
 share/kamailio/postgres/permissions-create.sql
+share/kamailio/postgres/pipelimit-create.sql
 share/kamailio/postgres/presence-create.sql
 share/kamailio/postgres/purple-create.sql
 share/kamailio/postgres/registrar-create.sql
@@ -29,6 +33,7 @@ share/kamailio/postgres/rls-create.sql
 share/kamailio/postgres/siptrace-create.sql
 share/kamailio/postgres/speeddial-create.sql
 share/kamailio/postgres/standard-create.sql
+share/kamailio/postgres/uac-create.sql
 share/kamailio/postgres/uri_db-create.sql
 share/kamailio/postgres/userblacklist-create.sql
 share/kamailio/postgres/usrloc-create.sql

telephony/kamailio/pkg/PLIST-radius

@@ -1,9 +0,0 @@
-@comment $OpenBSD: PLIST-radius,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
-lib/kamailio/modules/auth_radius.so
-lib/kamailio/modules/misc_radius.so
-lib/kamailio/modules/peering.so
-share/doc/kamailio/README.auth_radius
-share/doc/kamailio/README.misc_radius
-share/doc/kamailio/README.peering
-share/examples/kamailio/dictionary.radius
-@sample ${SYSCONFDIR}/kamailio/dictionary.radius

telephony/kamailio/pkg/PLIST-snmpstats

@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST-snmpstats,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
-lib/kamailio/modules/snmpstats.so
-share/doc/kamailio/README.snmpstats
+@comment $OpenBSD: PLIST-snmpstats,v 1.2 2012/04/22 21:44:24 sthen Exp $
+lib/kamailio/modules_k/snmpstats.so
+share/doc/kamailio/modules_k/README.snmpstats
 share/snmp/mibs/OPENSER-MIB
 share/snmp/mibs/OPENSER-REG-MIB
 share/snmp/mibs/OPENSER-SIP-COMMON-MIB

telephony/kamailio/pkg/PLIST-xmlrpc

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST-xmlrpc,v 1.1.1.1 2009/06/04 13:44:09 sthen Exp $
-lib/kamailio/modules/mi_xmlrpc.so
-share/doc/kamailio/README.mi_xmlrpc
+@comment $OpenBSD: PLIST-xmlrpc,v 1.2 2012/04/22 21:44:24 sthen Exp $
+lib/kamailio/modules_k/mi_xmlrpc.so
+share/doc/kamailio/modules_k/README.mi_xmlrpc

telephony/kamailio/pkg/kamailio.rc

@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $OpenBSD:
+
+daemon="${TRUEPREFIX}/sbin/kamailio"
+
+. /etc/rc.d/rc.subr
+
+rc_pre() {
+	install -d -o _kamailio /var/run/kamailio
+}
+
+rc_start() {
+	${rcexec} "${TRUEPREFIX}/sbin/kamctl start"
+}
+
+rc_stop() {
+	${rcexec} "${TRUEPREFIX}/sbin/kamctl stop"
+}
+
+rc_reload=NO
+
+rc_cmd $1