Skip to content

Commit 4cb05e7

Browse files
andywolkandywolk
committed
Merge branch 'master' into v1.10
2 parents a615e85 + 5c289cc commit 4cb05e7

File tree

163 files changed

+4341
-1208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+4341
-1208
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Step by step tutorials to install FreeSWITCH from packages:
4040
### Build from source
4141

4242
Example Dockerfiles to build FreeSWITCH and dependencies from source:
43-
* https://github.com/signalwire/freeswitch/tree/dockerfile/docker/examples
43+
* https://github.com/signalwire/freeswitch/tree/master/docker/examples
4444

4545
Step by step tutorials to build FreeSWITCH with provided dependency packages:
4646
* [Debian](https://freeswitch.org/confluence/display/FREESWITCH/Debian#Debian-buildfromsource) [<b>Recommended</b>]

‎SECURITY.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Security Policy
2+
3+
## Reporting a Vulnerability
4+
5+
Send an e-mail to [email protected] 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.

‎build/next-release.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.9-release
1+
1.10.10-release

‎conf/vanilla/freeswitch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
1010
Before you start to modify this default please visit this wiki page:
1111
12-
http://wiki.freeswitch.org/wiki/Getting_Started_Guide#Some_stuff_to_try_out.21
12+
https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Configuration/Default-Configuration_6587388/#6-configuration-files
1313
1414
If all else fails you can read our FAQ located at:
1515
16-
http://wiki.freeswitch.org/wiki/FreeSwitch_FAQ
16+
https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Miscellaneous/FAQ/
1717
1818
NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
1919
-->

‎configure.ac

+39-19
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
# Must change all of the below together
55
# For a release, set revision for that tagged release as well and uncomment
6-
AC_INIT([freeswitch], [1.10.9-release], [email protected])
6+
AC_INIT([freeswitch], [1.10.10-release], [email protected])
77
AC_SUBST(SWITCH_VERSION_MAJOR, [1])
88
AC_SUBST(SWITCH_VERSION_MINOR, [10])
9-
AC_SUBST(SWITCH_VERSION_MICRO, [9-release])
9+
AC_SUBST(SWITCH_VERSION_MICRO, [10-release])
1010
AC_SUBST(SWITCH_VERSION_REVISION, [])
1111
AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])
1212

@@ -582,7 +582,7 @@ AC_SUBST(SYS_XMLRPC_CFLAGS)
582582
AC_SUBST(SYS_XMLRPC_LDFLAGS)
583583
AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"])
584584

585-
for luaversion in luajit lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
585+
for luaversion in luajit lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
586586
PKG_CHECK_MODULES([LUA],[${luaversion}],[have_lua=yes],[have_lua=no])
587587
if test ${have_lua} = yes; then
588588
break
@@ -716,7 +716,7 @@ PKG_CHECK_MODULES([SPANDSP], [spandsp >= 3.0],[
716716
AC_MSG_ERROR([no usable spandsp; please install spandsp3 devel package or equivalent])
717717
])
718718

719-
PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.12],[
719+
PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.15],[
720720
AM_CONDITIONAL([HAVE_SOFIA_SIP],[true])],[
721721
AC_MSG_ERROR([no usable sofia-sip; please install sofia-sip-ua devel package or equivalent])
722722
])
@@ -1352,7 +1352,21 @@ PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.16.0],[
13521352
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MPG123],[false])])
13531353

13541354
PKG_CHECK_MODULES([SHOUT], [shout >= 2.2.2],[
1355-
AM_CONDITIONAL([HAVE_SHOUT],[true])],[
1355+
AM_CONDITIONAL([HAVE_SHOUT],[true])
1356+
SHOUT_VERSION="`$PKG_CONFIG --modversion shout`"
1357+
SHOUT_MAJOR_VERSION="`echo $SHOUT_VERSION | cut -d. -f1`"
1358+
SHOUT_MINOR_VERSION="`echo $SHOUT_VERSION | cut -d. -f2`"
1359+
SHOUT_PATCH_VERSION="`echo $SHOUT_VERSION | cut -d. -f3`"
1360+
test -n "$SHOUT_PATCH_VERSION" || SHOUT_PATCH_VERSION=0
1361+
AC_MSG_NOTICE([SHOUT version: $SHOUT_VERSION])
1362+
AC_MSG_NOTICE([SHOUT major version: $SHOUT_MAJOR_VERSION])
1363+
AC_MSG_NOTICE([SHOUT minor version: $SHOUT_MINOR_VERSION])
1364+
AC_MSG_NOTICE([SHOUT patch version: $SHOUT_PATCH_VERSION])
1365+
AC_SUBST([SHOUT_VERSION])
1366+
AC_SUBST([SHOUT_MAJOR_VERSION])
1367+
AC_SUBST([SHOUT_MINOR_VERSION])
1368+
AC_SUBST([SHOUT_PATCH_VERSION])
1369+
],[
13561370
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SHOUT],[false])])
13571371

13581372
mp3lame=false
@@ -1518,26 +1532,32 @@ PKG_CHECK_MODULES([V8FS_STATIC], [v8-6.1_static >= 6.1.298],[
15181532
])
15191533
])
15201534

1521-
PKG_CHECK_MODULES([KS], [libks >= 1.8.2],[
1535+
PKG_CHECK_MODULES([KS], [libks2 >= 2.0.0],[
15221536
AM_CONDITIONAL([HAVE_KS],[true])],[
1523-
if module_enabled mod_verto; then
1524-
AC_MSG_ERROR([You need to either install libks or disable mod_verto in modules.conf])
1525-
else
1526-
if module_enabled mod_signalwire; then
1527-
AC_MSG_ERROR([You need to either install libks or disable mod_signalwire in modules.conf])
1537+
PKG_CHECK_MODULES([KS], [libks >= 1.8.2],[
1538+
AM_CONDITIONAL([HAVE_KS],[true])],[
1539+
if module_enabled mod_verto; then
1540+
AC_MSG_ERROR([You need to either install libks2 or libks or disable mod_verto in modules.conf])
15281541
else
1529-
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])
1542+
if module_enabled mod_signalwire; then
1543+
AC_MSG_ERROR([You need to either install libks2 or libks or disable mod_signalwire in modules.conf])
1544+
else
1545+
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])
1546+
fi
15301547
fi
1531-
fi
1548+
])
15321549
])
15331550

1534-
PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[
1551+
PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client2 >= 2.0.0],[
15351552
AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
1536-
if module_enabled mod_signalwire; then
1537-
AC_MSG_ERROR([You need to either install signalwire-client-c or disable mod_signalwire in modules.conf])
1538-
else
1539-
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])
1540-
fi
1553+
PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[
1554+
AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
1555+
if module_enabled mod_signalwire; then
1556+
AC_MSG_ERROR([You need to either install signalwire-client-c2 or signalwire-client-c or disable mod_signalwire in modules.conf])
1557+
else
1558+
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])
1559+
fi
1560+
])
15411561
])
15421562

15431563
PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[

‎debian/bootstrap.sh

+7-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ conf_dir="../conf"
2929
lang_dir="../conf/vanilla/lang"
3030
fs_description="FreeSWITCH is a scalable open source cross-platform telephony platform designed to route and interconnect popular communication protocols using audio, video, text or any other form of media."
3131
mod_build_depends="." mod_depends="." mod_recommends="." mod_suggests="."
32-
supported_debian_distros="wheezy jessie stretch buster bullseye sid"
32+
supported_debian_distros="wheezy jessie stretch buster bullseye bookworm sid"
3333
supported_ubuntu_distros="trusty utopic xenial"
3434
supported_distros="$supported_debian_distros $supported_ubuntu_distros"
3535
avoid_mods=(
@@ -71,6 +71,9 @@ avoid_mods_sid=(
7171
avoid_mods_jessie=(
7272
directories/mod_ldap
7373
)
74+
avoid_mods_bookworm=(
75+
languages/mod_python
76+
)
7477
avoid_mods_wheezy=(
7578
event_handlers/mod_amqp
7679
languages/mod_java
@@ -325,14 +328,14 @@ Build-Depends:
325328
# configure options
326329
libssl1.0-dev | libssl-dev, unixodbc-dev, libpq-dev,
327330
libncurses5-dev, libjpeg62-turbo-dev | libjpeg-turbo8-dev | libjpeg62-dev | libjpeg8-dev,
328-
python-dev | python-dev-is-python2, python3-dev, python-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5),
331+
python-dev | python-dev-is-python2 | python-dev-is-python3, python3-dev, python-all-dev | python3-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5),
329332
# documentation
330333
doxygen,
331334
# for APR (not essential for build)
332335
uuid-dev, libexpat1-dev, libgdbm-dev, libdb-dev,
333336
# used by many modules
334337
libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev,
335-
bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.13.12),
338+
bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.13.15),
336339
libspandsp3-dev,
337340
# used to format the private freeswitch apt-repo key properly
338341
gnupg,
@@ -371,7 +374,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
371374
372375
Package: libfreeswitch1
373376
Architecture: amd64 armhf
374-
Depends: \${shlibs:Depends}, \${misc:Depends}, libsofia-sip-ua0 (>= 1.13.12)
377+
Depends: \${shlibs:Depends}, \${misc:Depends}, libsofia-sip-ua0 (>= 1.13.15)
375378
Recommends:
376379
Suggests: libfreeswitch1-dbg
377380
Conflicts: freeswitch-all (<= 1.6.7)

‎debian/control-modules

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Module: applications/mod_av
1212
Description: mod_av
1313
Adds mod_av.
1414
Build-Depends: libavformat-dev, libswscale-dev, libavresample-dev
15+
Build-Depends-Bookworm: libavformat-dev, libswscale-dev, libswresample-dev
1516

1617
Module: applications/mod_avmd
1718
Description: Advanced voicemail detection
@@ -209,7 +210,7 @@ Description: Adds mod_skel
209210
Module: applications/mod_signalwire
210211
Description: mod_signalwire
211212
Adds mod_signalwire.
212-
Build-Depends: libks, signalwire-client-c
213+
Build-Depends: libks2, signalwire-client-c2
213214

214215
Module: applications/mod_sms
215216
Description: Astract SMS
@@ -485,6 +486,7 @@ Description: Adds mod_verto.
485486
Build-Depends: libperl-dev
486487
Build-Depends-Buster: libperl-dev, libgdbm-compat-dev
487488
Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev
489+
Build-Depends-Bookworm: libperl-dev, libgdbm-compat-dev
488490

489491
## mod/event_handlers
490492

@@ -647,6 +649,7 @@ Module: languages/mod_lua
647649
Description: mod_lua
648650
Adds mod_lua.
649651
Build-Depends: liblua5.2-dev | liblua5.1-dev
652+
Build-Depends-Bookworm: liblua5.3-dev | liblua5.2-dev | liblua5.1-dev
650653

651654
Module: languages/mod_managed
652655
Description: mod_managed
@@ -659,6 +662,7 @@ Description: mod_perl
659662
Build-Depends: libperl-dev
660663
Build-Depends-Buster: libperl-dev, libgdbm-compat-dev
661664
Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev
665+
Build-Depends-Bookworm: libperl-dev, libgdbm-compat-dev
662666

663667
Module: languages/mod_python
664668
Description: mod_python
@@ -669,6 +673,7 @@ Module: languages/mod_python3
669673
Description: mod_python3
670674
Adds mod_python3.
671675
Build-Depends: python3-dev
676+
Build-Depends-Bookworm: python3-dev, python3-setuptools
672677

673678
Module: languages/mod_v8
674679
Description: mod_v8

‎debian/util.sh

+2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ find_distro () {
4646
case "$1" in
4747
experimental) echo "sid";;
4848
unstable) echo "sid";;
49+
experimental) echo "bookworm";;
4950
testing) echo "bullseye";;
5051
stable) echo "buster";;
5152
oldstable) echo "stretch";;
@@ -56,6 +57,7 @@ find_distro () {
5657
find_suite () {
5758
case "$1" in
5859
sid) echo "unstable";;
60+
bookworm) echo "experimental";;
5961
bullseye) echo "testing";;
6062
buster) echo "stable";;
6163
stretch) echo "oldstable";;

‎docker/examples/Debian11/Dockerfile

+8-3
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,18 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -yq install \
3131
# mod_pgsql
3232
libpq-dev \
3333
# mod_sndfile
34-
libsndfile1-dev libflac-dev libogg-dev libvorbis-dev
35-
34+
libsndfile1-dev libflac-dev libogg-dev libvorbis-dev \
35+
# mod_shout
36+
libshout3-dev libmpg123-dev libmp3lame-dev
37+
3638
RUN cd /usr/src/libs/libks && cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWITH_LIBBACKTRACE=1 && make install
3739
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
3840
RUN cd /usr/src/libs/spandsp && ./bootstrap.sh && ./configure CFLAGS="-g -ggdb" --with-pic --prefix=/usr && make -j`nproc --all` && make install
3941
RUN cd /usr/src/libs/signalwire-c && PKG_CONFIG_PATH=/usr/lib/pkgconfig cmake . -DCMAKE_INSTALL_PREFIX=/usr && make install
4042

43+
# Enable modules
44+
RUN sed -i 's|#formats/mod_shout|formats/mod_shout|' /usr/src/freeswitch/build/modules.conf.in
45+
4146
RUN cd /usr/src/freeswitch && ./bootstrap.sh -j
4247
RUN cd /usr/src/freeswitch && ./configure
4348
RUN cd /usr/src/freeswitch && make -j`nproc` && make install
@@ -46,4 +51,4 @@ RUN cd /usr/src/freeswitch && make -j`nproc` && make install
4651
RUN apt-get clean
4752

4853
# Uncomment to cleanup even more
49-
#RUN rm -rf /usr/src/*
54+
#RUN rm -rf /usr/src/*

‎freeswitch.spec

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ BuildRequires: curl-devel >= 7.19
140140
BuildRequires: gcc-c++
141141
BuildRequires: libtool >= 1.5.17
142142
BuildRequires: openssl-devel >= 1.0.1e
143-
BuildRequires: sofia-sip-devel >= 1.13.12
143+
BuildRequires: sofia-sip-devel >= 1.13.15
144144
BuildRequires: spandsp3-devel >= 3.0
145145
BuildRequires: pcre-devel
146146
BuildRequires: speex-devel
@@ -497,7 +497,7 @@ the entries aloud via a TTS engine
497497
Summary: FreeSWITCH mod_signalwire
498498
Group: System/Libraries
499499
Requires: %{name} = %{version}-%{release}
500-
BuildRequires: libks signalwire-client-c
500+
BuildRequires: libks2 signalwire-client-c2
501501

502502
%description application-signalwire
503503
Provides FreeSWITCH mod_signalwire

‎libs/libyuv/include/libyuv/planar_functions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ typedef void (*ARGBBlendRow)(const uint8_t* src_argb0,
582582

583583
// Get function to Alpha Blend ARGB pixels and store to destination.
584584
LIBYUV_API
585-
ARGBBlendRow GetARGBBlend();
585+
ARGBBlendRow GetARGBBlend(void);
586586

587587
// Alpha Blend ARGB images and store to destination.
588588
// Source is pre-multiplied by alpha using ARGBAttenuate.

‎libs/libyuv/source/planar_functions.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ int ARGBMirror(const uint8_t* src_argb,
11851185
// As there are 6 blenders to choose from, the caller should try to use
11861186
// the same blend function for all pixels if possible.
11871187
LIBYUV_API
1188-
ARGBBlendRow GetARGBBlend() {
1188+
ARGBBlendRow GetARGBBlend(void) {
11891189
void (*ARGBBlendRow)(const uint8_t* src_argb, const uint8_t* src_argb1,
11901190
uint8_t* dst_argb, int width) = ARGBBlendRow_C;
11911191
#if defined(HAS_ARGBBLENDROW_SSSE3)

‎libs/miniupnpc/miniupnpc.c

-2
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,6 @@ UPNP_GetValidIGD(struct UPNPDev * devlist,
679679
char * descXML;
680680
int descXMLsize = 0;
681681
struct UPNPDev * dev;
682-
int ndev = 0;
683682
int state; /* state 1 : IGD connected. State 2 : IGD. State 3 : anything */
684683
if(!devlist)
685684
{
@@ -698,7 +697,6 @@ UPNP_GetValidIGD(struct UPNPDev * devlist,
698697
lanaddr, lanaddrlen);
699698
if(descXML)
700699
{
701-
ndev++;
702700
memset(data, 0, sizeof(struct IGDdatas));
703701
memset(urls, 0, sizeof(struct UPNPUrls));
704702
parserootdesc(descXML, descXMLsize, data);

0 commit comments

Comments
 (0)