Date: Sun, 10 May 2020 17:44:47 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534857 - in head/net/sems: . files Message-ID: <202005101744.04AHilUF008991@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn (src committer) Date: Sun May 10 17:44:46 2020 New Revision: 534857 URL: https://svnweb.freebsd.org/changeset/ports/534857 Log: Update to a newer SEMS snapshot, which brings some minor bugfixes related to SIP message parsing, and make the installed Python scripts run under Python 3. Some of the upstream updates require functions from OpenSSL, which is added as a dependency. Approved by: manu Added: head/net/sems/files/patch-apps-xmlrpc2di-xmlrpc++-src-base64.h (contents, props changed) Deleted: head/net/sems/files/patch-core_plug-in_isac_libisac_typedefs.h Modified: head/net/sems/Makefile head/net/sems/distinfo head/net/sems/files/patch-core-CMakeLists.txt head/net/sems/pkg-plist Modified: head/net/sems/Makefile ============================================================================== --- head/net/sems/Makefile Sun May 10 16:50:49 2020 (r534856) +++ head/net/sems/Makefile Sun May 10 17:44:46 2020 (r534857) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sems -DISTVERSION= ${SEMS_VERSION}.g20190822 +DISTVERSION= ${SEMS_VERSION}.g20200510 CATEGORIES= net MAINTAINER= nwhitehorn@FreeBSD.org @@ -11,9 +11,6 @@ COMMENT= SIP Express Media Server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/COPYING -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - LIB_DEPENDS= libopus.so:audio/opus \ libcodec2.so:audio/codec2 \ libevent.so:devel/libevent \ @@ -24,17 +21,21 @@ LIB_DEPENDS= libopus.so:audio/opus \ libspeex.so:audio/speex \ libspandsp.so:comms/spandsp -USES= cmake compiler:c++11-lang python:2.7,run shebangfix +USES= cmake compiler:c++11-lang python:3.4+,run shebangfix ssl SHEBANG_GLOB= sems-* +PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} +PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write + USE_GITHUB= yes GH_ACCOUNT= sems-server -GH_TAGNAME= 7400051 +GH_TAGNAME= f89581a CFLAGS+= -Wno-reorder CMAKE_ARGS= -DSEMS_CFG_PREFIX=${PREFIX} -DSEMS_AUDIO_PREFIX=${PREFIX}/lib \ -DSEMS_EXEC_PREFIX=${PREFIX} -DSEMS_DOC_PREFIX=${PREFIX}/share/doc -CMAKE_ON= SEMS_USE_SPANDSP SEMS_USE_LIBSAMPLERATE SEMS_USE_OPUS +CMAKE_ON= SEMS_USE_SPANDSP SEMS_USE_LIBSAMPLERATE SEMS_USE_OPUS \ + SEMS_USE_OPENSSL USE_RC_SUBR= sems @@ -44,7 +45,20 @@ GROUPS= sems SEMS_VERSION= 1.7.0 PLIST_SUB= SEMS_VERSION=${SEMS_VERSION} +FIXUP_2TO3= sbin/sems-get-callproperties sbin/sems-list-active-calls \ + sbin/sems-list-calls sbin/sems-list-finished-calls \ + sbin/sems-sbc-get-activeprofile \ + sbin/sems-sbc-get-regex-map-names sbin/sems-sbc-list-profiles \ + sbin/sems-sbc-load-callcontrol-modules \ + sbin/sems-sbc-load-profile sbin/sems-sbc-reload-profile \ + sbin/sems-sbc-reload-profiles sbin/sems-sbc-set-activeprofile \ + sbin/sems-sbc-set-regex-map sbin/sems-sbc-teardown-call + post-install: +. for p in ${FIXUP_2TO3} + ${PY2TO3_CMD} ${PY2TO3_ARGS} ${STAGEDIR}${PREFIX}/${p} +. endfor + cd ${STAGEDIR}${ETCDIR} && ${FIND} . \ -type f -exec ${MV} {} {}.sample \; Modified: head/net/sems/distinfo ============================================================================== --- head/net/sems/distinfo Sun May 10 16:50:49 2020 (r534856) +++ head/net/sems/distinfo Sun May 10 17:44:46 2020 (r534857) @@ -1,3 +1,3 @@ -TIMESTAMP = 1566533104 -SHA256 (sems-server-sems-1.7.0.g20190822-7400051_GH0.tar.gz) = 0648e863c79363985e59174728f29a7b6c431fc76343fb004ed7c548aef7fcf0 -SIZE (sems-server-sems-1.7.0.g20190822-7400051_GH0.tar.gz) = 5200119 +TIMESTAMP = 1589124511 +SHA256 (sems-server-sems-1.7.0.g20200510-f89581a_GH0.tar.gz) = 31ac2c287c2abf40e028f1afe9493f52f3e872e62e4428585bb6b6387e10cd16 +SIZE (sems-server-sems-1.7.0.g20200510-f89581a_GH0.tar.gz) = 5135383 Added: head/net/sems/files/patch-apps-xmlrpc2di-xmlrpc++-src-base64.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/sems/files/patch-apps-xmlrpc2di-xmlrpc++-src-base64.h Sun May 10 17:44:46 2020 (r534857) @@ -0,0 +1,14 @@ +--- apps/xmlrpc2di/xmlrpc++/src/base64.h.orig 2019-12-06 20:43:40.279650000 -0800 ++++ apps/xmlrpc2di/xmlrpc++/src/base64.h 2019-12-06 20:44:03.636359000 -0800 +@@ -9,9 +9,9 @@ + #if !defined(__BASE64_H_INCLUDED__) + #define __BASE64_H_INCLUDED__ 1 + +-#if defined __APPLE__ && defined __clang__ ++#if !defined(__glibc__) && defined __clang__ + #include <ios> +-#endif // __APPLE__ && __clang__ ++#endif // !__glibc__ && __clang__ + + #ifndef MAKEDEPEND + # include <iterator> Modified: head/net/sems/files/patch-core-CMakeLists.txt ============================================================================== --- head/net/sems/files/patch-core-CMakeLists.txt Sun May 10 16:50:49 2020 (r534856) +++ head/net/sems/files/patch-core-CMakeLists.txt Sun May 10 17:44:46 2020 (r534857) @@ -1,6 +1,6 @@ ---- core/CMakeLists.txt.orig 2019-08-22 14:04:22.265669000 -0700 -+++ core/CMakeLists.txt 2019-08-22 14:05:02.760870000 -0700 -@@ -12,15 +12,12 @@ +--- core/CMakeLists.txt.orig 2020-05-10 08:28:35.425963000 -0700 ++++ core/CMakeLists.txt 2020-05-10 08:32:38.193983000 -0700 +@@ -13,22 +13,12 @@ INCLUDE_DIRECTORIES (ampi) INCLUDE_DIRECTORIES (amci) @@ -14,7 +14,14 @@ - FOREACH (EXE_TARGET sems sems_tests) -- TARGET_LINK_LIBRARIES(${EXE_TARGET} ${CMAKE_DL_LIBS} sems_core sems_sip event event_pthreads -rdynamic) +- # This allows symbols defined in the SIP stack but not used +- # by the core itself to be included in the executable and +- # thus be available for modules +- IF(APPLE) +- TARGET_LINK_LIBRARIES(${EXE_TARGET} ${CMAKE_DL_LIBS} -Wl,-force_load sems_core -Wl,-force_load sems_sip event event_pthreads -rdynamic) +- ELSE() +- TARGET_LINK_LIBRARIES(${EXE_TARGET} ${CMAKE_DL_LIBS} -Wl,--whole-archive sems_core sems_sip -Wl,--no-whole-archive event event_pthreads -rdynamic) +- ENDIF() + TARGET_LINK_LIBRARIES(${EXE_TARGET} ${CMAKE_DL_LIBS} event event_pthreads -rdynamic) IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") Modified: head/net/sems/pkg-plist ============================================================================== --- head/net/sems/pkg-plist Sun May 10 16:50:49 2020 (r534856) +++ head/net/sems/pkg-plist Sun May 10 17:44:46 2020 (r534857) @@ -36,6 +36,7 @@ @sample %%ETCDIR%%/etc/transparent.sbcprofile.conf.sample @sample %%ETCDIR%%/etc/voicebox.conf.sample @sample %%ETCDIR%%/etc/voicemail.conf.sample +@sample %%ETCDIR%%/etc/xmlrpc2di.conf.sample @sample %%ETCDIR%%/etc/webconference.conf.sample @sample %%ETCDIR%%/sems.conf.sample lib/sems/audio/annrecorder/beep.wav @@ -150,8 +151,8 @@ lib/sems/plug-in/cc_prepaid.so lib/sems/plug-in/cc_registrar.so lib/sems/plug-in/cc_syslog_cdr.so lib/sems/plug-in/click2dial.so -lib/sems/plug-in/codec2.so lib/sems/plug-in/conference.so +lib/sems/plug-in/diameter_client.so lib/sems/plug-in/dsm.so lib/sems/plug-in/early_announce.so lib/sems/plug-in/echo.so @@ -175,6 +176,7 @@ lib/sems/plug-in/stats.so lib/sems/plug-in/uac_auth.so lib/sems/plug-in/voicebox.so lib/sems/plug-in/voicemail.so +lib/sems/plug-in/xmlrpc2di.so lib/sems/plug-in/wav.so lib/sems/plug-in/webconference.so sbin/sems
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005101744.04AHilUF008991>