freeswitch: bump to 1.10.10

- bump to 1.10.10
- remove TARGET_CFLAGS workarounds
- remove BROKEN from modules av & python3
- remove 500-libshout-deprecated.patch
- refresh other patches

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
(cherry picked from commit 999a8a9ff1df8af205dcb0d43603f316334b6592)

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index b8cd607ea5ddea9d37798ad23d21a8a9f1796c24..c195e0029301cf52c767856344ab5883fce011cc 100644 (file)
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freeswitch
-PKG_VERSION:=1.10.9
-PKG_RELEASE:=2
+PKG_VERSION:=1.10.10
+PKG_RELEASE:=1
 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 
 PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz
 PKG_SOURCE_URL:=https://files.freeswitch.org/releases/freeswitch
-PKG_HASH:=f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063
+PKG_HASH:=d2c702c7f4bd6eca539c3981cf859ad5c1846d9283829e24cd75686f2322b9df
 
 PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch
 
@@ -234,12 +234,6 @@ FS_PERL_FEED:=$(TOPDIR)/feeds/packages/lang/perl
 include $(TOPDIR)/feeds/packages/lang/python/python3-version.mk
 include $(FS_PERL_FEED)/perlver.mk
 
-# https://github.com/signalwire/freeswitch/issues/1670
-TARGET_CFLAGS+=-Wno-error=address
-
-# Allow compiling with OpenSSL 3.0
-TARGET_CFLAGS+=-Wno-error=deprecated-declarations
-
 PERL_SITELIB:=/usr/lib/perl$(PERL_MAJOR)/$(PERL_VERSION2)
 
 FS_PERL_LIBS:=$(shell grep "^libs=" \
@@ -875,7 +869,7 @@ $(eval $(call Package/freeswitch/Module,abstraction,API abstraction,This module
 $(eval $(call Package/freeswitch/Module,alsa,ALSA endpoint,ALSA endpoint module.,+alsa-lib))
 $(eval $(call Package/freeswitch/Module,amr,AMR passthrough,Passthrough AMR codec support.,))
 $(eval $(call Package/freeswitch/Module,amrwb,AMR wideband passthrough,Passthrough AMR wideband codec support.,))
-$(eval $(call Package/freeswitch/Module,av,AV,Video codec and format support via FFmpeg.,+libffmpeg-full @BROKEN @x86_64))
+$(eval $(call Package/freeswitch/Module,av,AV,Video codec and format support via FFmpeg.,+libffmpeg-full @x86_64))
 $(eval $(call Package/freeswitch/Module,avmd,Voicemail detection,This module attempts to determine when a voicemail system has answered\nthe call.,))
 $(eval $(call Package/freeswitch/Module,b64,Base64,Transfers data Base64 encoded.,))
 $(eval $(call Package/freeswitch/Module,basic,BASIC,BASIC module for FreeSWITCH.,))
@@ -950,7 +944,7 @@ $(eval $(call Package/freeswitch/Module,portaudio,Portaudio,Voice through a loca
 $(eval $(call Package/freeswitch/Module,portaudio_stream,Portaudio streaming,Stream from an external audio source for Music on Hold.,+portaudio))
 $(eval $(call Package/freeswitch/Module,posix_timer,POSIX timer,Add POSIX timer support.,))
 $(eval $(call Package/freeswitch/Module,prefix,Prefix match,This module provides a data store with fast lookups by the longest\nprefix match rule.,))
-$(eval $(call Package/freeswitch/Module,python3,Python3,Python3 support module.,@BROKEN +python3-light))
+$(eval $(call Package/freeswitch/Module,python3,Python3,Python3 support module.,+python3-light))
 $(eval $(call Package/freeswitch/Module,radius_cdr,Radius CDR,Radius Call Detail Record handler.,))
 $(eval $(call Package/freeswitch/Module,random,Entropy,This module extracts entropy from FreeSWITCH and feeds it into\n/dev/random.,))
 $(eval $(call Package/freeswitch/Module,raven,Raven logging,Adds support for logging to Raven instances.,))

diff --git a/net/freeswitch/patches/030-fix-configure-ac.patch b/net/freeswitch/patches/030-fix-configure-ac.patch
index 9dcae0ba8085d69c8fffe3ba4e4a62d808dec386..9ac3a02d975c9d98ccde617bbad0d19bec3721fa 100644 (file)
--- a/net/freeswitch/patches/030-fix-configure-ac.patch
+++ b/net/freeswitch/patches/030-fix-configure-ac.patch
@@ -40,7 +40,7 @@
  AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
  
  case $host in
-@@ -1663,13 +1639,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl
+@@ -1683,13 +1659,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl
  # -a "x$ac_cv_have_EXTERN_h" != "xno"
  
  if test "x$ac_cv_have_perl" != "xno"; then

diff --git a/net/freeswitch/patches/120-fix-copts.patch b/net/freeswitch/patches/120-fix-copts.patch
index b70405fe6557e80a8dfcd2824d9f022f76247568..e56ae64485872e6628a2181d121aa2241f25d598 100644 (file)
--- a/net/freeswitch/patches/120-fix-copts.patch
+++ b/net/freeswitch/patches/120-fix-copts.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2280,7 +2280,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
+@@ -2300,7 +2300,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
  AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
  AC_SUBST(AM_MAKEFLAGS)
  

diff --git a/net/freeswitch/patches/380-disable-luajit.patch b/net/freeswitch/patches/380-disable-luajit.patch
index f384b3a878669a01990e0c776044bf4aaf065271..37ecd16f5e60012dba4922c181bbb2eb653a7743 100644 (file)
--- a/net/freeswitch/patches/380-disable-luajit.patch
+++ b/net/freeswitch/patches/380-disable-luajit.patch
@@ -4,8 +4,8 @@
  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 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
+-for luaversion in luajit lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
++for luaversion in lua5.3 lua-5.3 lua53 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/patches/460-remove-python-configure-checks.patch b/net/freeswitch/patches/460-remove-python-configure-checks.patch
index 9c69ebce4f61d98ea51dfeb3ae61c80fbac8565f..1a577a526e17eadb983f36ec2aa038c17de47605 100644 (file)
--- a/net/freeswitch/patches/460-remove-python-configure-checks.patch
+++ b/net/freeswitch/patches/460-remove-python-configure-checks.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1856,36 +1856,24 @@ then
+@@ -1876,36 +1876,24 @@ then
                fi
                AC_MSG_RESULT([$PYTHON3_VER])
  

diff --git a/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch b/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch
index f5bcb6287a883e81b84b3fe1b47429d920dfabb3..395f7acd38a9032971a7a76b003a0e1ab649bc62 100644 (file)
--- a/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch
+++ b/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch
@@ -62,7 +62,7 @@ The most portable fix for time_t handling is to always cast it to
  #else
 --- a/src/mod/applications/mod_httapi/mod_httapi.c
 +++ b/src/mod/applications/mod_httapi/mod_httapi.c
-@@ -2744,7 +2744,7 @@ static switch_status_t write_meta_file(h
+@@ -2742,7 +2742,7 @@ static switch_status_t write_meta_file(h
  
                switch_snprintf(write_data, sizeof(write_data),
                                                "%" TIME_T_FMT ":%s",
@@ -73,7 +73,7 @@ The most portable fix for time_t handling is to always cast it to
  
 --- a/src/mod/endpoints/mod_sofia/sofia_presence.c
 +++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
-@@ -4200,7 +4200,8 @@ void sofia_presence_handle_sip_i_subscri
+@@ -4198,7 +4198,8 @@ void sofia_presence_handle_sip_i_subscri
                                sql = switch_mprintf("insert into sip_dialogs (sip_from_user,sip_from_host,call_info,call_info_state,hostname,expires,rcd,profile_name) "
                                                                         "values ('%q','%q','%q','seized','%q',%"TIME_T_FMT",%ld,'%q')",
                                                                         to_user, to_host, switch_str_nil(p), mod_sofia_globals.hostname,
@@ -85,7 +85,7 @@ The most portable fix for time_t handling is to always cast it to
                                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SEIZE SQL %s\n", sql);
 --- a/src/switch_channel.c
 +++ b/src/switch_channel.c
-@@ -4643,39 +4643,39 @@ SWITCH_DECLARE(switch_status_t) switch_c
+@@ -4662,39 +4662,39 @@ SWITCH_DECLARE(switch_status_t) switch_c
  
                tt_created = (time_t) (caller_profile->times->created / 1000000);
                mtt_created = (time_t) (caller_profile->times->created / 1000);
@@ -131,7 +131,7 @@ The most portable fix for time_t handling is to always cast it to
                switch_channel_set_variable(channel, "hold_accum_seconds", tmp);
                switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hold_accum);
                switch_channel_set_variable(channel, "hold_accum_usec", tmp);
-@@ -4683,28 +4683,28 @@ SWITCH_DECLARE(switch_status_t) switch_c
+@@ -4702,28 +4702,28 @@ SWITCH_DECLARE(switch_status_t) switch_c
                switch_channel_set_variable(channel, "hold_accum_ms", tmp);
  
                tt_resurrected = (time_t) (caller_profile->times->resurrected / 1000000);
@@ -166,7 +166,7 @@ The most portable fix for time_t handling is to always cast it to
                switch_channel_set_variable(channel, "end_uepoch", tmp);
 --- a/src/switch_ivr_originate.c
 +++ b/src/switch_ivr_originate.c
-@@ -797,7 +797,7 @@ static uint8_t check_channel_status(orig
+@@ -800,7 +800,7 @@ static uint8_t check_channel_status(orig
                                        time_t elapsed = switch_epoch_time_now(NULL) - start;
                                        oglobals->originate_status[i].per_channel_progress_timelimit_sec = elapsed + extend_timeout;
                                        oglobals->originate_status[i].per_channel_timelimit_sec = elapsed + extend_timeout;

diff --git a/net/freeswitch/patches/492-mod_verto_time64.patch b/net/freeswitch/patches/492-mod_verto_time64.patch
index 50ad5de3161ef10cdab3be9a14656c6088c60293..dfddff2aaa6fb50b1089f5b9bb352d36981e5491 100644 (file)
--- a/net/freeswitch/patches/492-mod_verto_time64.patch
+++ b/net/freeswitch/patches/492-mod_verto_time64.patch
@@ -1,6 +1,6 @@
 --- a/src/mod/endpoints/mod_verto/mod_verto.c
 +++ b/src/mod/endpoints/mod_verto/mod_verto.c
-@@ -1126,7 +1126,7 @@ static switch_bool_t check_auth(jsock_t
+@@ -1121,7 +1121,7 @@ static switch_bool_t check_auth(jsock_t
  
                                                if (tmp > now) {
                                                        jsock->exptime = tmp;
@@ -9,7 +9,7 @@
                                                } else {
                                                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid expire time for %s. Defaulting to 300 sec\n", jsock->uid);
                                                        jsock->exptime = now + 300;
-@@ -2008,7 +2008,7 @@ static void client_run(jsock_t *jsock)
+@@ -2003,7 +2003,7 @@ static void client_run(jsock_t *jsock)
  
                        if (now >= jsock->exptime) {
                                switch_set_flag(jsock, JPFLAG_AUTH_EXPIRED);

diff --git a/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch b/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch
index 2c9cf0c87d4c8549f25d2199e4717e86332310fb..effb550ae7228ed81a5d176e72bdd5a88c85ecee 100644 (file)
--- a/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch
+++ b/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch
@@ -12,7 +12,7 @@ Reported-by: Sebastian Kemper <sebastian_ml@gmx.net>
 
 --- a/src/switch_core_sqldb.c
 +++ b/src/switch_core_sqldb.c
-@@ -3549,7 +3549,7 @@ SWITCH_DECLARE(switch_status_t) switch_c
+@@ -3551,7 +3551,7 @@ SWITCH_DECLARE(switch_status_t) switch_c
        if (force) {
                sql = switch_mprintf("delete from registrations where hostname='%q'", switch_core_get_switchname());
        } else {

diff --git a/net/freeswitch/patches/500-libshout-deprecated.patch b/net/freeswitch/patches/500-libshout-deprecated.patch
deleted file mode 100644 (file)
index 4bc6209..0000000
--- a/net/freeswitch/patches/500-libshout-deprecated.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Prevent compile from failing due to mod-shout using deprecated libshout
-declarations.
-
----
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -373,8 +373,20 @@ if test "$ax_cv_c_compiler_vendor" = "gn
-         [ac_cv_gcc_supports_w_no_err_format_truncation=no])])
-   CFLAGS="$saved_CFLAGS"
-   AC_MSG_RESULT($ac_cv_gcc_supports_w_no_err_format_truncation)
-+
-+  saved_CFLAGS="$CFLAGS"
-+  AC_CACHE_CHECK([whether compiler supports -Wno-error=deprecated-declarations],
-+    [ac_cv_gcc_supports_w_no_err_deprecated_declarations], [
-+      CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
-+      AC_TRY_COMPILE([],[return 0;],
-+        [ac_cv_gcc_supports_w_no_err_deprecated_declarations=yes],
-+        [ac_cv_gcc_supports_w_no_err_deprecated_declarations=no])])
-+  CFLAGS="$saved_CFLAGS"
-+  AC_MSG_RESULT($ac_cv_gcc_supports_w_no_err_deprecated_declarations)
- fi
- 
-+AM_CONDITIONAL([W_NO_ERR_DEPRECATED_DECLARATIONS], [test x$ac_cv_gcc_supports_w_no_err_deprecated_declarations = xyes])
-+
- # tweak compiler specific flags
- if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
-     APR_ADDTO(SWITCH_AM_CFLAGS, -KPIC)
---- a/src/mod/formats/mod_shout/Makefile.am
-+++ b/src/mod/formats/mod_shout/Makefile.am
-@@ -12,6 +12,10 @@ mod_shout_la_CPPFLAGS = $(CURL_CFLAGS) $
- mod_shout_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
- mod_shout_la_LDFLAGS  = $(CURL_LIBS) -avoid-version -module -no-undefined -shared $(SHOUT_LIBS) $(MP3LAME_LIBS) $(MPG123_LIBS)
- 
-+if W_NO_ERR_DEPRECATED_DECLARATIONS
-+mod_shout_la_CFLAGS   += -Wno-error=deprecated-declarations
-+endif
-+
- else
- install: error
- all: error