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)
> -
No comments:
Post a Comment