Date: Sun, 6 Sep 2015 19:37:36 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396230 - in head/net/kamailio: . files Message-ID: <201509061937.t86Jbaam008638@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sun Sep 6 19:37:36 2015 New Revision: 396230 URL: https://svnweb.freebsd.org/changeset/ports/396230 Log: net/kamailio: add some options, after tests - add PERL option - add SCTP option - patch to use atomic-ops PR: 199630 Added: head/net/kamailio/files/extra-patch-atomic-amd64 (contents, props changed) head/net/kamailio/files/extra-patch-atomic-i386 (contents, props changed) head/net/kamailio/files/patch-modules_app__perl_kamailioxs.xs (contents, props changed) Modified: head/net/kamailio/Makefile head/net/kamailio/pkg-plist Modified: head/net/kamailio/Makefile ============================================================================== --- head/net/kamailio/Makefile Sun Sep 6 19:29:10 2015 (r396229) +++ head/net/kamailio/Makefile Sun Sep 6 19:37:36 2015 (r396230) @@ -3,6 +3,7 @@ PORTNAME= kamailio PORTVERSION= 4.3.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}_src @@ -31,12 +32,13 @@ USE_RC_SUBR= kamailio USERS= kamailio GROUPS= kamailio -OPTIONS_DEFINE= DOCS MYSQL PGSQL RADIUS JITSI JABBER TLS UNIXODBC \ - PRESENCE WEBSOCKET +OPTIONS_DEFINE= DOCS MYSQL PGSQL PERL RADIUS JITSI JABBER SCTP TLS \ + UNIXODBC PRESENCE WEBSOCKET OPTIONS_DEFAULT=MYSQL RADIUS JABBER TLS PRESENCE OPTIONS_SUB= YES JITSI_DESC= VoIP Frontend GUI via Jitsi +SCTP_DESC= SCTP support PRESENCE_DESC= Presence support WEBSOCKET_DESC= Websocket support @@ -49,6 +51,15 @@ TLS_USE= OPENSSL=yes .include <bsd.port.options.mk> +# avoid slow locks, use fast atomic ops +.if ${ARCH} == "amd64" +EXTRA_PATCHES+= ${.CURDIR}/files/extra-patch-atomic-amd64 +.endif + +.if ${ARCH} == "i386" +EXTRA_PATCHES+= ${.CURDIR}/files/extra-patch-atomic-i386 +.endif + .if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 BUILD_DEPENDS+= clang33:${PORTSDIR}/lang/clang33 .endif @@ -63,6 +74,14 @@ EXTRA_GROUPS+= mysql EXTRA_GROUPS+= postgres .endif +.if ${PORT_OPTIONS:MPERL} +USES+= perl5 +EXTRA_MODULES+= app_perl +MAKE_ENV+= PERLLDOPTS=`perl -MExtUtils::Embed -e ldopts` \ + PERLCCOPTS=`perl -MExtUtils::Embed -e ccopts` \ + TYPEMAP=`perl -MConfig -e 'print $Config{installprivlib}'`/ExtUtils/typemap +.endif + .if ${PORT_OPTIONS:MUNIXODBC} EXTRA_MODULES+= db_unixodbc .endif @@ -75,6 +94,10 @@ EXTRA_GROUPS+= radius EXTRA_MODULES+= jabber .endif +.if ${PORT_OPTIONS:MSCTP} +EXTRA_MODULES+= sctp +.endif + .if ${PORT_OPTIONS:MTLS} EXTRA_MODULES+= tls .endif @@ -144,7 +167,8 @@ post-stage: presence_profile presence_reginfo presence_xml pua_bla \ pua_dialoginfo pua_mi pua_reginfo pua_usrloc rls \ acc_radius misc_radius peering pua pua_xmpp xcap_client xcap_server \ - tcpops auth_xkeys statsd dmq_usrloc rtjson websocket + tcpops auth_xkeys statsd dmq_usrloc rtjson websocket sctp \ + app_perl @if [ -e ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/${i}.so ]; then \ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/${i}.so; \ fi Added: head/net/kamailio/files/extra-patch-atomic-amd64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/kamailio/files/extra-patch-atomic-amd64 Sun Sep 6 19:37:36 2015 (r396230) @@ -0,0 +1,11 @@ +--- atomic/atomic_native.h.orig 2015-09-06 19:01:51 UTC ++++ atomic/atomic_native.h +@@ -46,6 +46,8 @@ + #ifndef __atomic_native + #define __atomic_native + ++#define CC_GCC_LIKE_ASM 1 ++#define __CPU_x86_64 1 + #ifdef CC_GCC_LIKE_ASM + + #if defined __CPU_i386 || defined __CPU_x86_64 Added: head/net/kamailio/files/extra-patch-atomic-i386 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/kamailio/files/extra-patch-atomic-i386 Sun Sep 6 19:37:36 2015 (r396230) @@ -0,0 +1,11 @@ +--- atomic/atomic_native.h.orig 2015-09-06 19:01:51 UTC ++++ atomic/atomic_native.h +@@ -46,6 +46,8 @@ + #ifndef __atomic_native + #define __atomic_native + ++#define CC_GCC_LIKE_ASM 1 ++#define __CPU_i386 1 + #ifdef CC_GCC_LIKE_ASM + + #if defined __CPU_i386 || defined __CPU_x86_64 Added: head/net/kamailio/files/patch-modules_app__perl_kamailioxs.xs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/kamailio/files/patch-modules_app__perl_kamailioxs.xs Sun Sep 6 19:37:36 2015 (r396230) @@ -0,0 +1,11 @@ +--- modules/app_perl/kamailioxs.xs.orig 2015-07-20 13:16:25 UTC ++++ modules/app_perl/kamailioxs.xs +@@ -402,7 +402,7 @@ char *pv_sprintf(struct sip_msg *m, char + * - strflag: flag mask to be or-applied for string match + */ + +-inline int sv2int_str(SV *val, int_str *is, ++static inline int sv2int_str(SV *val, int_str *is, + unsigned short *flags, unsigned short strflag) { + char *s; + STRLEN len; Modified: head/net/kamailio/pkg-plist ============================================================================== --- head/net/kamailio/pkg-plist Sun Sep 6 19:29:10 2015 (r396229) +++ head/net/kamailio/pkg-plist Sun Sep 6 19:37:36 2015 (r396230) @@ -43,6 +43,7 @@ lib/kamailio/kamctl/kamdbctl.base %%MYSQL%%lib/kamailio/kamctl/dbtextdb/dbtextdb.py %%MYSQL%%lib/kamailio/modules/acc.so %%MYSQL%%lib/kamailio/modules/alias_db.so +%%PERL%%lib/kamailio/modules/app_perl.so lib/kamailio/modules/async.so lib/kamailio/modules/auth.so %%MYSQL%%lib/kamailio/modules/auth_db.so @@ -121,6 +122,7 @@ lib/kamailio/modules/rtpengine.so lib/kamailio/modules/rtpproxy.so lib/kamailio/modules/sanity.so lib/kamailio/modules/sca.so +%%SCTP%%lib/kamailio/modules/sctp.so lib/kamailio/modules/sdpops.so lib/kamailio/modules/seas.so %%MYSQL%%lib/kamailio/modules/sipcapture.so @@ -154,6 +156,46 @@ lib/kamailio/modules/xhttp.so lib/kamailio/modules/xhttp_rpc.so lib/kamailio/modules/xlog.so lib/kamailio/modules/xprint.so +%%RADIUS%%lib/kamailio/modules/acc_radius.so +%%RADIUS%%lib/kamailio/modules/misc_radius.so +%%RADIUS%%lib/kamailio/modules/peering.so +%%PRESENCE%%lib/kamailio/modules/pua.so +%%PRESENCE%%lib/kamailio/modules/pua_xmpp.so +%%PRESENCE%%lib/kamailio/modules/xcap_client.so +%%PRESENCE%%lib/kamailio/modules/xcap_server.so +%%PRESENCE%%lib/kamailio/modules/presence.so +%%PRESENCE%%lib/kamailio/modules/presence_conference.so +%%PRESENCE%%lib/kamailio/modules/presence_dialoginfo.so +%%PRESENCE%%lib/kamailio/modules/presence_mwi.so +%%PRESENCE%%lib/kamailio/modules/presence_profile.so +%%PRESENCE%%lib/kamailio/modules/presence_reginfo.so +%%PRESENCE%%lib/kamailio/modules/presence_xml.so +%%PRESENCE%%lib/kamailio/modules/pua_bla.so +%%PRESENCE%%lib/kamailio/modules/pua_dialoginfo.so +%%PRESENCE%%lib/kamailio/modules/pua_mi.so +%%PRESENCE%%lib/kamailio/modules/pua_reginfo.so +%%PRESENCE%%lib/kamailio/modules/pua_usrloc.so +%%PRESENCE%%lib/kamailio/modules/rls.so +%%PERL%%lib/kamailio/perl/Kamailio.pm +%%PERL%%lib/kamailio/perl/Kamailio/Constants.pm +%%PERL%%lib/kamailio/perl/Kamailio/LDAPUtils/LDAPConf.pm +%%PERL%%lib/kamailio/perl/Kamailio/LDAPUtils/LDAPConnection.pm +%%PERL%%lib/kamailio/perl/Kamailio/Message.pm +%%PERL%%lib/kamailio/perl/Kamailio/Utils/Debug.pm +%%PERL%%lib/kamailio/perl/Kamailio/Utils/PhoneNumbers.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/Adapter/AccountingSIPtrace.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/Adapter/Alias.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/Adapter/Auth.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/Adapter/Describe.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/Adapter/Speeddial.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/Adapter/TableVersions.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/Column.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/Pair.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/ReqCond.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/Result.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/VTab.pm +%%PERL%%lib/kamailio/perl/Kamailio/VDB/Value.pm %%MYSQL%%%%DATADIR%%/dbtext/kamailio/acc %%MYSQL%%%%DATADIR%%/dbtext/kamailio/acc_cdrs %%MYSQL%%%%DATADIR%%/dbtext/kamailio/active_watchers @@ -312,23 +354,3 @@ man/man8/kamailio.8.gz man/man8/kamcmd.8.gz man/man8/kamctl.8.gz man/man8/kamdbctl.8.gz -%%RADIUS%%lib/kamailio/modules/acc_radius.so -%%RADIUS%%lib/kamailio/modules/misc_radius.so -%%RADIUS%%lib/kamailio/modules/peering.so -%%PRESENCE%%lib/kamailio/modules/pua.so -%%PRESENCE%%lib/kamailio/modules/pua_xmpp.so -%%PRESENCE%%lib/kamailio/modules/xcap_client.so -%%PRESENCE%%lib/kamailio/modules/xcap_server.so -%%PRESENCE%%lib/kamailio/modules/presence.so -%%PRESENCE%%lib/kamailio/modules/presence_conference.so -%%PRESENCE%%lib/kamailio/modules/presence_dialoginfo.so -%%PRESENCE%%lib/kamailio/modules/presence_mwi.so -%%PRESENCE%%lib/kamailio/modules/presence_profile.so -%%PRESENCE%%lib/kamailio/modules/presence_reginfo.so -%%PRESENCE%%lib/kamailio/modules/presence_xml.so -%%PRESENCE%%lib/kamailio/modules/pua_bla.so -%%PRESENCE%%lib/kamailio/modules/pua_dialoginfo.so -%%PRESENCE%%lib/kamailio/modules/pua_mi.so -%%PRESENCE%%lib/kamailio/modules/pua_reginfo.so -%%PRESENCE%%lib/kamailio/modules/pua_usrloc.so -%%PRESENCE%%lib/kamailio/modules/rls.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509061937.t86Jbaam008638>