diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index 6201030d725b..ab0e54b29d6d 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -1,185 +1,204 @@ # Created by: Corey Smith # $FreeBSD$ PORTNAME= freeswitch PORTVERSION= 1.10.3 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://files.freeswitch.org/releases/freeswitch/ \ https://files.freeswitch.org/releases/sounds/:sounds DISTFILES= ${PORTNAME}-${PORTVERSION}.-release${EXTRACT_SUFX} MAINTAINER= pi@FreeBSD.org COMMENT= Multi-protocol soft switch for telephony applications LICENSE= MPL11 ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= gdiff:textproc/diffutils LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libcurl.so:ftp/curl \ libavformat.so:multimedia/ffmpeg \ libpcre.so:devel/pcre \ libspeexdsp.so:audio/speexdsp \ libspeex.so:audio/speex \ libldns.so:dns/ldns \ libopus.so:audio/opus \ libsndfile.so:audio/libsndfile \ libfreetype.so:print/freetype2 \ libodbc.so:databases/unixODBC \ libpng.so:graphics/png \ libjbig.so:graphics/jbigkit \ libtiff.so:graphics/tiff \ libuuid.so:misc/e2fsprogs-libuuid -USES= gmake iconv jpeg libedit libtool lua:51-52 perl5 \ +USES= gmake iconv jpeg libedit autoreconf libtool lua perl5 \ pkgconfig shebangfix ssl USE_LDCONFIG= yes USE_RC_SUBR= freeswitch BINARY_ALIAS= diff=gdiff MAKE_JOBS_UNSAFE=yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.-release SHEBANG_FILES= scripts/fsxs.in CONFLICTS_BUILD= xmlrpc-c-* GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --enable-zrtp -CFLAGS+= -Wno-error +CFLAGS+= -Wno-error -I${LUA_INCDIR} USERS= ${PORTNAME} GROUPS= ${USERS} SUB_FILES= pkg-message OPTIONS_DEFINE= ALL_MODULES X11 EXAMPLES PGSQL OPTIONS_DEFAULT= 8K 16K ENGLISH PGSQL OPTIONS_MULTI= BITRATE LANGUAGE OPTIONS_MULTI_BITRATE= 8K 16K 32K 48K OPTIONS_MULTI_LANGUAGE= CHINESE_HK CHINESE_SIM BRAZILIAN ENGLISH ENGLISH_CA FRENCH_CA RUSSIAN SWEDISH OPTIONS_SUB= yes NO_OPTIONS_SORT= yes ALL_MODULES_DESC= Build all modules X11_DESC= graphics/ImageMagick[-nox11] dependency 8K_DESC= 8kHz Audio Files 16K_DESC= 16kHz Audio Files 32K_DESC= 32kHz Audio Files 48K_DESC= 48kHz Audio Files BRAZILIAN_DESC= Brazilian Portuguese Language Sounds CHINESE_HK_DESC= Chinese Traditional Language Sounds CHINESE_SIM_DESC= Chinese Simplified Language Sounds ENGLISH_DESC= US English Language Sounds ENGLISH_CA_DESC= Canadian English Language Sounds FRENCH_CA_DESC= French Canadian Language Sounds RUSSIAN_DESC= Russian Language Sounds SWEDISH_DESC= Swedish Language Sounds ALL_MODULES_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa \ - ${LOCALBASE}/bin/aclocal:devel/automake + ${LOCALBASE}/bin/aclocal:devel/automake \ + ${LOCALBASE}/bin/erl:lang/erlang \ + ${LOCALBASE}/bin/bash:shells/bash \ + ${LOCALBASE}/bin/mariadb:databases/mariadb104-client ALL_MODULES_CONFLICTS_BUILD= apr ALL_MODULES_EXTRA_PATCHES= ${FILESDIR}/extrapatch-modules.conf ALL_MODULES_LIB_DEPENDS= libopencv_video.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ - libhiredis.so:databases/hiredis \ - libmemcached.so:databases/libmemcached \ libSoundTouch.so:audio/soundtouch \ libasound.so:audio/alsa-lib \ - libportaudio.so:audio/portaudio \ + libcodec2.so:audio/codec2 \ + libflite.so:audio/flite \ + libh2o.so:www/h2o \ + libh323.so:net/h323plus \ + libhiredis.so:databases/hiredis \ + libilbc.so:net/ilbc \ + libmemcached.so:databases/libmemcached \ + libmongoc-1.0.so:devel/mongo-c-driver \ + libmp3lame.so:audio/lame \ libmp4v2.so:multimedia/mp4v2 \ - libshout.so:audio/libshout \ libmpg123.so:audio/mpg123 \ - libmp3lame.so:audio/lame \ libnetsnmp.so:net-mgmt/net-snmp \ + libopencv_core.so:graphics/opencv-core \ + libopusfile.so:audio/opusfile \ + libportaudio.so:audio/portaudio \ + libpt.so:devel/ptlib \ + librabbitmq.so:net/rabbitmq-c \ + libshout.so:audio/libshout \ + libtheora.so:multimedia/libtheora \ + libtonezone.so:misc/dahdi \ libvlc.so:multimedia/vlc \ libyaml.so:textproc/libyaml ALL_MODULES_RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa -ALL_MODULES_USE= XORG=x11 OPENLDAP=yes -ALL_MODULES_USES= autoreconf xorg # required by mod_unimrcp +ALL_MODULES_USE= XORG=x11 OPENLDAP=yes JAVA=yes +ALL_MODULES_USES= python:2.7 xorg # required by mod_unimrcp +ALL_MODULES_CFLAGS= -I${LOCALBASE}/include/openh323/ \ + -I${JAVA_HOME}/include/ \ + -I${JAVA_HOME}/include/freebsd +JAVA_VERSION= 11 8K_VARS= BITRATES+=8000 16K_VARS= BITRATES+=16000 32K_VARS= BITRATES+=32000 48K_VARS= BITRATES+=48000 PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= core-pgsql-support core-pgsql-pkgconfig PGSQL_CONFIGURE_ENV_OFF= ac_cv_lib_pq_PQgetvalue=false # install-strip causes `make stage' to fail: # libtool: install: strip --strip-debug /wrkdirs/usr/ports/net/freeswitch/work/stage/usr/local/lib/libfreeswitch.a # strip: file format not recognized # INSTALL_TARGET= install-strip .include .if ${PORT_OPTIONS:MALL_MODULES} .if ${PORT_OPTIONS:MX11} LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick6 .else LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick6-nox11 .endif .endif EDPRE= freeswitch-sounds EDPOST= 1.0.51.tar.gz #Swedish lang sounds are older/lower version. EDPOST_SV= 1.0.50.tar.gz EDPOST_MUSIC= 1.0.52.tar.gz .for rate in ${BITRATES} EXTRADISTFILES+= ${EDPRE}-music-${rate}-${EDPOST_MUSIC} .if ${PORT_OPTIONS:MBRAZILIAN} EXTRADISTFILES+= ${EDPRE}-pt-BR-karina-${rate}-${EDPOST} .endif .if ${PORT_OPTIONS:MCHINESE_SIM} EXTRADISTFILES+= ${EDPRE}-zh-cn-sinmei-${rate}-${EDPOST} .endif .if ${PORT_OPTIONS:MCHINESE_HK} EXTRADISTFILES+= ${EDPRE}-zh-hk-sinmei-${rate}-${EDPOST} .endif .if ${PORT_OPTIONS:MENGLISH} EXTRADISTFILES+= ${EDPRE}-en-us-callie-${rate}-${EDPOST} .endif .if ${PORT_OPTIONS:MENGLISH_CA} EXTRADISTFILES+= ${EDPRE}-en-ca-june-${rate}-${EDPOST} .endif .if ${PORT_OPTIONS:MFRENCH_CA} EXTRADISTFILES+= ${EDPRE}-fr-ca-june-${rate}-${EDPOST} .endif .if ${PORT_OPTIONS:MRUSSIAN} EXTRADISTFILES+= ${EDPRE}-ru-RU-elena-${rate}-${EDPOST} .endif .if ${PORT_OPTIONS:MSWEDISH} EXTRADISTFILES+= ${EDPRE}-sv-se-jakob-${rate}-${EDPOST_SV} .endif .endfor .for distfile in ${EXTRADISTFILES} DISTFILES+= ${distfile}:sounds .endfor # Patch out mod_signalwire as it requires libks that isn't available, yet. post-patch: ${REINPLACE_CMD} -Ee 's|^(applications/mod_signalwire)|#\1|' \ ${WRKSRC}/modules.conf post-patch-PGSQL-off: ${REINPLACE_CMD} -Ee 's|^(databases/mod_pgsql)|#\1|' ${WRKSRC}/modules.conf post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/sounds .for distfile in ${EXTRADISTFILES} ${TAR} --cd ${STAGEDIR}${DATADIR}/sounds -xf ${DISTDIR}/${distfile} .endfor ${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} ${RM} -r ${STAGEDIR}${ETCDIR} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freeswitch/mod/mod_*.so \ ${STAGEDIR}${PREFIX}/lib/libfreeswitch.so.1.0.0 (cd ${WRKSRC}/conf && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include diff --git a/net/freeswitch/files/extrapatch-modules.conf b/net/freeswitch/files/extrapatch-modules.conf index 61431067f143..7eda2a3e108c 100644 --- a/net/freeswitch/files/extrapatch-modules.conf +++ b/net/freeswitch/files/extrapatch-modules.conf @@ -1,258 +1,279 @@ ---- modules.conf.orig 2019-07-02 21:01:14 UTC -+++ modules.conf -@@ -1,167 +1,167 @@ +--- modules.conf.orig 2020-05-12 12:19:16.000000000 +0200 ++++ modules.conf 2020-05-23 20:50:32.788487000 +0200 +@@ -1,174 +1,174 @@ -#applications/mod_abstraction --#applications/mod_av ++applications/mod_abstraction + applications/mod_av -#applications/mod_avmd -#applications/mod_bert -#applications/mod_blacklist -#applications/mod_callcenter -#applications/mod_cidlookup -#applications/mod_cluechoo -+applications/mod_abstraction -+applications/mod_av +applications/mod_avmd +applications/mod_bert +applications/mod_blacklist +applications/mod_callcenter +applications/mod_cidlookup +applications/mod_cluechoo applications/mod_commands applications/mod_conference -#applications/mod_curl -#applications/mod_cv +applications/mod_curl +applications/mod_cv applications/mod_db -#applications/mod_directory -#applications/mod_distributor +applications/mod_directory +applications/mod_distributor applications/mod_dptools -#applications/mod_easyroute +applications/mod_easyroute applications/mod_enum applications/mod_esf -#applications/mod_esl +applications/mod_esl applications/mod_expr applications/mod_fifo -#applications/mod_fsk +applications/mod_fsk applications/mod_fsv applications/mod_hash -#applications/mod_hiredis +applications/mod_hiredis applications/mod_httapi -#applications/mod_http_cache -#applications/mod_ladspa -#applications/mod_lcr -#applications/mod_memcache +-#applications/mod_mongo +-#applications/mod_mp4 +-#applications/mod_mp4v2 +-#applications/mod_nibblebill +-#applications/mod_oreka +applications/mod_http_cache +applications/mod_ladspa +applications/mod_lcr +applications/mod_memcache - #applications/mod_mongo --#applications/mod_mp4 ++applications/mod_mongo +applications/mod_mp4 - #applications/mod_mp4v2 --#applications/mod_nibblebill --#applications/mod_oreka ++applications/mod_mp4v2 +applications/mod_nibblebill +applications/mod_oreka #applications/mod_osp -#applications/mod_prefix +applications/mod_prefix #applications/mod_rad_auth -#applications/mod_redis -#applications/mod_rss +-applications/mod_signalwire +applications/mod_redis +applications/mod_rss - applications/mod_signalwire ++#applications/mod_signalwire applications/mod_sms #applications/mod_sms_flowroute -#applications/mod_snapshot -#applications/mod_snom -#applications/mod_sonar -#applications/mod_soundtouch +applications/mod_snapshot +applications/mod_snom +applications/mod_sonar +applications/mod_soundtouch applications/mod_spandsp -#applications/mod_spy -#applications/mod_stress -#applications/mod_translate +applications/mod_spy +applications/mod_stress +applications/mod_translate applications/mod_valet_parking -#applications/mod_video_filter -#applications/mod_vmd +applications/mod_video_filter +applications/mod_vmd applications/mod_voicemail -#applications/mod_voicemail_ivr +applications/mod_voicemail_ivr #asr_tts/mod_cepstral - #asr_tts/mod_flite +-#asr_tts/mod_flite ++asr_tts/mod_flite #asr_tts/mod_pocketsphinx -#asr_tts/mod_tts_commandline -#asr_tts/mod_unimrcp +asr_tts/mod_tts_commandline +asr_tts/mod_unimrcp codecs/mod_amr -#codecs/mod_amrwb +codecs/mod_amrwb codecs/mod_b64 #codecs/mod_bv -#codecs/mod_clearmode -+codecs/mod_clearmode - #codecs/mod_codec2 +-#codecs/mod_codec2 -#codecs/mod_com_g729 +-#codecs/mod_dahdi_codec ++codecs/mod_clearmode ++codecs/mod_codec2 +codecs/mod_com_g729 - #codecs/mod_dahdi_codec ++codecs/mod_dahdi_codec codecs/mod_g723_1 codecs/mod_g729 codecs/mod_h26x #codecs/mod_ilbc -#codecs/mod_isac -#codecs/mod_mp4v +codecs/mod_isac +codecs/mod_mp4v codecs/mod_opus #codecs/mod_sangoma_codec #codecs/mod_silk #codecs/mod_siren -#codecs/mod_theora +-#databases/mod_mariadb +codecs/mod_theora ++databases/mod_mariadb + databases/mod_pgsql dialplans/mod_dialplan_asterisk -#dialplans/mod_dialplan_directory +dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml -#directories/mod_ldap -#endpoints/mod_alsa -#endpoints/mod_dingaling +directories/mod_ldap +endpoints/mod_alsa +endpoints/mod_dingaling #endpoints/mod_gsmopen #endpoints/mod_h323 #endpoints/mod_khomp endpoints/mod_loopback #endpoints/mod_opal -#endpoints/mod_portaudio +endpoints/mod_portaudio endpoints/mod_rtc -#endpoints/mod_rtmp +endpoints/mod_rtmp endpoints/mod_skinny endpoints/mod_sofia endpoints/mod_verto - #event_handlers/mod_amqp +-#event_handlers/mod_amqp ++event_handlers/mod_amqp event_handlers/mod_cdr_csv -#event_handlers/mod_cdr_mongodb +-#event_handlers/mod_cdr_pg_csv +event_handlers/mod_cdr_mongodb - #event_handlers/mod_cdr_pg_csv ++event_handlers/mod_cdr_pg_csv event_handlers/mod_cdr_sqlite #event_handlers/mod_erlang_event -#event_handlers/mod_event_multicast +event_handlers/mod_event_multicast event_handlers/mod_event_socket -#event_handlers/mod_fail2ban -#event_handlers/mod_format_cdr -#event_handlers/mod_json_cdr +event_handlers/mod_fail2ban +event_handlers/mod_format_cdr +event_handlers/mod_json_cdr #event_handlers/mod_radius_cdr -#event_handlers/mod_odbc_cdr -+event_handlers/mod_odbc_cdr - #event_handlers/mod_kazoo +-#event_handlers/mod_kazoo -#event_handlers/mod_rayo ++event_handlers/mod_odbc_cdr ++event_handlers/mod_kazoo +event_handlers/mod_rayo #event_handlers/mod_smpp -#event_handlers/mod_snmp +event_handlers/mod_snmp #event_handlers/mod_event_zmq -#formats/mod_imagick +formats/mod_imagick formats/mod_local_stream formats/mod_native_file formats/mod_png -#formats/mod_portaudio_stream -#formats/mod_shell_stream -#formats/mod_shout +formats/mod_portaudio_stream +formats/mod_shell_stream +formats/mod_shout formats/mod_sndfile -#formats/mod_ssml +formats/mod_ssml formats/mod_tone_stream -#formats/mod_vlc -+formats/mod_vlc - #formats/mod_opusfile +-#formats/mod_opusfile -#languages/mod_basic +-#languages/mod_java ++formats/mod_vlc ++formats/mod_opusfile +languages/mod_basic - #languages/mod_java ++languages/mod_java languages/mod_lua #languages/mod_managed - #languages/mod_perl - #languages/mod_python +-#languages/mod_perl +-#languages/mod_python ++languages/mod_perl ++languages/mod_python #languages/mod_v8 -#languages/mod_yaml +languages/mod_yaml loggers/mod_console -#loggers/mod_graylog2 +loggers/mod_graylog2 loggers/mod_logfile loggers/mod_syslog -#loggers/mod_raven -#say/mod_say_de +loggers/mod_raven +say/mod_say_de say/mod_say_en -#say/mod_say_es -#say/mod_say_es_ar -#say/mod_say_fa -#say/mod_say_fr -#say/mod_say_he -#say/mod_say_hr -#say/mod_say_hu -#say/mod_say_it -#say/mod_say_ja -#say/mod_say_nl -#say/mod_say_pl -#say/mod_say_pt -#say/mod_say_ru -#say/mod_say_sv -#say/mod_say_th -#say/mod_say_zh -#timers/mod_posix_timer +say/mod_say_es +say/mod_say_es_ar +say/mod_say_fa +say/mod_say_fr +say/mod_say_he +say/mod_say_hr +say/mod_say_hu +say/mod_say_it +say/mod_say_ja +say/mod_say_nl +say/mod_say_pl +say/mod_say_pt +say/mod_say_ru +say/mod_say_sv +say/mod_say_th +say/mod_say_zh +timers/mod_posix_timer #timers/mod_timerfd xml_int/mod_xml_cdr -#xml_int/mod_xml_curl -#xml_int/mod_xml_ldap +xml_int/mod_xml_curl +xml_int/mod_xml_ldap #xml_int/mod_xml_radius xml_int/mod_xml_rpc xml_int/mod_xml_scgi + + #../../libs/freetdm/mod_freetdm + +-## Experimental Modules (don't cry if they're broken) ++# Experimental Modules (don't cry if they're broken) + #../../contrib/mod/xml_int/mod_xml_odbc diff --git a/net/freeswitch/files/patch-build_Makefile.in b/net/freeswitch/files/patch-build_Makefile.in index b67d5ad03441..b657f5bbddd8 100644 --- a/net/freeswitch/files/patch-build_Makefile.in +++ b/net/freeswitch/files/patch-build_Makefile.in @@ -1,79 +1,79 @@ ---- build/Makefile.in.orig 2017-06-13 13:22:10 UTC +--- build/Makefile.in.orig 2020-05-12 10:20:11 UTC +++ build/Makefile.in -@@ -594,76 +594,9 @@ uninstall-am: +@@ -706,76 +706,9 @@ uninstall-am: all: @echo " +---------- FreeSWITCH Build Complete ----------+" - @echo " + FreeSWITCH has been successfully built. +" - @echo " + Install by running: +" - @echo " + +" - @echo " + $(MK) install +" - @echo " + +" - @echo " + While you're waiting, register for ClueCon! +" - @echo " + https://www.cluecon.com +" - @echo " + +" - @echo " +-----------------------------------------------+" - @cat $(switch_srcdir)/cluecon2.tmpl install: @echo " +---------- FreeSWITCH install Complete ----------+" - @echo " + FreeSWITCH has been successfully installed. +" - @echo " + +" - @echo " + Install sounds: +" - @echo " + (uhd-sounds includes hd-sounds, sounds) +" - @echo " + (hd-sounds includes sounds) +" - @echo " + ------------------------------------ +" - @echo " + $(MK) cd-sounds-install +" - @echo " + $(MK) cd-moh-install +" - @echo " + +" - @echo " + $(MK) uhd-sounds-install +" - @echo " + $(MK) uhd-moh-install +" - @echo " + +" - @echo " + $(MK) hd-sounds-install +" - @echo " + $(MK) hd-moh-install +" - @echo " + +" - @echo " + $(MK) sounds-install +" - @echo " + $(MK) moh-install +" - @echo " + +" - @echo " + Install non english sounds: +" - @echo " + replace XX with language +" - @echo " + (ru : Russian) +" - @echo " + (fr : French) +" - @echo " + ------------------------------------ +" - @echo " + $(MK) cd-sounds-XX-install +" - @echo " + $(MK) uhd-sounds-XX-install +" - @echo " + $(MK) hd-sounds-XX-install +" - @echo " + $(MK) sounds-XX-install +" - @echo " + +" - @echo " + Upgrade to latest: +" - @echo " + ---------------------------------- +" - @echo " + $(MK) current +" - @echo " + +" - @echo " + Rebuild all: +" - @echo " + ---------------------------------- +" - @echo " + $(MK) sure +" - @echo " + +" - @echo " + Install/Re-install default config: +" - @echo " + ---------------------------------- +" - @echo " + $(MK) samples +" - @echo " + +" - @echo " + +" - @echo " + Additional resources: +" - @echo " + ---------------------------------- +" - @echo " + https://www.freeswitch.org +" - @echo " + https://freeswitch.org/confluence +" - @echo " + https://freeswitch.org/jira +" - @echo " + http://lists.freeswitch.org +" - @echo " + +" - @echo " + irc.freenode.net / #freeswitch +" - @echo " + +" - @echo " + Register For ClueCon: +" - @echo " + ---------------------------------- +" - @echo " + https://www.cluecon.com +" - @echo " + +" - @echo " +-------------------------------------------------+" - @cat $(switch_srcdir)/cluecon2.tmpl - @sh $(switch_srcdir)/build/modcheck.sh $(DESTDIR)$(modulesdir) .PHONY: check dvi html info install-data \ install-dvi install-exec install-html install-info install-pdf install-ps installcheck installdirs pdf \ diff --git a/net/freeswitch/files/patch-configure.ac b/net/freeswitch/files/patch-configure.ac new file mode 100644 index 000000000000..9800906ce293 --- /dev/null +++ b/net/freeswitch/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2020-05-12 10:19:16 UTC ++++ configure.ac +@@ -582,7 +582,7 @@ AC_SUBST(SYS_XMLRPC_CFLAGS) + AC_SUBST(SYS_XMLRPC_LDFLAGS) + AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"]) + +-for luaversion in luajit lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do ++for luaversion in luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do + PKG_CHECK_MODULES([LUA],[${luaversion}],[have_lua=yes],[have_lua=no]) + if test ${have_lua} = yes; then + break diff --git a/net/freeswitch/files/patch-src_mod_codecs_mod__dahdi__codec_mod__dahdi__codec.c b/net/freeswitch/files/patch-src_mod_codecs_mod__dahdi__codec_mod__dahdi__codec.c new file mode 100644 index 000000000000..9e0fdc37c027 --- /dev/null +++ b/net/freeswitch/files/patch-src_mod_codecs_mod__dahdi__codec_mod__dahdi__codec.c @@ -0,0 +1,14 @@ +--- src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c.orig 2020-05-12 10:19:16 UTC ++++ src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c +@@ -33,7 +33,11 @@ + #include + #include + #include ++#if defined(__FreeBSD__) ++#include ++#else + #include /* __u32 */ ++#endif + #include + #include + #include diff --git a/net/freeswitch/files/patch-src_switch__utils.c b/net/freeswitch/files/patch-src_switch__utils.c index 7f8180e0612a..4cdf9fd51acd 100644 --- a/net/freeswitch/files/patch-src_switch__utils.c +++ b/net/freeswitch/files/patch-src_switch__utils.c @@ -1,11 +1,11 @@ ---- src/switch_utils.c.orig 2019-05-26 01:06:48 UTC +--- src/switch_utils.c.orig 2020-05-12 10:19:16 UTC +++ src/switch_utils.c -@@ -1847,7 +1847,7 @@ SWITCH_DECLARE(switch_status_t) switch_f +@@ -1945,7 +1945,7 @@ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(c goto doh; } - switch_copy_string(buf, get_addr(abuf, sizeof(abuf), (struct sockaddr *) &iface_out, sizeof(struct sockaddr_storage)), len); + switch_copy_string(buf, get_addr(abuf, sizeof(abuf), (struct sockaddr *) &iface_out, sizeof(iface_out)), len); if (mask) { get_netmask((struct sockaddr_in *) &iface_out, mask); }