Hi ports@,
This is update kamailio port.
Changelog:
- update port to version 4.3.5
- switch tls module to build with security/openssl
- cleanup patch-modules_tls_tls_init_c (upstream added
OPENSSL_NO_SSL3_METHOD flag)
Ok? Comments?
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/kamailio/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile 20 Nov 2015 10:09:52 -0000 1.33
+++ Makefile 12 Mar 2016 22:57:46 -0000
@@ -4,7 +4,7 @@ COMMENT-main = mature and flexible open
SHARED_ONLY = Yes
-VERSION = 4.3.3
+VERSION = 4.3.5
DISTNAME = kamailio-${VERSION}_src
PKGNAME-main = kamailio-${VERSION}
PKGNAME-mysql = kamailio-mysql-${VERSION}
@@ -24,14 +24,14 @@ 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 = kcore 4.0 # 1.0
+SHARED_LIBS += kmi 4.0 # 1.0
+SHARED_LIBS += srdb1 4.0 # 1.0
+SHARED_LIBS += srdb2 4.0 # 1.0
+SHARED_LIBS += trie 4.0 # 1.0
+SHARED_LIBS += binrpc 3.0 # 0.1
+SHARED_LIBS += srutils 3.0 # 1.0
+SHARED_LIBS += print 2.0 # 1.2
MAKE_ENV = CC="${CC}" \
CC_EXTRA_OPTS="${CFLAGS} -DOPENSSL_NO_BUF_FREELISTS
-DHAVE_ARC4RANDOM -I${LOCALBASE}/include" \
@@ -43,12 +43,14 @@ WRKDIST = ${WRKDIR}/kamailio-${VERSION}
MODULES = devel/gettext
WANTLIB-main = c crypto curl db expat m pcre pthread ssl xml2 nghttp2 \
- idn ncurses readline unistring z ${MODGETTEXT_WANTLIB}
+ idn ncurses readline unistring z lib/eopenssl/crypto
lib/eopenssl/ssl \
+ ${MODGETTEXT_WANTLIB}
LIB_DEPENDS-main = net/curl \
databases/db/v4,-main,no_java \
devel/pcre \
textproc/libxml,-main,no_python \
converters/libunistring \
+ security/openssl \
${MODGETTEXT_LIB_DEPENDS}
KAMAILIO_MODULES = cpl-c db_berkeley dialplan dialog_ng jabber lcr \
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/kamailio/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo 20 Nov 2015 10:09:52 -0000 1.7
+++ distinfo 12 Mar 2016 22:57:46 -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-4.3.5_src.tar.gz) =
LIyWOizQyZfGbMxluNXeAf1/S2tgU7zxC/dG2BSzE9U=
+SIZE (kamailio-4.3.5_src.tar.gz) = 11384179
Index: patches/patch-Makefile_defs
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-Makefile_defs,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Makefile_defs
--- patches/patch-Makefile_defs 20 Nov 2015 10:09:52 -0000 1.6
+++ patches/patch-Makefile_defs 12 Mar 2016 22:57:46 -0000
@@ -1,6 +1,6 @@
$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
+--- Makefile.defs.orig Thu Mar 3 16:24:28 2016
++++ Makefile.defs Sat Mar 12 15:11:07 2016
@@ -300,9 +300,9 @@ ppc_macros= __powerpc __powerpc__ __POWERPC__ __ppc__
ppc64_macros= __ppc64__ _ARCH_PPC64
@@ -44,12 +44,12 @@ $OpenBSD: patch-Makefile_defs,v 1.6 2015
+ 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)
+ $(call set_if_empty,CPUTYPE,athlon64)
- CFLAGS+=-m32 -minline-all-stringops \
- -falign-loops \
- -ftree-vectorize \
- -fno-strict-overflow \
-- -mtune=$(CPU)
+- -mtune=$(CPUTYPE)
- LDFLAGS+=-m32
+ CFLAGS+=
+ LDFLAGS+=
@@ -63,24 +63,24 @@ $OpenBSD: patch-Makefile_defs,v 1.6 2015
- CFLAGS=-g $(CC_OPT) -funroll-loops
-Wcast-align $(PROFILE)
+ CFLAGS=
#if gcc 4.5+
- # don't add '-mtune=$(CPU)' - gcc failure
+ # don't add '-mtune=$(CPUTYPE)' - 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)
+ $(call set_if_empty,CPUTYPE,opteron)
- CFLAGS+=-m64 -minline-all-stringops \
- -falign-loops \
- -ftree-vectorize \
- -fno-strict-overflow \
-- -mtune=$(CPU)
+- -mtune=$(CPUTYPE)
- LDFLAGS+=-m64
+ CFLAGS+=
+ LDFLAGS+=
else
#if gcc 4.0+
ifeq ($(CC_SHORTVER), 4.x)
-@@ -1848,9 +1840,10 @@ endif
+@@ -1850,9 +1842,10 @@ endif
ifeq ($(OS), openbsd)
C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \
Index: patches/patch-main_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-main_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-main_c
--- patches/patch-main_c 20 Nov 2015 10:09:52 -0000 1.1
+++ patches/patch-main_c 12 Mar 2016 22:57:46 -0000
@@ -1,7 +1,7 @@
$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)
+--- main.c.orig Thu Mar 3 16:24:28 2016
++++ main.c Sat Mar 12 15:05:47 2016
+@@ -1791,8 +1791,10 @@ int main(int argc, char** argv)
int proto;
char *options;
int ret;
@@ -12,7 +12,7 @@ $OpenBSD: patch-main_c,v 1.1 2015/11/20
int debug_save, debug_flag;
int dont_fork_cnt;
struct name_lst* n_lst;
-@@ -2026,6 +2028,7 @@ int main(int argc, char** argv)
+@@ -2030,6 +2032,7 @@ int main(int argc, char** argv)
goto error;
}
@@ -20,7 +20,7 @@ $OpenBSD: patch-main_c,v 1.1 2015/11/20
/* seed the prng */
/* try to use /dev/urandom if possible */
seed=0;
-@@ -2046,6 +2049,7 @@ try_again:
+@@ -2050,6 +2053,7 @@ try_again:
fastrand_seed(rand());
srandom(rand()+time(0));
LM_DBG("test random numbers %u %lu %u\n", rand(), random(), fastrand());
Index: patches/patch-modules_dmq_usrloc_usrloc_sync_c
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_dmq_usrloc_usrloc_sync_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_dmq_usrloc_usrloc_sync_c
--- patches/patch-modules_dmq_usrloc_usrloc_sync_c 20 Nov 2015 10:09:52
-0000 1.1
+++ patches/patch-modules_dmq_usrloc_usrloc_sync_c 12 Mar 2016 22:57:46
-0000
@@ -1,7 +1,7 @@
$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
+--- modules/dmq_usrloc/usrloc_sync.c.orig Thu Mar 3 16:24:28 2016
++++ modules/dmq_usrloc/usrloc_sync.c Sat Mar 12 15:05:47 2016
+@@ -281,8 +281,8 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_re
srjson_t *it = NULL;
static ucontact_info_t ci;
Index: patches/patch-modules_lcr_lcr_mod_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-modules_lcr_lcr_mod_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-modules_lcr_lcr_mod_c
--- patches/patch-modules_lcr_lcr_mod_c 20 Nov 2015 10:09:52 -0000 1.2
+++ patches/patch-modules_lcr_lcr_mod_c 12 Mar 2016 22:57:46 -0000
@@ -1,6 +1,6 @@
$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
+--- modules/lcr/lcr_mod.c.orig Thu Mar 3 16:24:28 2016
++++ modules/lcr/lcr_mod.c Sat Mar 12 15:05:47 2016
@@ -55,6 +55,9 @@
* least cost rules). Each such instance has its own LCR identifier.
*/
@@ -11,7 +11,7 @@ $OpenBSD: patch-modules_lcr_lcr_mod_c,v
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-@@ -2049,10 +2052,11 @@ static int generate_uris(struct sip_msg* _m, char *r_u
+@@ -2050,10 +2053,11 @@ static int generate_uris(struct sip_msg* _m, char *r_u
{
int_str gw_uri_val;
struct usr_avp *gu_avp;
Index: patches/patch-modules_tls_Makefile
===================================================================
RCS file: patches/patch-modules_tls_Makefile
diff -N patches/patch-modules_tls_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_tls_Makefile 12 Mar 2016 22:57:46 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- modules/tls/Makefile.orig Thu Mar 3 16:24:28 2016
++++ modules/tls/Makefile Sun Mar 13 00:34:36 2016
+@@ -10,14 +10,15 @@ NAME=tls.so
+
+ ifeq ($(CROSS_COMPILE),)
+ SSL_BUILDER=$(shell \
+- if pkg-config --exists libssl; then \
+- echo 'pkg-config libssl'; \
++ if pkg-config --exists eopenssl; then \
++ echo 'pkg-config eopenssl'; \
+ fi)
+ endif
+
+ ifneq ($(SSL_BUILDER),)
+ DEFS += $(shell $(SSL_BUILDER) --cflags)
+ LIBS += $(shell $(SSL_BUILDER) --libs)
++ LIBS += -Wl,-rpath,$(LOCALBASE)/lib/eopenssl
+ else
+ DEFS += -I$(LOCALBASE)/ssl/include
+ LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \
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-utils_kamctl_kamctl
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctl,v
retrieving revision 1.4
diff -u -p -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 12 Mar 2016 22:57:46 -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 Thu Mar 3 16:24:28 2016
++++ utils/kamctl/kamctl Sat Mar 12 15:05:47 2016
@@ -75,7 +75,7 @@ fi
if [ -f "$MYLIBDIR/kamctl.base" ]; then
. "$MYLIBDIR/kamctl.base"
@@ -10,7 +10,7 @@ $OpenBSD: patch-utils_kamctl_kamctl,v 1.
exit -1
fi
-@@ -1900,7 +1900,7 @@ kamailio_stop() {
+@@ -1903,7 +1903,7 @@ kamailio_stop() {
options_ping() {
myhost=`get_my_host`
require_ctlengine
