From 4f7658078522dd3292013d9b5d30ea21ad2c1b96 Mon Sep 17 00:00:00 2001 From: s3rj1k Date: Thu, 16 Feb 2023 18:11:28 +0200 Subject: [PATCH 1/4] [mod_shout] Enable module in Dockerfile example. Signed-off-by: s3rj1k --- docker/examples/Debian11/Dockerfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docker/examples/Debian11/Dockerfile b/docker/examples/Debian11/Dockerfile index 2497a39850..10d9302be1 100644 --- a/docker/examples/Debian11/Dockerfile +++ b/docker/examples/Debian11/Dockerfile @@ -31,13 +31,18 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -yq install \ # mod_pgsql libpq-dev \ # mod_sndfile - libsndfile1-dev libflac-dev libogg-dev libvorbis-dev - + libsndfile1-dev libflac-dev libogg-dev libvorbis-dev \ +# mod_shout + libshout3-dev libmpg123-dev libmp3lame-dev + RUN cd /usr/src/libs/libks && cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWITH_LIBBACKTRACE=1 && make install RUN cd /usr/src/libs/sofia-sip && ./bootstrap.sh && ./configure CFLAGS="-g -ggdb" --with-pic --with-glib=no --without-doxygen --disable-stun --prefix=/usr && make -j`nproc --all` && make install RUN cd /usr/src/libs/spandsp && ./bootstrap.sh && ./configure CFLAGS="-g -ggdb" --with-pic --prefix=/usr && make -j`nproc --all` && make install RUN cd /usr/src/libs/signalwire-c && PKG_CONFIG_PATH=/usr/lib/pkgconfig cmake . -DCMAKE_INSTALL_PREFIX=/usr && make install +# Enable modules +RUN sed -i 's|#formats/mod_shout|formats/mod_shout|' /usr/src/freeswitch/build/modules.conf.in + RUN cd /usr/src/freeswitch && ./bootstrap.sh -j RUN cd /usr/src/freeswitch && ./configure RUN cd /usr/src/freeswitch && make -j`nproc` && make install @@ -46,4 +51,4 @@ RUN cd /usr/src/freeswitch && make -j`nproc` && make install RUN apt-get clean # Uncomment to cleanup even more -#RUN rm -rf /usr/src/* \ No newline at end of file +#RUN rm -rf /usr/src/* From d4291b8113fd25ace184ee014742b6816c5ea85c Mon Sep 17 00:00:00 2001 From: Chris Rienzo Date: Fri, 17 Feb 2023 15:24:03 -0500 Subject: [PATCH 2/4] Create SECURITY.md --- SECURITY.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000000..9efb6b711a --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,5 @@ +# Security Policy + +## Reporting a Vulnerability + +Send an e-mail to security@signalwire.com to report a vulnerability. If accepted, we'll create a security advisory and add you and your team as collaborators. Please allow our team sufficient time to resolve the vulnerability before disclosing it; we'll remain in contact about the fix and may ask for your assistance to verify it is resolved. From 83e4ccf80234c71e23847f05795350f043305756 Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Tue, 21 Feb 2023 20:52:16 +0300 Subject: [PATCH 3/4] [Build-System] Windows: Update OpenSSL to 1.1.1t, libpq to 10.23, curl to 7.88.0, rabbitmq-c to 0.13.0. Allow using build numbers and bump libks version requirement to 1.8.2_1 and signalwire-c to 1.3.2_1 compiled with openssl 1.1.1t --- src/mod/event_handlers/mod_amqp/mod_amqp.2017.vcxproj | 5 +++++ w32/curl-version.props | 2 +- w32/libks-version.props | 1 + w32/libks.props | 4 ++-- w32/libpq-version.props | 2 +- w32/openssl-version.props | 2 +- w32/rabbitmq-c-version.props | 2 +- w32/signalwire-client-c-version.props | 1 + w32/signalwire-client-c.props | 4 ++-- 9 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/mod/event_handlers/mod_amqp/mod_amqp.2017.vcxproj b/src/mod/event_handlers/mod_amqp/mod_amqp.2017.vcxproj index 7abe38965f..657ad2027c 100644 --- a/src/mod/event_handlers/mod_amqp/mod_amqp.2017.vcxproj +++ b/src/mod/event_handlers/mod_amqp/mod_amqp.2017.vcxproj @@ -70,6 +70,11 @@ <_ProjectFileVersion>10.0.30319.1 + + + AMQP_STATIC;%(PreprocessorDefinitions) + + %(AdditionalIncludeDirectories) diff --git a/w32/curl-version.props b/w32/curl-version.props index fe37b46801..65f768859d 100644 --- a/w32/curl-version.props +++ b/w32/curl-version.props @@ -2,7 +2,7 @@ - 7.78.0 + 7.88.0 true diff --git a/w32/libks-version.props b/w32/libks-version.props index fd99aa73ca..44246b4d90 100644 --- a/w32/libks-version.props +++ b/w32/libks-version.props @@ -5,6 +5,7 @@ 1.8.2 + 1 true diff --git a/w32/libks.props b/w32/libks.props index 4bc05b2af0..fb7a82f200 100644 --- a/w32/libks.props +++ b/w32/libks.props @@ -36,7 +36,7 @@ - 10.18 + 10.23 true diff --git a/w32/openssl-version.props b/w32/openssl-version.props index f0147f9baf..2d88e736e7 100644 --- a/w32/openssl-version.props +++ b/w32/openssl-version.props @@ -4,7 +4,7 @@ - 1.1.1l + 1.1.1t $(BaseDir)libs\openssl-$(OpenSSLVersion) diff --git a/w32/rabbitmq-c-version.props b/w32/rabbitmq-c-version.props index 0688988cfb..6716df2314 100644 --- a/w32/rabbitmq-c-version.props +++ b/w32/rabbitmq-c-version.props @@ -4,7 +4,7 @@ - 0.11.0 + 0.13.0 true diff --git a/w32/signalwire-client-c-version.props b/w32/signalwire-client-c-version.props index 53d65c87bd..337dc4cc19 100644 --- a/w32/signalwire-client-c-version.props +++ b/w32/signalwire-client-c-version.props @@ -5,6 +5,7 @@ 1.3.2 + 1 true diff --git a/w32/signalwire-client-c.props b/w32/signalwire-client-c.props index e7e40e2c4a..4d5f917b7e 100644 --- a/w32/signalwire-client-c.props +++ b/w32/signalwire-client-c.props @@ -34,7 +34,7 @@ Date: Wed, 22 Feb 2023 23:06:28 +0300 Subject: [PATCH 4/4] Bump sofia-sip library requirement to version 1.13.14 --- configure.ac | 2 +- debian/bootstrap.sh | 4 ++-- freeswitch.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 5ddf9a513f..7ca19e49e8 100644 --- a/configure.ac +++ b/configure.ac @@ -716,7 +716,7 @@ PKG_CHECK_MODULES([SPANDSP], [spandsp >= 3.0],[ AC_MSG_ERROR([no usable spandsp; please install spandsp3 devel package or equivalent]) ]) -PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.12],[ +PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.14],[ AM_CONDITIONAL([HAVE_SOFIA_SIP],[true])],[ AC_MSG_ERROR([no usable sofia-sip; please install sofia-sip-ua devel package or equivalent]) ]) diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 6b1a83b86b..e3f0b1b9db 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -332,7 +332,7 @@ Build-Depends: uuid-dev, libexpat1-dev, libgdbm-dev, libdb-dev, # used by many modules libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev, - bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.13.12), + bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.13.14), libspandsp3-dev, # used to format the private freeswitch apt-repo key properly gnupg, @@ -371,7 +371,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch Package: libfreeswitch1 Architecture: amd64 armhf -Depends: \${shlibs:Depends}, \${misc:Depends}, libsofia-sip-ua0 (>= 1.13.12) +Depends: \${shlibs:Depends}, \${misc:Depends}, libsofia-sip-ua0 (>= 1.13.14) Recommends: Suggests: libfreeswitch1-dbg Conflicts: freeswitch-all (<= 1.6.7) diff --git a/freeswitch.spec b/freeswitch.spec index 807d3e7395..f3904afa2c 100644 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -140,7 +140,7 @@ BuildRequires: curl-devel >= 7.19 BuildRequires: gcc-c++ BuildRequires: libtool >= 1.5.17 BuildRequires: openssl-devel >= 1.0.1e -BuildRequires: sofia-sip-devel >= 1.13.12 +BuildRequires: sofia-sip-devel >= 1.13.14 BuildRequires: spandsp3-devel >= 3.0 BuildRequires: pcre-devel BuildRequires: speex-devel