On 2017/07/03 18:43, Roman Kravchuk wrote:
> Hi ports@,
>
> This is update kamailio port.
>
> Changelog:
> - update port to version 5.0.2
> - switched to use predefined module groups
> - moved berkeleydb\presence modules to subpackages
> - regen pathes (project changed structure)
> - included experimental fix for tls module to work with libressl without
> crash
>
> See
> https://www.kamailio.org/wiki/install/upgrade/4.3.x-to-4.4.0
> https://www.kamailio.org/wiki/install/upgrade/4.4.x-to-5.0.0
> for upgrade notes
>
>
> Ok? Comments?
Upstream has re-rolled the tarball. Can you check what they've changed please?
PLIST-xml needs this to be added,
@conflict kamailio-xmlrpc-*
@pkgpath telephony/kamailio,-xmlrpc
(and a quirks entry if it works) .. I can take care of that.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/Makefile,v
> retrieving revision 1.39
> diff -u -p -r1.39 Makefile
> --- Makefile 8 Nov 2016 14:23:59 -0000 1.39
> +++ Makefile 3 Jul 2017 15:11:23 -0000
> @@ -2,17 +2,20 @@
>
> COMMENT-main = mature and flexible open source SIP server
>
> -VERSION = 4.3.3
> -REVISION = 4
> +VERSION = 5.0.2
> +
> DISTNAME = kamailio-${VERSION}_src
> +
> PKGNAME-main = kamailio-${VERSION}
> +PKGNAME-berkeley = kamailio-berkeley-${VERSION}
> PKGNAME-mysql = kamailio-mysql-${VERSION}
> PKGNAME-postgresql = kamailio-postgresql-${VERSION}
> PKGNAME-ldap = kamailio-ldap-${VERSION}
> -PKGNAME-xmlrpc = kamailio-xmlrpc-${VERSION}
> +PKGNAME-xml = kamailio-xml-${VERSION}
> PKGNAME-carrierroute = kamailio-carrierroute-${VERSION}
> PKGNAME-snmpstats = kamailio-snmpstats-${VERSION}
> PKGNAME-perl = kamailio-perl-${VERSION}
> +PKGNAME-presence = kamailio-presence-${VERSION}
> #PKGNAME-radius = kamailio-radius-${VERSION} TODO
>
> CATEGORIES = telephony
> @@ -23,14 +26,10 @@ HOMEPAGE = http://www.kamailio.org/
> # GPLv2+
> PERMIT_PACKAGE_CDROM = Yes
>
> -SHARED_LIBS = kcore 3.0 # 1.0
> -SHARED_LIBS += kmi 3.0 # 1.0
> -SHARED_LIBS += srdb1 3.0 # 1.0
> -SHARED_LIBS += srdb2 3.0 # 1.0
> -SHARED_LIBS += trie 3.0 # 1.0
> -SHARED_LIBS += binrpc 2.0 # 0.1
> -SHARED_LIBS += srutils 2.0 # 1.0
> -SHARED_LIBS += print 1.0 # 1.2
> +SHARED_LIBS = srdb1 4.0 # 1.0
> +SHARED_LIBS += srdb2 4.0 # 1.0
> +SHARED_LIBS += trie 4.0 # 1.0
> +SHARED_LIBS += srutils 3.0 # 1.0
>
> MAKE_ENV = CC="${CC}" \
> CC_EXTRA_OPTS="${CFLAGS} -DOPENSSL_NO_BUF_FREELISTS
> -DHAVE_ARC4RANDOM -I${LOCALBASE}/include" \
> @@ -41,20 +40,16 @@ MASTER_SITES = http://www.kamailio.org/
> WRKDIST = ${WRKDIR}/kamailio-${VERSION}
>
> MODULES = devel/gettext
> -WANTLIB-main = c crypto curl db expat m pcre pthread ssl lzma
> xml2 nghttp2 \
> +WANTLIB-main = c crypto curl expat event_core event_extra m
> pcre pthread ssl lzma xml2 nghttp2 \
> ncurses readline unistring z ${MODGETTEXT_WANTLIB}
> LIB_DEPENDS-main = net/curl \
> - databases/db/v4,-main,no_java \
> + devel/libevent2 \
> devel/pcre \
> textproc/libxml,-main,no_python \
> converters/libunistring \
> ${MODGETTEXT_LIB_DEPENDS}
>
> -KAMAILIO_MODULES = cpl-c db_berkeley dialplan dialog_ng jabber lcr \
> - presence presence_dialoginfo presence_mwi
> presence_reginfo \
> - presence_xml pua pua_bla pua_dialoginfo pua_mi
> pua_reginfo \
> - pua_usrloc pua_xmpp regex rls seas utils xcap_client
> xmpp \
> - tls xhttp_pi websocket
> +KAMAILIO_GROUPS = kstandard kcpl khttp_async koutbound ktls kutils
> kwebsocket kxmpp
>
> FLAVOR ?=
> MULTI_PACKAGES = -main
> @@ -66,33 +61,39 @@ MAKE_FLAGS = LIBDIR=lib \
> PREFIX=${TRUEPREFIX} \
> BASEDIR=${WRKINST} \
> cfg-prefix=${WRKINST} \
> - SYSCONFDIR=${SYSCONFDIR} \
> - VARBASE=${VARBASE} \
> + cfg_dir=share/examples/kamailio/ \
> + cfg_target=${SYSCONFDIR}/kamailio/ \
> + run_target=${VARBASE}/run/kamailio/ \
> SCTP=0 \
> - include_modules="${KAMAILIO_MODULES}" \
> - LIBkcore_VERSION=${LIBkcore_VERSION} \
> - LIBkmi_VERSION=${LIBkmi_VERSION} \
> + group_include="${KAMAILIO_GROUPS}" \
> LIBsrdb1_VERSION=${LIBsrdb1_VERSION} \
> LIBsrdb2_VERSION=${LIBsrdb2_VERSION} \
> LIBtrie_VERSION=${LIBtrie_VERSION} \
> - LIBbinrpc_VERSION=${LIBbinrpc_VERSION} \
> LIBsrutils_VERSION=${LIBsrutils_VERSION} \
> - LIBprint_VERSION=${LIBprint_VERSION}
> +
> +PSEUDO_FLAVORS += no_berkeley
> +.if !${FLAVOR:Mno_berkeley}
> +MULTI_PACKAGES += -berkeley
> +COMMENT-berkeley = kamailio berkeley db module
> +KAMAILIO_GROUPS += kberkeley
> +WANTLIB-berkeley = c db pthread lib/kamailio/srdb1 lib/kamailio/srdb2
> +LIB_DEPENDS-berkeley = databases/db/v4,-main,no_java
> telephony/kamailio,-main
> +.endif
>
> PSEUDO_FLAVORS += no_postgresql
> .if !${FLAVOR:Mno_postgresql}
> MULTI_PACKAGES += -postgresql
> COMMENT-postgresql = kamailio postgresql module
> -KAMAILIO_MODULES += db_postgres
> +KAMAILIO_GROUPS += kpostgres
> WANTLIB-postgresql = c pq pthread lib/kamailio/srdb1 lib/kamailio/srdb2
> -LIB_DEPENDS-postgresql =databases/postgresql,-main telephony/kamailio,-main
> +LIB_DEPENDS-postgresql = databases/postgresql,-main telephony/kamailio,-main
> .endif
>
> PSEUDO_FLAVORS += no_mysql
> .if !${FLAVOR:Mno_mysql}
> MULTI_PACKAGES += -mysql
> COMMENT-mysql = kamailio mysql module
> -KAMAILIO_MODULES += db_mysql
> +KAMAILIO_GROUPS += kmysql
> WANTLIB-mysql = c crypto m pthread ssl z mysqlclient \
> lib/kamailio/srdb1 lib/kamailio/srdb2
> LIB_DEPENDS-mysql = databases/mariadb,-main telephony/kamailio,-main
> @@ -102,38 +103,36 @@ PSEUDO_FLAVORS += no_ldap
> .if !${FLAVOR:Mno_ldap}
> MULTI_PACKAGES += -ldap
> COMMENT-ldap = kamailio LDAP modules
> -KAMAILIO_MODULES += ldap h350
> +KAMAILIO_GROUPS += kldap
> WANTLIB-ldap = c ldap pthread lib/kamailio/srdb2
> LIB_DEPENDS-ldap = databases/openldap,-main telephony/kamailio,-main
> .endif
>
> -PSEUDO_FLAVORS += no_xmlrpc
> -.if !${FLAVOR:Mno_xmlrpc}
> -MULTI_PACKAGES += -xmlrpc
> -COMMENT-xmlrpc = kamailio XML-RPC module
> -KAMAILIO_MODULES += mi_xmlrpc
> -WANTLIB-xmlrpc += c pthread xmlrpc xmlrpc_abyss xmlrpc_server
> -WANTLIB-xmlrpc += xmlrpc_server_abyss xmlrpc_util
> -WANTLIB-xmlrpc += xmlrpc_xmlparse xmlrpc_xmltok lib/kamailio/kmi
> -LIB_DEPENDS-xmlrpc = net/xmlrpc-c telephony/kamailio,-main
> +PSEUDO_FLAVORS += no_xml
> +.if !${FLAVOR:Mno_xml}
> +MULTI_PACKAGES += -xml
> +COMMENT-xml = kamailio XML modules
> +KAMAILIO_GROUPS += kxml
> +WANTLIB-xml = lzma m pthread xml2 z ${MODGETTEXT_WANTLIB} \
> + lib/kamailio/srdb1
> +LIB_DEPENDS-xml = ${MODGETTEXT_LIB_DEPENDS} telephony/kamailio,-main
> .endif
>
> PSEUDO_FLAVORS += no_snmpstats
> .if !${FLAVOR:Mno_snmpstats}
> MULTI_PACKAGES += -snmpstats
> COMMENT-snmpstats = kamailio snmpstats module
> -KAMAILIO_MODULES += snmpstats
> -WANTLIB-snmpstats = c netsnmp netsnmpagent netsnmpmibs pthread
> lib/kamailio/kcore
> -LIB_DEPENDS-snmpstats = net/net-snmp telephony/kamailio,-main
> +KAMAILIO_GROUPS += ksnmpstats
> +WANTLIB-snmpstats = c netsnmp netsnmpagent netsnmpmibs pthread
> +LIB_DEPENDS-snmpstats = net/net-snmp
> .endif
>
> PSEUDO_FLAVORS += no_carrierroute
> .if !${FLAVOR:Mno_carrierroute}
> MULTI_PACKAGES += -carrierroute
> COMMENT-carrierroute = kamailio carrierroute module
> -KAMAILIO_MODULES += carrierroute
> +KAMAILIO_GROUPS += kcarrierroute
> WANTLIB-carrierroute = c confuse pthread ${MODGETTEXT_WANTLIB} \
> - lib/kamailio/kcore lib/kamailio/kmi \
> lib/kamailio/srdb1 lib/kamailio/trie
> LIB_DEPENDS-carrierroute = devel/libconfuse \
> ${MODGETTEXT_LIB_DEPENDS} telephony/kamailio,-main
> @@ -143,17 +142,27 @@ PSEUDO_FLAVORS += no_perl
> .if !${FLAVOR:Mno_perl}
> MULTI_PACKAGES += -perl
> COMMENT-perl = kamailio perl modules
> -KAMAILIO_MODULES += app_perl db_perlvdb
> -WANTLIB-perl = c m perl pthread util lib/kamailio/kmi
> lib/kamailio/srdb1
> +KAMAILIO_GROUPS += kperl
> +WANTLIB-perl = c m perl pthread util lib/kamailio/srdb1
> LIB_DEPENDS-perl = telephony/kamailio,-main
> .endif
>
> +PSEUDO_FLAVORS += no_presence
> +.if !${FLAVOR:Mno_presence}
> +MULTI_PACKAGES += -presence
> +COMMENT-presence = kamailio presence modules
> +KAMAILIO_GROUPS += kpresence
> +WANTLIB-presence += curl lzma m pthread xml2 z ${MODGETTEXT_WANTLIB} \
> + lib/kamailio/srdb1 lib/kamailio/srutils
> +LIB_DEPENDS-presence = ${MODGETTEXT_LIB_DEPENDS}
> telephony/kamailio,-main
> +.endif
> +
> # TODO
> #PSEUDO_FLAVORS += no_radius
> #.if !${FLAVOR:Mno_radius}
> #MULTI_PACKAGES += -radius
> #COMMENT-radius = kamailio RADIUS modules
> -#KAMAILIO_MODULES += auth_radius misc_radius peering
> +#KAMAILIO_GROUPS += kradius
> #WANTLIB-radius = freeradius-client
> #LIB_DEPENDS-radius = net/freeradius-client
> #.endif
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 20 Nov 2015 10:09:52 -0000 1.7
> +++ distinfo 3 Jul 2017 15:11:23 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (kamailio-4.3.3_src.tar.gz) =
> rg4D2jc+jUpFGUonorrPiPnheQDEKPmCeKyH2jCpGIo=
> -SIZE (kamailio-4.3.3_src.tar.gz) = 11364814
> +SHA256 (kamailio-5.0.2_src.tar.gz) =
> 9K6oUqiICB3v/7lDC0d1QsKaQnMpdS6NOsmYVHOpW0A=
> +SIZE (kamailio-5.0.2_src.tar.gz) = 11654359
> Index: patches/patch-Makefile_defs
> ===================================================================
> RCS file: patches/patch-Makefile_defs
> diff -N patches/patch-Makefile_defs
> --- patches/patch-Makefile_defs 20 Nov 2015 10:09:52 -0000 1.6
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,96 +0,0 @@
> -$OpenBSD: patch-Makefile_defs,v 1.6 2015/11/20 10:09:52 sthen Exp $
> ---- Makefile.defs.orig Fri Oct 2 15:35:19 2015
> -+++ Makefile.defs Wed Oct 21 02:36:24 2015
> -@@ -300,9 +300,9 @@ ppc_macros= __powerpc __powerpc__ __POWERPC__ __ppc__
> - ppc64_macros= __ppc64__ _ARCH_PPC64
> -
> - mips_macros= __mips__ __mips _MIPS_ARCH_MIPS1
> --mips2_macros= _MIPS_ISA_MIPS2 _MIPS_ISA_MIPS3 _MIPS_ISA_MIPS4 \
> -+mips2_macros= _MIPS_ISA_MIPS2 _MIPS_ISA_MIPS4 \
> - _MIPS_ARCH_MIPS2 _MIPS_ARCH_MIPS3 _MIPS_ARCH_MIPS4
> --mips64_macros= _MIPS_ISA_MIPS64 _MIPS_ARCH_MIPS64
> -+mips64_macros= _MIPS_ISA_MIPS64 _MIPS_ARCH_MIPS64 _MIPS_ISA_MIPS3
> -
> - alpha_macros= __alpha__ __alpha _M_ALPHA_
> -
> -@@ -373,7 +373,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
> -@@ -459,11 +459,11 @@ 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)
> --run_target = $(run_prefix)/$(run_dir)
> -+run_target = $(VARBASE)/run/$(MAIN_NAME)/
> - doc_target = $(prefix)/$(doc_dir)
> - data_target = $(prefix)/$(data_dir)
> -
> -@@ -841,16 +841,12 @@ ifeq ($(ARCH), i386)
> - ifeq ($(CC_NAME), gcc)
> - C_DEFS+=-DCC_GCC_LIKE_ASM
> - #common stuff
> -- CFLAGS=-g $(CC_OPT) -funroll-loops
> -Wcast-align $(PROFILE)
> -+ CFLAGS=
> - #if gcc 5.0+, 4.5+ or 4.2+
> - ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER))))
> - $(call set_if_empty,CPU,athlon64)
> -- CFLAGS+=-m32 -minline-all-stringops \
> -- -falign-loops \
> -- -ftree-vectorize \
> -- -fno-strict-overflow \
> -- -mtune=$(CPU)
> -- LDFLAGS+=-m32
> -+ CFLAGS+=
> -+ LDFLAGS+=
> - else
> - #if gcc 4.0+
> - ifeq ($(CC_SHORTVER), 4.x)
> -@@ -923,7 +919,7 @@ ifeq ($(ARCH), x86_64)
> - ifeq ($(CC_NAME), gcc)
> - C_DEFS+=-DCC_GCC_LIKE_ASM
> - #common stuff
> -- CFLAGS=-g $(CC_OPT) -funroll-loops
> -Wcast-align $(PROFILE)
> -+ CFLAGS=
> - #if gcc 4.5+
> - # don't add '-mtune=$(CPU)' - gcc failure
> - ifeq ($(CC_SHORTVER),$(filter $(CC_SHORTVER),4.5+
> 5.0+))
> -@@ -937,12 +933,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)
> -@@ -1848,9 +1840,10 @@ endif
> -
> - ifeq ($(OS), openbsd)
> - C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \
> -- -DHAVE_UNION_SEMUN -DHAVE_MSGHDR_MSG_CONTROL \
> -- -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \
> -- -DHAVE_NETINET_IN_SYSTM -DUSE_SIGWAIT
> -+ -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \
> -+ -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_CONNECT_ECONNRESET_BUG \
> -+ -DHAVE_TIMEGM -DHAVE_NETINET_IN_SYSTM \
> -+ -DUSE_SIGWAIT
> - ifneq ($(found_lock_method), yes)
> - C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems
> - found_lock_method=yes
> Index: patches/patch-Makefile_libs
> ===================================================================
> RCS file: patches/patch-Makefile_libs
> diff -N patches/patch-Makefile_libs
> --- patches/patch-Makefile_libs 20 Nov 2015 10:09:52 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,77 +0,0 @@
> -$OpenBSD: patch-Makefile_libs,v 1.3 2015/11/20 10:09:52 sthen Exp $
> ---- Makefile.libs.orig Fri Oct 2 15:35:17 2015
> -+++ Makefile.libs Mon Oct 19 14:00:40 2015
> -@@ -50,14 +50,19 @@ 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)
> -+ 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)
> -@@ -104,14 +109,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:
> -@@ -137,21 +146,31 @@ 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
> -+ifeq ($(OS), openbsd)
> -+install-if-newer: $(lib_prefix)/$(lib_dir)/$(LIB_NAME)
> -+
> -+$(lib_prefix)/$(lib_dir)/$(LIB_NAME): $(LIBINAME_F)
> -+ @$(MAKE) install
> -+else
> - install-if-newer: $(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME)
> -
> - $(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME): $(LIB_NAME) $(LIBINAME_F)
> - @$(MAKE) install
> --
> -+endif
> -
> - ifneq ($(strip $(LIBINAME_F)),)
> - $(LIBINAME_F): $(ALLDEP)
> Index: patches/patch-cfg_y
> ===================================================================
> RCS file: patches/patch-cfg_y
> diff -N patches/patch-cfg_y
> --- patches/patch-cfg_y 22 Apr 2012 21:44:24 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$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>
> Index: patches/patch-etc_kamailio_cfg
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/patches/patch-etc_kamailio_cfg,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-etc_kamailio_cfg
> --- patches/patch-etc_kamailio_cfg 20 Nov 2015 10:09:52 -0000 1.4
> +++ patches/patch-etc_kamailio_cfg 3 Jul 2017 15:11:23 -0000
> @@ -1,13 +1,13 @@
> $OpenBSD: patch-etc_kamailio_cfg,v 1.4 2015/11/20 10:09:52 sthen Exp $
> ---- etc/kamailio.cfg.orig Fri Oct 2 15:35:17 2015
> -+++ etc/kamailio.cfg Mon Oct 19 14:00:40 2015
> -@@ -150,6 +150,9 @@ log_facility=LOG_LOCAL0
> - fork=yes
> - children=4
> +--- etc/kamailio.cfg.orig Wed Apr 5 16:32:38 2017
> ++++ etc/kamailio.cfg Mon May 15 21:48:56 2017
> +@@ -160,6 +160,9 @@ log_facility=LOG_LOCAL0
> + /* number of SIP routing processes */
> + children=8
>
> +user="_kamailio"
> +group="_kamailio"
> +
> /* uncomment the next line to disable TCP (default on) */
> - #disable_tcp=yes
> + # disable_tcp=yes
>
> Index: patches/patch-lib_binrpc_Makefile
> ===================================================================
> RCS file: patches/patch-lib_binrpc_Makefile
> diff -N patches/patch-lib_binrpc_Makefile
> --- patches/patch-lib_binrpc_Makefile 15 Sep 2012 12:16:18 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-lib_binrpc_Makefile,v 1.1 2012/09/15 12:16:18 sthen Exp $
> ---- lib/binrpc/Makefile.orig Sun Jul 8 23:54:42 2012
> -+++ lib/binrpc/Makefile Sun Jul 8 23:55:36 2012
> -@@ -8,6 +8,7 @@ NAME:=binrpc
> - MAJOR_VER=0
> - MINOR_VER=1
> - BUGFIX_VER=0
> -+OBSD_VER=$(LIBbinrpc_VERSION)
> - LIBS=
> -
> - include ../../Makefile.libs
> Index: patches/patch-lib_binrpc_binrpc_api_c
> ===================================================================
> RCS file: patches/patch-lib_binrpc_binrpc_api_c
> diff -N patches/patch-lib_binrpc_binrpc_api_c
> --- patches/patch-lib_binrpc_binrpc_api_c 20 Nov 2015 10:09:52 -0000
> 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,36 +0,0 @@
> -$OpenBSD: patch-lib_binrpc_binrpc_api_c,v 1.2 2015/11/20 10:09:52 sthen Exp $
> ---- lib/binrpc/binrpc_api.c.orig Fri Oct 2 15:35:17 2015
> -+++ lib/binrpc/binrpc_api.c Mon Oct 19 14:00:40 2015
> -@@ -138,10 +138,10 @@ static int connect_unix_sock(char* name, int type, str
> - s=-1;
> - memset(&ifsun, 0, sizeof (struct sockaddr_un));
> - len=strlen(name);
> -- if (len>UNIX_PATH_MAX){
> -+ if (len>sizeof(ifsun.sun_path)){
> - snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1,
> - "connect_unix_sock: name too long "
> -- "(%d > %d): %s", len, UNIX_PATH_MAX, name);
> -+ "(%d > %ld): %s", len, sizeof(ifsun.sun_path),
> name);
> - goto error;
> - }
> - ifsun.sun_family=AF_UNIX;
> -@@ -163,16 +163,16 @@ static int connect_unix_sock(char* name, int type, str
> - if (sock_dir==0)
> - sock_dir="/tmp";
> - retry:
> -- ret=snprintf(mysun->sun_path, UNIX_PATH_MAX, "%s/" NAME
> "_%d",
> -+ ret=snprintf(mysun->sun_path, sizeof(mysun->sun_path),
> "%s/" NAME "_%d",
> - sock_dir, rand());
> -- if ((ret<0) ||(ret>=UNIX_PATH_MAX)){
> -+ if ((ret<0) ||(ret>=sizeof(mysun->sun_path))){
> - snprintf(binrpc_last_errs,
> sizeof(binrpc_last_errs)-1,
> - "connect_unix_sock:
> buffer overflow while trying to"
> - "generate unix datagram
> socket name");
> - goto error;
> - }
> - }else{
> -- if (strlen(reply_socket)>UNIX_PATH_MAX){
> -+ if (strlen(reply_socket)>sizeof(mysun->sun_path)){
> - snprintf(binrpc_last_errs,
> sizeof(binrpc_last_errs)-1,
> - "connect_unix_sock:
> buffer overflow while trying to"
> - "use the provided unix
> datagram socket name (%s)",
> Index: patches/patch-lib_kcore_Makefile
> ===================================================================
> RCS file: patches/patch-lib_kcore_Makefile
> diff -N patches/patch-lib_kcore_Makefile
> --- patches/patch-lib_kcore_Makefile 20 Nov 2015 10:09:52 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-lib_kcore_Makefile,v 1.2 2015/11/20 10:09:52 sthen Exp $
> ---- lib/kcore/Makefile.orig Fri Oct 2 15:35:17 2015
> -+++ lib/kcore/Makefile Mon Oct 19 14:00:40 2015
> -@@ -4,6 +4,7 @@ NAME:=kcore
> - MAJOR_VER=1
> - MINOR_VER=0
> - BUGFIX_VER=0
> -+OBSD_VER=$(LIBkcore_VERSION)
> - LIBS=
> -
> - SERLIBPATH=..
> Index: patches/patch-lib_kmi_Makefile
> ===================================================================
> RCS file: patches/patch-lib_kmi_Makefile
> diff -N patches/patch-lib_kmi_Makefile
> --- patches/patch-lib_kmi_Makefile 22 Apr 2012 21:44:24 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$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
> Index: patches/patch-lib_print_Makefile
> ===================================================================
> RCS file: patches/patch-lib_print_Makefile
> diff -N patches/patch-lib_print_Makefile
> --- patches/patch-lib_print_Makefile 16 Apr 2013 11:13:04 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-lib_print_Makefile,v 1.1 2013/04/16 11:13:04 sthen Exp $
> ---- lib/print/Makefile.orig Thu Mar 14 16:05:52 2013
> -+++ lib/print/Makefile Thu Mar 14 16:06:07 2013
> -@@ -8,6 +8,7 @@ NAME:=print
> - MAJOR_VER=1
> - MINOR_VER=2
> - BUGFIX_VER=1
> -+OBSD_VER=$(LIBprint_VERSION)
> - LIBS=
> -
> - include ../../Makefile.libs
> Index: patches/patch-lib_srdb1_Makefile
> ===================================================================
> RCS file: patches/patch-lib_srdb1_Makefile
> diff -N patches/patch-lib_srdb1_Makefile
> --- patches/patch-lib_srdb1_Makefile 22 Apr 2012 21:44:24 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$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
> Index: patches/patch-lib_srdb2_Makefile
> ===================================================================
> RCS file: patches/patch-lib_srdb2_Makefile
> diff -N patches/patch-lib_srdb2_Makefile
> --- patches/patch-lib_srdb2_Makefile 22 Apr 2012 21:44:24 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$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
> Index: patches/patch-lib_srutils_Makefile
> ===================================================================
> RCS file: patches/patch-lib_srutils_Makefile
> diff -N patches/patch-lib_srutils_Makefile
> --- patches/patch-lib_srutils_Makefile 15 Sep 2012 12:16:18 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-lib_srutils_Makefile,v 1.1 2012/09/15 12:16:18 sthen Exp $
> ---- lib/srutils/Makefile.orig Mon Jul 9 00:12:33 2012
> -+++ lib/srutils/Makefile Mon Jul 9 00:14:40 2012
> -@@ -4,6 +4,7 @@ NAME:=srutils
> - MAJOR_VER=1
> - MINOR_VER=0
> - BUGFIX_VER=0
> -+OBSD_VER=$(LIBsrutils_VERSION)
> - LIBS= -lm
> -
> - include ../../Makefile.libs
> Index: patches/patch-lib_trie_Makefile
> ===================================================================
> RCS file: patches/patch-lib_trie_Makefile
> diff -N patches/patch-lib_trie_Makefile
> --- patches/patch-lib_trie_Makefile 22 Apr 2012 21:44:24 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$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
> Index: patches/patch-list_h
> ===================================================================
> RCS file: patches/patch-list_h
> diff -N patches/patch-list_h
> --- patches/patch-list_h 9 May 2012 21:27:47 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,44 +0,0 @@
> -$OpenBSD: patch-list_h,v 1.1 2012/05/09 21:27:47 sthen Exp $
> ---- list.h.orig Thu Apr 19 13:10:03 2012
> -+++ list.h Wed May 9 18:06:33 2012
> -@@ -33,6 +33,8 @@
> - #ifndef _SER_LIST_H
> - #define _SER_LIST_H
> -
> -+#include <sys/queue.h>
> -+
> - /* #include <sys/cdefs.h> - not needed and not present on all the systems */
> -
> - /*
> -@@ -133,6 +135,7 @@ struct qm_trace {
> - #define TRASHIT(x)
> - #endif /* QUEUE_MACRO_DEBUG */
> -
> -+#ifndef SLIST_HEAD
> - /*
> - * Singly-linked List declarations.
> - */
> -@@ -205,6 +208,8 @@ struct {
> \
> - SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \
> - } while (0)
> -
> -+#endif /* SLIST_HEAD */
> -+
> - /*
> - * Singly-linked Tail queue declarations.
> - */
> -@@ -300,6 +305,7 @@ struct {
> \
> - (head)->stqh_last = &STAILQ_FIRST((head)); \
> - } while (0)
> -
> -+#ifndef LIST_HEAD
> - /*
> - * List declarations.
> - */
> -@@ -513,5 +519,6 @@ struct {
> \
> - TRASHIT((elm)->field.tqe_prev); \
> - QMD_TRACE_ELEM(&(elm)->field); \
> - } while (0)
> -+#endif /* LIST_HEAD */
> -
> - #endif /* !_LIST_H */
> Index: patches/patch-main_c
> ===================================================================
> RCS file: patches/patch-main_c
> diff -N patches/patch-main_c
> --- patches/patch-main_c 20 Nov 2015 10:09:52 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,30 +0,0 @@
> -$OpenBSD: patch-main_c,v 1.1 2015/11/20 10:09:52 sthen Exp $
> ---- main.c.orig Fri Oct 2 15:35:19 2015
> -+++ main.c Wed Oct 21 00:00:47 2015
> -@@ -1787,8 +1787,10 @@ int main(int argc, char** argv)
> - int proto;
> - char *options;
> - int ret;
> -+#ifndef HAVE_ARC4RANDOM
> - unsigned int seed;
> - int rfd;
> -+#endif
> - int debug_save, debug_flag;
> - int dont_fork_cnt;
> - struct name_lst* n_lst;
> -@@ -2026,6 +2028,7 @@ int main(int argc, char** argv)
> - goto error;
> - }
> -
> -+#ifndef HAVE_ARC4RANDOM
> - /* seed the prng */
> - /* try to use /dev/urandom if possible */
> - seed=0;
> -@@ -2046,6 +2049,7 @@ try_again:
> - fastrand_seed(rand());
> - srandom(rand()+time(0));
> - LM_DBG("test random numbers %u %lu %u\n", rand(), random(), fastrand());
> -+#endif
> -
> - /*register builtin modules*/
> - register_builtin_modules();
> Index: patches/patch-modules_auth_auth_mod_c
> ===================================================================
> RCS file: patches/patch-modules_auth_auth_mod_c
> diff -N patches/patch-modules_auth_auth_mod_c
> --- patches/patch-modules_auth_auth_mod_c 20 Nov 2015 10:09:52 -0000
> 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,33 +0,0 @@
> -$OpenBSD: patch-modules_auth_auth_mod_c,v 1.4 2015/11/20 10:09:52 sthen Exp $
> ---- modules/auth/auth_mod.c.orig Fri Oct 2 15:35:17 2015
> -+++ modules/auth/auth_mod.c Mon Oct 19 14:00:40 2015
> -@@ -958,7 +958,7 @@ static int proxy_challenge(struct sip_msg *msg, char*
> - goto error;
> - }
> -
> -- return auth_challenge(msg, &srealm, vflags, HDR_PROXYAUTH_T);
> -+ return auth_challenge_helper(msg, &srealm, vflags, HDR_PROXYAUTH_T,
> NULL);
> -
> - error:
> - if(!(vflags&4)) {
> -@@ -991,7 +991,7 @@ static int www_challenge(struct sip_msg *msg, char* re
> - goto error;
> - }
> -
> -- return auth_challenge(msg, &srealm, vflags, HDR_AUTHORIZATION_T);
> -+ return auth_challenge_helper(msg, &srealm, vflags, HDR_AUTHORIZATION_T,
> NULL);
> -
> - error:
> - if(!(vflags&4)) {
> -@@ -1029,9 +1029,9 @@ static int w_auth_challenge(struct sip_msg *msg, char*
> - }
> -
> - if(msg->REQ_METHOD==METHOD_REGISTER)
> -- return auth_challenge(msg, &srealm, vflags,
> HDR_AUTHORIZATION_T);
> -+ return auth_challenge_helper(msg, &srealm, vflags,
> HDR_AUTHORIZATION_T, NULL);
> - else
> -- return auth_challenge(msg, &srealm, vflags, HDR_PROXYAUTH_T);
> -+ return auth_challenge_helper(msg, &srealm, vflags,
> HDR_PROXYAUTH_T, NULL);
> -
> - error:
> - if(!(vflags&4)) {
> Index: patches/patch-modules_ctl_init_socks_c
> ===================================================================
> RCS file: patches/patch-modules_ctl_init_socks_c
> diff -N patches/patch-modules_ctl_init_socks_c
> --- patches/patch-modules_ctl_init_socks_c 20 Nov 2015 10:09:52 -0000
> 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-modules_ctl_init_socks_c,v 1.2 2015/11/20 10:09:52 sthen Exp
> $
> ---- modules/ctl/init_socks.c.orig Fri Oct 2 15:35:17 2015
> -+++ modules/ctl/init_socks.c Mon Oct 19 14:00:40 2015
> -@@ -85,9 +85,9 @@ int init_unix_sock(struct sockaddr_un* su, char* name,
> - unlink(name);
> - memset(&ifsun, 0, sizeof (struct sockaddr_un));
> - len=strlen(name);
> -- if (len>UNIX_PATH_MAX){
> -- LOG(L_ERR, "ERROR: init_unix_sock: name too long (%d > %d):
> %s\n",
> -- len, UNIX_PATH_MAX, name);
> -+ if (len>sizeof(ifsun.sun_path)){
> -+ LOG(L_ERR, "ERROR: init_unix_sock: name too long (%d > %ld):
> %s\n",
> -+ len, sizeof(ifsun.sun_path), name);
> - goto error;
> - }
> - ifsun.sun_family=AF_UNIX;
> Index: patches/patch-modules_db_berkeley_Makefile
> ===================================================================
> RCS file: patches/patch-modules_db_berkeley_Makefile
> diff -N patches/patch-modules_db_berkeley_Makefile
> --- patches/patch-modules_db_berkeley_Makefile 20 Nov 2015 10:09:52
> -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,25 +0,0 @@
> -$OpenBSD: patch-modules_db_berkeley_Makefile,v 1.2 2015/11/20 10:09:52 sthen
> Exp $
> ---- modules/db_berkeley/Makefile.orig Fri Oct 2 15:35:17 2015
> -+++ modules/db_berkeley/Makefile Mon Oct 19 14:00:40 2015
> -@@ -10,10 +10,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
> -@@ -24,7 +24,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
> -
> Index: patches/patch-modules_db_berkeley_bdb_lib_c
> ===================================================================
> RCS file: patches/patch-modules_db_berkeley_bdb_lib_c
> diff -N patches/patch-modules_db_berkeley_bdb_lib_c
> --- patches/patch-modules_db_berkeley_bdb_lib_c 20 Nov 2015 10:09:52
> -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-modules_db_berkeley_bdb_lib_c,v 1.2 2015/11/20 10:09:52
> sthen Exp $
> ---- modules/db_berkeley/bdb_lib.c.orig Fri Oct 2 15:35:17 2015
> -+++ modules/db_berkeley/bdb_lib.c Mon Oct 19 14:00:40 2015
> -@@ -666,7 +666,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
> - {
> - char *s;
> - char fn[1024];
> -- char d[64];
> -+ char d[128];
> - FILE *fp = NULL;
> - struct tm *t;
> - int bl;
> -@@ -686,7 +686,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
> - s+=_tp->name.len;
> -
> - t = localtime( &tim );
> -- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
> -+ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
> - strncpy(s, d, bl);
> - s+= bl;
> - *s = 0;
> Index: patches/patch-modules_db_berkeley_km_bdb_lib_c
> ===================================================================
> RCS file: patches/patch-modules_db_berkeley_km_bdb_lib_c
> diff -N patches/patch-modules_db_berkeley_km_bdb_lib_c
> --- patches/patch-modules_db_berkeley_km_bdb_lib_c 20 Nov 2015 10:09:52
> -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-modules_db_berkeley_km_bdb_lib_c,v 1.2 2015/11/20 10:09:52
> sthen Exp $
> ---- modules/db_berkeley/km_bdb_lib.c.orig Fri Oct 2 15:35:17 2015
> -+++ modules/db_berkeley/km_bdb_lib.c Mon Oct 19 14:00:40 2015
> -@@ -719,7 +719,7 @@ int km_bdblib_create_journal(table_p _tp)
> - {
> - char *s;
> - char fn[1024];
> -- char d[64];
> -+ char d[128];
> - FILE *fp = NULL;
> - struct tm *t;
> - int bl;
> -@@ -740,7 +740,7 @@ int km_bdblib_create_journal(table_p _tp)
> - s+=_tp->name.len;
> -
> - t = localtime( &tim );
> -- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
> -+ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
> - strncpy(s, d, bl);
> - s+= bl;
> - *s = 0;
> Index: patches/patch-modules_db_mysql_my_cmd_c
> ===================================================================
> RCS file: patches/patch-modules_db_mysql_my_cmd_c
> diff -N patches/patch-modules_db_mysql_my_cmd_c
> --- patches/patch-modules_db_mysql_my_cmd_c 20 Nov 2015 10:09:52 -0000
> 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,20 +0,0 @@
> -$OpenBSD: patch-modules_db_mysql_my_cmd_c,v 1.3 2015/11/20 10:09:52 sthen
> Exp $
> ---- modules/db_mysql/my_cmd.c.orig Fri Oct 2 15:35:17 2015
> -+++ modules/db_mysql/my_cmd.c Mon Oct 19 14:00:40 2015
> -@@ -24,7 +24,7 @@
> - */
> -
> - /* the following macro will break the compile on solaris */
> --#if !defined (__SVR4) && !defined (__sun)
> -+#if !defined (__SVR4) && !defined (__sun) && !defined (__OpenBSD__)
> - #define _XOPEN_SOURCE 4 /* bsd */
> - #endif
> - #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */
> -@@ -42,6 +42,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 */
> Index: patches/patch-modules_dmq_usrloc_usrloc_sync_c
> ===================================================================
> RCS file: patches/patch-modules_dmq_usrloc_usrloc_sync_c
> diff -N patches/patch-modules_dmq_usrloc_usrloc_sync_c
> --- patches/patch-modules_dmq_usrloc_usrloc_sync_c 20 Nov 2015 10:09:52
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-modules_dmq_usrloc_usrloc_sync_c,v 1.1 2015/11/20 10:09:52
> sthen Exp $
> ---- modules/dmq_usrloc/usrloc_sync.c.orig Wed Oct 21 00:58:01 2015
> -+++ modules/dmq_usrloc/usrloc_sync.c Wed Oct 21 01:01:22 2015
> -@@ -278,8 +278,8 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_re
> - srjson_t *it = NULL;
> - static ucontact_info_t ci;
> -
> -- int action, expires, cseq, flags, cflags, q, last_modified, methods,
> reg_id;
> -- str aor, ruid, c, received, path, callid, user_agent, instance;
> -+ int action = 0, expires = 0, cseq = 0, flags = 0, cflags = 0, q = 0,
> last_modified = 0, methods = 0, reg_id = 0;
> -+ str aor = {NULL, 0}, ruid = {NULL, 0}, c, received = {NULL, 0}, path,
> callid, user_agent, instance = {NULL, 0};
> -
> - parse_from_header(msg);
> - body = ((struct to_body*)msg->from->parsed)->uri;
> Index: patches/patch-modules_lcr_lcr_mod_c
> ===================================================================
> RCS file: patches/patch-modules_lcr_lcr_mod_c
> diff -N patches/patch-modules_lcr_lcr_mod_c
> --- patches/patch-modules_lcr_lcr_mod_c 20 Nov 2015 10:09:52 -0000
> 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,28 +0,0 @@
> -$OpenBSD: patch-modules_lcr_lcr_mod_c,v 1.2 2015/11/20 10:09:52 sthen Exp $
> ---- modules/lcr/lcr_mod.c.orig Fri Oct 2 15:35:19 2015
> -+++ modules/lcr/lcr_mod.c Wed Oct 21 00:44:53 2015
> -@@ -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>
> -@@ -2049,10 +2052,11 @@ static int generate_uris(struct sip_msg* _m, char
> *r_u
> - {
> - int_str gw_uri_val;
> - struct usr_avp *gu_avp;
> -- str scheme, prefix, hostname, port, params, transport, addr_str,
> -- tmp_tag;
> -+ str scheme = {NULL, 0}, prefix = {NULL, 0}, hostname = {NULL, 0},
> -+ port = {NULL, 0}, params = {NULL, 0}, transport = {NULL, 0},
> -+ addr_str, tmp_tag = {NULL, 0};
> - char *at;
> -- unsigned int strip;
> -+ unsigned int strip = 0;
> -
> - gu_avp = search_first_avp(gw_uri_avp_type, gw_uri_avp, &gw_uri_val, 0);
> -
> Index: patches/patch-modules_ldap_ld_session_h
> ===================================================================
> RCS file: patches/patch-modules_ldap_ld_session_h
> diff -N patches/patch-modules_ldap_ld_session_h
> --- patches/patch-modules_ldap_ld_session_h 11 Sep 2016 20:54:13 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-modules_ldap_ld_session_h,v 1.1 2016/09/11 20:54:13
> ajacoutot Exp $
> ---- modules/ldap/ld_session.h.orig Sun Sep 11 13:02:26 2016
> -+++ modules/ldap/ld_session.h Sun Sep 11 13:02:40 2016
> -@@ -29,6 +29,7 @@
> - #define LD_SESSION_H
> -
> - #include <ldap.h>
> -+#include <sys/select.h> /* timeval */
> -
> - #include "iniparser.h"
> -
> Index: patches/patch-modules_mediaproxy_mediaproxy_c
> ===================================================================
> RCS file: patches/patch-modules_mediaproxy_mediaproxy_c
> diff -N patches/patch-modules_mediaproxy_mediaproxy_c
> --- patches/patch-modules_mediaproxy_mediaproxy_c 20 Nov 2015 10:09:52
> -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-modules_mediaproxy_mediaproxy_c,v 1.2 2015/11/20 10:09:52
> sthen Exp $
> ---- modules/mediaproxy/mediaproxy.c.orig Fri Oct 2 15:35:18 2015
> -+++ modules/mediaproxy/mediaproxy.c Mon Oct 19 14:00:40 2015
> -@@ -19,6 +19,9 @@
> - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
> - */
> -
> -+#include <sys/types.h>
> -+#include <sys/socket.h>
> -+#include <netinet/in.h>
> - #include <stdio.h>
> - #include <stdlib.h>
> - #include <unistd.h>
> Index: patches/patch-modules_mi_xmlrpc_abyss_data_h
> ===================================================================
> RCS file: patches/patch-modules_mi_xmlrpc_abyss_data_h
> diff -N patches/patch-modules_mi_xmlrpc_abyss_data_h
> --- patches/patch-modules_mi_xmlrpc_abyss_data_h 20 Nov 2015 10:09:52
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-modules_mi_xmlrpc_abyss_data_h,v 1.1 2015/11/20 10:09:52
> sthen Exp $
> ---- modules/mi_xmlrpc/abyss_data.h.orig Mon Oct 19 16:30:34 2015
> -+++ modules/mi_xmlrpc/abyss_data.h Mon Oct 19 16:30:44 2015
> -@@ -3,7 +3,7 @@
> -
> - #include "abyss_thread.h"
> -
> --#ifndef XMLRPC_OLD_VERSION
> -+#ifdef XMLRPC_OLD_VERSION
> - #define MAX_CONN 16
> - typedef struct
> - {
> Index: patches/patch-modules_mi_xmlrpc_abyss_xmlrpc_int_h
> ===================================================================
> RCS file: patches/patch-modules_mi_xmlrpc_abyss_xmlrpc_int_h
> diff -N patches/patch-modules_mi_xmlrpc_abyss_xmlrpc_int_h
> --- patches/patch-modules_mi_xmlrpc_abyss_xmlrpc_int_h 16 Apr 2013
> 11:13:04 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-modules_mi_xmlrpc_abyss_xmlrpc_int_h,v 1.1 2013/04/16
> 11:13:04 sthen Exp $
> ---- modules/mi_xmlrpc/abyss_xmlrpc_int.h.orig Sun Mar 31 13:37:28 2013
> -+++ modules/mi_xmlrpc/abyss_xmlrpc_int.h Sun Mar 31 13:37:52 2013
> -@@ -48,8 +48,10 @@ typedef enum {
> - true = 1
> - } bool;
> -
> -+#ifndef MIN
> - #define MIN(a,b) ((a) < (b) ? (a) : (b))
> - #define MAX(a,b) ((a) > (b) ? (a) : (b))
> -+#endif /* MIN */
> -
> - /* When we deallocate a pointer in a struct, we often replace it with
> - ** this and throw in a few assertions here and there. */
> Index: patches/patch-modules_nat_traversal_nat_traversal_c
> ===================================================================
> RCS file: patches/patch-modules_nat_traversal_nat_traversal_c
> diff -N patches/patch-modules_nat_traversal_nat_traversal_c
> --- patches/patch-modules_nat_traversal_nat_traversal_c 20 Nov 2015
> 10:09:52 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-modules_nat_traversal_nat_traversal_c,v 1.2 2015/11/20
> 10:09:52 sthen Exp $
> ---- modules/nat_traversal/nat_traversal.c.orig Fri Oct 2 15:35:18 2015
> -+++ modules/nat_traversal/nat_traversal.c Mon Oct 19 14:00:40 2015
> -@@ -1662,7 +1662,7 @@ static void
> - restore_keepalive_state(void)
> - {
> - char uri[64], socket[64];
> -- time_t rtime, stime, now;
> -+ long rtime, stime, now;
> - NAT_Contact *contact;
> - struct socket_info *sock;
> - int port, proto, res;
> -@@ -1680,7 +1680,7 @@ restore_keepalive_state(void)
> - return;
> - }
> -
> -- now = time(NULL);
> -+ now = (long)time(NULL);
> -
> - res = fscanf(f, STATE_FILE_HEADER); // skip header
> -
> Index: patches/patch-modules_nathelper_nathelper_c
> ===================================================================
> RCS file: patches/patch-modules_nathelper_nathelper_c
> diff -N patches/patch-modules_nathelper_nathelper_c
> --- patches/patch-modules_nathelper_nathelper_c 20 Nov 2015 10:09:52
> -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-modules_nathelper_nathelper_c,v 1.2 2015/11/20 10:09:52
> sthen Exp $
> ---- modules/nathelper/nathelper.c.orig Fri Oct 2 15:35:19 2015
> -+++ modules/nathelper/nathelper.c Mon Oct 19 14:00:40 2015
> -@@ -1656,7 +1656,7 @@ replace_sdp_ip(struct sip_msg* msg, str *org_body, cha
> - str body1, oldip, newip;
> - str body = *org_body;
> - unsigned hasreplaced = 0;
> -- int pf, pf1 = 0;
> -+ int pf = 0, pf1 = 0;
> - str body2;
> - char *bodylimit = body.s + body.len;
> - int ret;
> Index: patches/patch-modules_pv_pv_time_c
> ===================================================================
> RCS file: patches/patch-modules_pv_pv_time_c
> diff -N patches/patch-modules_pv_pv_time_c
> --- patches/patch-modules_pv_pv_time_c 20 Nov 2015 10:09:52 -0000
> 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,30 +0,0 @@
> -$OpenBSD: patch-modules_pv_pv_time_c,v 1.2 2015/11/20 10:09:52 sthen Exp $
> ---- modules/pv/pv_time.c.orig Fri Oct 2 15:35:19 2015
> -+++ modules/pv/pv_time.c Mon Oct 19 14:00:40 2015
> -@@ -115,7 +115,7 @@ int pv_get_time(struct sip_msg *msg, pv_param_t *param
> - {
> - msg_set_time(msg);
> - msg_ctx_id_set(msg, &_cfgutils_msgid);
> -- if(localtime_r(&msg->tval.tv_sec, &_cfgutils_ts) == NULL)
> -+ if(localtime_r((time_t*)&msg->tval.tv_sec, &_cfgutils_ts) ==
> NULL)
> - {
> - LM_ERR("unable to break time to attributes\n");
> - return -1;
> -@@ -166,7 +166,7 @@ int pv_get_strftime(struct sip_msg *msg, pv_param_t *p
> - {
> - msg_set_time(msg);
> - msg_ctx_id_set(msg, &_cfgutils_msgid);
> -- if(localtime_r(&msg->tval.tv_sec, &_cfgutils_ts) == NULL)
> -+ if(localtime_r((time_t*)&msg->tval.tv_sec, &_cfgutils_ts) ==
> NULL)
> - {
> - LM_ERR("unable to break time to attributes\n");
> - return -1;
> -@@ -223,7 +223,7 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *para
> -
> - msg_set_time(msg);
> -
> -- s.s = ctime(&msg->tval.tv_sec);
> -+ s.s = ctime((time_t*)&msg->tval.tv_sec);
> - s.len = strlen(s.s)-1;
> - return pv_get_strintval(msg, param, res, &s, (int)msg->tval.tv_sec);
> - }
> Index: patches/patch-modules_rls_utils_c
> ===================================================================
> RCS file: patches/patch-modules_rls_utils_c
> diff -N patches/patch-modules_rls_utils_c
> --- patches/patch-modules_rls_utils_c 20 Nov 2015 10:09:52 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,20 +0,0 @@
> -$OpenBSD: patch-modules_rls_utils_c,v 1.1 2015/11/20 10:09:52 sthen Exp $
> ---- modules/rls/utils.c.orig Wed Oct 21 00:09:23 2015
> -+++ modules/rls/utils.c Wed Oct 21 00:14:37 2015
> -@@ -26,14 +26,14 @@
> - #define SIP_PREFIX "sip:"
> - #define SIP_PREFIX_LEN sizeof(SIP_PREFIX)-1
> -
> --str* normalize_sip_uri(const str *uri)
> -+str* normalize_sip_uri(str *uri)
> - {
> - static str normalized_uri;
> - static str null_str = {NULL, 0};
> - static char buf[MAX_URI_SIZE];
> -
> - normalized_uri.s = buf;
> -- if (un_escape((str *)uri, &normalized_uri) < 0)
> -+ if (un_escape(uri, &normalized_uri) < 0)
> - {
> - LM_ERR("un-escaping URI\n");
> - return &null_str;
> Index: patches/patch-modules_rls_utils_h
> ===================================================================
> RCS file: patches/patch-modules_rls_utils_h
> diff -N patches/patch-modules_rls_utils_h
> --- patches/patch-modules_rls_utils_h 20 Nov 2015 10:09:52 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-modules_rls_utils_h,v 1.1 2015/11/20 10:09:52 sthen Exp $
> ---- modules/rls/utils.h.orig Wed Oct 21 00:14:47 2015
> -+++ modules/rls/utils.h Wed Oct 21 00:15:06 2015
> -@@ -26,6 +26,6 @@
> -
> - #include "../../ut.h"
> -
> --extern str* normalize_sip_uri(const str *uri);
> -+extern str* normalize_sip_uri(str *uri);
> -
> - #endif
> Index: patches/patch-modules_sca_sca_subscribe_c
> ===================================================================
> RCS file: patches/patch-modules_sca_sca_subscribe_c
> diff -N patches/patch-modules_sca_sca_subscribe_c
> --- patches/patch-modules_sca_sca_subscribe_c 20 Nov 2015 10:09:52 -0000
> 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,39 +0,0 @@
> -$OpenBSD: patch-modules_sca_sca_subscribe_c,v 1.2 2015/11/20 10:09:52 sthen
> Exp $
> ---- modules/sca/sca_subscribe.c.orig Fri Oct 2 15:35:18 2015
> -+++ modules/sca/sca_subscribe.c Mon Oct 19 14:00:40 2015
> -@@ -78,7 +78,7 @@ sca_subscription_purge_expired( unsigned int ticks, vo
> - sca_hash_table *ht;
> - sca_hash_entry *ent, *ent_tmp;
> - sca_subscription *sub;
> -- time_t now = time( NULL );
> -+ long now = (long)time( NULL );
> - int state;
> - int i;
> -
> -@@ -246,7 +246,7 @@ sca_subscriptions_restore_from_db( sca_mod *scam )
> - int i;
> - int idx;
> - int rc = -1;
> -- time_t now = time( NULL );
> -+ long now = (long)time( NULL );
> -
> - db_con = scam->db_api->init( scam->cfg->db_url );
> - if ( db_con == NULL ) {
> -@@ -456,7 +456,7 @@ sca_subscription_db_delete_expired( db1_con_t *db_con
> - db_key_t delete_columns[ 1 ];
> - db_val_t delete_values[ 1 ];
> - db_op_t delete_ops[ 1 ];
> -- time_t now = time( NULL );
> -+ long now = (long)time(NULL);
> - int kv_count = 0;
> -
> - delete_columns[ 0 ] = (str *)&SCA_DB_EXPIRES_COL_NAME;
> -@@ -484,7 +484,7 @@ sca_subscription_db_update( void )
> - sca_subscription *sub;
> - int i;
> - int rc = -1;
> -- time_t now = time( NULL );
> -+ long now = (long)time( NULL );
> -
> - db_con = sca_db_get_connection();
> - if ( db_con == NULL ){
> Index: patches/patch-modules_sca_sca_subscribe_h
> ===================================================================
> RCS file: patches/patch-modules_sca_sca_subscribe_h
> diff -N patches/patch-modules_sca_sca_subscribe_h
> --- patches/patch-modules_sca_sca_subscribe_h 20 Nov 2015 10:09:52 -0000
> 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-modules_sca_sca_subscribe_h,v 1.2 2015/11/20 10:09:52 sthen
> Exp $
> ---- modules/sca/sca_subscribe.h.orig Fri Oct 2 15:35:18 2015
> -+++ modules/sca/sca_subscribe.h Mon Oct 19 14:00:40 2015
> -@@ -39,7 +39,7 @@ struct _sca_subscription {
> - str subscriber; /* contact: user@ip */
> - str target_aor; /* account of record to watch:
> user@domain */
> - int event; /* "call-info", "line-seize" */
> -- time_t expires; /* expiration date of subscription */
> -+ long expires; /* expiration date of subscription */
> - int state; /* active, pending, terminated */
> - int index; /* seized appearance-index, line-seize
> only */
> -
> Index: patches/patch-modules_seas_encode_msg_c
> ===================================================================
> RCS file: patches/patch-modules_seas_encode_msg_c
> diff -N patches/patch-modules_seas_encode_msg_c
> --- patches/patch-modules_seas_encode_msg_c 16 Mar 2016 09:30:01 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,27 +0,0 @@
> -$OpenBSD: patch-modules_seas_encode_msg_c,v 1.1 2016/03/16 09:30:01 jasper
> Exp $
> -
> -Security fix for CVE-2016-2385
> -https://github.com/kamailio/kamailio/commit/f50c9c853e7809810099c970780c30b0765b0643
> -
> ---- modules/seas/encode_msg.c.orig Fri Oct 2 14:35:18 2015
> -+++ modules/seas/encode_msg.c Fri Mar 11 09:45:37 2016
> -@@ -158,6 +158,7 @@ int encode_msg(struct sip_msg *msg,char *payload,int l
> -
> - if(len < MAX_ENCODED_MSG + MAX_MESSAGE_LEN)
> - return -1;
> -+
> - if(parse_headers(msg,HDR_EOH_F,0)<0){
> - myerror="in parse_headers";
> - goto error;
> -@@ -266,6 +267,11 @@ int encode_msg(struct sip_msg *msg,char *payload,int l
> - /*j+=k;*/
> - /*pkg_free(payload2);*/
> - /*now we copy the actual message after the headers-meta-section*/
> -+
> -+ if(len < j + msg->len + 1) {
> -+ LM_ERR("not enough space to encode sip message\n");
> -+ return -1;
> -+ }
> - memcpy(&payload[j],msg->buf,msg->len);
> - LM_DBG("msglen = %d,msg starts at %d\n",msg->len,j);
> - j=htons(j);
> Index: patches/patch-modules_seas_ha_c
> ===================================================================
> RCS file: patches/patch-modules_seas_ha_c
> diff -N patches/patch-modules_seas_ha_c
> --- patches/patch-modules_seas_ha_c 11 Sep 2016 20:54:13 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-modules_seas_ha_c,v 1.1 2016/09/11 20:54:13 ajacoutot Exp $
> ---- modules/seas/ha.c.orig Sun Sep 11 12:53:57 2016
> -+++ modules/seas/ha.c Sun Sep 11 12:54:03 2016
> -@@ -21,7 +21,7 @@
> -
> -
> - #include <stdlib.h>/*atoi*/
> --#include <time.h>/*gettimeofday*/
> -+#include <sys/time.h>/*gettimeofday*/
> - #include <poll.h>/*poll*/
> - #include "ha.h"
> - #include "seas.h"
> Index: patches/patch-modules_sipcapture_sipcapture_c
> ===================================================================
> RCS file: patches/patch-modules_sipcapture_sipcapture_c
> diff -N patches/patch-modules_sipcapture_sipcapture_c
> --- patches/patch-modules_sipcapture_sipcapture_c 20 Nov 2015 10:09:52
> -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,29 +0,0 @@
> -$OpenBSD: patch-modules_sipcapture_sipcapture_c,v 1.4 2015/11/20 10:09:52
> sthen Exp $
> ---- modules/sipcapture/sipcapture.c.orig Fri Oct 2 15:35:19 2015
> -+++ modules/sipcapture/sipcapture.c Wed Oct 21 01:03:18 2015
> -@@ -47,6 +47,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>
> -@@ -1085,7 +1086,7 @@ static int sip_capture_store(struct _sipcapture_object
> - db_key_t db_keys[NR_KEYS];
> - db_val_t db_vals[NR_KEYS];
> -
> -- str tmp, corrtmp;
> -+ str tmp, corrtmp = {NULL, 0};
> - int ii = 0;
> - int ret = 0;
> - int counter = 0;
> -@@ -2056,7 +2057,7 @@ int receive_logging_json_msg(char * buf, unsigned int
> - struct timezone tz;
> - time_t epoch_time_as_time_t;
> -
> -- str tmp, corrtmp, table;
> -+ str tmp, corrtmp = {NULL, 0}, table;
> - _capture_mode_data_t *c = NULL;
> -
> - c = capture_def;
> Index: patches/patch-modules_tls_tls_init_c
> ===================================================================
> RCS file: patches/patch-modules_tls_tls_init_c
> diff -N patches/patch-modules_tls_tls_init_c
> --- patches/patch-modules_tls_tls_init_c 20 Nov 2015 10:09:52 -0000
> 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-modules_tls_tls_init_c,v 1.2 2015/11/20 10:09:52 sthen Exp $
> ---- modules/tls/tls_init.c.orig Fri Oct 2 15:35:18 2015
> -+++ modules/tls/tls_init.c Mon Oct 19 15:14:01 2015
> -@@ -344,9 +344,11 @@ static void init_ssl_methods(void)
> - ssl_methods[TLS_USE_SSLv2 - 1] = SSLv2_method();
> - #endif
> -
> -+#ifndef OPENSSL_NO_SSL3
> - ssl_methods[TLS_USE_SSLv3_cli - 1] = SSLv3_client_method();
> - ssl_methods[TLS_USE_SSLv3_srv - 1] = SSLv3_server_method();
> - ssl_methods[TLS_USE_SSLv3 - 1] = SSLv3_method();
> -+#endif
> -
> - ssl_methods[TLS_USE_TLSv1_cli - 1] = TLSv1_client_method();
> - ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method();
> Index: patches/patch-modules_tsilo_ts_hash_h
> ===================================================================
> RCS file: patches/patch-modules_tsilo_ts_hash_h
> diff -N patches/patch-modules_tsilo_ts_hash_h
> --- patches/patch-modules_tsilo_ts_hash_h 20 Nov 2015 10:09:52 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,10 +0,0 @@
> -$OpenBSD: patch-modules_tsilo_ts_hash_h,v 1.1 2015/11/20 10:09:52 sthen Exp $
> ---- modules/tsilo/ts_hash.h.orig Tue Oct 20 23:40:28 2015
> -+++ modules/tsilo/ts_hash.h Tue Oct 20 23:40:51 2015
> -@@ -175,5 +175,5 @@ ts_transaction_t* clone_ts_transaction(ts_transaction_
> - */
> - void remove_ts_transaction(ts_transaction_t* ts_t);
> -
> --void free_ts_transaction(void *ts_t);
> -+inline void free_ts_transaction(void *ts_t);
> - #endif
> Index: patches/patch-modules_xhttp_pi_xhttp_pi_fnc_c
> ===================================================================
> RCS file: patches/patch-modules_xhttp_pi_xhttp_pi_fnc_c
> diff -N patches/patch-modules_xhttp_pi_xhttp_pi_fnc_c
> --- patches/patch-modules_xhttp_pi_xhttp_pi_fnc_c 20 Nov 2015 10:09:52
> -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-modules_xhttp_pi_xhttp_pi_fnc_c,v 1.2 2015/11/20 10:09:52
> sthen Exp $
> ---- modules/xhttp_pi/xhttp_pi_fnc.c.orig Fri Oct 2 15:35:18 2015
> -+++ modules/xhttp_pi/xhttp_pi_fnc.c Mon Oct 19 14:00:40 2015
> -@@ -3178,7 +3178,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
> -
> if(db_time2str(values[j].val.time_val,
> -
> val_str.s, &val_str.len)!=0){
> - LM_ERR("Unable to
> convert double [%ld]\n",
> --
> values[j].val.time_val);
> -+
> (long)values[j].val.time_val);
> - goto error;
> - }
> - p += val_str.len;
> -@@ -3188,7 +3188,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
> - "[%ld][%.*s]\n",
> - command->q_keys[j]->len,
> - command->q_keys[j]->s,
> i,
> -- values[j].val.time_val,
> -+
> (long)values[j].val.time_val,
> - val_str.len, val_str.s);
> - break;
> - default:
> Index: patches/patch-msg_translator_c
> ===================================================================
> RCS file: patches/patch-msg_translator_c
> diff -N patches/patch-msg_translator_c
> --- patches/patch-msg_translator_c 20 Nov 2015 10:09:52 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,23 +0,0 @@
> -$OpenBSD: patch-msg_translator_c,v 1.1 2015/11/20 10:09:52 sthen Exp $
> ---- msg_translator.c.orig Fri Oct 2 15:35:19 2015
> -+++ msg_translator.c Wed Oct 21 00:05:06 2015
> -@@ -520,7 +520,11 @@ static inline int lump_check_opt( struct lump *l,
> - return 1;
> - }
> - case COND_IF_RAND:
> -+#ifdef HAVE_ARC4RANDOM
> -+ if(arc4random()>=RAND_MAX/2) {
> -+#else
> - if(rand()>=RAND_MAX/2) {
> -+#endif
> - LUMP_SET_COND_TRUE(l);
> - return 1;
> - } else return 0;
> -@@ -2284,6 +2288,7 @@ char * build_res_buf_from_sip_req( unsigned int code,
> -
> - body = 0;
> - buf=0;
> -+ pvia=0;
> - received_buf=rport_buf=warning_buf=content_len_buf=0;
> - received_len=rport_len=warning_len=content_len_len=0;
> -
> Index: patches/patch-pt_c
> ===================================================================
> RCS file: patches/patch-pt_c
> diff -N patches/patch-pt_c
> --- patches/patch-pt_c 20 Nov 2015 10:09:52 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,71 +0,0 @@
> -$OpenBSD: patch-pt_c,v 1.1 2015/11/20 10:09:52 sthen Exp $
> ---- pt.c.orig Fri Oct 2 15:35:18 2015
> -+++ pt.c Tue Oct 20 23:45:46 2015
> -@@ -244,8 +244,10 @@ int fork_process(int child_id, char *desc, int make_so
> - {
> - int pid, child_process_no;
> - int ret;
> -+#ifndef HAVE_ARC4RANDOM
> - unsigned int new_seed1;
> - unsigned int new_seed2;
> -+#endif
> - #ifdef USE_TCP
> - int sockfd[2];
> - #endif
> -@@ -284,8 +286,10 @@ int fork_process(int child_id, char *desc, int make_so
> -
> -
> - child_process_no = *process_count;
> -+#ifndef HAVE_ARC4RANDOM
> - new_seed1=rand();
> - new_seed2=random();
> -+#endif
> - pid = fork();
> - if (pid<0) {
> - lock_release(process_lock);
> -@@ -300,9 +304,11 @@ int fork_process(int child_id, char *desc, int make_so
> - #ifdef USE_TCP
> - close_extra_socks(child_id, process_no);
> - #endif /* USE_TCP */
> -+#ifndef HAVE_ARC4RANDOM
> - srand(new_seed1);
> - fastrand_seed(rand());
> - srandom(new_seed2+time(0));
> -+#endif
> - shm_malloc_on_fork();
> - #ifdef PROFILING
> - monstartup((u_long) &_start, (u_long) &etext);
> -@@ -379,8 +385,10 @@ int fork_tcp_process(int child_id, char *desc, int r,
> - int reader_fd[2]; /* for comm. with the tcp children read */
> - int ret;
> - int i;
> -+#ifndef HAVE_ARC4RANDOM
> - unsigned int new_seed1;
> - unsigned int new_seed2;
> -+#endif
> -
> - /* init */
> - sockfd[0]=sockfd[1]=-1;
> -@@ -419,8 +427,10 @@ int fork_tcp_process(int child_id, char *desc, int r,
> -
> -
> - child_process_no = *process_count;
> -+#ifndef HAVE_ARC4RANDOM
> - new_seed1=rand();
> - new_seed2=random();
> -+#endif
> - pid = fork();
> - if (pid<0) {
> - lock_release(process_lock);
> -@@ -442,9 +452,11 @@ int fork_tcp_process(int child_id, char *desc, int r,
> - }
> - }
> - daemon_status_on_fork_cleanup();
> -+#ifndef HAVE_ARC4RANDOM
> - srand(new_seed1);
> - fastrand_seed(rand());
> - srandom(new_seed2+time(0));
> -+#endif
> - shm_malloc_on_fork();
> - #ifdef PROFILING
> - monstartup((u_long) &_start, (u_long) &etext);
> Index: patches/patch-rand_fastrand_c
> ===================================================================
> RCS file: patches/patch-rand_fastrand_c
> diff -N patches/patch-rand_fastrand_c
> --- patches/patch-rand_fastrand_c 20 Nov 2015 10:09:52 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,27 +0,0 @@
> -$OpenBSD: patch-rand_fastrand_c,v 1.1 2015/11/20 10:09:52 sthen Exp $
> ---- rand/fastrand.c.orig Fri Oct 2 15:35:18 2015
> -+++ rand/fastrand.c Wed Oct 21 00:26:56 2015
> -@@ -25,6 +25,18 @@
> - #include "fastrand.h"
> -
> - #include <stdlib.h>
> -+
> -+#ifdef HAVE_ARC4RANDOM
> -+unsigned int fastrand()
> -+{
> -+ return arc4random();
> -+}
> -+
> -+unsigned int fastrand_max(unsigned int max)
> -+{
> -+ return arc4random_uniform(max+1);
> -+}
> -+#else
> - #include "isaac/rand.h"
> -
> - #define FASTRAND_MAX ((unsigned int)(-1))
> -@@ -54,3 +66,4 @@ unsigned int fastrand_max(unsigned int max)
> - {
> - return fastrand()%(max+1);
> - }
> -+#endif
> Index: patches/patch-rand_fastrand_h
> ===================================================================
> RCS file: patches/patch-rand_fastrand_h
> diff -N patches/patch-rand_fastrand_h
> --- patches/patch-rand_fastrand_h 20 Nov 2015 10:09:52 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-rand_fastrand_h,v 1.1 2015/11/20 10:09:52 sthen Exp $
> ---- rand/fastrand.h.orig Wed Oct 21 00:27:08 2015
> -+++ rand/fastrand.h Wed Oct 21 00:27:38 2015
> -@@ -22,9 +22,10 @@
> - #ifndef _fastrand_h
> - #define _fastrand_h
> -
> --
> -+#ifndef HAVE_ARC4RANDOM
> - /* side effect: seeds also random w/ seed */
> - void fastrand_seed(unsigned int seed);
> -+#endif
> - /* generate a 32 bit random number */
> - unsigned int fastrand(void);
> - /* generate a random number between 0 and max inclusive ( 0 <= r <= max)
> Index: patches/patch-select_core_c
> ===================================================================
> RCS file: patches/patch-select_core_c
> diff -N patches/patch-select_core_c
> --- patches/patch-select_core_c 20 Nov 2015 10:09:52 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-select_core_c,v 1.1 2015/11/20 10:09:52 sthen Exp $
> ---- select_core.c.orig Wed Oct 21 00:28:31 2015
> -+++ select_core.c Wed Oct 21 00:29:26 2015
> -@@ -1512,7 +1512,11 @@ int select_sys_unique(str* res, select_t* s, struct si
> - for (i = UNIQUE_ID_FIX_LEN, cb = 0, x = 0; i <
> UNIQUE_ID_FIX_LEN+UNIQUE_ID_RAND_LEN; i++) {
> - if (!cb) {
> - cb = rb;
> -+#ifdef HAVE_ARC4RANDOM
> -+ x = arc4random();
> -+#else
> - x = rand();
> -+#endif
> - }
> - uniq_id[i] = fourbits2char[x & 0x0F];
> - x >>= rb;
> Index: patches/patch-sip_msg_clone_c
> ===================================================================
> RCS file: patches/patch-sip_msg_clone_c
> diff -N patches/patch-sip_msg_clone_c
> --- patches/patch-sip_msg_clone_c 20 Nov 2015 10:09:52 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-sip_msg_clone_c,v 1.2 2015/11/20 10:09:52 sthen Exp $
> ---- sip_msg_clone.c.orig Fri Oct 2 15:35:18 2015
> -+++ sip_msg_clone.c Mon Oct 19 14:00:40 2015
> -@@ -183,7 +183,7 @@ static inline struct via_body* via_body_cloner( char*
> -
> - if ( org_via->param_lst )
> - {
> -- struct via_param *vp, *new_vp, *last_new_vp;
> -+ struct via_param *vp, *new_vp = NULL, *last_new_vp;
> - for( vp=org_via->param_lst, last_new_vp=0 ; vp ;
> vp=vp->next )
> - {
> - new_vp = (struct via_param*)(*p);
> Index: patches/patch-src_Makefile_defs
> ===================================================================
> RCS file: patches/patch-src_Makefile_defs
> diff -N patches/patch-src_Makefile_defs
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_Makefile_defs 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,83 @@
> +$OpenBSD$
> +Index: src/Makefile.defs
> +--- src/Makefile.defs.orig
> ++++ src/Makefile.defs
> +@@ -316,9 +316,9 @@ ppc_macros= __powerpc __powerpc__ __POWERPC__ __ppc__
> + ppc64_macros= __ppc64__ _ARCH_PPC64
> +
> + mips_macros= __mips__ __mips _MIPS_ARCH_MIPS1
> +-mips2_macros= _MIPS_ISA_MIPS2 _MIPS_ISA_MIPS3 _MIPS_ISA_MIPS4 \
> ++mips2_macros= _MIPS_ISA_MIPS2 _MIPS_ISA_MIPS4 \
> + _MIPS_ARCH_MIPS2 _MIPS_ARCH_MIPS3 _MIPS_ARCH_MIPS4
> +-mips64_macros= _MIPS_ISA_MIPS64 _MIPS_ARCH_MIPS64
> ++mips64_macros= _MIPS_ISA_MIPS64 _MIPS_ARCH_MIPS64 _MIPS_ISA_MIPS3
> +
> + alpha_macros= __alpha__ __alpha _M_ALPHA_
> +
> +@@ -867,16 +867,12 @@ ifeq ($(ARCH), i386)
> + ifeq ($(CC_NAME), gcc)
> + C_DEFS+=-DCC_GCC_LIKE_ASM
> + #common stuff
> +- CFLAGS=-g $(CC_OPT) -funroll-loops
> -Wcast-align $(PROFILE)
> ++ CFLAGS=
> + #if gcc 6.0+, 5.0+, 4.5+ or 4.2+
> + ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+,$(CC_SHORTVER))))
> + $(call set_if_empty,CPUTYPE,athlon64)
> +- CFLAGS+=-m32 -minline-all-stringops \
> +- -falign-loops \
> +- -ftree-vectorize \
> +- -fno-strict-overflow \
> +- -mtune=$(CPUTYPE)
> +- LDFLAGS+=-m32
> ++ CFLAGS+=
> ++ LDFLAGS+=
> + else
> + #if gcc 4.0+
> + ifeq ($(CC_SHORTVER), 4.x)
> +@@ -924,8 +920,8 @@ else # CC_NAME, gcc
> + ifeq ($(CC_NAME), clang)
> + $(call set_if_empty,CPUTYPE,athlon64)
> + C_DEFS+=-DCC_GCC_LIKE_ASM
> +- CFLAGS+=-g -m32 $(CC_OPT)
> -mtune=$(CPUTYPE)
> +- LDFLAGS+=-m32
> ++ CFLAGS+=
> ++ LDFLAGS+=
> + else # CC_NAME, clang
> + ifeq ($(CC_NAME), icc)
> + C_DEFS+=-DCC_GCC_LIKE_ASM
> +@@ -949,7 +945,7 @@ ifeq ($(ARCH), x86_64)
> + ifeq ($(CC_NAME), gcc)
> + C_DEFS+=-DCC_GCC_LIKE_ASM
> + #common stuff
> +- CFLAGS=-g $(CC_OPT) -funroll-loops
> -Wcast-align $(PROFILE)
> ++ CFLAGS=
> + #if gcc 4.5+
> + # don't add '-mtune=$(CPUTYPE)' - gcc failure
> + ifeq ($(CC_SHORTVER),$(filter $(CC_SHORTVER),4.5+
> 5.0+ 6.0+))
> +@@ -963,12 +959,8 @@ else
> + #if gcc 4.2+
> + ifeq ($(CC_SHORTVER), 4.2+)
> + $(call set_if_empty,CPUTYPE,opteron)
> +- CFLAGS+=-m64 -minline-all-stringops \
> +- -falign-loops \
> +- -ftree-vectorize \
> +- -fno-strict-overflow \
> +- -mtune=$(CPUTYPE)
> +- LDFLAGS+=-m64
> ++ CFLAGS+=
> ++ LDFLAGS+=
> + else
> + #if gcc 4.0+
> + ifeq ($(CC_SHORTVER), 4.x)
> +@@ -1017,9 +1009,8 @@ else # CC_NAME, gcc
> + ifeq ($(CC_NAME), clang)
> + $(call set_if_empty,CPUTYPE,opteron)
> + C_DEFS+=-DCC_GCC_LIKE_ASM
> +- CFLAGS+=-g -m64 \
> +- $(CC_OPT)
> +- LDFLAGS+=-m64
> ++ CFLAGS+=
> ++ LDFLAGS+=
> + else # CC_NAME, clang
> + ifeq ($(CC_NAME), icc)
> + C_DEFS+=-DCC_GCC_LIKE_ASM
> Index: patches/patch-src_Makefile_libs
> ===================================================================
> RCS file: patches/patch-src_Makefile_libs
> diff -N patches/patch-src_Makefile_libs
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_Makefile_libs 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,75 @@
> +$OpenBSD$
> +--- src/Makefile.libs.orig Mon May 15 22:09:20 2017
> ++++ src/Makefile.libs Mon May 15 22:15:55 2017
> +@@ -52,12 +52,18 @@ ifeq ($(OS), darwin)
> + -install_name $(LIB_INSTALL_NAME)
> +
> + else
> ++ifeq ($(OS), openbsd)
> ++ LIB_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)
> +@@ -104,14 +110,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:
> +@@ -137,21 +147,31 @@ 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
> ++ifeq ($(OS), openbsd)
> ++install-if-newer: $(lib_prefix)/$(lib_dir)/$(LIB_NAME)
> ++
> ++$(lib_prefix)/$(lib_dir)/$(LIB_NAME): $(LIBINAME_F)
> ++ @$(MAKE) install
> ++else
> + install-if-newer: $(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME)
> +
> + $(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME): $(LIB_NAME) $(LIBINAME_F)
> + @$(MAKE) install
> +-
> ++endif
> +
> + ifneq ($(strip $(LIBINAME_F)),)
> + $(LIBINAME_F): $(ALLDEP)
> Index: patches/patch-src_core_cfg_y
> ===================================================================
> RCS file: patches/patch-src_core_cfg_y
> diff -N patches/patch-src_core_cfg_y
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_core_cfg_y 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- src/core/cfg.y.orig Mon May 15 22:30:18 2017
> ++++ src/core/cfg.y Mon May 15 22:30:40 2017
> +@@ -35,6 +35,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>
> Index: patches/patch-src_core_list_h
> ===================================================================
> RCS file: patches/patch-src_core_list_h
> diff -N patches/patch-src_core_list_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_core_list_h 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,43 @@
> +$OpenBSD$
> +--- src/core/list.h.orig Mon May 15 22:31:06 2017
> ++++ src/core/list.h Mon May 15 22:34:38 2017
> +@@ -33,6 +33,8 @@
> + #ifndef _SER_LIST_H
> + #define _SER_LIST_H
> +
> ++#include <sys/queue.h>
> ++
> + /* #include <sys/cdefs.h> - not needed and not present on all the systems */
> +
> + /*
> +@@ -133,6 +135,7 @@ struct qm_trace {
> + #define TRASHIT(x)
> + #endif /* QUEUE_MACRO_DEBUG */
> +
> ++#ifndef SLIST_HEAD
> + /*
> + * Singly-linked List declarations.
> + */
> +@@ -204,6 +207,7 @@ struct {
> \
> + #define SLIST_REMOVE_HEAD(head, field) do {
> \
> + SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \
> + } while (0)
> ++#endif /* SLIST_HEAD */
> +
> + /*
> + * Singly-linked Tail queue declarations.
> +@@ -300,6 +304,7 @@ struct {
> \
> + (head)->stqh_last = &STAILQ_FIRST((head)); \
> + } while (0)
> +
> ++#ifndef LIST_HEAD
> + /*
> + * List declarations.
> + */
> +@@ -513,5 +518,6 @@ struct {
> \
> + TRASHIT((elm)->field.tqe_prev); \
> + QMD_TRACE_ELEM(&(elm)->field); \
> + } while (0)
> ++#endif /* LIST_HEAD */
> +
> + #endif /* !_LIST_H */
> Index: patches/patch-src_core_msg_translator_c
> ===================================================================
> RCS file: patches/patch-src_core_msg_translator_c
> diff -N patches/patch-src_core_msg_translator_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_core_msg_translator_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +--- src/core/msg_translator.c.orig Mon May 15 22:35:06 2017
> ++++ src/core/msg_translator.c Mon May 15 22:42:28 2017
> +@@ -522,7 +522,11 @@ static inline int lump_check_opt( struct lump *l,
> + return 1;
> + }
> + case COND_IF_RAND:
> ++#ifdef HAVE_ARC4RANDOM
> ++ if(arc4random()>=KAM_RAND_MAX/2) {
> ++#else
> + if(kam_rand()>=KAM_RAND_MAX/2) {
> ++#endif
> + LUMP_SET_COND_TRUE(l);
> + return 1;
> + } else return 0;
> +@@ -2317,6 +2321,7 @@ char * build_res_buf_from_sip_req( unsigned int code,
> +
> + body = 0;
> + buf=0;
> ++ pvia=0;
> + received_buf=rport_buf=warning_buf=content_len_buf=0;
> + received_len=rport_len=warning_len=content_len_len=0;
> +
> Index: patches/patch-src_core_pt_c
> ===================================================================
> RCS file: patches/patch-src_core_pt_c
> diff -N patches/patch-src_core_pt_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_core_pt_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,71 @@
> +$OpenBSD$
> +--- src/core/pt.c.orig Mon May 15 22:43:07 2017
> ++++ src/core/pt.c Mon May 15 22:48:08 2017
> +@@ -245,8 +245,10 @@ int fork_process(int child_id, char *desc, int make_so
> + {
> + int pid, child_process_no;
> + int ret;
> ++#ifndef HAVE_ARC4RANDOM
> + unsigned int new_seed1;
> + unsigned int new_seed2;
> ++#endif
> + #ifdef USE_TCP
> + int sockfd[2];
> + #endif
> +@@ -285,8 +287,10 @@ int fork_process(int child_id, char *desc, int make_so
> +
> +
> + child_process_no = *process_count;
> ++#ifndef HAVE_ARC4RANDOM
> + new_seed1=kam_rand();
> + new_seed2=random();
> ++#endif
> + pid = fork();
> + if (pid<0) {
> + lock_release(process_lock);
> +@@ -301,9 +305,11 @@ int fork_process(int child_id, char *desc, int make_so
> + #ifdef USE_TCP
> + close_extra_socks(child_id, process_no);
> + #endif /* USE_TCP */
> ++#ifndef HAVE_ARC4RANDOM
> + kam_srand(new_seed1);
> + fastrand_seed(kam_rand());
> + srandom(new_seed2+time(0));
> ++#endif
> + shm_malloc_on_fork();
> + #ifdef PROFILING
> + monstartup((u_long) &_start, (u_long) &etext);
> +@@ -380,8 +386,10 @@ int fork_tcp_process(int child_id, char *desc, int r,
> + int reader_fd[2]; /* for comm. with the tcp children read */
> + int ret;
> + int i;
> ++#ifndef HAVE_ARC4RANDOM
> + unsigned int new_seed1;
> + unsigned int new_seed2;
> ++#endif
> +
> + /* init */
> + sockfd[0]=sockfd[1]=-1;
> +@@ -420,8 +428,10 @@ int fork_tcp_process(int child_id, char *desc, int r,
> +
> +
> + child_process_no = *process_count;
> ++#ifndef HAVE_ARC4RANDOM
> + new_seed1=kam_rand();
> + new_seed2=random();
> ++#endif
> + pid = fork();
> + if (pid<0) {
> + lock_release(process_lock);
> +@@ -443,9 +453,11 @@ int fork_tcp_process(int child_id, char *desc, int r,
> + }
> + }
> + daemon_status_on_fork_cleanup();
> ++#ifndef HAVE_ARC4RANDOM
> + kam_srand(new_seed1);
> + fastrand_seed(kam_rand());
> + srandom(new_seed2+time(0));
> ++#endif
> + shm_malloc_on_fork();
> + #ifdef PROFILING
> + monstartup((u_long) &_start, (u_long) &etext);
> Index: patches/patch-src_core_rand_fastrand_c
> ===================================================================
> RCS file: patches/patch-src_core_rand_fastrand_c
> diff -N patches/patch-src_core_rand_fastrand_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_core_rand_fastrand_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,27 @@
> +$OpenBSD$
> +--- src/core/rand/fastrand.c.orig Mon May 15 22:48:56 2017
> ++++ src/core/rand/fastrand.c Mon May 15 22:50:19 2017
> +@@ -25,6 +25,18 @@
> + #include "fastrand.h"
> +
> + #include <stdlib.h>
> ++
> ++#ifdef HAVE_ARC4RANDOM
> ++unsigned int fastrand()
> ++{
> ++ return arc4random();
> ++}
> ++
> ++unsigned int fastrand_max(unsigned int max)
> ++{
> ++ return arc4random_uniform(max+1);
> ++}
> ++#else
> + #include "isaac/rand.h"
> +
> + #define FASTRAND_MAX ((unsigned int)(-1))
> +@@ -54,3 +66,4 @@ unsigned int fastrand_max(unsigned int max)
> + {
> + return fastrand()%(max+1);
> + }
> ++#endif
> Index: patches/patch-src_core_rand_fastrand_h
> ===================================================================
> RCS file: patches/patch-src_core_rand_fastrand_h
> diff -N patches/patch-src_core_rand_fastrand_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_core_rand_fastrand_h 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +--- src/core/rand/fastrand.h.orig Mon May 15 22:50:42 2017
> ++++ src/core/rand/fastrand.h Mon May 15 22:51:20 2017
> +@@ -22,9 +22,10 @@
> + #ifndef _fastrand_h
> + #define _fastrand_h
> +
> +-
> ++#ifndef HAVE_ARC4RANDOM
> + /* side effect: seeds also random w/ seed */
> + void fastrand_seed(unsigned int seed);
> ++#endif
> + /* generate a 32 bit random number */
> + unsigned int fastrand(void);
> + /* generate a random number between 0 and max inclusive ( 0 <= r <= max)
> Index: patches/patch-src_core_select_core_c
> ===================================================================
> RCS file: patches/patch-src_core_select_core_c
> diff -N patches/patch-src_core_select_core_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_core_select_core_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +--- src/core/select_core.c.orig Mon May 15 22:51:55 2017
> ++++ src/core/select_core.c Mon May 15 22:53:45 2017
> +@@ -1513,7 +1513,11 @@ int select_sys_unique(str* res, select_t* s, struct si
> + for (i = UNIQUE_ID_FIX_LEN, cb = 0, x = 0; i <
> UNIQUE_ID_FIX_LEN+UNIQUE_ID_RAND_LEN; i++) {
> + if (!cb) {
> + cb = rb;
> ++#ifdef HAVE_ARC4RANDOM
> ++ x = arc4random();
> ++#else
> + x = kam_rand();
> ++#endif
> + }
> + uniq_id[i] = fourbits2char[x & 0x0F];
> + x >>= rb;
> Index: patches/patch-src_core_sip_msg_clone_c
> ===================================================================
> RCS file: patches/patch-src_core_sip_msg_clone_c
> diff -N patches/patch-src_core_sip_msg_clone_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_core_sip_msg_clone_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- src/core/sip_msg_clone.c.orig Mon May 15 22:54:19 2017
> ++++ src/core/sip_msg_clone.c Mon May 15 22:55:18 2017
> +@@ -183,7 +183,7 @@ static inline struct via_body* via_body_cloner( char*
> +
> + if ( org_via->param_lst )
> + {
> +- struct via_param *vp, *new_vp, *last_new_vp;
> ++ struct via_param *vp, *new_vp = NULL, *last_new_vp;
> + for( vp=org_via->param_lst, last_new_vp=0 ; vp ;
> vp=vp->next )
> + {
> + new_vp = (struct via_param*)(*p);
> Index: patches/patch-src_core_tcp_read_c
> ===================================================================
> RCS file: patches/patch-src_core_tcp_read_c
> diff -N patches/patch-src_core_tcp_read_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_core_tcp_read_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +Index: src/core/tcp_read.c
> +--- src/core/tcp_read.c.orig
> ++++ src/core/tcp_read.c
> +@@ -1497,6 +1497,14 @@ void release_tcpconn(struct tcp_connection* c, long st
> + ip_addr2a(&c->rcv.src_ip), c->rcv.src_port,
> + ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);
> + LM_DBG("extra_data %p\n", c->extra_data);
> ++
> ++ /* experimental fix tls crash with libressl */
> ++ /* add cleanup SSL structure in child process, in parent
> process SSL structure is empty */
> ++ if ((c->type==PROTO_TLS || c->type==PROTO_WSS) &&
> (c->extra_data) && c->fd != -1) {
> ++ tls_close(c, c->fd);
> ++ tls_tcpconn_clean(c);
> ++ }
> ++
> + /* release req & signal the parent */
> + c->reader_pid=0; /* reset it */
> + if (c->fd!=-1){
> Index: patches/patch-src_core_timer_c
> ===================================================================
> RCS file: patches/patch-src_core_timer_c
> diff -N patches/patch-src_core_timer_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_core_timer_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +--- src/core/timer.c.orig Mon May 15 22:55:54 2017
> ++++ src/core/timer.c Mon May 15 22:57:05 2017
> +@@ -244,7 +244,11 @@ int init_timer()
> +
> + /* initial values */
> + memset(timer_lst, 0, sizeof(struct timer_lists));
> ++#ifdef HAVE_ARC4RANDOM
> ++ *ticks=arc4random();
> ++#else
> + *ticks=random(); /* random value for start, for debugging */
> ++#endif
> + prev_ticks=last_ticks=last_adj_check=*ticks;
> + *running_timer=0;
> + if (gettimeofday(&start_time, 0)<0){
> Index: patches/patch-src_lib_srdb1_Makefile
> ===================================================================
> RCS file: patches/patch-src_lib_srdb1_Makefile
> diff -N patches/patch-src_lib_srdb1_Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_lib_srdb1_Makefile 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- src/lib/srdb1/Makefile.orig Mon May 15 23:09:10 2017
> ++++ src/lib/srdb1/Makefile Mon May 15 23:09:29 2017
> +@@ -4,6 +4,7 @@ NAME:=srdb1
> + MAJOR_VER=1
> + MINOR_VER=0
> + BUGFIX_VER=0
> ++OBSD_VER=$(LIBsrdb1_VERSION)
> + LIBS=
> +
> + include ../../Makefile.libs
> Index: patches/patch-src_lib_srdb2_Makefile
> ===================================================================
> RCS file: patches/patch-src_lib_srdb2_Makefile
> diff -N patches/patch-src_lib_srdb2_Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_lib_srdb2_Makefile 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- src/lib/srdb2/Makefile.orig Mon May 15 23:10:16 2017
> ++++ src/lib/srdb2/Makefile Mon May 15 23:10:32 2017
> +@@ -4,6 +4,7 @@ NAME:=srdb2
> + MAJOR_VER=1
> + MINOR_VER=0
> + BUGFIX_VER=0
> ++OBSD_VER=$(LIBsrdb2_VERSION)
> + LIBS=
> +
> + include ../../Makefile.libs
> Index: patches/patch-src_lib_srutils_Makefile
> ===================================================================
> RCS file: patches/patch-src_lib_srutils_Makefile
> diff -N patches/patch-src_lib_srutils_Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_lib_srutils_Makefile 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- src/lib/srutils/Makefile.orig Mon May 15 23:15:29 2017
> ++++ src/lib/srutils/Makefile Mon May 15 23:15:43 2017
> +@@ -4,6 +4,7 @@ NAME:=srutils
> + MAJOR_VER=1
> + MINOR_VER=0
> + BUGFIX_VER=0
> ++OBSD_VER=$(LIBsrutils_VERSION)
> + LIBS= -lm
> +
> + include ../../Makefile.libs
> Index: patches/patch-src_lib_trie_Makefile
> ===================================================================
> RCS file: patches/patch-src_lib_trie_Makefile
> diff -N patches/patch-src_lib_trie_Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_lib_trie_Makefile 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- src/lib/trie/Makefile.orig Mon May 15 23:11:07 2017
> ++++ src/lib/trie/Makefile Mon May 15 23:11:25 2017
> +@@ -4,6 +4,7 @@ NAME:=trie
> + MAJOR_VER=1
> + MINOR_VER=0
> + BUGFIX_VER=0
> ++OBSD_VER=$(LIBtrie_VERSION)
> + LIBS=
> +
> + include ../../Makefile.libs
> Index: patches/patch-src_main_c
> ===================================================================
> RCS file: patches/patch-src_main_c
> diff -N patches/patch-src_main_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_main_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,31 @@
> +$OpenBSD$
> +Index: src/main.c
> +--- src/main.c.orig
> ++++ src/main.c
> +@@ -1845,8 +1845,10 @@ int main(int argc, char** argv)
> + int proto;
> + char *options;
> + int ret;
> ++#ifndef HAVE_ARC4RANDOM
> + unsigned int seed;
> + int rfd;
> ++#endif
> + int debug_save, debug_flag;
> + int dont_fork_cnt;
> + struct name_lst* n_lst;
> +@@ -2112,6 +2114,7 @@ int main(int argc, char** argv)
> + goto error;
> + }
> +
> ++#ifndef HAVE_ARC4RANDOM
> + /* seed the prng */
> + /* try to use /dev/urandom if possible */
> + seed=0;
> +@@ -2132,6 +2135,7 @@ try_again:
> + fastrand_seed(kam_rand());
> + srandom(kam_rand()+time(0));
> + LM_DBG("test random numbers %u %lu %u\n", kam_rand(), random(),
> fastrand());
> ++#endif
> +
> + /*register builtin modules*/
> + register_builtin_modules();
> Index: patches/patch-src_modules_auth_identity_auth_crypt_c
> ===================================================================
> RCS file: patches/patch-src_modules_auth_identity_auth_crypt_c
> diff -N patches/patch-src_modules_auth_identity_auth_crypt_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_auth_identity_auth_crypt_c 3 Jul 2017
> 15:11:23 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/modules/auth_identity/auth_crypt.c
> +--- src/modules/auth_identity/auth_crypt.c.orig
> ++++ src/modules/auth_identity/auth_crypt.c
> +@@ -114,7 +114,7 @@ int check_x509_subj(X509 *pcert, str* sdom)
> +
> + if (actname->type == GEN_DNS || actname->type ==
> GEN_URI) {
> + /* we've found one */
> +-#if OPENSSL_VERSION_NUMBER >= 0x010100000L
> ++#if OPENSSL_VERSION_NUMBER >= 0x010100000L &&
> !defined(LIBRESSL_VERSION_NUMBER)
> + altptr = (char
> *)ASN1_STRING_get0_data(actname->d.ia5);
> + #else
> + altptr = (char
> *)ASN1_STRING_data(actname->d.ia5);
> Index: patches/patch-src_modules_auth_identity_auth_identity_c
> ===================================================================
> RCS file: patches/patch-src_modules_auth_identity_auth_identity_c
> diff -N patches/patch-src_modules_auth_identity_auth_identity_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_auth_identity_auth_identity_c 3 Jul 2017
> 15:11:23 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/modules/auth_identity/auth_identity.c
> +--- src/modules/auth_identity/auth_identity.c.orig
> ++++ src/modules/auth_identity/auth_identity.c
> +@@ -590,7 +590,7 @@ static int check_date(struct sip_msg* msg, char* srt1,
> + }
> +
> + if (tnow > tmsg + glb_iauthval) {
> +- LOG(L_INFO, "AUTH_IDENTITY VERIFIER: Outdated date header value
> (%ld sec)\n", tnow - tmsg + glb_iauthval);
> ++ LOG(L_INFO, "AUTH_IDENTITY VERIFIER: Outdated date header value
> (%lld sec)\n", tnow - tmsg + glb_iauthval);
> + return -4;
> + } else
> + LOG(AUTH_DBG_LEVEL, "AUTH_IDENTITY VERIFIER: Date header value
> OK\n");
> Index: patches/patch-src_modules_ctl_init_socks_c
> ===================================================================
> RCS file: patches/patch-src_modules_ctl_init_socks_c
> diff -N patches/patch-src_modules_ctl_init_socks_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_ctl_init_socks_c 3 Jul 2017 15:11:23
> -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +--- src/modules/ctl/init_socks.c.orig Mon May 15 23:36:56 2017
> ++++ src/modules/ctl/init_socks.c Mon May 15 23:37:52 2017
> +@@ -85,9 +85,9 @@ int init_unix_sock(struct sockaddr_un* su, char* name,
> + unlink(name);
> + memset(&ifsun, 0, sizeof (struct sockaddr_un));
> + len=strlen(name);
> +- if (len>UNIX_PATH_MAX){
> +- LOG(L_ERR, "ERROR: init_unix_sock: name too long (%d > %d):
> %s\n",
> +- len, UNIX_PATH_MAX, name);
> ++ if (len>sizeof(ifsun.sun_path)){
> ++ LOG(L_ERR, "ERROR: init_unix_sock: name too long (%d > %ld):
> %s\n",
> ++ len, sizeof(ifsun.sun_path), name);
> + goto error;
> + }
> + ifsun.sun_family=AF_UNIX;
> Index: patches/patch-src_modules_db_berkeley_Makefile
> ===================================================================
> RCS file: patches/patch-src_modules_db_berkeley_Makefile
> diff -N patches/patch-src_modules_db_berkeley_Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_db_berkeley_Makefile 3 Jul 2017 15:11:23
> -0000
> @@ -0,0 +1,25 @@
> +$OpenBSD$
> +--- src/modules/db_berkeley/Makefile.orig Mon May 15 23:31:59 2017
> ++++ src/modules/db_berkeley/Makefile Mon May 15 23:33:10 2017
> +@@ -10,10 +10,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/srdb1
> +@@ -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
> +
> Index: patches/patch-src_modules_db_berkeley_bdb_lib_c
> ===================================================================
> RCS file: patches/patch-src_modules_db_berkeley_bdb_lib_c
> diff -N patches/patch-src_modules_db_berkeley_bdb_lib_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_db_berkeley_bdb_lib_c 3 Jul 2017 15:11:23
> -0000
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +--- src/modules/db_berkeley/bdb_lib.c.orig Mon May 15 23:34:21 2017
> ++++ src/modules/db_berkeley/bdb_lib.c Mon May 15 23:34:56 2017
> +@@ -666,7 +666,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
> + {
> + char *s;
> + char fn[1024];
> +- char d[64];
> ++ char d[128];
> + FILE *fp = NULL;
> + struct tm *t;
> + int bl;
> +@@ -686,7 +686,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
> + s+=_tp->name.len;
> +
> + t = localtime( &tim );
> +- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
> ++ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
> + strncpy(s, d, bl);
> + s+= bl;
> + *s = 0;
> Index: patches/patch-src_modules_db_berkeley_km_bdb_lib_c
> ===================================================================
> RCS file: patches/patch-src_modules_db_berkeley_km_bdb_lib_c
> diff -N patches/patch-src_modules_db_berkeley_km_bdb_lib_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_db_berkeley_km_bdb_lib_c 3 Jul 2017
> 15:11:23 -0000
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +--- src/modules/db_berkeley/km_bdb_lib.c.orig Mon May 15 23:35:24 2017
> ++++ src/modules/db_berkeley/km_bdb_lib.c Mon May 15 23:36:06 2017
> +@@ -719,7 +719,7 @@ int km_bdblib_create_journal(table_p _tp)
> + {
> + char *s;
> + char fn[1024];
> +- char d[64];
> ++ char d[128];
> + FILE *fp = NULL;
> + struct tm *t;
> + int bl;
> +@@ -740,7 +740,7 @@ int km_bdblib_create_journal(table_p _tp)
> + s+=_tp->name.len;
> +
> + t = localtime( &tim );
> +- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
> ++ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
> + strncpy(s, d, bl);
> + s+= bl;
> + *s = 0;
> Index: patches/patch-src_modules_db_mysql_my_cmd_c
> ===================================================================
> RCS file: patches/patch-src_modules_db_mysql_my_cmd_c
> diff -N patches/patch-src_modules_db_mysql_my_cmd_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_db_mysql_my_cmd_c 3 Jul 2017 15:11:23
> -0000
> @@ -0,0 +1,22 @@
> +$OpenBSD$
> +
> +Index: src/modules/db_mysql/my_cmd.c
> +--- src/modules/db_mysql/my_cmd.c.orig
> ++++ src/modules/db_mysql/my_cmd.c
> +@@ -24,7 +24,7 @@
> + */
> +
> + /* the following macro will break the compile on solaris */
> +-#if !defined (__SVR4) && !defined (__sun)
> ++#if !defined (__SVR4) && !defined (__sun) && !defined (__OpenBSD__)
> + #define _XOPEN_SOURCE 4 /* bsd */
> + #endif
> + #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */
> +@@ -45,6 +45,7 @@
> +
> + #include <strings.h>
> + #include <stdio.h>
> ++#include <sys/types.h>
> + #include <time.h> /*strptime, XOPEN issue must be >=4 */
> + #include <string.h>
> + #include <errmsg.h>
> Index: patches/patch-src_modules_domain_domain_c
> ===================================================================
> RCS file: patches/patch-src_modules_domain_domain_c
> diff -N patches/patch-src_modules_domain_domain_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_domain_domain_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,26 @@
> +$OpenBSD$
> +
> +domain: fix uninitialized variable
> +https://github.com/kamailio/kamailio/commit/1df7cc74fac83aee1d0131962ccefb81d73125e1
> +
> +Index: src/modules/domain/domain.c
> +--- src/modules/domain/domain.c.orig
> ++++ src/modules/domain/domain.c
> +@@ -175,7 +175,7 @@ int w_lookup_domain(struct sip_msg *_msg, char *_sp, c
> +
> + int_str name, val;
> + struct attr_list *attrs;
> +- str *prefix, did;
> ++ str did;
> + unsigned short flags;
> + str sdomain;
> + str sprefix;
> +@@ -219,7 +219,7 @@ int w_lookup_domain(struct sip_msg *_msg, char *_sp, c
> + return -1;
> + }
> + LM_DBG("added AVP '%.*s'\n", name.s.len, name.s.s);
> +- if(prefix)
> ++ if(_prefix)
> + pkg_free(name.s.s);
> + attrs = attrs->next;
> + }
> Index: patches/patch-src_modules_ipops_detailed_ip_type_c
> ===================================================================
> RCS file: patches/patch-src_modules_ipops_detailed_ip_type_c
> diff -N patches/patch-src_modules_ipops_detailed_ip_type_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_ipops_detailed_ip_type_c 3 Jul 2017
> 15:11:23 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/modules/ipops/detailed_ip_type.c
> +--- src/modules/ipops/detailed_ip_type.c.orig
> ++++ src/modules/ipops/detailed_ip_type.c
> +@@ -26,7 +26,7 @@
> + #include <stdio.h>
> + #include <stdlib.h>
> + #include <arpa/inet.h>
> +-#if defined (__OS_freebsd)
> ++#if defined (__OS_freebsd) || defined(__OpenBSD__)
> + #include <sys/socket.h>
> + #endif
> + #include <string.h>
> Index: patches/patch-src_modules_lcr_lcr_mod_c
> ===================================================================
> RCS file: patches/patch-src_modules_lcr_lcr_mod_c
> diff -N patches/patch-src_modules_lcr_lcr_mod_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_lcr_lcr_mod_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Index: src/modules/lcr/lcr_mod.c
> +--- src/modules/lcr/lcr_mod.c.orig
> ++++ src/modules/lcr/lcr_mod.c
> +@@ -38,7 +38,9 @@
> + * The LCR module supports many independent LCR instances (gateways and
> + * 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>
> Index: patches/patch-src_modules_ldap_ld_session_h
> ===================================================================
> RCS file: patches/patch-src_modules_ldap_ld_session_h
> diff -N patches/patch-src_modules_ldap_ld_session_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_ldap_ld_session_h 3 Jul 2017 15:11:23
> -0000
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: src/modules/ldap/ld_session.h
> +--- src/modules/ldap/ld_session.h.orig
> ++++ src/modules/ldap/ld_session.h
> +@@ -30,6 +30,7 @@
> +
> + #include <sys/time.h>
> + #include <ldap.h>
> ++#include <sys/select.h> /* timeval */
> +
> + #include "iniparser.h"
> +
> Index: patches/patch-src_modules_nat_traversal_nat_traversal_c
> ===================================================================
> RCS file: patches/patch-src_modules_nat_traversal_nat_traversal_c
> diff -N patches/patch-src_modules_nat_traversal_nat_traversal_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_nat_traversal_nat_traversal_c 3 Jul 2017
> 15:11:23 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/modules/nat_traversal/nat_traversal.c
> +--- src/modules/nat_traversal/nat_traversal.c.orig
> ++++ src/modules/nat_traversal/nat_traversal.c
> +@@ -1687,7 +1687,7 @@ restore_keepalive_state(void)
> + res = fscanf(f, STATE_FILE_HEADER); // skip header
> +
> + while (true) {
> +- res = fscanf(f, "%63s %63s %ld %ld", uri, socket, &rtime, &stime);
> ++ res = fscanf(f, "%63s %63s %lld %lld", uri, socket, &rtime, &stime);
> + if (res == EOF) {
> + if (ferror(f))
> + LM_ERR("error while reading keepalive state file: %s\n",
> strerror(errno));
> Index: patches/patch-src_modules_rls_utils_c
> ===================================================================
> RCS file: patches/patch-src_modules_rls_utils_c
> diff -N patches/patch-src_modules_rls_utils_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_rls_utils_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,22 @@
> +$OpenBSD$
> +
> +Index: src/modules/rls/utils.c
> +--- src/modules/rls/utils.c.orig
> ++++ src/modules/rls/utils.c
> +@@ -26,14 +26,14 @@
> + #define SIP_PREFIX "sip:"
> + #define SIP_PREFIX_LEN sizeof(SIP_PREFIX)-1
> +
> +-str* normalize_sip_uri(const str *uri)
> ++str* normalize_sip_uri(str *uri)
> + {
> + static str normalized_uri;
> + static str null_str = {NULL, 0};
> + static char buf[MAX_URI_SIZE];
> +
> + normalized_uri.s = buf;
> +- if (un_escape((str *)uri, &normalized_uri) < 0)
> ++ if (un_escape(uri, &normalized_uri) < 0)
> + {
> + LM_ERR("un-escaping URI\n");
> + return &null_str;
> Index: patches/patch-src_modules_rls_utils_h
> ===================================================================
> RCS file: patches/patch-src_modules_rls_utils_h
> diff -N patches/patch-src_modules_rls_utils_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_rls_utils_h 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: src/modules/rls/utils.h
> +--- src/modules/rls/utils.h.orig
> ++++ src/modules/rls/utils.h
> +@@ -26,6 +26,6 @@
> +
> + #include "../../core/ut.h"
> +
> +-extern str* normalize_sip_uri(const str *uri);
> ++extern str* normalize_sip_uri(str *uri);
> +
> + #endif
> Index: patches/patch-src_modules_seas_ha_c
> ===================================================================
> RCS file: patches/patch-src_modules_seas_ha_c
> diff -N patches/patch-src_modules_seas_ha_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_seas_ha_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/modules/seas/ha.c
> +--- src/modules/seas/ha.c.orig
> ++++ src/modules/seas/ha.c
> +@@ -21,7 +21,7 @@
> +
> +
> + #include <stdlib.h>/*atoi*/
> +-#include <time.h>/*gettimeofday*/
> ++#include <sys/time.h>/*gettimeofday*/
> + #include <poll.h>/*poll*/
> + #include "ha.h"
> + #include "seas.h"
> Index: patches/patch-src_modules_tls_tls_init_c
> ===================================================================
> RCS file: patches/patch-src_modules_tls_tls_init_c
> diff -N patches/patch-src_modules_tls_tls_init_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_tls_tls_init_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,111 @@
> +$OpenBSD$
> +
> +Index: src/modules/tls/tls_init.c
> +--- src/modules/tls/tls_init.c.orig
> ++++ src/modules/tls/tls_init.c
> +@@ -139,7 +139,7 @@ const SSL_METHOD* ssl_methods[TLS_METHOD_MAX];
> + */
> +
> +
> +-
> ++#ifndef LIBRESSL_VERSION_NUMBER
> + inline static char* buf_append(char* buf, char* end, char* str, int str_len)
> + {
> + if ( (buf+str_len)<end){
> +@@ -317,6 +317,7 @@ static void ser_free(void *ptr, const char *fname, int
> + }
> + #endif
> +
> ++#endif /* LIBRESSL_VERSION_NUMBER */
> +
> + /*
> + * Initialize TLS socket
> +@@ -360,7 +361,7 @@ static void init_ssl_methods(void)
> + ssl_methods[TLS_USE_SSLv23 - 1] = SSLv23_method();
> +
> + /* only specific SSL or TLS version */
> +-#if OPENSSL_VERSION_NUMBER < 0x010100000L
> ++#if OPENSSL_VERSION_NUMBER < 0x010100000L ||
> defined(LIBRESSL_VERSION_NUMBER)
> + #ifndef OPENSSL_NO_SSL2
> + ssl_methods[TLS_USE_SSLv2_cli - 1] = SSLv2_client_method();
> + ssl_methods[TLS_USE_SSLv2_srv - 1] = SSLv2_server_method();
> +@@ -378,13 +379,13 @@ static void init_ssl_methods(void)
> + ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method();
> + ssl_methods[TLS_USE_TLSv1 - 1] = TLSv1_method();
> +
> +-#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
> ++#if OPENSSL_VERSION_NUMBER >= 0x1000100fL &&
> !defined(LIBRESSL_VERSION_NUMBER)
> + ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method();
> + ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method();
> + ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method();
> + #endif
> +
> +-#if OPENSSL_VERSION_NUMBER >= 0x1000105fL
> ++#if OPENSSL_VERSION_NUMBER >= 0x1000105fL &&
> !defined(LIBRESSL_VERSION_NUMBER)
> + ssl_methods[TLS_USE_TLSv1_2_cli - 1] = TLSv1_2_client_method();
> + ssl_methods[TLS_USE_TLSv1_2_srv - 1] = TLSv1_2_server_method();
> + ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method();
> +@@ -393,11 +394,11 @@ static void init_ssl_methods(void)
> + /* ranges of TLS versions (require a minimum TLS version) */
> + ssl_methods[TLS_USE_TLSv1_PLUS - 1] = (void*)TLS_OP_TLSv1_PLUS;
> +
> +-#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
> ++#if OPENSSL_VERSION_NUMBER >= 0x1000100fL &&
> !defined(LIBRESSL_VERSION_NUMBER)
> + ssl_methods[TLS_USE_TLSv1_1_PLUS - 1] = (void*)TLS_OP_TLSv1_1_PLUS;
> + #endif
> +
> +-#if OPENSSL_VERSION_NUMBER >= 0x1000105fL
> ++#if OPENSSL_VERSION_NUMBER >= 0x1000105fL &&
> !defined(LIBRESSL_VERSION_NUMBER)
> + ssl_methods[TLS_USE_TLSv1_2_PLUS - 1] = (void*)TLS_OP_TLSv1_2_PLUS;
> + #endif
> + }
> +@@ -408,6 +409,7 @@ static void init_ssl_methods(void)
> + */
> + static int init_tls_compression(void)
> + {
> ++#ifndef LIBRESSL_VERSION_NUMBER
> + #if OPENSSL_VERSION_NUMBER < 0x010100000L
> + #if OPENSSL_VERSION_NUMBER >= 0x00908000L
> + int n, r;
> +@@ -494,6 +496,7 @@ static int init_tls_compression(void)
> + end:
> + #endif /* OPENSSL_VERSION_NUMBER >= 0.9.8 */
> + #endif /* OPENSSL_VERSION_NUMBER < 1.1.0 */
> ++#endif /* LIBRESSL_VERSION_NUMBER */
> + return 0;
> + }
> +
> +@@ -504,6 +507,7 @@ end:
> + */
> + int tls_pre_init(void)
> + {
> ++#ifndef LIBRESSL_VERSION_NUMBER
> + #if OPENSSL_VERSION_NUMBER < 0x010100000L
> + void *(*mf)(size_t) = NULL;
> + void *(*rf)(void *, size_t) = NULL;
> +@@ -530,6 +534,7 @@ int tls_pre_init(void)
> + " (can be loaded first to be safe)\n");
> + return -1;
> + }
> ++#endif /* LIBRESSL_VERSION_NUMBER */
> +
> + if (tls_init_locks()<0)
> + return -1;
> +@@ -563,7 +568,7 @@ int init_tls_h(void)
> + {
> + /*struct socket_info* si;*/
> + long ssl_version;
> +-#if OPENSSL_VERSION_NUMBER < 0x010100000L
> ++#if OPENSSL_VERSION_NUMBER < 0x010100000L &&
> !defined(LIBRESSL_VERSION_NUMBER)
> + int lib_kerberos;
> + int lib_zlib;
> + int kerberos_support;
> +@@ -607,7 +612,7 @@ int init_tls_h(void)
> + }
> +
> + /* check kerberos support using compile flags only for version < 1.1.0 */
> +-#if OPENSSL_VERSION_NUMBER < 0x010100000L
> ++#if OPENSSL_VERSION_NUMBER < 0x010100000L &&
> !defined(LIBRESSL_VERSION_NUMBER)
> +
> + #ifdef TLS_KERBEROS_SUPPORT
> + kerberos_support=1;
> Index: patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c
> ===================================================================
> RCS file: patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c
> diff -N patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c 3 Jul 2017 15:11:23
> -0000
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +
> +Index: src/modules/xhttp_pi/xhttp_pi_fnc.c
> +--- src/modules/xhttp_pi/xhttp_pi_fnc.c.orig
> ++++ src/modules/xhttp_pi/xhttp_pi_fnc.c
> +@@ -3189,7 +3189,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
> + val_str.len = max_page_len -
> ctx->reply.body.len;
> +
> if(db_time2str(values[j].val.time_val,
> +
> val_str.s, &val_str.len)!=0){
> +- LM_ERR("Unable to
> convert double [%ld]\n",
> ++ LM_ERR("Unable to
> convert double [%lld]\n",
> +
> values[j].val.time_val);
> + goto error;
> + }
> +@@ -3197,7 +3197,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
> + ctx->reply.body.len +=
> val_str.len;
> + if(link_on)
> XHTTP_PI_COPY_2(p,XHTTP_PI_SQUOT_GT,val_str);
> + LM_DBG(" got %.*s[%d]=>"
> +- "[%ld][%.*s]\n",
> ++ "[%lld][%.*s]\n",
> + command->q_keys[j]->len,
> + command->q_keys[j]->s,
> i,
> + values[j].val.time_val,
> Index: patches/patch-src_modules_xmlrpc_xmlrpc_c
> ===================================================================
> RCS file: patches/patch-src_modules_xmlrpc_xmlrpc_c
> diff -N patches/patch-src_modules_xmlrpc_xmlrpc_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_xmlrpc_xmlrpc_c 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/modules/xmlrpc/xmlrpc.c
> +--- src/modules/xmlrpc/xmlrpc.c.orig
> ++++ src/modules/xmlrpc/xmlrpc.c
> +@@ -19,7 +19,7 @@
> + * Temple Place, Suite 330, Boston, MA 02111-1307 USA
> + */
> + /*This define breaks on Solaris OS */
> +-#ifndef __OS_solaris
> ++#if !defined (__OS_solaris) && !defined (__OpenBSD__)
> + #define _XOPEN_SOURCE 4 /* strptime */
> + #endif
> + #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */
> Index: patches/patch-timer_c
> ===================================================================
> RCS file: patches/patch-timer_c
> diff -N patches/patch-timer_c
> --- patches/patch-timer_c 20 Nov 2015 10:09:52 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-timer_c,v 1.2 2015/11/20 10:09:52 sthen Exp $
> ---- timer.c.orig Wed Oct 21 00:01:29 2015
> -+++ timer.c Wed Oct 21 00:02:57 2015
> -@@ -243,7 +243,11 @@ int init_timer()
> -
> - /* initial values */
> - memset(timer_lst, 0, sizeof(struct timer_lists));
> -+#ifdef HAVE_ARC4RANDOM
> -+ *ticks=arc4random();
> -+#else
> - *ticks=random(); /* random value for start, for debugging */
> -+#endif
> - prev_ticks=last_ticks=last_adj_check=*ticks;
> - *running_timer=0;
> - if (gettimeofday(&start_time, 0)<0){
> Index: patches/patch-utils_kamctl_kamctl
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctl,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-utils_kamctl_kamctl
> --- patches/patch-utils_kamctl_kamctl 20 Nov 2015 10:09:52 -0000 1.4
> +++ patches/patch-utils_kamctl_kamctl 3 Jul 2017 15:11:23 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-utils_kamctl_kamctl,v 1.4 2015/11/20 10:09:52 sthen Exp $
> ---- utils/kamctl/kamctl.orig Fri Oct 2 15:35:18 2015
> -+++ utils/kamctl/kamctl Mon Oct 19 14:00:40 2015
> +--- utils/kamctl/kamctl.orig Wed Apr 5 16:32:39 2017
> ++++ utils/kamctl/kamctl Mon May 15 21:48:56 2017
> @@ -75,7 +75,7 @@ fi
> if [ -f "$MYLIBDIR/kamctl.base" ]; then
> . "$MYLIBDIR/kamctl.base"
> @@ -10,12 +10,3 @@ $OpenBSD: patch-utils_kamctl_kamctl,v 1.
> exit -1
> fi
>
> -@@ -1900,7 +1900,7 @@ kamailio_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
> - }
> Index: patches/patch-utils_kamctl_kamctl_base
> ===================================================================
> RCS file:
> /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctl_base,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-utils_kamctl_kamctl_base
> --- patches/patch-utils_kamctl_kamctl_base 20 Nov 2015 10:09:52 -0000
> 1.4
> +++ patches/patch-utils_kamctl_kamctl_base 3 Jul 2017 15:11:23 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-utils_kamctl_kamctl_base,v 1.4 2015/11/20 10:09:52 sthen Exp
> $
> ---- utils/kamctl/kamctl.base.orig Fri Oct 2 15:35:18 2015
> -+++ utils/kamctl/kamctl.base Mon Oct 19 14:00:40 2015
> -@@ -536,7 +536,7 @@ EOF
> +--- utils/kamctl/kamctl.base.orig Wed Apr 5 16:32:39 2017
> ++++ utils/kamctl/kamctl.base Mon May 15 21:48:56 2017
> +@@ -556,7 +556,7 @@ USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv"
> mdbg() {
> if [ "0$VERBOSE" -ne 0 ] ; then
> if [ -t 1 -a -z "$NOHLPRINT" ] ; then
> @@ -10,7 +10,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
> else
> echo "$1"
> fi
> -@@ -545,7 +545,7 @@ mdbg() {
> +@@ -565,7 +565,7 @@ mdbg() {
>
> mwarn() {
> if [ -t 1 -a -z "$NOHLPRINT" ] ; then
> @@ -19,7 +19,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
> else
> echo "** WARNING: $1"
> fi
> -@@ -553,7 +553,7 @@ mwarn() {
> +@@ -573,7 +573,7 @@ mwarn() {
>
> minfo() {
> if [ -t 1 -a -z "$NOHLPRINT" ] ; then
> @@ -28,7 +28,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
> else
> echo "** INFO: $1"
> fi
> -@@ -561,7 +561,7 @@ minfo() {
> +@@ -581,7 +581,7 @@ minfo() {
>
> mecho() {
> if [ -t 1 -a -z "$NOHLPRINT" ] ; then
> @@ -37,7 +37,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
> else
> echo "$1"
> fi
> -@@ -569,7 +569,7 @@ mecho() {
> +@@ -589,7 +589,7 @@ mecho() {
>
> merr() {
> if [ -t 1 -a -z "$NOHLPRINT" ] ; then
> Index: patches/patch-utils_kamctl_kamctlrc
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctlrc,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-utils_kamctl_kamctlrc
> --- patches/patch-utils_kamctl_kamctlrc 20 Nov 2015 10:09:52 -0000
> 1.3
> +++ patches/patch-utils_kamctl_kamctlrc 3 Jul 2017 15:11:23 -0000
> @@ -1,16 +1,16 @@
> $OpenBSD: patch-utils_kamctl_kamctlrc,v 1.3 2015/11/20 10:09:52 sthen Exp $
> ---- utils/kamctl/kamctlrc.orig Fri Oct 2 15:35:18 2015
> -+++ utils/kamctl/kamctlrc Mon Oct 19 15:19:01 2015
> -@@ -60,7 +60,7 @@
> +--- utils/kamctl/kamctlrc.orig Wed Apr 5 16:32:39 2017
> ++++ utils/kamctl/kamctlrc Mon May 15 21:52:23 2017
> +@@ -64,7 +64,7 @@
>
>
> - # Program to calculate a message-digest fingerprint
> + # Program to calculate a message-digest fingerprint
> -# MD5="md5sum"
> -+MD5="md5"
> ++MD5="md5sum"
>
> # awk tool
> # AWK="awk"
> -@@ -142,8 +142,11 @@
> +@@ -146,8 +146,11 @@
>
> ## Kamailio START Options
> ## PID file path - default is: /var/run/kamailio.pid
> Index: patches/patch-utils_kamctl_kamdbctl_base
> ===================================================================
> RCS file:
> /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamdbctl_base,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-utils_kamctl_kamdbctl_base
> --- patches/patch-utils_kamctl_kamdbctl_base 20 Nov 2015 10:09:52 -0000
> 1.3
> +++ patches/patch-utils_kamctl_kamdbctl_base 3 Jul 2017 15:11:23 -0000
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-utils_kamctl_kamdbctl_base,v 1.3 2015/11/20 10:09:52 sthen
> Exp $
> ---- utils/kamctl/kamdbctl.base.orig Fri Oct 2 15:35:18 2015
> -+++ utils/kamctl/kamdbctl.base Mon Oct 19 14:00:40 2015
> -@@ -154,7 +154,7 @@ credentials()
> +Index: utils/kamctl/kamdbctl.base
> +--- utils/kamctl/kamdbctl.base.orig
> ++++ utils/kamctl/kamdbctl.base
> +@@ -155,7 +155,7 @@ credentials()
> mdbg() {
> if [ "0$VERBOSE" -ne 0 ] ; then
> if [ -t 1 -a -z "$NOHLPRINT" ] ; then
> @@ -10,7 +11,7 @@ $OpenBSD: patch-utils_kamctl_kamdbctl_ba
> else
> echo "$1"
> fi
> -@@ -163,7 +163,7 @@ mdbg() {
> +@@ -164,7 +164,7 @@ mdbg() {
>
> mwarn() {
> if [ -t 1 -a -z "$NOHLPRINT" ] ; then
> @@ -19,7 +20,7 @@ $OpenBSD: patch-utils_kamctl_kamdbctl_ba
> else
> echo "** WARNING: $1"
> fi
> -@@ -171,7 +171,7 @@ mwarn() {
> +@@ -172,7 +172,7 @@ mwarn() {
>
> minfo() {
> if [ -t 1 -a -z "$NOHLPRINT" ] ; then
> @@ -28,7 +29,7 @@ $OpenBSD: patch-utils_kamctl_kamdbctl_ba
> else
> echo "** INFO: $1"
> fi
> -@@ -179,7 +179,7 @@ minfo() {
> +@@ -180,7 +180,7 @@ minfo() {
>
> mecho() {
> if [ -t 1 -a -z "$NOHLPRINT" ] ; then
> @@ -37,7 +38,7 @@ $OpenBSD: patch-utils_kamctl_kamdbctl_ba
> else
> echo "$1"
> fi
> -@@ -187,7 +187,7 @@ mecho() {
> +@@ -188,7 +188,7 @@ mecho() {
>
> merr() {
> if [ -t 1 -a -z "$NOHLPRINT" ] ; then
> @@ -46,7 +47,7 @@ $OpenBSD: patch-utils_kamctl_kamdbctl_ba
> else
> echo "** ERROR: $1"
> fi
> -@@ -213,8 +213,8 @@ get_answer ()
> +@@ -214,8 +214,8 @@ get_answer ()
> else
> ANSWER=${value}
> fi
> Index: patches/patch-utils_kamctl_kamdbctl_pgsql
> ===================================================================
> RCS file: patches/patch-utils_kamctl_kamdbctl_pgsql
> diff -N patches/patch-utils_kamctl_kamdbctl_pgsql
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-utils_kamctl_kamdbctl_pgsql 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +kamctl: kamdbctl - proper use of DBPORT for postgres
> +https://github.com/kamailio/kamailio/commit/8cdee50d7c89c1617b68e2eff1ce646eba0c33fb
> +
> +Index: utils/kamctl/kamdbctl.pgsql
> +--- utils/kamctl/kamdbctl.pgsql.orig
> ++++ utils/kamctl/kamdbctl.pgsql
> +@@ -55,8 +55,8 @@ if [ -z "$DBPORT" ] ; then
> + CMD="psql -q -h $DBHOST -U $DBROOTUSER "
> + DUMP_CMD="pg_dump -h $DBHOST -U $DBROOTUSER -c"
> + else
> +- CMD="psql -q -h $DBHOST -p $DBHOST -U $DBROOTUSER "
> +- DUMP_CMD="pg_dump -h $DBHOST -p $DBHOST -U $DBROOTUSER -c"
> ++ CMD="psql -q -h $DBHOST -p $DBPORT -U $DBROOTUSER "
> ++ DUMP_CMD="pg_dump -h $DBHOST -p $DBPORT -U $DBROOTUSER -c"
> + fi
> +
> + #################################################################
> Index: pkg/DESCR-berkeley
> ===================================================================
> RCS file: pkg/DESCR-berkeley
> diff -N pkg/DESCR-berkeley
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/DESCR-berkeley 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1 @@
> +kamailio berkeley db module
> Index: pkg/DESCR-presence
> ===================================================================
> RCS file: pkg/DESCR-presence
> diff -N pkg/DESCR-presence
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/DESCR-presence 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1 @@
> +kamailio presence modules
> \ No newline at end of file
> Index: pkg/DESCR-xml
> ===================================================================
> RCS file: pkg/DESCR-xml
> diff -N pkg/DESCR-xml
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/DESCR-xml 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1 @@
> +kamailio XML modules
> Index: pkg/DESCR-xmlrpc
> ===================================================================
> RCS file: pkg/DESCR-xmlrpc
> diff -N pkg/DESCR-xmlrpc
> --- pkg/DESCR-xmlrpc 4 Jun 2009 13:44:09 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1 +0,0 @@
> -kamailio XML-RPC module
> Index: pkg/PLIST-berkeley
> ===================================================================
> RCS file: pkg/PLIST-berkeley
> diff -N pkg/PLIST-berkeley
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/PLIST-berkeley 3 Jul 2017 15:11:23 -0000
> @@ -0,0 +1,78 @@
> +@comment $OpenBSD: $
> +lib/kamailio/kamctl/kamctl.db_berkeley
> +lib/kamailio/kamctl/kamdbctl.db_berkeley
> +lib/kamailio/modules/db_berkeley.so
> +@bin sbin/kambdb_recover
> +share/doc/kamailio/modules/README.db_berkeley
> +share/kamailio/db_berkeley/
> +share/kamailio/db_berkeley/kamailio/
> +share/kamailio/db_berkeley/kamailio/acc
> +share/kamailio/db_berkeley/kamailio/acc_cdrs
> +share/kamailio/db_berkeley/kamailio/active_watchers
> +share/kamailio/db_berkeley/kamailio/address
> +share/kamailio/db_berkeley/kamailio/aliases
> +share/kamailio/db_berkeley/kamailio/carrier_name
> +share/kamailio/db_berkeley/kamailio/carrierfailureroute
> +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_attrs
> +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/htable
> +share/kamailio/db_berkeley/kamailio/imc_members
> +share/kamailio/db_berkeley/kamailio/imc_rooms
> +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/location_attrs
> +share/kamailio/db_berkeley/kamailio/matrix
> +share/kamailio/db_berkeley/kamailio/missed_calls
> +share/kamailio/db_berkeley/kamailio/mohqcalls
> +share/kamailio/db_berkeley/kamailio/mohqueues
> +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
> +share/kamailio/db_berkeley/kamailio/re_grp
> +share/kamailio/db_berkeley/kamailio/rls_presentity
> +share/kamailio/db_berkeley/kamailio/rls_watchers
> +share/kamailio/db_berkeley/kamailio/rtpengine
> +share/kamailio/db_berkeley/kamailio/rtpproxy
> +share/kamailio/db_berkeley/kamailio/sca_subscriptions
> +share/kamailio/db_berkeley/kamailio/silo
> +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/topos_d
> +share/kamailio/db_berkeley/kamailio/topos_t
> +share/kamailio/db_berkeley/kamailio/trusted
> +share/kamailio/db_berkeley/kamailio/uacreg
> +share/kamailio/db_berkeley/kamailio/uid_credentials
> +share/kamailio/db_berkeley/kamailio/uid_domain
> +share/kamailio/db_berkeley/kamailio/uid_domain_attrs
> +share/kamailio/db_berkeley/kamailio/uid_global_attrs
> +share/kamailio/db_berkeley/kamailio/uid_uri
> +share/kamailio/db_berkeley/kamailio/uid_uri_attrs
> +share/kamailio/db_berkeley/kamailio/uid_user_attrs
> +share/kamailio/db_berkeley/kamailio/uri
> +share/kamailio/db_berkeley/kamailio/userblacklist
> +share/kamailio/db_berkeley/kamailio/usr_preferences
> +share/kamailio/db_berkeley/kamailio/version
> +share/kamailio/db_berkeley/kamailio/watchers
> +share/kamailio/db_berkeley/kamailio/xcap
> Index: pkg/PLIST-ldap
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/pkg/PLIST-ldap,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-ldap
> --- pkg/PLIST-ldap 16 Apr 2013 11:13:04 -0000 1.3
> +++ pkg/PLIST-ldap 3 Jul 2017 15:11:23 -0000
> @@ -1,5 +1,7 @@
> @comment $OpenBSD: PLIST-ldap,v 1.3 2013/04/16 11:13:04 sthen Exp $
> +lib/kamailio/modules/db2_ldap.so
> lib/kamailio/modules/h350.so
> lib/kamailio/modules/ldap.so
> +share/doc/kamailio/modules/README.db2_ldap
> share/doc/kamailio/modules/README.h350
> share/doc/kamailio/modules/README.ldap
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/pkg/PLIST-main,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST-main
> --- pkg/PLIST-main 20 Nov 2015 10:09:52 -0000 1.5
> +++ pkg/PLIST-main 3 Jul 2017 15:11:23 -0000
> @@ -7,20 +7,12 @@ lib/kamailio/kamctl/dbtextdb/
> lib/kamailio/kamctl/dbtextdb/dbtextdb.py
> lib/kamailio/kamctl/kamctl.base
> 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.rpcfifo
> 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/libbinrpc.so.${LIBbinrpc_VERSION}
> -@lib lib/kamailio/libkcore.so.${LIBkcore_VERSION}
> -@lib lib/kamailio/libkmi.so.${LIBkmi_VERSION}
> -@lib lib/kamailio/libprint.so.${LIBprint_VERSION}
> @lib lib/kamailio/libsrdb1.so.${LIBsrdb1_VERSION}
> @lib lib/kamailio/libsrdb2.so.${LIBsrdb2_VERSION}
> @lib lib/kamailio/libsrutils.so.${LIBsrutils_VERSION}
> @@ -28,10 +20,12 @@ lib/kamailio/kamctl/kamdbctl.dbtext
> lib/kamailio/modules/
> lib/kamailio/modules/acc.so
> lib/kamailio/modules/alias_db.so
> +lib/kamailio/modules/app_jsdt.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/auth_identity.so
> lib/kamailio/modules/auth_xkeys.so
> lib/kamailio/modules/avp.so
> lib/kamailio/modules/avpops.so
> @@ -40,19 +34,19 @@ lib/kamailio/modules/blst.so
> lib/kamailio/modules/call_control.so
> lib/kamailio/modules/cfg_db.so
> lib/kamailio/modules/cfg_rpc.so
> +lib/kamailio/modules/cfgt.so
> lib/kamailio/modules/cfgutils.so
> lib/kamailio/modules/corex.so
> lib/kamailio/modules/counters.so
> -lib/kamailio/modules/cpl-c.so
> +lib/kamailio/modules/cplc.so
> +lib/kamailio/modules/crypto.so
> lib/kamailio/modules/ctl.so
> lib/kamailio/modules/db2_ops.so
> -lib/kamailio/modules/db_berkeley.so
> lib/kamailio/modules/db_cluster.so
> lib/kamailio/modules/db_flatstore.so
> lib/kamailio/modules/db_text.so
> lib/kamailio/modules/debugger.so
> lib/kamailio/modules/dialog.so
> -lib/kamailio/modules/dialog_ng.so
> lib/kamailio/modules/dialplan.so
> lib/kamailio/modules/dispatcher.so
> lib/kamailio/modules/diversion.so
> @@ -65,19 +59,18 @@ lib/kamailio/modules/enum.so
> lib/kamailio/modules/exec.so
> lib/kamailio/modules/group.so
> lib/kamailio/modules/htable.so
> +lib/kamailio/modules/http_async_client.so
> +lib/kamailio/modules/http_client.so
> lib/kamailio/modules/imc.so
> lib/kamailio/modules/ipops.so
> -lib/kamailio/modules/jsonrpc-s.so
> +lib/kamailio/modules/jsonrpcs.so
> lib/kamailio/modules/kex.so
> lib/kamailio/modules/lcr.so
> -lib/kamailio/modules/malloc_test.so
> +lib/kamailio/modules/log_custom.so
> lib/kamailio/modules/mangler.so
> lib/kamailio/modules/matrix.so
> lib/kamailio/modules/maxfwd.so
> lib/kamailio/modules/mediaproxy.so
> -lib/kamailio/modules/mi_datagram.so
> -lib/kamailio/modules/mi_fifo.so
> -lib/kamailio/modules/mi_rpc.so
> lib/kamailio/modules/mohqueue.so
> lib/kamailio/modules/mqueue.so
> lib/kamailio/modules/msilo.so
> @@ -86,6 +79,7 @@ lib/kamailio/modules/mtree.so
> lib/kamailio/modules/nat_traversal.so
> lib/kamailio/modules/nathelper.so
> lib/kamailio/modules/nosip.so
> +lib/kamailio/modules/outbound.so
> lib/kamailio/modules/p_usrloc.so
> lib/kamailio/modules/path.so
> lib/kamailio/modules/pdb.so
> @@ -94,26 +88,11 @@ lib/kamailio/modules/permissions.so
> lib/kamailio/modules/pike.so
> lib/kamailio/modules/pipelimit.so
> lib/kamailio/modules/prefix_route.so
> -lib/kamailio/modules/presence.so
> -lib/kamailio/modules/presence_dialoginfo.so
> -lib/kamailio/modules/presence_mwi.so
> -lib/kamailio/modules/presence_reginfo.so
> -lib/kamailio/modules/presence_xml.so
> -lib/kamailio/modules/print.so
> -lib/kamailio/modules/print_lib.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_reginfo.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/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/rtjson.so
> @@ -129,10 +108,13 @@ lib/kamailio/modules/siptrace.so
> lib/kamailio/modules/siputils.so
> lib/kamailio/modules/sl.so
> lib/kamailio/modules/sms.so
> +lib/kamailio/modules/smsops.so
> lib/kamailio/modules/speeddial.so
> lib/kamailio/modules/sqlops.so
> +lib/kamailio/modules/ss7ops.so
> lib/kamailio/modules/sst.so
> lib/kamailio/modules/statistics.so
> +lib/kamailio/modules/statsc.so
> lib/kamailio/modules/statsd.so
> lib/kamailio/modules/stun.so
> lib/kamailio/modules/tcpops.so
> @@ -144,6 +126,7 @@ lib/kamailio/modules/tm.so
> lib/kamailio/modules/tmrec.so
> lib/kamailio/modules/tmx.so
> lib/kamailio/modules/topoh.so
> +lib/kamailio/modules/topos.so
> lib/kamailio/modules/tsilo.so
> lib/kamailio/modules/uac.so
> lib/kamailio/modules/uac_redirect.so
> @@ -157,9 +140,7 @@ lib/kamailio/modules/userblacklist.so
> lib/kamailio/modules/usrloc.so
> lib/kamailio/modules/utils.so
> lib/kamailio/modules/websocket.so
> -lib/kamailio/modules/xcap_client.so
> lib/kamailio/modules/xhttp.so
> -lib/kamailio/modules/xhttp_pi.so
> lib/kamailio/modules/xhttp_rpc.so
> lib/kamailio/modules/xlog.so
> lib/kamailio/modules/xmpp.so
> @@ -170,23 +151,21 @@ lib/kamailio/modules/xprint.so
> @man man/man8/kamctl.8
> @man man/man8/kamdbctl.8
> @bin sbin/kamailio
> -@bin sbin/kambdb_recover
> @bin sbin/kamcmd
> sbin/kamctl
> sbin/kamdbctl
> 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/modules/
> share/doc/kamailio/modules/README.acc
> share/doc/kamailio/modules/README.alias_db
> +share/doc/kamailio/modules/README.app_jsdt
> share/doc/kamailio/modules/README.async
> share/doc/kamailio/modules/README.auth
> share/doc/kamailio/modules/README.auth_db
> share/doc/kamailio/modules/README.auth_diameter
> +share/doc/kamailio/modules/README.auth_identity
> share/doc/kamailio/modules/README.auth_xkeys
> share/doc/kamailio/modules/README.avp
> share/doc/kamailio/modules/README.avpops
> @@ -195,19 +174,19 @@ share/doc/kamailio/modules/README.blst
> share/doc/kamailio/modules/README.call_control
> share/doc/kamailio/modules/README.cfg_db
> share/doc/kamailio/modules/README.cfg_rpc
> +share/doc/kamailio/modules/README.cfgt
> share/doc/kamailio/modules/README.cfgutils
> share/doc/kamailio/modules/README.corex
> share/doc/kamailio/modules/README.counters
> -share/doc/kamailio/modules/README.cpl-c
> +share/doc/kamailio/modules/README.cplc
> +share/doc/kamailio/modules/README.crypto
> share/doc/kamailio/modules/README.ctl
> share/doc/kamailio/modules/README.db2_ops
> -share/doc/kamailio/modules/README.db_berkeley
> share/doc/kamailio/modules/README.db_cluster
> share/doc/kamailio/modules/README.db_flatstore
> share/doc/kamailio/modules/README.db_text
> share/doc/kamailio/modules/README.debugger
> share/doc/kamailio/modules/README.dialog
> -share/doc/kamailio/modules/README.dialog_ng
> share/doc/kamailio/modules/README.dialplan
> share/doc/kamailio/modules/README.dispatcher
> share/doc/kamailio/modules/README.diversion
> @@ -220,19 +199,18 @@ share/doc/kamailio/modules/README.enum
> share/doc/kamailio/modules/README.exec
> share/doc/kamailio/modules/README.group
> share/doc/kamailio/modules/README.htable
> +share/doc/kamailio/modules/README.http_async_client
> +share/doc/kamailio/modules/README.http_client
> share/doc/kamailio/modules/README.imc
> share/doc/kamailio/modules/README.ipops
> -share/doc/kamailio/modules/README.jsonrpc-s
> +share/doc/kamailio/modules/README.jsonrpcs
> share/doc/kamailio/modules/README.kex
> share/doc/kamailio/modules/README.lcr
> -share/doc/kamailio/modules/README.malloc_test
> +share/doc/kamailio/modules/README.log_custom
> share/doc/kamailio/modules/README.mangler
> share/doc/kamailio/modules/README.matrix
> share/doc/kamailio/modules/README.maxfwd
> share/doc/kamailio/modules/README.mediaproxy
> -share/doc/kamailio/modules/README.mi_datagram
> -share/doc/kamailio/modules/README.mi_fifo
> -share/doc/kamailio/modules/README.mi_rpc
> share/doc/kamailio/modules/README.mohqueue
> share/doc/kamailio/modules/README.mqueue
> share/doc/kamailio/modules/README.msilo
> @@ -241,6 +219,7 @@ share/doc/kamailio/modules/README.mtree
> share/doc/kamailio/modules/README.nat_traversal
> share/doc/kamailio/modules/README.nathelper
> share/doc/kamailio/modules/README.nosip
> +share/doc/kamailio/modules/README.outbound
> share/doc/kamailio/modules/README.p_usrloc
> share/doc/kamailio/modules/README.path
> share/doc/kamailio/modules/README.pdb
> @@ -249,26 +228,11 @@ share/doc/kamailio/modules/README.permis
> share/doc/kamailio/modules/README.pike
> share/doc/kamailio/modules/README.pipelimit
> share/doc/kamailio/modules/README.prefix_route
> -share/doc/kamailio/modules/README.presence
> -share/doc/kamailio/modules/README.presence_dialoginfo
> -share/doc/kamailio/modules/README.presence_mwi
> -share/doc/kamailio/modules/README.presence_reginfo
> -share/doc/kamailio/modules/README.presence_xml
> -share/doc/kamailio/modules/README.print
> -share/doc/kamailio/modules/README.print_lib
> -share/doc/kamailio/modules/README.pua
> -share/doc/kamailio/modules/README.pua_bla
> -share/doc/kamailio/modules/README.pua_dialoginfo
> -share/doc/kamailio/modules/README.pua_mi
> -share/doc/kamailio/modules/README.pua_reginfo
> -share/doc/kamailio/modules/README.pua_usrloc
> -share/doc/kamailio/modules/README.pua_xmpp
> share/doc/kamailio/modules/README.pv
> share/doc/kamailio/modules/README.qos
> share/doc/kamailio/modules/README.ratelimit
> share/doc/kamailio/modules/README.regex
> share/doc/kamailio/modules/README.registrar
> -share/doc/kamailio/modules/README.rls
> share/doc/kamailio/modules/README.rr
> share/doc/kamailio/modules/README.rtimer
> share/doc/kamailio/modules/README.rtjson
> @@ -284,10 +248,13 @@ share/doc/kamailio/modules/README.siptra
> share/doc/kamailio/modules/README.siputils
> share/doc/kamailio/modules/README.sl
> share/doc/kamailio/modules/README.sms
> +share/doc/kamailio/modules/README.smsops
> share/doc/kamailio/modules/README.speeddial
> share/doc/kamailio/modules/README.sqlops
> +share/doc/kamailio/modules/README.ss7ops
> share/doc/kamailio/modules/README.sst
> share/doc/kamailio/modules/README.statistics
> +share/doc/kamailio/modules/README.statsc
> share/doc/kamailio/modules/README.statsd
> share/doc/kamailio/modules/README.stun
> share/doc/kamailio/modules/README.tcpops
> @@ -299,6 +266,7 @@ share/doc/kamailio/modules/README.tm
> share/doc/kamailio/modules/README.tmrec
> share/doc/kamailio/modules/README.tmx
> share/doc/kamailio/modules/README.topoh
> +share/doc/kamailio/modules/README.topos
> share/doc/kamailio/modules/README.tsilo
> share/doc/kamailio/modules/README.uac
> share/doc/kamailio/modules/README.uac_redirect
> @@ -312,9 +280,7 @@ share/doc/kamailio/modules/README.userbl
> share/doc/kamailio/modules/README.usrloc
> share/doc/kamailio/modules/README.utils
> share/doc/kamailio/modules/README.websocket
> -share/doc/kamailio/modules/README.xcap_client
> share/doc/kamailio/modules/README.xhttp
> -share/doc/kamailio/modules/README.xhttp_pi
> share/doc/kamailio/modules/README.xhttp_rpc
> share/doc/kamailio/modules/README.xlog
> share/doc/kamailio/modules/README.xmpp
> @@ -324,87 +290,13 @@ share/examples/kamailio/
> @comment share/examples/kamailio/dictionary.kamailio
> share/examples/kamailio/kamailio-advanced.cfg
> share/examples/kamailio/kamailio-basic.cfg
> -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/pi_framework.xml
> share/examples/kamailio/tls.cfg
> @sample ${SYSCONFDIR}/kamailio/tls.cfg
> share/kamailio/
> -share/kamailio/db_berkeley/
> -share/kamailio/db_berkeley/kamailio/
> -share/kamailio/db_berkeley/kamailio/acc
> -share/kamailio/db_berkeley/kamailio/acc_cdrs
> -share/kamailio/db_berkeley/kamailio/active_watchers
> -share/kamailio/db_berkeley/kamailio/address
> -share/kamailio/db_berkeley/kamailio/aliases
> -share/kamailio/db_berkeley/kamailio/carrier_name
> -share/kamailio/db_berkeley/kamailio/carrierfailureroute
> -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_attrs
> -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/htable
> -share/kamailio/db_berkeley/kamailio/imc_members
> -share/kamailio/db_berkeley/kamailio/imc_rooms
> -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/location_attrs
> -share/kamailio/db_berkeley/kamailio/matrix
> -share/kamailio/db_berkeley/kamailio/missed_calls
> -share/kamailio/db_berkeley/kamailio/mohqcalls
> -share/kamailio/db_berkeley/kamailio/mohqueues
> -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
> -share/kamailio/db_berkeley/kamailio/re_grp
> -share/kamailio/db_berkeley/kamailio/rls_presentity
> -share/kamailio/db_berkeley/kamailio/rls_watchers
> -share/kamailio/db_berkeley/kamailio/rtpproxy
> -share/kamailio/db_berkeley/kamailio/sca_subscriptions
> -share/kamailio/db_berkeley/kamailio/silo
> -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/uid_credentials
> -share/kamailio/db_berkeley/kamailio/uid_domain
> -share/kamailio/db_berkeley/kamailio/uid_domain_attrs
> -share/kamailio/db_berkeley/kamailio/uid_global_attrs
> -share/kamailio/db_berkeley/kamailio/uid_uri
> -share/kamailio/db_berkeley/kamailio/uid_uri_attrs
> -share/kamailio/db_berkeley/kamailio/uid_user_attrs
> -share/kamailio/db_berkeley/kamailio/uri
> -share/kamailio/db_berkeley/kamailio/userblacklist
> -share/kamailio/db_berkeley/kamailio/usr_preferences
> -share/kamailio/db_berkeley/kamailio/version
> -share/kamailio/db_berkeley/kamailio/watchers
> -share/kamailio/db_berkeley/kamailio/xcap
> share/kamailio/dbtext/
> share/kamailio/dbtext/kamailio/
> share/kamailio/dbtext/kamailio/acc
> @@ -453,12 +345,15 @@ share/kamailio/dbtext/kamailio/purplemap
> share/kamailio/dbtext/kamailio/re_grp
> share/kamailio/dbtext/kamailio/rls_presentity
> share/kamailio/dbtext/kamailio/rls_watchers
> +share/kamailio/dbtext/kamailio/rtpengine
> share/kamailio/dbtext/kamailio/rtpproxy
> share/kamailio/dbtext/kamailio/sca_subscriptions
> share/kamailio/dbtext/kamailio/silo
> share/kamailio/dbtext/kamailio/sip_trace
> share/kamailio/dbtext/kamailio/speed_dial
> share/kamailio/dbtext/kamailio/subscriber
> +share/kamailio/dbtext/kamailio/topos_d
> +share/kamailio/dbtext/kamailio/topos_t
> share/kamailio/dbtext/kamailio/trusted
> share/kamailio/dbtext/kamailio/uacreg
> share/kamailio/dbtext/kamailio/uid_credentials
> @@ -474,93 +369,6 @@ share/kamailio/dbtext/kamailio/usr_prefe
> share/kamailio/dbtext/kamailio/version
> share/kamailio/dbtext/kamailio/watchers
> share/kamailio/dbtext/kamailio/xcap
> -share/kamailio/xhttp_pi/
> -share/kamailio/xhttp_pi/acc-mod
> -share/kamailio/xhttp_pi/acc-table
> -share/kamailio/xhttp_pi/alias_db-mod
> -share/kamailio/xhttp_pi/alias_db-table
> -share/kamailio/xhttp_pi/auth_db-mod
> -share/kamailio/xhttp_pi/auth_db-table
> -share/kamailio/xhttp_pi/avpops-mod
> -share/kamailio/xhttp_pi/avpops-table
> -share/kamailio/xhttp_pi/carrierroute-mod
> -share/kamailio/xhttp_pi/carrierroute-table
> -share/kamailio/xhttp_pi/cpl-mod
> -share/kamailio/xhttp_pi/cpl-table
> -share/kamailio/xhttp_pi/dialog-mod
> -share/kamailio/xhttp_pi/dialog-table
> -share/kamailio/xhttp_pi/dialplan-mod
> -share/kamailio/xhttp_pi/dialplan-table
> -share/kamailio/xhttp_pi/dispatcher-mod
> -share/kamailio/xhttp_pi/dispatcher-table
> -share/kamailio/xhttp_pi/domain-mod
> -share/kamailio/xhttp_pi/domain-table
> -share/kamailio/xhttp_pi/domainpolicy-mod
> -share/kamailio/xhttp_pi/domainpolicy-table
> -share/kamailio/xhttp_pi/drouting-mod
> -share/kamailio/xhttp_pi/drouting-table
> -share/kamailio/xhttp_pi/group-mod
> -share/kamailio/xhttp_pi/group-table
> -share/kamailio/xhttp_pi/htable-mod
> -share/kamailio/xhttp_pi/htable-table
> -share/kamailio/xhttp_pi/imc-mod
> -share/kamailio/xhttp_pi/imc-table
> -share/kamailio/xhttp_pi/lcr-mod
> -share/kamailio/xhttp_pi/lcr-table
> -share/kamailio/xhttp_pi/matrix-mod
> -share/kamailio/xhttp_pi/matrix-table
> -share/kamailio/xhttp_pi/mohqueue-mod
> -share/kamailio/xhttp_pi/mohqueue-table
> -share/kamailio/xhttp_pi/msilo-mod
> -share/kamailio/xhttp_pi/msilo-table
> -share/kamailio/xhttp_pi/mtree-mod
> -share/kamailio/xhttp_pi/mtree-table
> -share/kamailio/xhttp_pi/pdt-mod
> -share/kamailio/xhttp_pi/pdt-table
> -share/kamailio/xhttp_pi/permissions-mod
> -share/kamailio/xhttp_pi/permissions-table
> -share/kamailio/xhttp_pi/pi_framework-00
> -share/kamailio/xhttp_pi/pi_framework-01
> -share/kamailio/xhttp_pi/pi_framework-02
> -share/kamailio/xhttp_pi/pi_framework.xml
> -share/kamailio/xhttp_pi/pipelimit-mod
> -share/kamailio/xhttp_pi/pipelimit-table
> -share/kamailio/xhttp_pi/presence-mod
> -share/kamailio/xhttp_pi/presence-table
> -share/kamailio/xhttp_pi/purple-mod
> -share/kamailio/xhttp_pi/purple-table
> -share/kamailio/xhttp_pi/registrar-mod
> -share/kamailio/xhttp_pi/registrar-table
> -share/kamailio/xhttp_pi/rls-mod
> -share/kamailio/xhttp_pi/rls-table
> -share/kamailio/xhttp_pi/rtpproxy-mod
> -share/kamailio/xhttp_pi/rtpproxy-table
> -share/kamailio/xhttp_pi/sca-mod
> -share/kamailio/xhttp_pi/sca-table
> -share/kamailio/xhttp_pi/siptrace-mod
> -share/kamailio/xhttp_pi/siptrace-table
> -share/kamailio/xhttp_pi/speeddial-mod
> -share/kamailio/xhttp_pi/speeddial-table
> -share/kamailio/xhttp_pi/standard-mod
> -share/kamailio/xhttp_pi/standard-table
> -share/kamailio/xhttp_pi/uac-mod
> -share/kamailio/xhttp_pi/uac-table
> -share/kamailio/xhttp_pi/uid_auth_db-mod
> -share/kamailio/xhttp_pi/uid_auth_db-table
> -share/kamailio/xhttp_pi/uid_avp_db-mod
> -share/kamailio/xhttp_pi/uid_avp_db-table
> -share/kamailio/xhttp_pi/uid_domain-mod
> -share/kamailio/xhttp_pi/uid_domain-table
> -share/kamailio/xhttp_pi/uid_gflags-mod
> -share/kamailio/xhttp_pi/uid_gflags-table
> -share/kamailio/xhttp_pi/uid_uri_db-mod
> -share/kamailio/xhttp_pi/uid_uri_db-table
> -share/kamailio/xhttp_pi/uri_db-mod
> -share/kamailio/xhttp_pi/uri_db-table
> -share/kamailio/xhttp_pi/userblacklist-mod
> -share/kamailio/xhttp_pi/userblacklist-table
> -share/kamailio/xhttp_pi/usrloc-mod
> -share/kamailio/xhttp_pi/usrloc-table
> @comment share/snmp/
> @comment share/snmp/mibs/
> @rcscript ${RCDIR}/kamailio
> Index: pkg/PLIST-mysql
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/pkg/PLIST-mysql,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-mysql
> --- pkg/PLIST-mysql 20 Nov 2015 10:09:52 -0000 1.4
> +++ pkg/PLIST-mysql 3 Jul 2017 15:11:24 -0000
> @@ -11,7 +11,6 @@ share/kamailio/mysql/avpops-create.sql
> share/kamailio/mysql/carrierroute-create.sql
> share/kamailio/mysql/cpl-create.sql
> share/kamailio/mysql/dialog-create.sql
> -share/kamailio/mysql/dialog_ng-create.sql
> share/kamailio/mysql/dialplan-create.sql
> share/kamailio/mysql/dispatcher-create.sql
> share/kamailio/mysql/domain-create.sql
> @@ -21,6 +20,7 @@ share/kamailio/mysql/group-create.sql
> share/kamailio/mysql/htable-create.sql
> share/kamailio/mysql/imc-create.sql
> share/kamailio/mysql/ims_charging_create.sql
> +share/kamailio/mysql/ims_dialog-create.sql
> share/kamailio/mysql/ims_usrloc_pcscf-create.sql
> share/kamailio/mysql/ims_usrloc_scscf-create.sql
> share/kamailio/mysql/lcr-create.sql
> @@ -35,11 +35,13 @@ share/kamailio/mysql/presence-create.sql
> share/kamailio/mysql/purple-create.sql
> share/kamailio/mysql/registrar-create.sql
> share/kamailio/mysql/rls-create.sql
> +share/kamailio/mysql/rtpengine-create.sql
> share/kamailio/mysql/rtpproxy-create.sql
> share/kamailio/mysql/sca-create.sql
> share/kamailio/mysql/siptrace-create.sql
> share/kamailio/mysql/speeddial-create.sql
> share/kamailio/mysql/standard-create.sql
> +share/kamailio/mysql/topos-create.sql
> share/kamailio/mysql/uac-create.sql
> share/kamailio/mysql/uid_auth_db-create.sql
> share/kamailio/mysql/uid_avp_db-create.sql
> Index: pkg/PLIST-postgresql
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/pkg/PLIST-postgresql,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-postgresql
> --- pkg/PLIST-postgresql 20 Nov 2015 10:09:52 -0000 1.4
> +++ pkg/PLIST-postgresql 3 Jul 2017 15:11:24 -0000
> @@ -31,11 +31,13 @@ share/kamailio/postgres/presence-create.
> share/kamailio/postgres/purple-create.sql
> share/kamailio/postgres/registrar-create.sql
> share/kamailio/postgres/rls-create.sql
> +share/kamailio/postgres/rtpengine-create.sql
> share/kamailio/postgres/rtpproxy-create.sql
> share/kamailio/postgres/sca-create.sql
> share/kamailio/postgres/siptrace-create.sql
> share/kamailio/postgres/speeddial-create.sql
> share/kamailio/postgres/standard-create.sql
> +share/kamailio/postgres/topos-create.sql
> share/kamailio/postgres/uac-create.sql
> share/kamailio/postgres/uid_auth_db-create.sql
> share/kamailio/postgres/uid_avp_db-create.sql
> Index: pkg/PLIST-presence
> ===================================================================
> RCS file: pkg/PLIST-presence
> diff -N pkg/PLIST-presence
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/PLIST-presence 3 Jul 2017 15:11:24 -0000
> @@ -0,0 +1,35 @@
> +@comment $OpenBSD: $
> +lib/kamailio/modules/presence.so
> +lib/kamailio/modules/presence_conference.so
> +lib/kamailio/modules/presence_dialoginfo.so
> +lib/kamailio/modules/presence_mwi.so
> +lib/kamailio/modules/presence_profile.so
> +lib/kamailio/modules/presence_reginfo.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_reginfo.so
> +lib/kamailio/modules/pua_rpc.so
> +lib/kamailio/modules/pua_usrloc.so
> +lib/kamailio/modules/pua_xmpp.so
> +lib/kamailio/modules/rls.so
> +lib/kamailio/modules/xcap_client.so
> +lib/kamailio/modules/xcap_server.so
> +share/doc/kamailio/modules/README.presence
> +share/doc/kamailio/modules/README.presence_conference
> +share/doc/kamailio/modules/README.presence_dialoginfo
> +share/doc/kamailio/modules/README.presence_mwi
> +share/doc/kamailio/modules/README.presence_profile
> +share/doc/kamailio/modules/README.presence_reginfo
> +share/doc/kamailio/modules/README.presence_xml
> +share/doc/kamailio/modules/README.pua
> +share/doc/kamailio/modules/README.pua_bla
> +share/doc/kamailio/modules/README.pua_dialoginfo
> +share/doc/kamailio/modules/README.pua_reginfo
> +share/doc/kamailio/modules/README.pua_rpc
> +share/doc/kamailio/modules/README.pua_usrloc
> +share/doc/kamailio/modules/README.pua_xmpp
> +share/doc/kamailio/modules/README.rls
> +share/doc/kamailio/modules/README.xcap_client
> +share/doc/kamailio/modules/README.xcap_server
> Index: pkg/PLIST-xml
> ===================================================================
> RCS file: pkg/PLIST-xml
> diff -N pkg/PLIST-xml
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/PLIST-xml 3 Jul 2017 15:11:24 -0000
> @@ -0,0 +1,99 @@
> +@comment $OpenBSD: $
> +lib/kamailio/modules/xhttp_pi.so
> +lib/kamailio/modules/xmlops.so
> +lib/kamailio/modules/xmlrpc.so
> +share/doc/kamailio/modules/README.xhttp_pi
> +share/doc/kamailio/modules/README.xmlops
> +share/doc/kamailio/modules/README.xmlrpc
> +share/examples/kamailio/pi_framework.xml
> +share/kamailio/xhttp_pi/
> +share/kamailio/xhttp_pi/acc-mod
> +share/kamailio/xhttp_pi/acc-table
> +share/kamailio/xhttp_pi/alias_db-mod
> +share/kamailio/xhttp_pi/alias_db-table
> +share/kamailio/xhttp_pi/auth_db-mod
> +share/kamailio/xhttp_pi/auth_db-table
> +share/kamailio/xhttp_pi/avpops-mod
> +share/kamailio/xhttp_pi/avpops-table
> +share/kamailio/xhttp_pi/carrierroute-mod
> +share/kamailio/xhttp_pi/carrierroute-table
> +share/kamailio/xhttp_pi/cpl-mod
> +share/kamailio/xhttp_pi/cpl-table
> +share/kamailio/xhttp_pi/dialog-mod
> +share/kamailio/xhttp_pi/dialog-table
> +share/kamailio/xhttp_pi/dialplan-mod
> +share/kamailio/xhttp_pi/dialplan-table
> +share/kamailio/xhttp_pi/dispatcher-mod
> +share/kamailio/xhttp_pi/dispatcher-table
> +share/kamailio/xhttp_pi/domain-mod
> +share/kamailio/xhttp_pi/domain-table
> +share/kamailio/xhttp_pi/domainpolicy-mod
> +share/kamailio/xhttp_pi/domainpolicy-table
> +share/kamailio/xhttp_pi/drouting-mod
> +share/kamailio/xhttp_pi/drouting-table
> +share/kamailio/xhttp_pi/group-mod
> +share/kamailio/xhttp_pi/group-table
> +share/kamailio/xhttp_pi/htable-mod
> +share/kamailio/xhttp_pi/htable-table
> +share/kamailio/xhttp_pi/imc-mod
> +share/kamailio/xhttp_pi/imc-table
> +share/kamailio/xhttp_pi/lcr-mod
> +share/kamailio/xhttp_pi/lcr-table
> +share/kamailio/xhttp_pi/matrix-mod
> +share/kamailio/xhttp_pi/matrix-table
> +share/kamailio/xhttp_pi/mohqueue-mod
> +share/kamailio/xhttp_pi/mohqueue-table
> +share/kamailio/xhttp_pi/msilo-mod
> +share/kamailio/xhttp_pi/msilo-table
> +share/kamailio/xhttp_pi/mtree-mod
> +share/kamailio/xhttp_pi/mtree-table
> +share/kamailio/xhttp_pi/pdt-mod
> +share/kamailio/xhttp_pi/pdt-table
> +share/kamailio/xhttp_pi/permissions-mod
> +share/kamailio/xhttp_pi/permissions-table
> +share/kamailio/xhttp_pi/pi_framework-00
> +share/kamailio/xhttp_pi/pi_framework-01
> +share/kamailio/xhttp_pi/pi_framework-02
> +share/kamailio/xhttp_pi/pi_framework.xml
> +share/kamailio/xhttp_pi/pipelimit-mod
> +share/kamailio/xhttp_pi/pipelimit-table
> +share/kamailio/xhttp_pi/presence-mod
> +share/kamailio/xhttp_pi/presence-table
> +share/kamailio/xhttp_pi/purple-mod
> +share/kamailio/xhttp_pi/purple-table
> +share/kamailio/xhttp_pi/registrar-mod
> +share/kamailio/xhttp_pi/registrar-table
> +share/kamailio/xhttp_pi/rls-mod
> +share/kamailio/xhttp_pi/rls-table
> +share/kamailio/xhttp_pi/rtpengine-mod
> +share/kamailio/xhttp_pi/rtpengine-table
> +share/kamailio/xhttp_pi/rtpproxy-mod
> +share/kamailio/xhttp_pi/rtpproxy-table
> +share/kamailio/xhttp_pi/sca-mod
> +share/kamailio/xhttp_pi/sca-table
> +share/kamailio/xhttp_pi/siptrace-mod
> +share/kamailio/xhttp_pi/siptrace-table
> +share/kamailio/xhttp_pi/speeddial-mod
> +share/kamailio/xhttp_pi/speeddial-table
> +share/kamailio/xhttp_pi/standard-mod
> +share/kamailio/xhttp_pi/standard-table
> +share/kamailio/xhttp_pi/topos-mod
> +share/kamailio/xhttp_pi/topos-table
> +share/kamailio/xhttp_pi/uac-mod
> +share/kamailio/xhttp_pi/uac-table
> +share/kamailio/xhttp_pi/uid_auth_db-mod
> +share/kamailio/xhttp_pi/uid_auth_db-table
> +share/kamailio/xhttp_pi/uid_avp_db-mod
> +share/kamailio/xhttp_pi/uid_avp_db-table
> +share/kamailio/xhttp_pi/uid_domain-mod
> +share/kamailio/xhttp_pi/uid_domain-table
> +share/kamailio/xhttp_pi/uid_gflags-mod
> +share/kamailio/xhttp_pi/uid_gflags-table
> +share/kamailio/xhttp_pi/uid_uri_db-mod
> +share/kamailio/xhttp_pi/uid_uri_db-table
> +share/kamailio/xhttp_pi/uri_db-mod
> +share/kamailio/xhttp_pi/uri_db-table
> +share/kamailio/xhttp_pi/userblacklist-mod
> +share/kamailio/xhttp_pi/userblacklist-table
> +share/kamailio/xhttp_pi/usrloc-mod
> +share/kamailio/xhttp_pi/usrloc-table
> Index: pkg/PLIST-xmlrpc
> ===================================================================
> RCS file: pkg/PLIST-xmlrpc
> diff -N pkg/PLIST-xmlrpc
> --- pkg/PLIST-xmlrpc 16 Apr 2013 11:13:04 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -@comment $OpenBSD: PLIST-xmlrpc,v 1.3 2013/04/16 11:13:04 sthen Exp $
> -lib/kamailio/modules/mi_xmlrpc.so
> -share/doc/kamailio/modules/README.mi_xmlrpc
> Index: pkg/kamailio.rc
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/pkg/kamailio.rc,v
> retrieving revision 1.2
> diff -u -p -r1.2 kamailio.rc
> --- pkg/kamailio.rc 20 Nov 2015 10:09:52 -0000 1.2
> +++ pkg/kamailio.rc 3 Jul 2017 15:11:24 -0000
> @@ -1,6 +1,6 @@
> #!/bin/sh
> #
> -# $OpenBSD:
> +# $OpenBSD: $
>
> daemon="${TRUEPREFIX}/sbin/kamailio"
>
