Merge branch 'openwrt:master' into master

libs/libks/Makefile

@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libks
 
-PKG_VERSION:=1.8.0
+PKG_VERSION:=1.8.2
-PKG_RELEASE:=$(AUTORELEASE)
+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:=b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d
+PKG_HASH:=131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107
 
 PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1

libs/libks/patches/03-fix-flags.patch

@@ -5,7 +5,7 @@
  #include(cmake/cotire.cmake)
  
 +# Declare our project, libks
-+project(LibKS VERSION 1.8.0 LANGUAGES C CXX)
++project(LibKS VERSION 1.8.2 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.8.0 LANGUAGES C CXX)
+-project(LibKS VERSION 1.8.2 LANGUAGES C CXX)
 -message("LibKS Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 -
  # Set package version

libs/sofia-sip/Makefile

@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sofia-sip
 
-PKG_VERSION:=1.13.11
+PKG_VERSION:=1.13.14
 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:=aaebd6b480ab8fa56e02eea2d33272d8a8fc49257b1b94daa7033569f50acc6c
+PKG_HASH:=a517e31c6a406af3d7ec8cb0154e46ad12fbcb54dadfc3deada5d97bdbd9cc5a
 
 # sofia-sip adds a version to include path
 # need to update this when the version changes

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_DATE=2023-02-06
-PKG_SOURCE_VERSION:=e08c74db3f072db893c4d37de733f03c27bf7ed3
+PKG_SOURCE_VERSION:=67d2455efe02e7ff0d897f3fd5636fed4d54549e
 PKG_RELEASE:=1
-PKG_MIRROR_HASH:=4c2b29f71e130548a539cb86e47b34a5bda19896d96050868193e5aa86860db0
+PKG_MIRROR_HASH:=2bb858566fae644fc18a60092ac0224500cb8117c9ed106d6a7cf825fab98459
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

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

net/freeswitch/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freeswitch
-PKG_VERSION:=1.10.8
+PKG_VERSION:=1.10.9
-PKG_RELEASE:=$(AUTORELEASE)
+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:=1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f
+PKG_HASH:=f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063
 
 PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch
 
@@ -220,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 \
@@ -586,7 +585,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") \

net/freeswitch/patches/010-fix-zrtp-cflags.patch

@@ -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 =============================="

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
-@@ -1672,13 +1648,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl
+@@ -1663,13 +1639,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

net/freeswitch/patches/120-fix-copts.patch

@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2289,7 +2289,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
+@@ -2280,7 +2280,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
  AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
  AC_SUBST(AM_MAKEFLAGS)
  

net/freeswitch/patches/140-libvpx-cross.patch

@@ -1,8 +1,8 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -573,8 +573,15 @@ libs/libedit/src/.libs/libedit.a:
+@@ -557,8 +557,15 @@ src/include/switch_version.h: src/includ
- libs/libzrtp/libzrtp.a:
+ libs/libedit/src/.libs/libedit.a:
- 	cd libs/libzrtp && $(MAKE)
+ 	cd libs/libedit && $(MAKE)
  
 +# !!! OpenWrt was here !!!
 +# - added CROSS and set target to generic-gnu for cross-compile

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
    ])
  ])
  

net/freeswitch/patches/460-remove-python-configure-checks.patch

@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1865,36 +1865,24 @@ then
+@@ -1856,36 +1856,24 @@ then
  		fi
  		AC_MSG_RESULT([$PYTHON3_VER])
  

net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch

@@ -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
+@@ -4643,39 +4643,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
+@@ -4683,28 +4683,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);

net/freeswitch/patches/492-mod_verto_time64.patch

@@ -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)
+@@ -2008,7 +2008,7 @@ static void client_run(jsock_t *jsock)
  
  			if (now >= jsock->exptime) {
  				switch_set_flag(jsock, JPFLAG_AUTH_EXPIRED);