summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormicmac12018-08-03 16:52:00 +0000
committerGitHub2018-08-03 16:52:00 +0000
commit5a918f3df3122108d8c615627afeafe2785a008b (patch)
treeb2ec934a492ae81ce8e502636879734273a35c9a
parent70e0535e5999fefac957705e84d3c4e3ff6c3f84 (diff)
parentf0d34a6e6db6ee85b7534352017956ebc3eb05cd (diff)
downloadtelephony-5a918f3df3122108d8c615627afeafe2785a008b.tar.gz
Merge pull request #357 from micmac1/fs-1.8-fs_cli
freeswitch-stable: fix garbled output in fs_cli
-rw-r--r--net/freeswitch-stable/Makefile2
-rw-r--r--net/freeswitch-stable/patches/020-fix-fs_cli-typo.patch27
2 files changed, 28 insertions, 1 deletions
diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile
index 77cccc8..76ce872 100644
--- a/net/freeswitch-stable/Makefile
+++ b/net/freeswitch-stable/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PRG_NAME:=freeswitch
PKG_NAME:=$(PRG_NAME)-stable
PKG_VERSION:=1.8.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_SOURCE_PROTO:=git
diff --git a/net/freeswitch-stable/patches/020-fix-fs_cli-typo.patch b/net/freeswitch-stable/patches/020-fix-fs_cli-typo.patch
new file mode 100644
index 0000000..ed56433
--- /dev/null
+++ b/net/freeswitch-stable/patches/020-fix-fs_cli-typo.patch
@@ -0,0 +1,27 @@
+commit f76230b16ed6e28847a00e1fa4edd46d19a52251
+Author: Sebastian Kemper <sebastian_ml@gmx.net>
+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 <sebastian_ml@gmx.net>
+
+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. */