From 269b6110274408e837bdd0972167981d2af1905c Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 2 Mar 2023 20:11:57 +0100 Subject: [PATCH] freeswitch: bump to 1.10.9 ZRTP support removed as it was dropped upstream. Signed-off-by: Sebastian Kemper --- net/freeswitch/Config.in | 7 ------- net/freeswitch/Makefile | 8 +++----- net/freeswitch/patches/010-fix-zrtp-cflags.patch | 11 ----------- net/freeswitch/patches/030-fix-configure-ac.patch | 4 ++-- net/freeswitch/patches/120-fix-copts.patch | 2 +- net/freeswitch/patches/140-libvpx-cross.patch | 6 +++--- net/freeswitch/patches/390-spandsp3-pkg-config.patch | 2 +- .../patches/460-remove-python-configure-checks.patch | 2 +- .../490-build-properly-fix-time_t-issues.patch | 4 ++-- net/freeswitch/patches/492-mod_verto_time64.patch | 2 +- 10 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 net/freeswitch/patches/010-fix-zrtp-cflags.patch 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 ceb048f..5c542b5 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeswitch -PKG_VERSION:=1.10.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.10.9 +PKG_RELEASE:=1 PKG_MAINTAINER:=Sebastian Kemper 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") \ 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 7d2ec46..9dcae0b 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 -@@ -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 diff --git a/net/freeswitch/patches/120-fix-copts.patch b/net/freeswitch/patches/120-fix-copts.patch index c3b48f0..b70405f 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 -@@ -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) diff --git a/net/freeswitch/patches/140-libvpx-cross.patch b/net/freeswitch/patches/140-libvpx-cross.patch index 47d6d67..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 -@@ -573,8 +573,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/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/460-remove-python-configure-checks.patch b/net/freeswitch/patches/460-remove-python-configure-checks.patch index f841b79..9c69ebc 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 -@@ -1865,36 +1865,24 @@ then +@@ -1856,36 +1856,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 5da9275..f5bcb62 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 @@ -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); diff --git a/net/freeswitch/patches/492-mod_verto_time64.patch b/net/freeswitch/patches/492-mod_verto_time64.patch index c0085aa..50ad5de 100644 --- a/net/freeswitch/patches/492-mod_verto_time64.patch +++ b/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); -- 2.30.2