From 0d4bfdaf6898eea620925c6ee734eae710e00519 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Mon, 10 Jun 2019 14:44:12 +0200 Subject: [PATCH] freeswitch-stable: bump to 1.8.6 - refresh patches - drop RAND_bytes patch which was upstreamed - fix ei_init detection - add opusfile module Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 8 +++++--- .../patches/030-fix-configure-ac.patch | 6 +++--- net/freeswitch-stable/patches/120-fix-copts.diff | 2 +- .../patches/380-disable-luajit.patch | 2 +- ...-implicit-declaration-of-function-RAND_bytes.patch | 10 ---------- ...00-switch_core_media-fix-stringop-truncation.patch | 2 +- .../patches/420-mod_kazoo-correct-ei_init-check.patch | 11 +++++++++++ 7 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 net/freeswitch-stable/patches/390-switch-rtp_c-fix-implicit-declaration-of-function-RAND_bytes.patch create mode 100644 net/freeswitch-stable/patches/420-mod_kazoo-correct-ei_init-check.patch diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index b18ea85..45d33d4 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.8.5 -PKG_RELEASE:=3 +PKG_VERSION:=1.8.6 +PKG_RELEASE:=1 PKG_MAINTAINER:=Sebastian Kemper PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://files.$(PRG_NAME).org/releases/$(PRG_NAME) -PKG_HASH:=503a551be5d6df06162ea9d98a952b6fb524852ce2352fe3ca3a36a76995b046 +PKG_HASH:=b87f47e57d13de2b901bd1e4eb85491178e59a159a2831d7430abe7947f0d3a4 PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch @@ -152,6 +152,7 @@ FS_STABLE_MOD_AVAILABLE:= \ nibblebill \ odbc_cdr \ opus \ + opusfile \ oreka \ perl \ png \ @@ -1065,6 +1066,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,native_file,Native file,Plays files tha $(eval $(call Package/$(PKG_NAME)/Module,nibblebill,Nibblebill,This module allows for real-time accounting of a cash balance and\nusing that information for call routing.,)) $(eval $(call Package/$(PKG_NAME)/Module,odbc_cdr,ODBC CDR,ODBC Call Detail Record handler.,)) $(eval $(call Package/$(PKG_NAME)/Module,opus,Opus,Opus codec support.,+libopus)) +$(eval $(call Package/$(PKG_NAME)/Module,opusfile,Opus file,Read and Write OGG/Opus files.,+libopusenc +libopusfile)) $(eval $(call Package/$(PKG_NAME)/Module,oreka,Oreka,This module provides media recording with the Oreka cross-platform\naudio stream recording and retrieval system.,)) $(eval $(call Package/$(PKG_NAME)/Module,perl,Perl,This package contains mod_perl for FreeSWITCH.,+libdb47 +libgdbm +perlbase-essential @PERL_THREADS)) $(eval $(call Package/$(PKG_NAME)/Module,png,PNG,Allows playback of video using PNG files.,@FS_STABLE_WITH_PNG)) diff --git a/net/freeswitch-stable/patches/030-fix-configure-ac.patch b/net/freeswitch-stable/patches/030-fix-configure-ac.patch index 602013b..754a0a2 100644 --- a/net/freeswitch-stable/patches/030-fix-configure-ac.patch +++ b/net/freeswitch-stable/patches/030-fix-configure-ac.patch @@ -31,7 +31,7 @@ else CC_FOR_BUILD='$(CC)' fi -@@ -662,7 +638,7 @@ AC_ARG_ENABLE(core-pgsql-pkgconfig, +@@ -649,7 +625,7 @@ AC_ARG_ENABLE(core-pgsql-pkgconfig, [AS_HELP_STRING([--disable-core-pgsql-pkgconfig], [Use pg_config to get PGQSL build options])],[enable_core_pgsql_pkgconfig="$enableval"],[enable_core_pgsql_pkgconfig="yes"]) if test x"$enable_core_pgsql_support" = x"yes" ; then @@ -40,7 +40,7 @@ AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) if test "$PKG_CONFIG" = "no" \ || test x"$enable_core_pgsql_pkgconfig" = x"no" \ -@@ -1617,13 +1593,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl +@@ -1613,13 +1589,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" -@@ -1718,24 +1688,12 @@ then +@@ -1714,24 +1684,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.diff b/net/freeswitch-stable/patches/120-fix-copts.diff index 3eeeb9d..3eae7bd 100644 --- a/net/freeswitch-stable/patches/120-fix-copts.diff +++ b/net/freeswitch-stable/patches/120-fix-copts.diff @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2009,7 +2009,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) +@@ -2018,7 +2018,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) AC_SUBST(OUR_DISABLED_UNINSTALL_MODS) AC_SUBST(AM_MAKEFLAGS) diff --git a/net/freeswitch-stable/patches/380-disable-luajit.patch b/net/freeswitch-stable/patches/380-disable-luajit.patch index cb9c5ac..f384b3a 100644 --- a/net/freeswitch-stable/patches/380-disable-luajit.patch +++ b/net/freeswitch-stable/patches/380-disable-luajit.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -584,7 +584,7 @@ AC_SUBST(SYS_XMLRPC_CFLAGS) +@@ -571,7 +571,7 @@ AC_SUBST(SYS_XMLRPC_CFLAGS) AC_SUBST(SYS_XMLRPC_LDFLAGS) AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"]) diff --git a/net/freeswitch-stable/patches/390-switch-rtp_c-fix-implicit-declaration-of-function-RAND_bytes.patch b/net/freeswitch-stable/patches/390-switch-rtp_c-fix-implicit-declaration-of-function-RAND_bytes.patch deleted file mode 100644 index 8102392..0000000 --- a/net/freeswitch-stable/patches/390-switch-rtp_c-fix-implicit-declaration-of-function-RAND_bytes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/include/switch_ssl.h -+++ b/src/include/switch_ssl.h -@@ -38,6 +38,7 @@ - #endif - #include - #include -+#include - #include - #include - #ifndef OPENSSL_NO_ENGINE diff --git a/net/freeswitch-stable/patches/400-switch_core_media-fix-stringop-truncation.patch b/net/freeswitch-stable/patches/400-switch_core_media-fix-stringop-truncation.patch index adaea38..607df68 100644 --- a/net/freeswitch-stable/patches/400-switch_core_media-fix-stringop-truncation.patch +++ b/net/freeswitch-stable/patches/400-switch_core_media-fix-stringop-truncation.patch @@ -21,7 +21,7 @@ Date: Sun Apr 14 19:11:58 2019 +0200 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c -@@ -11851,7 +11851,7 @@ SWITCH_DECLARE(void) switch_core_media_p +@@ -11918,7 +11918,7 @@ SWITCH_DECLARE(void) switch_core_media_p strncpy(q, p, 7); p += 7; q += 7; diff --git a/net/freeswitch-stable/patches/420-mod_kazoo-correct-ei_init-check.patch b/net/freeswitch-stable/patches/420-mod_kazoo-correct-ei_init-check.patch new file mode 100644 index 0000000..4381643 --- /dev/null +++ b/net/freeswitch-stable/patches/420-mod_kazoo-correct-ei_init-check.patch @@ -0,0 +1,11 @@ +--- a/src/mod/event_handlers/mod_kazoo/kazoo_ei_utils.c ++++ b/src/mod/event_handlers/mod_kazoo/kazoo_ei_utils.c +@@ -519,7 +519,7 @@ switch_status_t create_acceptor() { + char ipbuf[48]; + const char *ip_addr; + +-#if ERLANG_MAJOR >= 10 ++#if (ERLANG_MAJOR == 10 && ERLANG_MINOR >= 3) || ERLANG_MAJOR >= 11 + ei_init(); + #endif + -- 2.30.2