From nobody Sat Apr 08 20:26:28 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pv6Fx0MbCz44qj7; Sat, 8 Apr 2023 20:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pv6Fw7231z42rP; Sat, 8 Apr 2023 20:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680985588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FP00OXZBk30cLnBKwBP/IhOk9coLF2d1CncvpkUZLOw=; b=dRAV5F+zm2VygnCf0D1sjlU2kBDfDYtG2HCwoNr/4QjQxFp5B8QMFzayJeed1kCcuN4eEP hS0QQUl3vAIrS1j7GIDCPgOnHMKHn/aDIhiDrOK2gzbbdue7b2vzL2aLhbIM2HmZUDRUha Ix0iwszkfipBZeIqD8U+KASkLzU/UQgsAfUrA+0etm14QqfN6tt3RoM5EL0RaZ132yscGz rlKH6PQbVXHIoUE19VfEwYZA1G/jb+8kyhaS1coJsRq2FnXf3Ht9i1yP4xVjE//GknsRMK Ps8Bwyq70A7hAGpRLIJbOsQaGzXc4wX0bbZHQ8lbJunoY7GQDOGwRL4Ou+JAKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680985588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FP00OXZBk30cLnBKwBP/IhOk9coLF2d1CncvpkUZLOw=; b=VT4UcHaATCrM8nJhyNjWiIj2OdtXxyFYeunXZzBcYojzDiHi1E66i6o2kOdzJ/b4FFy7v0 0ceuOCRMZ5mj59bBFZYHHTJ8LBatX1HtB4qiE0mkOH0uHyPu5HAZXuHCXrpZyjFf/hMZ3n TJU9kZYdR8M0sGJ6pmAZYAmSFLK45HzcOFVi7iOVG8GbymSNoynSGDY/fylk9FmYJGRbud dNPUWD2EfG1Iqpxn3cx89xE3HUmVOTgeBtwEYylLCBdWc/iR8UQnNXCJMn9iSQLpyoTz90 RCqXS0PhbR+1s8GQUK9A6b8gvsENJ1/ca1j4TGc4FOn9nHkluLgtmpCmKH+JRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680985589; a=rsa-sha256; cv=none; b=xNel7kFKsfxncdxnf9d6G86RykBHDZPsco9p01CPbK10j5NY2cAZ7Y3KIbOGD/LUjJKf7X yHPIZxtjUXERSKJD5CbCLZ5oFZrpX6WU1+Dyx1U+3YQa1/2iGWO95EF0yDMs+3BWsODojc 84NqRTUUlZ99zLxB60Vbru3RYCyfh3ZXEdMkW3g5G7H8rdJ9GhgdyYjyOr4yuRR00pi1Qm RyCaeRud0gOa6QpUzdXd42pNmqURxxe4/KYhOZhgrW+rF1KHsNH38mCK/psSNVa8l7UVGw KOxMK5dmLL+T8ea0/h79CFrsR5WY3PKV/Q95/bU7V1vutnAJWoe/vy4tAqcYYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pv6Fw5yBmzgtg; Sat, 8 Apr 2023 20:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 338KQSLA085126; Sat, 8 Apr 2023 20:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338KQS9e085125; Sat, 8 Apr 2023 20:26:28 GMT (envelope-from git) Date: Sat, 8 Apr 2023 20:26:28 GMT Message-Id: <202304082026.338KQS9e085125@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: 54415870a3f3 - main - net/freeswitch: update 1.10.3 -> 1.10.9 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54415870a3f395f95c19b62b538b974ea8b7396c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=54415870a3f395f95c19b62b538b974ea8b7396c commit 54415870a3f395f95c19b62b538b974ea8b7396c Author: Dustin Marquess AuthorDate: 2023-04-08 20:20:40 +0000 Commit: Kurt Jaeger CommitDate: 2023-04-08 20:20:40 +0000 net/freeswitch: update 1.10.3 -> 1.10.9 - several security fixes PR: 269482 Changes: https://github.com/signalwire/freeswitch/releases --- net/freeswitch/Makefile | 73 +++++++++++-- net/freeswitch/distinfo | 118 ++++++++++----------- net/freeswitch/files/extrapatch-modules.conf | 3 +- net/freeswitch/files/freeswitch.in | 6 +- net/freeswitch/files/patch-build_Makefile.in | 4 +- net/freeswitch/files/patch-libs_libvpx_configure | 11 ++ .../patch-src_mod_endpoints_mod__sofia_Makefile.am | 26 +++++ .../patch-src_mod_endpoints_mod__sofia_Makefile.in | 27 +++++ ...h-src_mod_event__handlers_mod__rayo_Makefile.am | 32 ++++++ ...h-src_mod_event__handlers_mod__rayo_Makefile.in | 75 +++++++++++++ net/freeswitch/files/patch-src_switch__utils.c | 4 +- net/freeswitch/pkg-plist | 23 ++-- 12 files changed, 312 insertions(+), 90 deletions(-) diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index 6c6472e4e513..9cc19d8ae8cd 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -1,6 +1,5 @@ PORTNAME= freeswitch -PORTVERSION= 1.10.3 -PORTREVISION= 2 +PORTVERSION= 1.10.9 CATEGORIES= net MASTER_SITES= https://files.freeswitch.org/releases/freeswitch/ \ https://files.freeswitch.org/releases/sounds/:sounds @@ -14,7 +13,10 @@ LICENSE= MPL11 ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le -BUILD_DEPENDS= gdiff:textproc/diffutils +BUILD_DEPENDS= gdiff:textproc/diffutils \ + doxygen:devel/doxygen \ + erlang>=21.3:lang/erlang +RUN_DEPENDS= erlang>=21.3:lang/erlang LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libcurl.so:ftp/curl \ libavformat.so:multimedia/ffmpeg \ @@ -29,10 +31,15 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libpng.so:graphics/png \ libjbig.so:graphics/jbigkit \ libtiff.so:graphics/tiff \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/e2fsprogs-libuuid \ + libpq.so:databases/postgresql12-client \ + libmariadb.so:databases/mariadb-connector-c \ + libspandsp.so:comms/spandsp \ + libsofia-sip-ua.so:net/sofia-sip + +USES= compiler:c11 cpe gmake iconv jpeg libedit autoreconf \ + libtool lua:53 openal perl5 pkgconfig shebangfix ssl tar:xz -USES= compiler:c11 cpe gmake iconv jpeg libedit autoreconf libtool lua:-53 \ - perl5 pkgconfig shebangfix ssl USE_LDCONFIG= yes USE_RC_SUBR= freeswitch BINARY_ALIAS= diff=gdiff @@ -76,6 +83,54 @@ 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/erl:lang/erlang \ + ${LOCALBASE}/bin/bash:shells/bash \ + ${LOCALBASE}/bin/mariadb:databases/mariadb104-client \ + ${LOCALBASE}/bin/php:lang/php80 +ALL_MODULES_CONFLICTS_BUILD= apr +ALL_MODULES_EXTRA_PATCHES= ${FILESDIR}/extrapatch-modules.conf +ALL_MODULES_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ + libopencv_video.so:graphics/opencv \ + libopencv_core.so:graphics/opencv-core \ + libhiredis.so:databases/hiredis \ + libldap.so:net/openldap24-client \ + libmemcached.so:databases/libmemcached \ + libSoundTouch.so:audio/soundtouch \ + libasound.so:audio/alsa-lib \ + 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 \ + libmpg123.so:audio/mpg123 \ + libnetsnmp.so:net-mgmt/net-snmp \ + libopencv_core.so:graphics/opencv-core \ + libopusfile.so:audio/opusfile \ + libphp.so:lang/php80 \ + 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 JAVA=yes +ALL_MODULES_VARS= USE_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 @@ -110,7 +165,7 @@ EXTRADISTFILES+= ${EDPRE}-zh-cn-sinmei-${rate}-${EDPOST} EXTRADISTFILES+= ${EDPRE}-zh-hk-sinmei-${rate}-${EDPOST} .endif .if ${PORT_OPTIONS:MENGLISH} -EXTRADISTFILES+= ${EDPRE}-en-us-callie-${rate}-${EDPOST} +EXTRADISTFILES+= ${EDPRE}-en-us-callie-${rate}-${EDPOST_MUSIC} .endif .if ${PORT_OPTIONS:MENGLISH_CA} EXTRADISTFILES+= ${EDPRE}-en-ca-june-${rate}-${EDPOST} @@ -130,10 +185,12 @@ EXTRADISTFILES+= ${EDPRE}-sv-se-jakob-${rate}-${EDPOST_SV} DISTFILES+= ${distfile}:sounds .endfor -# Patch out mod_signalwire as it requires libks that isn't available, yet. +# Patch out mod_signalwire & mod_verto as they require libks that isn't available, yet. post-patch: ${REINPLACE_CMD} -Ee 's|^(applications/mod_signalwire)|#\1|' \ ${WRKSRC}/modules.conf + ${REINPLACE_CMD} -Ee 's|^(endpoints/mod_verto)|#\1|' \ + ${WRKSRC}/modules.conf post-patch-PGSQL-off: ${REINPLACE_CMD} -Ee 's|^(databases/mod_pgsql)|#\1|' ${WRKSRC}/modules.conf diff --git a/net/freeswitch/distinfo b/net/freeswitch/distinfo index 4889ba4c9681..a57edffb7929 100644 --- a/net/freeswitch/distinfo +++ b/net/freeswitch/distinfo @@ -1,75 +1,75 @@ -TIMESTAMP = 1590055652 -SHA256 (freeswitch-1.10.3.-release.tar.gz) = 15a1f741cc682d3161ff266d9fa4c568a0200d8bfcb5edf74611aeb620bfa917 -SIZE (freeswitch-1.10.3.-release.tar.gz) = 48818052 +TIMESTAMP = 1675461277 +SHA256 (freeswitch-1.10.9.-release.tar.xz) = f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 +SIZE (freeswitch-1.10.9.-release.tar.xz) = 21626016 SHA256 (freeswitch-sounds-music-16000-1.0.52.tar.gz) = 93e0bf31797f4847dc19a94605c039ad4f0763616b6d819f5bddbfb6dd09718a SIZE (freeswitch-sounds-music-16000-1.0.52.tar.gz) = 27991592 -SHA256 (freeswitch-sounds-pt-BR-karina-16000-1.0.51.tar.gz) = 80432c1027f57e464cd899ed92216936cf48a3993dc1c168b1be2545b8f97aed -SIZE (freeswitch-sounds-pt-BR-karina-16000-1.0.51.tar.gz) = 27665896 -SHA256 (freeswitch-sounds-zh-cn-sinmei-16000-1.0.51.tar.gz) = d849a5818ac6630d7c572d728dcd48176a6877defd8c239cb12011528e95c2cd -SIZE (freeswitch-sounds-zh-cn-sinmei-16000-1.0.51.tar.gz) = 596908 -SHA256 (freeswitch-sounds-zh-hk-sinmei-16000-1.0.51.tar.gz) = 0950e1d971b4f2ba4decd949406ccd0198fe9c686f246e175c70aafdf9783f30 -SIZE (freeswitch-sounds-zh-hk-sinmei-16000-1.0.51.tar.gz) = 553051 -SHA256 (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2 -SIZE (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 37171776 -SHA256 (freeswitch-sounds-en-ca-june-16000-1.0.51.tar.gz) = 8d0091a2c98e5e06afea6bdd9f6cf2942e937786016037207b85757218b0f7a7 -SIZE (freeswitch-sounds-en-ca-june-16000-1.0.51.tar.gz) = 9417564 -SHA256 (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = f942980ad359951ef3f69a324a3299ef86cdb4f8d2c62adaf73a1b95fb39fcc6 -SIZE (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = 26591167 -SHA256 (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = e5a354cd10401208291f1d0e668a8cf8215d3cdcb93f2cbd4b83dd134425e60b -SIZE (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = 25072831 +SHA256 (freeswitch-sounds-pt-BR-karina-16000-1.0.52.tar.gz) = 80432c1027f57e464cd899ed92216936cf48a3993dc1c168b1be2545b8f97aed +SIZE (freeswitch-sounds-pt-BR-karina-16000-1.0.52.tar.gz) = 27665896 +SHA256 (freeswitch-sounds-zh-cn-sinmei-16000-1.0.52.tar.gz) = d849a5818ac6630d7c572d728dcd48176a6877defd8c239cb12011528e95c2cd +SIZE (freeswitch-sounds-zh-cn-sinmei-16000-1.0.52.tar.gz) = 596908 +SHA256 (freeswitch-sounds-zh-hk-sinmei-16000-1.0.52.tar.gz) = 0950e1d971b4f2ba4decd949406ccd0198fe9c686f246e175c70aafdf9783f30 +SIZE (freeswitch-sounds-zh-hk-sinmei-16000-1.0.52.tar.gz) = 553051 +SHA256 (freeswitch-sounds-en-us-callie-16000-1.0.52.tar.gz) = bf3ac7be99939f57ed4fab7b76d1e47ba78d1573cc72aa0cfe656c559eb097bd +SIZE (freeswitch-sounds-en-us-callie-16000-1.0.52.tar.gz) = 36099315 +SHA256 (freeswitch-sounds-en-ca-june-16000-1.0.52.tar.gz) = 8d0091a2c98e5e06afea6bdd9f6cf2942e937786016037207b85757218b0f7a7 +SIZE (freeswitch-sounds-en-ca-june-16000-1.0.52.tar.gz) = 9417564 +SHA256 (freeswitch-sounds-fr-ca-june-16000-1.0.52.tar.gz) = f942980ad359951ef3f69a324a3299ef86cdb4f8d2c62adaf73a1b95fb39fcc6 +SIZE (freeswitch-sounds-fr-ca-june-16000-1.0.52.tar.gz) = 26591167 +SHA256 (freeswitch-sounds-ru-RU-elena-16000-1.0.52.tar.gz) = e5a354cd10401208291f1d0e668a8cf8215d3cdcb93f2cbd4b83dd134425e60b +SIZE (freeswitch-sounds-ru-RU-elena-16000-1.0.52.tar.gz) = 25072831 SHA256 (freeswitch-sounds-sv-se-jakob-16000-1.0.50.tar.gz) = 52da670c651ff598815aed655644b44b891ee158f4c67d048da90056a36ddcf6 SIZE (freeswitch-sounds-sv-se-jakob-16000-1.0.50.tar.gz) = 5391972 SHA256 (freeswitch-sounds-music-32000-1.0.52.tar.gz) = 4129788a638b77c5f85ff35abfcd69793d8aeb9d7833a75c74ec77355b2657a9 SIZE (freeswitch-sounds-music-32000-1.0.52.tar.gz) = 53007947 -SHA256 (freeswitch-sounds-pt-BR-karina-32000-1.0.51.tar.gz) = e80a8653585cf9a4fe9cf1c0004279602542d15894ba13f2104d990cefdee567 -SIZE (freeswitch-sounds-pt-BR-karina-32000-1.0.51.tar.gz) = 53420983 -SHA256 (freeswitch-sounds-zh-cn-sinmei-32000-1.0.51.tar.gz) = 903fda016d2ac053ffe6bc2d4eaf816a66c8043ddc3383d48b7b14335d9ea98e -SIZE (freeswitch-sounds-zh-cn-sinmei-32000-1.0.51.tar.gz) = 1153330 -SHA256 (freeswitch-sounds-zh-hk-sinmei-32000-1.0.51.tar.gz) = 97d846ab06b5c84d2c46bec64560556acbfc88eb2080bd325b2c5259a5ae80d0 -SIZE (freeswitch-sounds-zh-hk-sinmei-32000-1.0.51.tar.gz) = 1061068 -SHA256 (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 06fd6b8aec937556bf5303ab19a212c60daf00546d395cf269dfe324ac9c6838 -SIZE (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 73012907 -SHA256 (freeswitch-sounds-en-ca-june-32000-1.0.51.tar.gz) = 8720b363995724792ff4723e1c8218ef95b27cb36208b7258f93bdda72123387 -SIZE (freeswitch-sounds-en-ca-june-32000-1.0.51.tar.gz) = 18422131 -SHA256 (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 8966a0c4daf666018cca6d8ba0f7708e251bed952b015d0ca6a0792341fe531b -SIZE (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 52040064 -SHA256 (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = a2b43f20246f376d55dd73d269eb238cbeb6a961a40716d2f79a5835344aabfc -SIZE (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = 49276482 +SHA256 (freeswitch-sounds-pt-BR-karina-32000-1.0.52.tar.gz) = e80a8653585cf9a4fe9cf1c0004279602542d15894ba13f2104d990cefdee567 +SIZE (freeswitch-sounds-pt-BR-karina-32000-1.0.52.tar.gz) = 53420983 +SHA256 (freeswitch-sounds-zh-cn-sinmei-32000-1.0.52.tar.gz) = 903fda016d2ac053ffe6bc2d4eaf816a66c8043ddc3383d48b7b14335d9ea98e +SIZE (freeswitch-sounds-zh-cn-sinmei-32000-1.0.52.tar.gz) = 1153330 +SHA256 (freeswitch-sounds-zh-hk-sinmei-32000-1.0.52.tar.gz) = 97d846ab06b5c84d2c46bec64560556acbfc88eb2080bd325b2c5259a5ae80d0 +SIZE (freeswitch-sounds-zh-hk-sinmei-32000-1.0.52.tar.gz) = 1061068 +SHA256 (freeswitch-sounds-en-us-callie-32000-1.0.52.tar.gz) = 9091553934f7ee453646058ff54837f55c5b38be11c987148c63a1cccc88b741 +SIZE (freeswitch-sounds-en-us-callie-32000-1.0.52.tar.gz) = 70902830 +SHA256 (freeswitch-sounds-en-ca-june-32000-1.0.52.tar.gz) = 8720b363995724792ff4723e1c8218ef95b27cb36208b7258f93bdda72123387 +SIZE (freeswitch-sounds-en-ca-june-32000-1.0.52.tar.gz) = 18422131 +SHA256 (freeswitch-sounds-fr-ca-june-32000-1.0.52.tar.gz) = 8966a0c4daf666018cca6d8ba0f7708e251bed952b015d0ca6a0792341fe531b +SIZE (freeswitch-sounds-fr-ca-june-32000-1.0.52.tar.gz) = 52040064 +SHA256 (freeswitch-sounds-ru-RU-elena-32000-1.0.52.tar.gz) = a2b43f20246f376d55dd73d269eb238cbeb6a961a40716d2f79a5835344aabfc +SIZE (freeswitch-sounds-ru-RU-elena-32000-1.0.52.tar.gz) = 49276482 SHA256 (freeswitch-sounds-sv-se-jakob-32000-1.0.50.tar.gz) = 160de01069afa827c830595e521b53d95de4b415b48061fb843a1c4025fa17f2 SIZE (freeswitch-sounds-sv-se-jakob-32000-1.0.50.tar.gz) = 10018608 SHA256 (freeswitch-sounds-music-48000-1.0.52.tar.gz) = cc31cdb5b1bd653850bf6e054d963314bcf7c1706a9bf05f5a69bcbd00858d2a SIZE (freeswitch-sounds-music-48000-1.0.52.tar.gz) = 75551487 -SHA256 (freeswitch-sounds-pt-BR-karina-48000-1.0.51.tar.gz) = 51ef9cac2dc4dd70d81c18f8e65bfd11de44207e8fac9961a68aa0d50d539870 -SIZE (freeswitch-sounds-pt-BR-karina-48000-1.0.51.tar.gz) = 78609528 -SHA256 (freeswitch-sounds-zh-cn-sinmei-48000-1.0.51.tar.gz) = 95b9064acec13a0a32b15ea0b44dc408094b4d9dee84b183c5d9150a77e9bb23 -SIZE (freeswitch-sounds-zh-cn-sinmei-48000-1.0.51.tar.gz) = 1680437 -SHA256 (freeswitch-sounds-zh-hk-sinmei-48000-1.0.51.tar.gz) = bd605be7e536e11f8f67229a95513ef3f177263587c5bca75ccae647f43962a1 -SIZE (freeswitch-sounds-zh-hk-sinmei-48000-1.0.51.tar.gz) = 1552162 -SHA256 (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = cfc50f1d9b5d43cb87a9a2c0ce136c37ee85ac3b0e5be930d8dc2c913c4495aa -SIZE (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = 105319388 -SHA256 (freeswitch-sounds-en-ca-june-48000-1.0.51.tar.gz) = d2fce478a95b8d9500a544a00253c81d7e9f639e21980bd689910fac87f30871 -SIZE (freeswitch-sounds-en-ca-june-48000-1.0.51.tar.gz) = 27088410 -SHA256 (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = abaea558fb5485abdd01d0b1186e03cf508f96ac90492814cc7ed4475e99a1e0 -SIZE (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = 76666642 -SHA256 (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = ffd7d34907f6b6ac861e7898d2237ad763f242a17cd23811da28fd7745d3350d -SIZE (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = 72438142 +SHA256 (freeswitch-sounds-pt-BR-karina-48000-1.0.52.tar.gz) = 51ef9cac2dc4dd70d81c18f8e65bfd11de44207e8fac9961a68aa0d50d539870 +SIZE (freeswitch-sounds-pt-BR-karina-48000-1.0.52.tar.gz) = 78609528 +SHA256 (freeswitch-sounds-zh-cn-sinmei-48000-1.0.52.tar.gz) = 95b9064acec13a0a32b15ea0b44dc408094b4d9dee84b183c5d9150a77e9bb23 +SIZE (freeswitch-sounds-zh-cn-sinmei-48000-1.0.52.tar.gz) = 1680437 +SHA256 (freeswitch-sounds-zh-hk-sinmei-48000-1.0.52.tar.gz) = bd605be7e536e11f8f67229a95513ef3f177263587c5bca75ccae647f43962a1 +SIZE (freeswitch-sounds-zh-hk-sinmei-48000-1.0.52.tar.gz) = 1552162 +SHA256 (freeswitch-sounds-en-us-callie-48000-1.0.52.tar.gz) = 9df388d855996a04f6014999d59d4191e22b579f2e8df542834451a25ea3e1cf +SIZE (freeswitch-sounds-en-us-callie-48000-1.0.52.tar.gz) = 102215843 +SHA256 (freeswitch-sounds-en-ca-june-48000-1.0.52.tar.gz) = d2fce478a95b8d9500a544a00253c81d7e9f639e21980bd689910fac87f30871 +SIZE (freeswitch-sounds-en-ca-june-48000-1.0.52.tar.gz) = 27088410 +SHA256 (freeswitch-sounds-fr-ca-june-48000-1.0.52.tar.gz) = abaea558fb5485abdd01d0b1186e03cf508f96ac90492814cc7ed4475e99a1e0 +SIZE (freeswitch-sounds-fr-ca-june-48000-1.0.52.tar.gz) = 76666642 +SHA256 (freeswitch-sounds-ru-RU-elena-48000-1.0.52.tar.gz) = ffd7d34907f6b6ac861e7898d2237ad763f242a17cd23811da28fd7745d3350d +SIZE (freeswitch-sounds-ru-RU-elena-48000-1.0.52.tar.gz) = 72438142 SHA256 (freeswitch-sounds-sv-se-jakob-48000-1.0.50.tar.gz) = 059889d75926b8e1f39e8d2c33f0e8f744a43c094bbe213a1caa9f26ae9a2799 SIZE (freeswitch-sounds-sv-se-jakob-48000-1.0.50.tar.gz) = 14125474 SHA256 (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 2491dcb92a69c629b03ea070d2483908a52e2c530dd77791f49a45a4d70aaa07 SIZE (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 14620675 -SHA256 (freeswitch-sounds-pt-BR-karina-8000-1.0.51.tar.gz) = ba9b5d7f97675c560823a6f94804a6716dac66efe203dd1779952518c3944a77 -SIZE (freeswitch-sounds-pt-BR-karina-8000-1.0.51.tar.gz) = 14142676 -SHA256 (freeswitch-sounds-zh-cn-sinmei-8000-1.0.51.tar.gz) = 764985f39313426ef4a0ea4dd848f05faaced37b91b2c9a22f17d3f77235fae3 -SIZE (freeswitch-sounds-zh-cn-sinmei-8000-1.0.51.tar.gz) = 302713 -SHA256 (freeswitch-sounds-zh-hk-sinmei-8000-1.0.51.tar.gz) = 917d08c80969bdaf30f2a63a3b69f542b143614d42c6241503ac655d13864eb0 -SIZE (freeswitch-sounds-zh-hk-sinmei-8000-1.0.51.tar.gz) = 282597 -SHA256 (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8 -SIZE (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = 18657031 -SHA256 (freeswitch-sounds-en-ca-june-8000-1.0.51.tar.gz) = 9aaa9d73cfecfdab7a1fa2d63d65b922b86a405ebb9a31b09b15e58a2af9260a -SIZE (freeswitch-sounds-en-ca-june-8000-1.0.51.tar.gz) = 4754438 -SHA256 (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = eada67c61bd62ec420eb017df7524d10de286fba0c2da4800516b9f62c00e78c -SIZE (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = 13460178 -SHA256 (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = d2679503eb1f4dc1716df5f8c4b5a7b721f087b17e96a02b1a92480311074c66 -SIZE (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = 12678200 +SHA256 (freeswitch-sounds-pt-BR-karina-8000-1.0.52.tar.gz) = ba9b5d7f97675c560823a6f94804a6716dac66efe203dd1779952518c3944a77 +SIZE (freeswitch-sounds-pt-BR-karina-8000-1.0.52.tar.gz) = 14142676 +SHA256 (freeswitch-sounds-zh-cn-sinmei-8000-1.0.52.tar.gz) = 764985f39313426ef4a0ea4dd848f05faaced37b91b2c9a22f17d3f77235fae3 +SIZE (freeswitch-sounds-zh-cn-sinmei-8000-1.0.52.tar.gz) = 302713 +SHA256 (freeswitch-sounds-zh-hk-sinmei-8000-1.0.52.tar.gz) = 917d08c80969bdaf30f2a63a3b69f542b143614d42c6241503ac655d13864eb0 +SIZE (freeswitch-sounds-zh-hk-sinmei-8000-1.0.52.tar.gz) = 282597 +SHA256 (freeswitch-sounds-en-us-callie-8000-1.0.52.tar.gz) = fbe51296ba5282864a8f0269a968de0783b88b2a75dad710ee076138382a5151 +SIZE (freeswitch-sounds-en-us-callie-8000-1.0.52.tar.gz) = 18116745 +SHA256 (freeswitch-sounds-en-ca-june-8000-1.0.52.tar.gz) = 9aaa9d73cfecfdab7a1fa2d63d65b922b86a405ebb9a31b09b15e58a2af9260a +SIZE (freeswitch-sounds-en-ca-june-8000-1.0.52.tar.gz) = 4754438 +SHA256 (freeswitch-sounds-fr-ca-june-8000-1.0.52.tar.gz) = eada67c61bd62ec420eb017df7524d10de286fba0c2da4800516b9f62c00e78c +SIZE (freeswitch-sounds-fr-ca-june-8000-1.0.52.tar.gz) = 13460178 +SHA256 (freeswitch-sounds-ru-RU-elena-8000-1.0.52.tar.gz) = d2679503eb1f4dc1716df5f8c4b5a7b721f087b17e96a02b1a92480311074c66 +SIZE (freeswitch-sounds-ru-RU-elena-8000-1.0.52.tar.gz) = 12678200 SHA256 (freeswitch-sounds-sv-se-jakob-8000-1.0.50.tar.gz) = aa81c97b2954b36d5625d556d2c6764ee79d0c925284ba5ff4c60cb479936b48 SIZE (freeswitch-sounds-sv-se-jakob-8000-1.0.50.tar.gz) = 2800728 diff --git a/net/freeswitch/files/extrapatch-modules.conf b/net/freeswitch/files/extrapatch-modules.conf index 7eda2a3e108c..00f41f02b8dc 100644 --- a/net/freeswitch/files/extrapatch-modules.conf +++ b/net/freeswitch/files/extrapatch-modules.conf @@ -156,7 +156,8 @@ +endpoints/mod_rtmp endpoints/mod_skinny endpoints/mod_sofia - endpoints/mod_verto +-endpoints/mod_verto ++#endpoints/mod_verto -#event_handlers/mod_amqp +event_handlers/mod_amqp event_handlers/mod_cdr_csv diff --git a/net/freeswitch/files/freeswitch.in b/net/freeswitch/files/freeswitch.in index 06fb34abaacb..f07d489bc9c4 100644 --- a/net/freeswitch/files/freeswitch.in +++ b/net/freeswitch/files/freeswitch.in @@ -18,11 +18,11 @@ rcvar=${name}_enable load_rc_config $name : ${freeswitch_enable:="NO"} -: ${freeswitch_user:=freeswitch} -: ${freeswitch_group:=freeswitch} +: ${freeswitch_username:=freeswitch} +: ${freeswitch_groupname:=freeswitch} command=%%PREFIX%%/bin/freeswitch -command_args="-nc" +command_args="-nc -u ${freeswitch_username} -g ${freeswitch_groupname}" run_rc_command "$1" diff --git a/net/freeswitch/files/patch-build_Makefile.in b/net/freeswitch/files/patch-build_Makefile.in index b657f5bbddd8..6fe6dbd356b0 100644 --- a/net/freeswitch/files/patch-build_Makefile.in +++ b/net/freeswitch/files/patch-build_Makefile.in @@ -1,6 +1,6 @@ ---- build/Makefile.in.orig 2020-05-12 10:20:11 UTC +--- build/Makefile.in.orig 2021-10-24 18:23:02 UTC +++ build/Makefile.in -@@ -706,76 +706,9 @@ uninstall-am: +@@ -720,76 +720,9 @@ uninstall-am: all: @echo " +---------- FreeSWITCH Build Complete ----------+" diff --git a/net/freeswitch/files/patch-libs_libvpx_configure b/net/freeswitch/files/patch-libs_libvpx_configure new file mode 100644 index 000000000000..c1a1f87f717c --- /dev/null +++ b/net/freeswitch/files/patch-libs_libvpx_configure @@ -0,0 +1,11 @@ +--- libs/libvpx/configure.orig 2021-10-24 18:22:28 UTC ++++ libs/libvpx/configure +@@ -146,7 +146,7 @@ for t in ${all_targets}; do + [ -f "${source_path}/${t}.mk" ] && enable_feature ${t} + done + +-if ! diff --version >/dev/null; then ++if ! command -v diff >/dev/null; then + die "diff missing: Try installing diffutils via your package manager." + fi + diff --git a/net/freeswitch/files/patch-src_mod_endpoints_mod__sofia_Makefile.am b/net/freeswitch/files/patch-src_mod_endpoints_mod__sofia_Makefile.am new file mode 100644 index 000000000000..605407ae26bd --- /dev/null +++ b/net/freeswitch/files/patch-src_mod_endpoints_mod__sofia_Makefile.am @@ -0,0 +1,26 @@ +--- src/mod/endpoints/mod_sofia/Makefile.am.orig 2021-10-24 18:22:28 UTC ++++ src/mod/endpoints/mod_sofia/Makefile.am +@@ -1,10 +1,13 @@ + include $(top_srcdir)/build/modmake.rulesam + ++CFLAGS+=-fPIC ++SOLINK=-shared -Xlinker -x ++ + MODNAME=mod_sofia + + noinst_LTLIBRARIES = libsofiamod.la + libsofiamod_la_SOURCES = mod_sofia.c sofia.c sofia_json_api.c sofia_glue.c sofia_presence.c sofia_reg.c sofia_media.c sip-dig.c rtp.c mod_sofia.h sip-dig.h +-libsofiamod_la_LDFLAGS = -static ++libsofiamod_la_LDFLAGS = -avoid-version -module -no-undefined -shared -Xlinker -x + libsofiamod_la_CFLAGS = $(AM_CFLAGS) -I. $(SOFIA_SIP_CFLAGS) $(STIRSHAKEN_CFLAGS) + if HAVE_STIRSHAKEN + libsofiamod_la_CFLAGS += -DHAVE_STIRSHAKEN +@@ -13,7 +16,7 @@ endif + mod_LTLIBRARIES = mod_sofia.la + mod_sofia_la_SOURCES = + mod_sofia_la_LIBADD = $(switch_builddir)/libfreeswitch.la libsofiamod.la +-mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(SOFIA_SIP_LIBS) $(STIRSHAKEN_LIBS) ++mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined -shared -Xliner -x $(SOFIA_SIP_LIBS) $(STIRSHAKEN_LIBS) + + noinst_PROGRAMS = test/test_sofia_funcs test/test_nuafail test/sipp-based-tests + diff --git a/net/freeswitch/files/patch-src_mod_endpoints_mod__sofia_Makefile.in b/net/freeswitch/files/patch-src_mod_endpoints_mod__sofia_Makefile.in new file mode 100644 index 000000000000..66f38d34b054 --- /dev/null +++ b/net/freeswitch/files/patch-src_mod_endpoints_mod__sofia_Makefile.in @@ -0,0 +1,27 @@ +--- src/mod/endpoints/mod_sofia/Makefile.in.orig 2021-10-24 18:23:10 UTC ++++ src/mod/endpoints/mod_sofia/Makefile.in +@@ -14,6 +14,8 @@ + + @SET_MAKE@ + ++CFLAGS+=-fPIC ++SOLINK=-shared -Xlinker -x + + VPATH = @srcdir@ + am__is_gnu_make = { \ +@@ -840,13 +842,13 @@ moddir = @modulesdir@ + MODNAME = mod_sofia + noinst_LTLIBRARIES = libsofiamod.la + libsofiamod_la_SOURCES = mod_sofia.c sofia.c sofia_json_api.c sofia_glue.c sofia_presence.c sofia_reg.c sofia_media.c sip-dig.c rtp.c mod_sofia.h sip-dig.h +-libsofiamod_la_LDFLAGS = -static ++libsofiamod_la_LDFLAGS = -avoid-version -module -no-undefined -shared -Xlinker -x + libsofiamod_la_CFLAGS = $(AM_CFLAGS) -I. $(SOFIA_SIP_CFLAGS) \ + $(STIRSHAKEN_CFLAGS) $(am__append_1) + mod_LTLIBRARIES = mod_sofia.la + mod_sofia_la_SOURCES = + mod_sofia_la_LIBADD = $(switch_builddir)/libfreeswitch.la libsofiamod.la +-mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined -shared \ ++mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined -shared -Xlinker -x \ + $(SOFIA_SIP_LIBS) $(STIRSHAKEN_LIBS) $(am__append_4) + test_test_sofia_funcs_SOURCES = test/test_sofia_funcs.c + test_test_sofia_funcs_CFLAGS = $(AM_CFLAGS) $(SOFIA_SIP_CFLAGS) \ diff --git a/net/freeswitch/files/patch-src_mod_event__handlers_mod__rayo_Makefile.am b/net/freeswitch/files/patch-src_mod_event__handlers_mod__rayo_Makefile.am new file mode 100644 index 000000000000..fddcd952ef96 --- /dev/null +++ b/net/freeswitch/files/patch-src_mod_event__handlers_mod__rayo_Makefile.am @@ -0,0 +1,32 @@ +--- src/mod/event_handlers/mod_rayo/Makefile.am.orig 2021-10-24 18:22:28 UTC ++++ src/mod/event_handlers/mod_rayo/Makefile.am +@@ -14,7 +14,7 @@ mod_LTLIBRARIES = mod_rayo.la + mod_rayo_la_SOURCES = + mod_rayo_la_CFLAGS = $(AM_CFLAGS) -I$(IKS_DIR)/include $(PCRE_CFLAGS) + mod_rayo_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(IKS_LA) $(PCRE_LIBS) librayomod.la +-mod_rayo_la_LDFLAGS = -avoid-version -module -no-undefined -shared ++mod_rayo_la_LDFLAGS = -avoid-version -module -no-undefined -shared -Xlinker --allow-multiple-definition + + BUILT_SOURCES=$(IKS_LA) + +@@ -26,17 +26,17 @@ noinst_PROGRAMS = test/test_iks test/test_nlsml test/t + + test_test_iks_SOURCES = test/test_iks.c + test_test_iks_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\" +-test_test_iks_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) ++test_test_iks_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) -Xlinker --allow-multiple-definition $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) + test_test_iks_LDADD = librayomod.la $(IKS_LA) $(PCRE_LIBS) $(switch_builddir)/libfreeswitch.la + + test_test_nlsml_SOURCES = test/test_nlsml.c + test_test_nlsml_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\" +-test_test_nlsml_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) ++test_test_nlsml_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) -Xlinker --allow-multiple-definition $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) + test_test_nlsml_LDADD = librayomod.la $(IKS_LA) $(PCRE_LIBS) $(switch_builddir)/libfreeswitch.la + + test_test_srgs_SOURCES = test/test_srgs.c + test_test_srgs_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\" +-test_test_srgs_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) ++test_test_srgs_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) -Xlinker --allow-multiple-definition $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) + test_test_srgs_LDADD = librayomod.la $(IKS_LA) $(PCRE_LIBS) $(switch_builddir)/libfreeswitch.la + + diff --git a/net/freeswitch/files/patch-src_mod_event__handlers_mod__rayo_Makefile.in b/net/freeswitch/files/patch-src_mod_event__handlers_mod__rayo_Makefile.in new file mode 100644 index 000000000000..b17bc57f8f04 --- /dev/null +++ b/net/freeswitch/files/patch-src_mod_event__handlers_mod__rayo_Makefile.in @@ -0,0 +1,75 @@ +--- src/mod/event_handlers/mod_rayo/Makefile.in.orig 2021-10-24 18:23:11 UTC ++++ src/mod/event_handlers/mod_rayo/Makefile.in +@@ -170,7 +170,7 @@ am__v_lt_0 = --silent + am__v_lt_1 = + librayomod_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(librayomod_la_CFLAGS) \ +- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -Xlinker --allow-multiple-definition -o $@ + am__DEPENDENCIES_1 = + mod_rayo_la_DEPENDENCIES = $(switch_builddir)/libfreeswitch.la \ + $(IKS_LA) $(am__DEPENDENCIES_1) librayomod.la +@@ -178,7 +178,7 @@ am_mod_rayo_la_OBJECTS = + mod_rayo_la_OBJECTS = $(am_mod_rayo_la_OBJECTS) + mod_rayo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(mod_rayo_la_CFLAGS) \ +- $(CFLAGS) $(mod_rayo_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(CFLAGS) $(mod_rayo_la_LDFLAGS) $(LDFLAGS) -Xlinker --allow-multiple-definition -o $@ + PROGRAMS = $(noinst_PROGRAMS) + am__dirstamp = $(am__leading_dot)dirstamp + am_test_test_iks_OBJECTS = test/test_test_iks-test_iks.$(OBJEXT) +@@ -187,7 +187,7 @@ test_test_iks_DEPENDENCIES = librayomod.la $(IKS_LA) \ + $(am__DEPENDENCIES_1) $(switch_builddir)/libfreeswitch.la + test_test_iks_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_test_iks_CFLAGS) \ +- $(CFLAGS) $(test_test_iks_LDFLAGS) $(LDFLAGS) -o $@ ++ $(CFLAGS) $(test_test_iks_LDFLAGS) $(LDFLAGS) -Xlinker --allow-multiple-definition -o $@ + am_test_test_nlsml_OBJECTS = \ + test/test_test_nlsml-test_nlsml.$(OBJEXT) + test_test_nlsml_OBJECTS = $(am_test_test_nlsml_OBJECTS) +@@ -196,7 +196,7 @@ test_test_nlsml_DEPENDENCIES = librayomod.la $(IKS_LA) + test_test_nlsml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(test_test_nlsml_CFLAGS) $(CFLAGS) $(test_test_nlsml_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ $(LDFLAGS) -Xlinker --allow-multiple-definition -o $@ + am_test_test_srgs_OBJECTS = test/test_test_srgs-test_srgs.$(OBJEXT) + test_test_srgs_OBJECTS = $(am_test_test_srgs_OBJECTS) + test_test_srgs_DEPENDENCIES = librayomod.la $(IKS_LA) \ +@@ -204,7 +204,7 @@ test_test_srgs_DEPENDENCIES = librayomod.la $(IKS_LA) + test_test_srgs_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(test_test_srgs_CFLAGS) $(CFLAGS) $(test_test_srgs_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ $(LDFLAGS) -Xlinker --allow-multiple-definition -o $@ + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) + am__v_P_0 = false +@@ -234,7 +234,7 @@ am__v_CC_1 = + CCLD = $(CC) + LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(AM_LDFLAGS) $(LDFLAGS) -Xlinker --allow-multiple-definition -o $@ + AM_V_CCLD = $(am__v_CCLD_@AM_V@) + am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) + am__v_CCLD_0 = @echo " CCLD " $@; +@@ -853,15 +853,15 @@ mod_rayo_la_LDFLAGS = -avoid-version -module -no-undef + BUILT_SOURCES = $(IKS_LA) + test_test_iks_SOURCES = test/test_iks.c + test_test_iks_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\" +-test_test_iks_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) ++test_test_iks_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) -Xlinker --allow-multiple-definition $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) + test_test_iks_LDADD = librayomod.la $(IKS_LA) $(PCRE_LIBS) $(switch_builddir)/libfreeswitch.la + test_test_nlsml_SOURCES = test/test_nlsml.c + test_test_nlsml_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\" +-test_test_nlsml_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) ++test_test_nlsml_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) -Xlinker --allow-multiple-definition-Xlinker --allow-multiple-definition $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) + test_test_nlsml_LDADD = librayomod.la $(IKS_LA) $(PCRE_LIBS) $(switch_builddir)/libfreeswitch.la + test_test_srgs_SOURCES = test/test_srgs.c + test_test_srgs_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\" +-test_test_srgs_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) ++test_test_srgs_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) -Xlinker --allow-multiple-definition $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) + test_test_srgs_LDADD = librayomod.la $(IKS_LA) $(PCRE_LIBS) $(switch_builddir)/libfreeswitch.la + TESTS = $(noinst_PROGRAMS) + all: $(BUILT_SOURCES) diff --git a/net/freeswitch/files/patch-src_switch__utils.c b/net/freeswitch/files/patch-src_switch__utils.c index 4cdf9fd51acd..f75ba8ecd823 100644 --- a/net/freeswitch/files/patch-src_switch__utils.c +++ b/net/freeswitch/files/patch-src_switch__utils.c @@ -1,6 +1,6 @@ ---- src/switch_utils.c.orig 2020-05-12 10:19:16 UTC +--- src/switch_utils.c.orig 2021-10-24 18:22:29 UTC +++ src/switch_utils.c -@@ -1945,7 +1945,7 @@ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(c +@@ -1956,7 +1956,7 @@ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(c goto doh; } diff --git a/net/freeswitch/pkg-plist b/net/freeswitch/pkg-plist index ab802ab4f109..4812c1615e71 100644 --- a/net/freeswitch/pkg-plist +++ b/net/freeswitch/pkg-plist @@ -5,6 +5,7 @@ bin/fs_ivrd bin/fs_tts bin/fsxs bin/gentls_cert +bin/switch_eavesdrop bin/tone2wav include/freeswitch/libteletone.h include/freeswitch/libteletone_detect.h @@ -43,12 +44,14 @@ include/freeswitch/switch_mprintf.h include/freeswitch/switch_msrp.h include/freeswitch/switch_nat.h include/freeswitch/switch_odbc.h +include/freeswitch/switch_packetizer.h include/freeswitch/switch_platform.h include/freeswitch/switch_regex.h include/freeswitch/switch_resample.h include/freeswitch/switch_rtcp_frame.h include/freeswitch/switch_rtp.h include/freeswitch/switch_scheduler.h +include/freeswitch/switch_spandsp.h include/freeswitch/switch_stun.h include/freeswitch/switch_types.h include/freeswitch/switch_utf8.h @@ -97,14 +100,13 @@ lib/freeswitch/mod/mod_sndfile.so lib/freeswitch/mod/mod_sofia.so lib/freeswitch/mod/mod_spandsp.so lib/freeswitch/mod/mod_syslog.so +lib/freeswitch/mod/mod_test.so lib/freeswitch/mod/mod_tone_stream.so lib/freeswitch/mod/mod_valet_parking.so -lib/freeswitch/mod/mod_verto.so lib/freeswitch/mod/mod_voicemail.so lib/freeswitch/mod/mod_xml_cdr.so lib/freeswitch/mod/mod_xml_rpc.so lib/freeswitch/mod/mod_xml_scgi.so -lib/libfreeswitch.a lib/libfreeswitch.so lib/libfreeswitch.so.1 lib/libfreeswitch.so.1.0.0 @@ -181,7 +183,6 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curl/autoload_configs/conference.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curl/autoload_configs/console.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curl/autoload_configs/dialplan_directory.conf.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curl/autoload_configs/dingaling.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curl/autoload_configs/enum.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curl/autoload_configs/event_multicast.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curl/autoload_configs/event_socket.conf.xml @@ -216,6 +217,7 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curl/autoload_configs/zeroconf.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curl/freeswitch.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curl/mime.types +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FreeMono.ttf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/freeswitch.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/insideout/autoload_configs/acl.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/insideout/autoload_configs/alsa.conf.xml @@ -466,6 +468,7 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/acl.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/amd.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/amr.conf.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/amrwb.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/cdr_csv.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/conference.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/conference_layouts.conf.xml @@ -578,7 +581,6 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/curl.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/db.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/dialplan_directory.conf.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/dingaling.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/directory.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/distributor.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/easyroute.conf.xml @@ -622,6 +624,7 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/rtmp.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/sangoma_codec.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/shout.conf.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/signalwire.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/skinny.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/smpp.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/sms_flowroute.conf.xml @@ -634,9 +637,7 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/translate.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/tts_commandline.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/unicall.conf.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/unimrcp.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/v8.conf.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/verto.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/voicemail.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/voicemail_ivr.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/vpx.conf.xml @@ -644,6 +645,7 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/xml_curl.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/xml_rpc.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/xml_scgi.conf.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/verto.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/zeroconf.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/chatplan/default.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/config.FS0 @@ -695,8 +697,6 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/fur_elise.ttml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/ivr_menus/demo_ivr.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/ivr_menus/new_demo_ivr.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/jingle_profiles/client.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/jingle_profiles/server.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/lang/de/de.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/lang/de/demo/demo.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/lang/de/vm/sounds.xml @@ -760,13 +760,6 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/lang/sv/sv.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/lang/sv/vm/sounds.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/mime.types -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/mrcp_profiles/loquendo-7-mrcp-v2.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/mrcp_profiles/nuance-5.0-mrcp-v1.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/mrcp_profiles/nuance-5.0-mrcp-v2.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/mrcp_profiles/unimrcpserver-mrcp-v1.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/mrcp_profiles/vestec-mrcp-v1.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/notify-voicemail.tpl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/sip_profiles/external-ipv6.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/sip_profiles/external-ipv6/example.xml