Merge pull request #828 from micmac1/fs-1.10.10-22.03

[22.03] freeswitch: bump to 1.10.10

26 files changed, 42 insertions, 412 deletions

diff --git a/libs/libks/Makefile b/libs/libks/Makefile
index 819aea7..b8e5c7d 100644
--- a/libs/libks/Makefile
+++ b/libs/libks/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libks
 
-PKG_VERSION:=1.7.0
+PKG_VERSION:=1.8.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/signalwire/libks/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=73c5751eadad4d3390d61b9765e9b860e0aba7336044ecf8b007dfc1818baa69
+PKG_HASH:=c677c36a0d8ceca2e53e07d1de66b87045ac2784df458d012557e2432692528b
 
 PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
diff --git a/libs/libks/patches/03-fix-flags.patch b/libs/libks/patches/03-fix-flags.patch
index 06166cc..e4a4bd9 100644
--- a/libs/libks/patches/03-fix-flags.patch
+++ b/libs/libks/patches/03-fix-flags.patch
@@ -5,7 +5,7 @@
  #include(cmake/cotire.cmake)
  
 +# Declare our project, libks
-+project(LibKS VERSION 1.7.0 LANGUAGES C CXX)
++project(LibKS VERSION 1.8.3 LANGUAGES C CXX)
 +message("LibKS Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 +
  # Load our common utility api and setup the platfomrm and build
@@ -16,7 +16,7 @@
  endif()
  
 -# Declare our project, libks
--project(LibKS VERSION 1.7.0 LANGUAGES C CXX)
+-project(LibKS VERSION 1.8.3 LANGUAGES C CXX)
 -message("LibKS Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 -
  # Set package version
diff --git a/libs/signalwire-client-c/Makefile b/libs/signalwire-client-c/Makefile
index d9ea0b8..5b055e2 100644
--- a/libs/signalwire-client-c/Makefile
+++ b/libs/signalwire-client-c/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=signalwire-client-c
 
-PKG_VERSION:=1.3.0
+PKG_VERSION:=1.3.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=signalwire-c-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/signalwire/signalwire-c/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=77bc7fbd8405283ef64ccbc22fba6687fc936ed76fafcc15e7e90290e2906884
+PKG_SOURCE_URL:=https://codeload.github.com/signalwire/signalwire-c/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=c4e065f471c822df9d08d3597102dd7033032e112561387b9d89b4f5adf698d7
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/signalwire-c-$(PKG_VERSION)
 
diff --git a/libs/sofia-sip/Makefile b/libs/sofia-sip/Makefile
index c087b2c..7e5e281 100644
--- a/libs/sofia-sip/Makefile
+++ b/libs/sofia-sip/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sofia-sip
 
-PKG_VERSION:=1.13.8
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=1.13.16
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/freeswitch/$(PKG_NAME)/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=792b99eb35e50d7abeb42e91a5dceaf28afc5be1a85ffb01995855792a747fec
+PKG_HASH:=125a9653bea1fc1cb275e4aec3445aa2deadf1fe3f1adffae9559d2349bfab36
 
 # sofia-sip adds a version to include path
 # need to update this when the version changes
diff --git a/libs/spandsp3/Makefile b/libs/spandsp3/Makefile
index 5bf6212..fa04b2f 100644
--- a/libs/spandsp3/Makefile
+++ b/libs/spandsp3/Makefile
@@ -11,10 +11,10 @@ PKG_NAME:=spandsp3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/freeswitch/spandsp.git
-PKG_SOURCE_DATE=2020-10-19
-PKG_SOURCE_VERSION:=e08c74db3f072db893c4d37de733f03c27bf7ed3
+PKG_SOURCE_DATE=2023-06-16
+PKG_SOURCE_VERSION:=0d2e6ac65e0e8f53d652665a743015a88bf048d4
 PKG_RELEASE:=1
-PKG_MIRROR_HASH:=4c2b29f71e130548a539cb86e47b34a5bda19896d96050868193e5aa86860db0
+PKG_MIRROR_HASH:=2d25c0f73f15aab37af7f09cf84f379b3fafb7c4d4e867ed1643dd3b3f594920
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
diff --git a/net/freeswitch/Config.in b/net/freeswitch/Config.in
index 0418e8c..52b1c06 100644
--- a/net/freeswitch/Config.in
+++ b/net/freeswitch/Config.in
@@ -46,13 +46,6 @@ config FS_WITH_VPX
 	help
 	  Compile with VPx video codec support
 
-config FS_WITH_ZRTP
-	bool "Compile with ZRTP support"
-	depends on aarch64||aarch64_be||arm||armeb||i386||mips||mips64||mips64el||mipsel||powerpc||powerpc64||powerpcle||sparc||x86_64
-	default y if x86_64
-	help
-	  Compile with ZRTP support.
-
 config FS_WITH_MODCONF
 	bool "Include module examples"
 	default y if x86_64
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 62896f4..c195e00 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freeswitch
-PKG_VERSION:=1.10.7
-PKG_RELEASE:=$(AUTORELEASE)
+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:=0919bddc2ea9cab2e4944314e71637bea9dd4f40d510722a74ea032104594c41
+PKG_HASH:=d2c702c7f4bd6eca539c3981cf859ad5c1846d9283829e24cd75686f2322b9df
 
 PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch
 
@@ -98,7 +98,6 @@ FS_MOD_AVAILABLE:= \
 	dialplan_asterisk \
 	dialplan_directory \
 	dialplan_xml \
-	dingaling \
 	directory \
 	distributor \
 	dptools \
@@ -198,7 +197,6 @@ FS_MOD_AVAILABLE:= \
 	tone_stream \
 	translate \
 	tts_commandline \
-	unimrcp \
 	valet_parking \
 	verto \
 	video_filter \
@@ -222,7 +220,6 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_FS_WITH_PNG \
 	CONFIG_FS_WITH_SRTP \
 	CONFIG_FS_WITH_VPX \
-	CONFIG_FS_WITH_ZRTP \
 	CONFIG_LIBC \
 	CONFIG_PACKAGE_freeswitch-misc-perl-esl \
 	CONFIG_PACKAGE_freeswitch-misc-python3-esl \
@@ -237,9 +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
 
-# 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=" \
@@ -585,7 +579,6 @@ CONFIGURE_ARGS+= \
 	$(call autoconf_bool,CONFIG_FS_WITH_ODBC,core-odbc-support) \
 	$(call autoconf_bool,CONFIG_FS_WITH_SRTP,srtp) \
 	$(call autoconf_bool,CONFIG_FS_WITH_VPX,libvpx) \
-	$(call autoconf_bool,CONFIG_FS_WITH_ZRTP,zrtp) \
 	$(if $(CONFIG_FS_WITH_FREETYPE),,--without-freetype) \
 	$(if $(CONFIG_FS_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)$(FS_LIB_DIR)") \
 	$(if $(CONFIG_FS_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \
@@ -658,7 +651,7 @@ endif
 ifneq ($(CONFIG_PACKAGE_freeswitch-misc-perl-esl)$(CONFIG_PACKAGE_freeswitch-mod-perl),)
 CONFIGURE_VARS+= \
 	PERL="$(STAGING_DIR_HOSTPKG)/usr/bin/perl$(PERL_VERSION)" \
-	PERL_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_GNU_SOURCE -I$(STAGING_DIR)$(PERL_SITELIB)/CORE" \
+	PERL_CFLAGS="-D_LARGEFILE_SOURCE $(if $(CONFIG_USE_MUSL),-D_LARGEFILE64_SOURCE) -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_GNU_SOURCE -I$(STAGING_DIR)$(PERL_SITELIB)/CORE" \
 	PERL_INC="-I$(STAGING_DIR)$(PERL_SITELIB)/CORE" \
 	PERL_LDFLAGS="-Wl,-rpath,$(PERL_SITELIB)/CORE -L$(STAGING_DIR)$(PERL_SITELIB)/CORE -lperl" \
 	PERL_LIBDIR="-L$(PERL_SITELIB)/CORE" \
@@ -728,21 +721,12 @@ ifneq ($(CONFIG_PACKAGE_freeswitch-mod-radius-cdr),)
 $(eval $(call Download/files,freeradius-client,$(FS_FREERADIUS_CLIENT_FILE),$(FS_LIBS_URL),$(FS_FREERADIUS_CLIENT_HASH)))
 endif
 
-# Need to update LDFLAGS for libs/unimrcp, otherwise it will try to link to a
-# different apr/apr-util if found.
-# FS_ANCHOR: string in build/acmacros/apr.m4 that will be replaced
-FS_ANCHOR:=dnl Get build information from APR
-FS_APR_LIBS:=-L$(PKG_BUILD_DIR)/libs/apr -L$(PKG_BUILD_DIR)/libs/apr-util
-
 define Build/Prepare
 	$(call Build/Prepare/Default)
 
 	echo '#applications/mod_random' >> $(PKG_BUILD_DIR)/modules.conf
 	echo '#codecs/mod_yuv' >> $(PKG_BUILD_DIR)/modules.conf
 	echo '#event_handlers/mod_event_test' >> $(PKG_BUILD_DIR)/modules.conf
-
-	$(SED) 's|$(FS_ANCHOR)|APR_SETVAR(LDFLAGS,[$(FS_APR_LIBS) $(TARGET_LDFLAGS)])|' \
-		$(PKG_BUILD_DIR)/libs/unimrcp/build/acmacros/apr.m4
 endef
 
 define Build/Configure
@@ -764,21 +748,9 @@ ifneq ($(CONFIG_PACKAGE_freeswitch-mod-gsmopen),)
 	$(call Package/freeswitch/enable/plugin,mod_spandsp)
 endif
 
-# Hack for mod_rayo - it has a build-time dep on mod_dingaling
-ifneq ($(CONFIG_PACKAGE_freeswitch-mod-rayo),)
-	$(call Package/freeswitch/enable/plugin,mod_dingaling)
-endif
-
-# Hack for mod_ssml - it has a build-time dep on mod_rayo. And mod_rayo needs
-# mod_dingaling :)
+# Hack for mod_ssml - it has a build-time dep on mod_rayo.
 ifneq ($(CONFIG_PACKAGE_freeswitch-mod-ssml),)
 	$(call Package/freeswitch/enable/plugin,mod_rayo)
-	$(call Package/freeswitch/enable/plugin,mod_dingaling)
-endif
-
-# Hack for mod_unimrcp - it has a build-time dep on mod_sofia
-ifneq ($(CONFIG_PACKAGE_freeswitch-mod-unimrcp),)
-	$(call Package/freeswitch/enable/plugin,mod_sofia)
 endif
 
 	$(call Build/Configure/Default)
@@ -897,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.,))
@@ -920,7 +892,6 @@ $(eval $(call Package/freeswitch/Module,db,DB,This module implements a simple db
 $(eval $(call Package/freeswitch/Module,dialplan_asterisk,Asterisk dialplan,Asterisk extensions.conf style dialplan parser.,))
 $(eval $(call Package/freeswitch/Module,dialplan_directory,Directory dialplan,Directory dialplan support.,))
 $(eval $(call Package/freeswitch/Module,dialplan_xml,XML dialplan,Standard FreeSWITCH XML dialplan support.,))
-$(eval $(call Package/freeswitch/Module,dingaling,Generic XMPP,Allows FreeSWITCH to be used as a client for XMPP Servers.,))
 $(eval $(call Package/freeswitch/Module,directory,Dial-by-name directory,This module implements a dial-by-name directory IVR.,))
 $(eval $(call Package/freeswitch/Module,distributor,Load distributor,This module implements a mechanism for performing load balancing.,))
 $(eval $(call Package/freeswitch/Module,dptools,Dialplan tools,This module implements basic dialplan tools.,))
@@ -1020,7 +991,6 @@ $(eval $(call Package/freeswitch/Module,theora,Theora passthrough,Theora video c
 $(eval $(call Package/freeswitch/Module,tone_stream,Tone stream,Tone generation stream.,))
 $(eval $(call Package/freeswitch/Module,translate,Number translation,This module implements number translation.,))
 $(eval $(call Package/freeswitch/Module,tts_commandline,TTS command-line,Run a command-line and play the output file.,))
-$(eval $(call Package/freeswitch/Module,unimrcp,UniMRCP,Allows communication with Media Resource Control Protocol servers.,))
 $(eval $(call Package/freeswitch/Module,valet_parking,Valet parking,This module implements the valet call parking strategy.,))
 $(eval $(call Package/freeswitch/Module,verto,Verto,Verto signaling protocol.,+libks))
 $(eval $(call Package/freeswitch/Module,video_filter,Video filter chromakey,This module provides a media bug for chromakey functionality.,))
diff --git a/net/freeswitch/files/freeswitch.init b/net/freeswitch/files/freeswitch.init
index c390b9f..f2b0c9c 100644
--- a/net/freeswitch/files/freeswitch.init
+++ b/net/freeswitch/files/freeswitch.init
@@ -26,7 +26,7 @@ start_service() {
   config_get_bool enabled general enabled 0
   if [ $enabled -eq 0 ]; then
     $LOG_ERR service not enabled in /etc/config/$NAME
-    exit 1
+    return 1
   fi
 
   config_get_bool log_stderr general log_stderr 1
@@ -46,7 +46,7 @@ start_service() {
     $LOG_INFO using procd\'s default term_timeout
   elif ! [ 0 -lt "$term_timeout" ] 2>/dev/null; then
     $LOG_ERR invalid term_timeout in /etc/config/$NAME
-    exit 1
+    return 1
   fi
 
   for i in "$dir_localstate" "$dir_run"; do
diff --git a/net/freeswitch/patches/010-fix-zrtp-cflags.patch b/net/freeswitch/patches/010-fix-zrtp-cflags.patch
deleted file mode 100644
index 00b959f..0000000
--- a/net/freeswitch/patches/010-fix-zrtp-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libs/libzrtp/configure.ac
-+++ b/libs/libzrtp/configure.ac
-@@ -34,7 +34,7 @@ esac
- AM_INIT_AUTOMAKE
- AX_PREFIX_CONFIG_H(include/zrtp_config_unix.h,ZRTP,config/config.h)
- 
--CFLAGS="$CFLAGS -std=c99 -O2 -g3 -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -fPIC -DZRTP_AUTOMAKE=1"
-+CFLAGS="$CFLAGS -std=c99 -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -fPIC -DZRTP_AUTOMAKE=1"
- 
- # Configuring external libraries
- echo "========================= configuring bnlib =============================="
diff --git a/net/freeswitch/patches/030-fix-configure-ac.patch b/net/freeswitch/patches/030-fix-configure-ac.patch
index 09782c2..9ac3a02 100644
--- a/net/freeswitch/patches/030-fix-configure-ac.patch
+++ b/net/freeswitch/patches/030-fix-configure-ac.patch
@@ -31,7 +31,7 @@
  else
      CC_FOR_BUILD='$(CC)'
  fi
-@@ -659,7 +635,7 @@ path_push_unique () {
+@@ -650,7 +626,7 @@ path_push_unique () {
    fi
  }
  
@@ -40,7 +40,7 @@
  AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
  
  case $host in
-@@ -1660,13 +1636,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/040-gcc11.patch b/net/freeswitch/patches/040-gcc11.patch
deleted file mode 100644
index bd8e639..0000000
--- a/net/freeswitch/patches/040-gcc11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/src/include/switch_core_media.h
-+++ b/src/include/switch_core_media.h
-@@ -203,7 +203,7 @@ SWITCH_DECLARE(switch_status_t) switch_c
- SWITCH_DECLARE(void) switch_media_handle_set_media_flag(switch_media_handle_t *smh, switch_core_media_flag_t flag);
- SWITCH_DECLARE(void) switch_media_handle_clear_media_flag(switch_media_handle_t *smh, switch_core_media_flag_t flag);
- SWITCH_DECLARE(int32_t) switch_media_handle_test_media_flag(switch_media_handle_t *smh, switch_core_media_flag_t flag);
--SWITCH_DECLARE(void) switch_media_handle_set_media_flags(switch_media_handle_t *smh, switch_core_media_flag_t flags[]);
-+SWITCH_DECLARE(void) switch_media_handle_set_media_flags(switch_media_handle_t *smh, switch_core_media_flag_t flags[SCMF_MAX]);
- SWITCH_DECLARE(void) switch_core_session_check_outgoing_crypto(switch_core_session_t *session);
- SWITCH_DECLARE(const char *) switch_core_session_local_crypto_key(switch_core_session_t *session, switch_media_type_t type);
- SWITCH_DECLARE(int) switch_core_session_check_incoming_crypto(switch_core_session_t *session,
---- a/src/include/switch_rtp.h
-+++ b/src/include/switch_rtp.h
-@@ -234,7 +234,7 @@ SWITCH_DECLARE(switch_status_t) switch_r
- 												  switch_payload_t payload,
- 												  uint32_t samples_per_interval,
- 												  uint32_t ms_per_packet,
--												  switch_rtp_flag_t flags[], char *timer_name, const char **err, switch_memory_pool_t *pool);
-+												  switch_rtp_flag_t flags[SWITCH_RTP_FLAG_INVALID], char *timer_name, const char **err, switch_memory_pool_t *pool);
- 
- 
- /*!
-@@ -260,7 +260,7 @@ SWITCH_DECLARE(switch_rtp_t *) switch_rt
- 											  switch_payload_t payload,
- 											  uint32_t samples_per_interval,
- 											  uint32_t ms_per_packet,
--											  switch_rtp_flag_t flags[], char *timer_name, const char **err, switch_memory_pool_t *pool, switch_port_t bundle_internal_ports, switch_port_t bundle_external_port);
-+											  switch_rtp_flag_t flags[SWITCH_RTP_FLAG_INVALID], char *timer_name, const char **err, switch_memory_pool_t *pool, switch_port_t bundle_internal_ports, switch_port_t bundle_external_port);
- 
- 
- /*!
diff --git a/net/freeswitch/patches/110-apr-add-cache-for-strerror_r.patch b/net/freeswitch/patches/110-apr-add-cache-for-strerror_r.patch
index 2b86010..2aa7f93 100644
--- a/net/freeswitch/patches/110-apr-add-cache-for-strerror_r.patch
+++ b/net/freeswitch/patches/110-apr-add-cache-for-strerror_r.patch
@@ -1,33 +1,3 @@
---- a/libs/apr-util/build/apr_common.m4
-+++ b/libs/apr-util/build/apr_common.m4
-@@ -514,8 +514,9 @@ dnl  string.
- dnl
- dnl
- AC_DEFUN([APR_CHECK_STRERROR_R_RC],[
--AC_MSG_CHECKING(for type of return code from strerror_r)
--AC_TRY_RUN([
-+AC_CACHE_CHECK([whether return code from strerror_r has type int],
-+[ac_cv_strerror_r_rc_int],
-+[AC_TRY_RUN([
- #include <errno.h>
- #include <string.h>
- #include <stdio.h>
-@@ -534,14 +535,10 @@ int main(void)
- }], [
-     ac_cv_strerror_r_rc_int=yes ], [
-     ac_cv_strerror_r_rc_int=no ], [
--    ac_cv_strerror_r_rc_int=no ] )
-+    ac_cv_strerror_r_rc_int=no ] ) ] )
- if test "x$ac_cv_strerror_r_rc_int" = xyes; then
-   AC_DEFINE(STRERROR_R_RC_INT, 1, [Define if strerror returns int])
--  msg="int"
--else
--  msg="pointer"
- fi
--AC_MSG_RESULT([$msg])
- ] )
- 
- dnl
 --- a/libs/apr/build/apr_common.m4
 +++ b/libs/apr/build/apr_common.m4
 @@ -514,8 +514,9 @@ dnl  string.
@@ -58,33 +28,3 @@
  ] )
  
  dnl
---- a/libs/unimrcp/build/acmacros/apr_common.m4
-+++ b/libs/unimrcp/build/acmacros/apr_common.m4
-@@ -526,8 +526,9 @@ dnl  string.
- dnl
- dnl
- AC_DEFUN([APR_CHECK_STRERROR_R_RC], [
--AC_MSG_CHECKING(for type of return code from strerror_r)
--AC_TRY_RUN([
-+AC_CACHE_CHECK([whether return code from strerror_r has type int],
-+[ac_cv_strerror_r_rc_int],
-+[AC_TRY_RUN([
- #include <errno.h>
- #include <string.h>
- #include <stdio.h>
-@@ -543,14 +544,10 @@ main()
- }], [
-     ac_cv_strerror_r_rc_int=yes ], [
-     ac_cv_strerror_r_rc_int=no ], [
--    ac_cv_strerror_r_rc_int=no ] )
-+    ac_cv_strerror_r_rc_int=no ] ) ] )
- if test "x$ac_cv_strerror_r_rc_int" = xyes; then
-   AC_DEFINE(STRERROR_R_RC_INT, 1, [Define if strerror returns int])
--  msg="int"
--else
--  msg="pointer"
- fi
--AC_MSG_RESULT([$msg])
- ] )
- 
- dnl
diff --git a/net/freeswitch/patches/120-fix-copts.patch b/net/freeswitch/patches/120-fix-copts.patch
index 29fd4b5..e56ae64 100644
--- 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
-@@ -2263,7 +2263,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)
  
@@ -14,22 +14,6 @@
  
  #	--prefix='$prefix' --exec_prefix='$exec_prefix' --libdir='$libdir' --libexecdir='$libexecdir' --bindir='$bindir' --sbindir='$sbindir' \
  #	--localstatedir='$localstatedir' --datadir='$datadir'"
---- a/libs/apr-util/configure.ac
-+++ b/libs/apr-util/configure.ac
-@@ -20,9 +20,10 @@ dnl Generate ./config.nice for reproduci
- dnl 
- APR_CONFIG_NICE(config.nice)
- 
--CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
--CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
--LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
-+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
-+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
-+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
-+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
- 
- dnl # Some initial steps for configuration.  We setup the default directory
- dnl # and which files are to be configured.
 --- a/libs/apr/configure.ac
 +++ b/libs/apr/configure.ac
 @@ -20,9 +20,10 @@ sinclude(build/apr_hints.m4)
@@ -44,7 +28,7 @@
 +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
 +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
  
- dnl Hard-coded inclusion at the tail end of apr_private.h:
+ dnl Hard-coded inclusion at the tail end of fspr_private.h:
  AH_BOTTOM([
 --- a/libs/iksemel/configure.ac
 +++ b/libs/iksemel/configure.ac
@@ -64,24 +48,6 @@
  
  AC_CANONICAL_HOST
  
---- a/libs/libdingaling/configure.ac
-+++ b/libs/libdingaling/configure.ac
-@@ -8,9 +8,12 @@ AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR([src])
- AC_CONFIG_HEADERS([src/config.h])
- 
--CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
--CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
--LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
-+m4_include(../apr/build/apr_common.m4)
-+
-+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
-+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
-+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
-+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
- 
- #Set default language
- AC_LANG_C
 --- a/libs/srtp/configure.ac
 +++ b/libs/srtp/configure.ac
 @@ -3,9 +3,12 @@ AC_INIT(srtp, 2.4.0, mcgrew@cisco.com)
diff --git a/net/freeswitch/patches/140-libvpx-cross.patch b/net/freeswitch/patches/140-libvpx-cross.patch
index 9cf1c3f..6c7a4a9 100644
--- a/net/freeswitch/patches/140-libvpx-cross.patch
+++ b/net/freeswitch/patches/140-libvpx-cross.patch
@@ -1,8 +1,8 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -585,8 +585,15 @@ libs/libedit/src/.libs/libedit.a:
- libs/libzrtp/libzrtp.a:
- 	cd libs/libzrtp && $(MAKE)
+@@ -557,8 +557,15 @@ src/include/switch_version.h: src/includ
+ libs/libedit/src/.libs/libedit.a:
+ 	cd libs/libedit && $(MAKE)
  
 +# !!! OpenWrt was here !!!
 +# - added CROSS and set target to generic-gnu for cross-compile
diff --git a/net/freeswitch/patches/200-mod_verto-fix-copts.patch b/net/freeswitch/patches/200-mod_verto-fix-copts.patch
index bb8f48d..44549ec 100644
--- a/net/freeswitch/patches/200-mod_verto-fix-copts.patch
+++ b/net/freeswitch/patches/200-mod_verto-fix-copts.patch
@@ -1,13 +1,13 @@
 --- a/src/mod/endpoints/mod_verto/Makefile.am
 +++ b/src/mod/endpoints/mod_verto/Makefile.am
-@@ -12,8 +12,8 @@ if HAVE_PERL
+@@ -13,8 +13,8 @@ if HAVE_PERL
  #perldir = $(PERL_SITEDIR)
  noinst_LTLIBRARIES = MCAST.la
  MCAST_la_SOURCES   = mcast/mcast_wrap.cpp mcast/perlxsi.c mcast/mcast.c mcast/mcast_cpp.cpp
 -MCAST_la_CFLAGS    = $(CC_CFLAGS) $(CFLAGS) $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
 -MCAST_la_CXXFLAGS  = $(SWITCH_AM_CXXFLAGS) $(CXXFLAGS) -w $(PERL_INC)
 +MCAST_la_CFLAGS    = $(CC_CFLAGS) $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
-+MCAST_la_CXXFLAGS  = $(SWITCH_AM_CXXFLAGS) -w $(PERL_INC)
++MCAST_la_CXXFLAGS  = $(SWITCH_AM_CXXFLAGS) $(PERL_CFLAGS) -w $(PERL_INC)
  MCAST_la_CPPFLAGS  = -I$(switch_srcdir)/src/mod/endpoints/mod_verto/mcast
  MCAST_la_LDFLAGS   = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS)
  
diff --git a/net/freeswitch/patches/210-esl-perl-fix-copts.patch b/net/freeswitch/patches/210-esl-perl-fix-copts.patch
index d9f71d8..4b03ea3 100644
--- a/net/freeswitch/patches/210-esl-perl-fix-copts.patch
+++ b/net/freeswitch/patches/210-esl-perl-fix-copts.patch
@@ -7,7 +7,7 @@
 -ESL_la_CFLAGS    = $(CC_CFLAGS) $(CFLAGS) -I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
 -ESL_la_CXXFLAGS  = -I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS) $(CXXFLAGS) -w $(PERL_INC)
 +ESL_la_CFLAGS    = $(CC_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
-+ESL_la_CXXFLAGS  = -I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS) -w $(PERL_INC)
++ESL_la_CXXFLAGS  = -I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS) $(PERL_CFLAGS) -w $(PERL_INC)
  ESL_la_LDFLAGS   = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS)
  ESL_la_LIBADD    = ../libesl.la
  
diff --git a/net/freeswitch/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch b/net/freeswitch/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch
index 245e327..403e87b 100644
--- a/net/freeswitch/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch
+++ b/net/freeswitch/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch
@@ -1,28 +1,3 @@
---- a/libs/apr-util/build/apr_common.m4
-+++ b/libs/apr-util/build/apr_common.m4
-@@ -493,13 +493,15 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
-  if test "$ac_cv_prog_gcc" = "yes"; then 
-    CFLAGS="$CFLAGS -Werror"
-  fi
-- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
--  [#include "confdefs.h"
--  ]
--  [[$1]]
--  [int main(int argc, const char *const *argv) {]
--  [[$2]]
--  [   return 0; }]])],
-+ AC_COMPILE_IFELSE(
-+  [AC_LANG_SOURCE(
-+   [#include "confdefs.h"
-+   ]
-+   [[$1]]
-+   [int main(int argc, const char *const *argv) {]
-+   [[$2]]
-+   [   return 0; }]
-+  )],
-   [$3], [$4])
-  CFLAGS=$apr_save_CFLAGS
- ])
 --- a/libs/apr/build/apr_common.m4
 +++ b/libs/apr/build/apr_common.m4
 @@ -493,13 +493,15 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
diff --git a/net/freeswitch/patches/380-disable-luajit.patch b/net/freeswitch/patches/380-disable-luajit.patch
index f384b3a..37ecd16 100644
--- 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/390-spandsp3-pkg-config.patch b/net/freeswitch/patches/390-spandsp3-pkg-config.patch
index 2ce2ed4..5cb61d4 100644
--- a/net/freeswitch/patches/390-spandsp3-pkg-config.patch
+++ b/net/freeswitch/patches/390-spandsp3-pkg-config.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -709,7 +709,7 @@ PKG_CHECK_MODULES([MARIADB], [libmariadb
+@@ -700,7 +700,7 @@ PKG_CHECK_MODULES([MARIADB], [libmariadb
    ])
  ])
  
diff --git a/net/freeswitch/patches/420-switch_rtp-report-undeclared.patch b/net/freeswitch/patches/420-switch_rtp-report-undeclared.patch
deleted file mode 100644
index bf6a868..0000000
--- a/net/freeswitch/patches/420-switch_rtp-report-undeclared.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/switch_rtp.c
-+++ b/src/switch_rtp.c
-@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switc
- 				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value);
- 				snprintf(header, sizeof(header), "Source-Lost");
- #if SWITCH_BYTE_ORDER == __BIG_ENDIAN
--				tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */
-+				tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */
- #else
- 				tmpLost = ntohl(rtcp_report_block->lost)>>8;
- 				tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */
diff --git a/net/freeswitch/patches/430-mod_opusfile-format-error.patch b/net/freeswitch/patches/430-mod_opusfile-format-error.patch
deleted file mode 100644
index c2a60ef..0000000
--- a/net/freeswitch/patches/430-mod_opusfile-format-error.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/mod/formats/mod_opusfile/mod_opusfile.c
-+++ b/src/mod/formats/mod_opusfile/mod_opusfile.c
-@@ -930,7 +930,7 @@ static int decode_stream_cb(void *dconte
- 	if (globals.debug) {
- 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[OGG/OPUS Stream Decode] decode CB called: context: %p data: %p packet_len: %d\n", 
- 				(void *)context, data, nbytes);
--		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[OGG/OPUS Stream Decode] decode_stream_cb(): switch_thread_self(): %lx\n",  switch_thread_self());
-+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[OGG/OPUS Stream Decode] decode_stream_cb(): switch_thread_self(): %lx\n", (unsigned long)(intptr_t)switch_thread_self());
- 	}
- 
- 	switch_mutex_lock(context->ogg_mutex);
-@@ -973,7 +973,7 @@ static void *SWITCH_THREAD_FUNC read_str
- 	int buffered_ogg_bytes;
- 
- 	if (globals.debug) {
--		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[OGG/OPUS Stream Decode] read_stream_thread(): switch_thread_self(): 0x%lx\n",  switch_thread_self());
-+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[OGG/OPUS Stream Decode] read_stream_thread(): switch_thread_self(): 0x%lx\n", (unsigned long)(intptr_t)switch_thread_self());
- 	}
- 	switch_thread_rwlock_rdlock(context->rwlock);
- 	switch_mutex_lock(context->ogg_mutex);
diff --git a/net/freeswitch/patches/450-mod_pgsql-Add-support-for-postgresql-14.patch b/net/freeswitch/patches/450-mod_pgsql-Add-support-for-postgresql-14.patch
deleted file mode 100644
index 543e7f1..0000000
--- a/net/freeswitch/patches/450-mod_pgsql-Add-support-for-postgresql-14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9f26a15220b8b8b09c4debe41fe395d25d4cfeec Mon Sep 17 00:00:00 2001
-From: shaunjstokes <shaun@sysconfig.cloud>
-Date: Tue, 26 Oct 2021 18:25:14 +0200
-Subject: [PATCH] [mod_pgsql] Add support for postgresql 14
-
----
- src/mod/databases/mod_pgsql/mod_pgsql.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/src/mod/databases/mod_pgsql/mod_pgsql.c
-+++ b/src/mod/databases/mod_pgsql/mod_pgsql.c
-@@ -774,6 +774,11 @@ switch_status_t pgsql_next_result_timed(
- 		case PGRES_COPY_IN:
- 		case PGRES_COMMAND_OK:
- 			break;
-+#if POSTGRESQL_MAJOR_VERSION >= 14
-+		case PGRES_PIPELINE_ABORTED:
-+		case PGRES_PIPELINE_SYNC:
-+			break;
-+#endif
- 		case PGRES_EMPTY_QUERY:
- 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Query (%s) returned PGRES_EMPTY_QUERY\n", handle->sql);
- 		case PGRES_BAD_RESPONSE:
diff --git a/net/freeswitch/patches/460-remove-python-configure-checks.patch b/net/freeswitch/patches/460-remove-python-configure-checks.patch
index 79f8e26..1a577a5 100644
--- 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
-@@ -1853,36 +1853,24 @@ then
+@@ -1876,36 +1876,24 @@ then
  		fi
  		AC_MSG_RESULT([$PYTHON3_VER])
  
diff --git a/net/freeswitch/patches/480-fix-libyuv-dependency.patch b/net/freeswitch/patches/480-fix-libyuv-dependency.patch
deleted file mode 100644
index 0dbc19e..0000000
--- a/net/freeswitch/patches/480-fix-libyuv-dependency.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-commit a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071
-Author: Sebastian Kemper <sebastian_ml@gmx.net>
-Date:   Mon Nov 1 09:59:09 2021 +0100
-
-    [core] fix "--disable-libyuv"
-    
-    Recent changes made it impossible to compile freeswitch without libyuv
-    support.
-    
-    src/switch_core_video.c: In function 'switch_img_read_from_file':
-    src/switch_core_video.c:3139:4: error: implicit declaration of function 'RAWToI420' [-Werror=implicit-function-declaration]
-    RAWToI420(data, width * 3,
-    ^
-    src/switch_core_video.c:3148:4: error: implicit declaration of function 'ABGRToARGB' [-Werror=implicit-function-declaration]
-    ABGRToARGB(data, width * 4, img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], width, height);
-    ^
-    
-    Fix this my adding/moving the checks for "SWITCH_HAVE_YUV".
-    
-    Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
-
---- a/src/switch_core_video.c
-+++ b/src/switch_core_video.c
-@@ -3116,6 +3116,7 @@ SWITCH_DECLARE(switch_status_t) switch_i
- 
- SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name, switch_img_fmt_t img_fmt)
- {
-+#ifdef SWITCH_HAVE_YUV
- 	int width = 0, height = 0, channels = 0;
- 	int comp = STBI_rgb;
- 	unsigned char *data = NULL;
-@@ -3155,12 +3156,16 @@ SWITCH_DECLARE(switch_image_t *) switch_
- 	} else if (data) {
- 		stbi_image_free(data);
- 	}
-+#endif
- 
- 	return NULL;
- }
- 
- SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, const char* file_name, int quality)
- {
-+#ifndef SWITCH_HAVE_YUV
-+	return SWITCH_STATUS_FALSE;
-+#else
- 	int comp = STBI_rgb;
- 	unsigned char *data = NULL;
- 	const char *ext = strrchr(file_name, '.');
-@@ -3217,6 +3222,7 @@ SWITCH_DECLARE(switch_status_t) switch_i
- 	free(data);
- 
- 	return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
-+#endif
- }
- 
- typedef struct data_url_context_s {
-@@ -3224,14 +3230,19 @@ typedef struct data_url_context_s {
- 	char **urlP;
- } data_url_context_t;
- 
-+#ifdef SWITCH_HAVE_YUV
- static void data_url_write_func(void *context, void *data, int size)
- {
- 	switch_buffer_t *buffer = (switch_buffer_t *)context;
- 	switch_buffer_write(buffer, data, size);
- }
-+#endif
- 
- SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char **urlP, const char *type, int quality)
- {
-+#ifndef SWITCH_HAVE_YUV
-+	return SWITCH_STATUS_FALSE;
-+#else
- 	int comp = STBI_rgb;
- 	unsigned char *data = NULL;
- 	int stride_in_bytes = 0;
-@@ -3300,6 +3311,7 @@ SWITCH_DECLARE(switch_status_t) switch_i
- 	switch_buffer_destroy(&buffer);
- 
- 	return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
-+#endif /* SWITCH_HAVE_YUV */
- }
- 
- 
---- a/tests/unit/switch_core_video.c
-+++ b/tests/unit/switch_core_video.c
-@@ -48,6 +48,7 @@ FST_CORE_BEGIN("./conf")
- 		}
- 		FST_TEARDOWN_END()
- 
-+#ifdef SWITCH_HAVE_YUV
- 		FST_TEST_BEGIN(data_url_test)
- 		{
- 			char *data_url = NULL;
-@@ -88,6 +89,7 @@ FST_CORE_BEGIN("./conf")
- 			unlink(argb_filename);
- 		}
- 		FST_TEST_END()
-+#endif /* SWITCH_HAVE_YUV */
- 
- 		FST_TEST_BEGIN(img_patch)
- 		{
-@@ -239,6 +241,7 @@ FST_CORE_BEGIN("./conf")
- 		}
- 		FST_TEST_END()
- 
-+#ifdef SWITCH_HAVE_YUV
- 		FST_TEST_BEGIN(stb_data_url)
- 		{
- 			switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 120, 60, 1);
-@@ -321,6 +324,7 @@ FST_CORE_BEGIN("./conf")
- 			unlink(jpg_write_filename);
- 		}
- 		FST_TEST_END()
-+#endif /* SWITCH_HAVE_YUV */
- 	}
- 	FST_SUITE_END()
- }
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 4e272f1..395f7ac 100644
--- 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
-@@ -2745,7 +2745,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
-@@ -4700,39 +4700,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);
-@@ -4740,28 +4740,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 c0085aa..dfddff2 100644
--- 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;
-@@ -2000,7 +2000,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);