From 625b2c81a03d13b547dd79b82bd57ee9dba0b4ec Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Wed, 1 Jan 2020 15:11:19 +0100 Subject: [PATCH] freeswitch-stable: bump to 1.10.2 Patches refreshed, two patches removed (included upstream), fixed one typo (will send pull request to upstream if nobody did so yet). Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 6 ++-- .../patches/020-fix-fs_cli-typo.patch | 27 ---------------- .../patches/030-fix-configure-ac.patch | 4 +-- .../patches/120-fix-copts.patch | 2 +- .../patches/140-libvpx-cross.patch | 8 +++-- ...x-memory-leak-in-mod_event_multicast.patch | 32 ------------------- .../patches/390-t38-reinvite-488-fix.patch | 2 +- .../410-fix-typo-in-switch_xml_h.patch | 11 +++++++ 8 files changed, 23 insertions(+), 69 deletions(-) delete mode 100644 net/freeswitch-stable/patches/020-fix-fs_cli-typo.patch delete mode 100644 net/freeswitch-stable/patches/300-fix-memory-leak-in-mod_event_multicast.patch create mode 100644 net/freeswitch-stable/patches/410-fix-typo-in-switch_xml_h.patch diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index 21349b2..3ced657 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PRG_NAME:=freeswitch PKG_NAME:=$(PRG_NAME)-stable -PKG_VERSION:=1.10.1 -PKG_RELEASE:=4 +PKG_VERSION:=1.10.2 +PKG_RELEASE:=1 PKG_MAINTAINER:=Sebastian Kemper PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).-release.tar.xz PKG_SOURCE_URL:=https://files.$(PRG_NAME).org/releases/$(PRG_NAME) -PKG_HASH:=360c867103c5f529a3724a46cf86da9b9acd8443b6793eb7f88fba0ace72001d +PKG_HASH:=1fd46dee82ecc52ac90ebab6bd454e34c64950fae7d6dc0589c8daa14bfc7d34 PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch diff --git a/net/freeswitch-stable/patches/020-fix-fs_cli-typo.patch b/net/freeswitch-stable/patches/020-fix-fs_cli-typo.patch deleted file mode 100644 index ed56433..0000000 --- a/net/freeswitch-stable/patches/020-fix-fs_cli-typo.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit f76230b16ed6e28847a00e1fa4edd46d19a52251 -Author: Sebastian Kemper -Date: Thu Aug 2 23:38:43 2018 +0200 - - FS-11309: [fs_cli] fix typo - - Commit bc3e1c9e7de1855eec454bba467fd2586e5e251b introduced a typo that - results in EL_REFRESH never being used, even if available. This can - cause the screen to garble. - - This fixes the typo. - - Signed-off-by: Sebastian Kemper - -diff --git a/libs/esl/fs_cli.c b/libs/esl/fs_cli.c -index b4a5838175..d52422dd4c 100644 ---- a/libs/esl/fs_cli.c -+++ b/libs/esl/fs_cli.c -@@ -674,7 +674,7 @@ static void redisplay(void) - esl_mutex_lock(MUTEX); - { - #ifdef HAVE_LIBEDIT --#ifdef XHAVE_DECL_EL_REFRESH -+#ifdef HAVE_DECL_EL_REFRESH - #ifdef HAVE_EL_WSET - /* Current libedit versions don't implement EL_REFRESH in eln.c so - * use the wide version instead. */ diff --git a/net/freeswitch-stable/patches/030-fix-configure-ac.patch b/net/freeswitch-stable/patches/030-fix-configure-ac.patch index 23c5094..cea47f0 100644 --- a/net/freeswitch-stable/patches/030-fix-configure-ac.patch +++ b/net/freeswitch-stable/patches/030-fix-configure-ac.patch @@ -40,7 +40,7 @@ AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) case $host in -@@ -1620,13 +1596,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl +@@ -1623,13 +1599,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 @@ -55,7 +55,7 @@ save_CFLAGS="$CFLAGS" CFLAGS="$PERL_CFLAGS" -@@ -1721,24 +1691,12 @@ then +@@ -1724,24 +1694,12 @@ then if test "$python_has_distutils" != "no" ; then AC_MSG_CHECKING([location of site-packages]) diff --git a/net/freeswitch-stable/patches/120-fix-copts.patch b/net/freeswitch-stable/patches/120-fix-copts.patch index 6381f90..09c800a 100644 --- a/net/freeswitch-stable/patches/120-fix-copts.patch +++ b/net/freeswitch-stable/patches/120-fix-copts.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2038,7 +2038,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) +@@ -2041,7 +2041,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) AC_SUBST(OUR_DISABLED_UNINSTALL_MODS) AC_SUBST(AM_MAKEFLAGS) diff --git a/net/freeswitch-stable/patches/140-libvpx-cross.patch b/net/freeswitch-stable/patches/140-libvpx-cross.patch index 88eda1b..9cf1c3f 100644 --- a/net/freeswitch-stable/patches/140-libvpx-cross.patch +++ b/net/freeswitch-stable/patches/140-libvpx-cross.patch @@ -1,6 +1,6 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -585,8 +585,13 @@ libs/libedit/src/.libs/libedit.a: +@@ -585,8 +585,15 @@ libs/libedit/src/.libs/libedit.a: libs/libzrtp/libzrtp.a: cd libs/libzrtp && $(MAKE) @@ -8,10 +8,12 @@ +# - added CROSS and set target to generic-gnu for cross-compile +# - added CPPFLAGS to CFLAGS, otherwise they would be ignored +# - disabled optimizations that would override OpenWrt's CFLAGS ++# - disabled the building of tools (because they fail to build and we ++# don't need them anyway) + libs/libvpx/Makefile: libs/libvpx/.update -- cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384 --extra-cflags="$(VISIBILITY_FLAG)" -+ cd libs/libvpx && CROSS="$(CROSS)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-tools --disable-unit-tests --size-limit=16384x16384 --extra-cflags="$(VISIBILITY_FLAG)" --disable-optimizations +- cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) $(VISIBILITY_FLAG)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384 ++ cd libs/libvpx && CROSS="$(CROSS)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) $(CPPFLAGS) $(VISIBILITY_FLAG)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --disable-optimizations --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-tools --disable-unit-tests --size-limit=16384x16384 libs/libvpx/libvpx.a: libs/libvpx/Makefile libs/libvpx/.update @cd libs/libvpx && $(MAKE) diff --git a/net/freeswitch-stable/patches/300-fix-memory-leak-in-mod_event_multicast.patch b/net/freeswitch-stable/patches/300-fix-memory-leak-in-mod_event_multicast.patch deleted file mode 100644 index 4709404..0000000 --- a/net/freeswitch-stable/patches/300-fix-memory-leak-in-mod_event_multicast.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ae56352cfff570f1b7ac0748aa339bd7bf373794 Mon Sep 17 00:00:00 2001 -From: Eneas U de Queiroz -Date: Sat, 9 Jun 2018 19:02:41 -0300 -Subject: [PATCH] mod_event_multicast.c: fix memory leak - -Fixed two memory leaks with openssl 1.1. - -Signed-off-by: Eneas U de Queiroz ---- - src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c -+++ b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c -@@ -324,7 +324,7 @@ static void event_handler(switch_event_t - &tmplen, (unsigned char *) MAGIC, (int) strlen((char *) MAGIC)); - outlen += tmplen; - EVP_EncryptFinal(ctx, (unsigned char *) buf + SWITCH_UUID_FORMATTED_LENGTH + outlen, &tmplen); -- EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - #else - EVP_CIPHER_CTX_init(&ctx); - EVP_EncryptInit(&ctx, EVP_bf_cbc(), NULL, NULL); -@@ -577,7 +577,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event - EVP_DecryptInit(ctx, NULL, (unsigned char *) globals.psk, (unsigned char *) uuid_str); - EVP_DecryptUpdate(ctx, (unsigned char *) tmp, &outl, (unsigned char *) packet, (int) len); - EVP_DecryptFinal(ctx, (unsigned char *) tmp + outl, &tmplen); -- EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - #else - EVP_CIPHER_CTX_init(&ctx); - EVP_DecryptInit(&ctx, EVP_bf_cbc(), NULL, NULL); diff --git a/net/freeswitch-stable/patches/390-t38-reinvite-488-fix.patch b/net/freeswitch-stable/patches/390-t38-reinvite-488-fix.patch index a16266b..ea9c3dc 100644 --- a/net/freeswitch-stable/patches/390-t38-reinvite-488-fix.patch +++ b/net/freeswitch-stable/patches/390-t38-reinvite-488-fix.patch @@ -56,7 +56,7 @@ Date: Fri Oct 18 18:28:07 2019 +0200 --- a/src/mod/endpoints/mod_sofia/sofia.c +++ b/src/mod/endpoints/mod_sofia/sofia.c -@@ -6501,6 +6501,7 @@ static void sofia_handle_sip_r_invite(sw +@@ -6512,6 +6512,7 @@ static void sofia_handle_sip_r_invite(sw switch_channel_clear_app_flag_key("T38", tech_pvt->channel, CF_APP_T38_REQ); switch_channel_set_app_flag_key("T38", tech_pvt->channel, CF_APP_T38_FAIL); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s T38 invite failed\n", switch_channel_get_name(tech_pvt->channel)); diff --git a/net/freeswitch-stable/patches/410-fix-typo-in-switch_xml_h.patch b/net/freeswitch-stable/patches/410-fix-typo-in-switch_xml_h.patch new file mode 100644 index 0000000..302d4a8 --- /dev/null +++ b/net/freeswitch-stable/patches/410-fix-typo-in-switch_xml_h.patch @@ -0,0 +1,11 @@ +--- a/src/include/switch_xml.h ++++ b/src/include/switch_xml.h +@@ -233,7 +233,7 @@ SWITCH_DECLARE(char *) switch_xml_tohtml + ///\param prn_header add header too + ///\param use_utf8_encoding encoding into ampersand entities for UTF-8 chars + ///\return the xml text string +-#define switch_xml_toxml_buf(xml, buf, buflen, offset, prn_header) switch_xml_toxml_buf(xml, buf, buflen, offset, prn_header, USE_UTF_8_ENCODING); ++#define switch_xml_toxml_buf(xml, buf, buflen, offset, prn_header) switch_xml_toxml_buf_ex(xml, buf, buflen, offset, prn_header, USE_UTF_8_ENCODING); + SWITCH_DECLARE(char *) switch_xml_toxml_buf_ex(_In_ switch_xml_t xml, _In_z_ char *buf, _In_ switch_size_t buflen, _In_ switch_size_t offset, + _In_ switch_bool_t prn_header, switch_bool_t use_utf8_encoding); + -- 2.30.2