ZRTP support removed as it was dropped upstream.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
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
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 <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
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 \
$(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") \
+++ /dev/null
---- 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 =============================="
else
CC_FOR_BUILD='$(CC)'
fi
-@@ -659,7 +635,7 @@ path_push_unique () {
+@@ -650,7 +626,7 @@ path_push_unique () {
fi
}
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
--- 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)
--- 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
--- a/configure.ac
+++ b/configure.ac
-@@ -709,7 +709,7 @@ PKG_CHECK_MODULES([MARIADB], [libmariadb
+@@ -700,7 +700,7 @@ PKG_CHECK_MODULES([MARIADB], [libmariadb
])
])
--- a/configure.ac
+++ b/configure.ac
-@@ -1865,36 +1865,24 @@ then
+@@ -1856,36 +1856,24 @@ then
fi
AC_MSG_RESULT([$PYTHON3_VER])
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);
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);
} 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);