freeswitch-stable: import 1.10.1 from master
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
parent
956289cb10
commit
b755b01c70
15 changed files with 39 additions and 128 deletions
|
@ -27,12 +27,6 @@ config FS_STABLE_WITH_ODBC
|
||||||
help
|
help
|
||||||
Enable ODBC support.
|
Enable ODBC support.
|
||||||
|
|
||||||
config FS_STABLE_WITH_PGSQL
|
|
||||||
bool "Compile with PGSQL support"
|
|
||||||
default y if x86_64
|
|
||||||
help
|
|
||||||
Enable PostgreSQL support.
|
|
||||||
|
|
||||||
config FS_STABLE_WITH_PNG
|
config FS_STABLE_WITH_PNG
|
||||||
bool "Compile with PNG support"
|
bool "Compile with PNG support"
|
||||||
default y if x86_64
|
default y if x86_64
|
||||||
|
|
|
@ -9,17 +9,17 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PRG_NAME:=freeswitch
|
PRG_NAME:=freeswitch
|
||||||
PKG_NAME:=$(PRG_NAME)-stable
|
PKG_NAME:=$(PRG_NAME)-stable
|
||||||
PKG_VERSION:=1.8.6
|
PKG_VERSION:=1.10.1
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
|
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
|
||||||
|
|
||||||
PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).-release.tar.xz
|
||||||
PKG_SOURCE_URL:=https://files.$(PRG_NAME).org/releases/$(PRG_NAME)
|
PKG_SOURCE_URL:=https://files.$(PRG_NAME).org/releases/$(PRG_NAME)
|
||||||
PKG_HASH:=b87f47e57d13de2b901bd1e4eb85491178e59a159a2831d7430abe7947f0d3a4
|
PKG_HASH:=360c867103c5f529a3724a46cf86da9b9acd8443b6793eb7f88fba0ace72001d
|
||||||
|
|
||||||
PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch
|
PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PRG_NAME)-$(PKG_VERSION)
|
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PRG_NAME)-$(PKG_VERSION).-release
|
||||||
|
|
||||||
# configure in libs/spandsp fails without libjpeg and tiff
|
# configure in libs/spandsp fails without libjpeg and tiff
|
||||||
PKG_BUILD_DEPENDS:= \
|
PKG_BUILD_DEPENDS:= \
|
||||||
|
@ -147,6 +147,7 @@ FS_STABLE_MOD_AVAILABLE:= \
|
||||||
logfile \
|
logfile \
|
||||||
loopback \
|
loopback \
|
||||||
lua \
|
lua \
|
||||||
|
mariadb \
|
||||||
mp4v \
|
mp4v \
|
||||||
native_file \
|
native_file \
|
||||||
nibblebill \
|
nibblebill \
|
||||||
|
@ -155,6 +156,7 @@ FS_STABLE_MOD_AVAILABLE:= \
|
||||||
opusfile \
|
opusfile \
|
||||||
oreka \
|
oreka \
|
||||||
perl \
|
perl \
|
||||||
|
pgsql \
|
||||||
png \
|
png \
|
||||||
pocketsphinx \
|
pocketsphinx \
|
||||||
portaudio \
|
portaudio \
|
||||||
|
@ -228,7 +230,6 @@ PKG_CONFIG_DEPENDS:= \
|
||||||
CONFIG_FS_STABLE_WITH_FREETYPE \
|
CONFIG_FS_STABLE_WITH_FREETYPE \
|
||||||
CONFIG_FS_STABLE_WITH_LIBYUV \
|
CONFIG_FS_STABLE_WITH_LIBYUV \
|
||||||
CONFIG_FS_STABLE_WITH_ODBC \
|
CONFIG_FS_STABLE_WITH_ODBC \
|
||||||
CONFIG_FS_STABLE_WITH_PGSQL \
|
|
||||||
CONFIG_FS_STABLE_WITH_PNG \
|
CONFIG_FS_STABLE_WITH_PNG \
|
||||||
CONFIG_FS_STABLE_WITH_SRTP \
|
CONFIG_FS_STABLE_WITH_SRTP \
|
||||||
CONFIG_FS_STABLE_WITH_VPX \
|
CONFIG_FS_STABLE_WITH_VPX \
|
||||||
|
@ -305,7 +306,7 @@ endef
|
||||||
|
|
||||||
define Package/$(PKG_NAME)/install/lib
|
define Package/$(PKG_NAME)/install/lib
|
||||||
$(INSTALL_DIR) $(1)$(FS_STABLE_LIB_DIR)
|
$(INSTALL_DIR) $(1)$(FS_STABLE_LIB_DIR)
|
||||||
$(CP) $(PKG_INSTALL_DIR)$(FS_STABLE_LIB_DIR)/$(2).so* \
|
$(CP) $(PKG_INSTALL_DIR)$(FS_STABLE_LIB_DIR)/$(2).so.* \
|
||||||
$(1)$(FS_STABLE_LIB_DIR)
|
$(1)$(FS_STABLE_LIB_DIR)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -375,7 +376,6 @@ $(call Package/$(PKG_NAME)/Default)
|
||||||
$(ICONV_DEPENDS) \
|
$(ICONV_DEPENDS) \
|
||||||
+FS_STABLE_WITH_FREETYPE:libfreetype \
|
+FS_STABLE_WITH_FREETYPE:libfreetype \
|
||||||
+FS_STABLE_WITH_ODBC:unixodbc \
|
+FS_STABLE_WITH_ODBC:unixodbc \
|
||||||
+FS_STABLE_WITH_PGSQL:libpq \
|
|
||||||
+FS_STABLE_WITH_PNG:libpng \
|
+FS_STABLE_WITH_PNG:libpng \
|
||||||
+libcurl \
|
+libcurl \
|
||||||
+libedit \
|
+libedit \
|
||||||
|
@ -420,7 +420,7 @@ $(call Package/$(PKG_NAME)/install/lib,$(1),lib$(PRG_NAME))
|
||||||
$(1)$(FS_STABLE_SYSCONF_DIR)/init.d/$(PRG_NAME)
|
$(1)$(FS_STABLE_SYSCONF_DIR)/init.d/$(PRG_NAME)
|
||||||
$(INSTALL_BIN) ./files/$(PRG_NAME).hotplug \
|
$(INSTALL_BIN) ./files/$(PRG_NAME).hotplug \
|
||||||
$(1)$(FS_STABLE_SYSCONF_DIR)/hotplug.d/iface/90-$(PRG_NAME)
|
$(1)$(FS_STABLE_SYSCONF_DIR)/hotplug.d/iface/90-$(PRG_NAME)
|
||||||
$(INSTALL_CONF) ./files/$(PRG_NAME).config \
|
$(INSTALL_CONF) ./files/$(PRG_NAME).conf \
|
||||||
$(1)$(FS_STABLE_SYSCONF_DIR)/config/$(PRG_NAME)
|
$(1)$(FS_STABLE_SYSCONF_DIR)/config/$(PRG_NAME)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -646,14 +646,12 @@ CONFIGURE_ARGS+= \
|
||||||
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_DEBUG,debug) \
|
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_DEBUG,debug) \
|
||||||
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_LIBYUV,libyuv) \
|
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_LIBYUV,libyuv) \
|
||||||
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_ODBC,core-odbc-support) \
|
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_ODBC,core-odbc-support) \
|
||||||
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_PGSQL,core-pgsql-support) \
|
|
||||||
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_SRTP,srtp) \
|
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_SRTP,srtp) \
|
||||||
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_VPX,libvpx) \
|
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_VPX,libvpx) \
|
||||||
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_ZRTP,zrtp) \
|
$(call autoconf_bool,CONFIG_FS_STABLE_WITH_ZRTP,zrtp) \
|
||||||
$(if $(CONFIG_FS_STABLE_WITH_FREETYPE),,--without-freetype) \
|
$(if $(CONFIG_FS_STABLE_WITH_FREETYPE),,--without-freetype) \
|
||||||
$(if $(CONFIG_FS_STABLE_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)$(FS_STABLE_LIB_DIR)") \
|
$(if $(CONFIG_FS_STABLE_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)$(FS_STABLE_LIB_DIR)") \
|
||||||
$(if $(CONFIG_FS_STABLE_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \
|
$(if $(CONFIG_FS_STABLE_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \
|
||||||
$(if $(CONFIG_FS_STABLE_WITH_PGSQL),,--without-pgsql) \
|
|
||||||
$(if $(CONFIG_FS_STABLE_WITH_PNG),,--without-png) \
|
$(if $(CONFIG_FS_STABLE_WITH_PNG),,--without-png) \
|
||||||
$(if $(CONFIG_PACKAGE_$(PKG_LIBFTDM)-ftmod-libpri),--with-libpri="$(STAGING_DIR)/usr",--without-libpri) \
|
$(if $(CONFIG_PACKAGE_$(PKG_LIBFTDM)-ftmod-libpri),--with-libpri="$(STAGING_DIR)/usr",--without-libpri) \
|
||||||
$(if $(CONFIG_PACKAGE_$(PKG_LIBFTDM)-ftmod-pritap),--with-pritap,--without-pritap)
|
$(if $(CONFIG_PACKAGE_$(PKG_LIBFTDM)-ftmod-pritap),--with-pritap,--without-pritap)
|
||||||
|
@ -678,6 +676,13 @@ CONFIGURE_ARGS+= \
|
||||||
--enable-fixed-point
|
--enable-fixed-point
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# FreeSWITCH dropped postgresql support from the core. postgresql
|
||||||
|
# support is now available via mod_pgsql. We still need to pass
|
||||||
|
# '--without-pgsql', otherwise apr-util links to libpq and we still
|
||||||
|
# would have the core link to it.
|
||||||
|
CONFIGURE_ARGS+= \
|
||||||
|
--without-pgsql
|
||||||
|
|
||||||
# Don't want host-php
|
# Don't want host-php
|
||||||
CONFIGURE_VARS+= \
|
CONFIGURE_VARS+= \
|
||||||
ac_cv_have_php=no \
|
ac_cv_have_php=no \
|
||||||
|
@ -713,8 +718,7 @@ CONFIGURE_VARS+= \
|
||||||
|
|
||||||
# Regarding apr_cv_mutex_robust_shared=no see
|
# Regarding apr_cv_mutex_robust_shared=no see
|
||||||
# http://www.openwall.com/lists/musl/2016/11/26/1
|
# http://www.openwall.com/lists/musl/2016/11/26/1
|
||||||
# _Don't_ remove quotes below!
|
ifeq ($(call qstrip,$(CONFIG_LIBC)),musl)
|
||||||
ifeq ($(CONFIG_LIBC),"musl")
|
|
||||||
CONFIGURE_VARS+= \
|
CONFIGURE_VARS+= \
|
||||||
apr_cv_mutex_robust_shared=no \
|
apr_cv_mutex_robust_shared=no \
|
||||||
ac_cv_strerror_r_rc_int=yes
|
ac_cv_strerror_r_rc_int=yes
|
||||||
|
@ -1008,7 +1012,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,blacklist,Blacklist helper,This module
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,callcenter,Call center,This module implements Automated Call Distribution queues.,))
|
$(eval $(call Package/$(PKG_NAME)/Module,callcenter,Call center,This module implements Automated Call Distribution queues.,))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,cdr_csv,CSV CDR,CSV Call Detail Record handler.,))
|
$(eval $(call Package/$(PKG_NAME)/Module,cdr_csv,CSV CDR,CSV Call Detail Record handler.,))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,cdr_mongodb,MongoDB CDR,MongoDB Call Detail Record handler.,))
|
$(eval $(call Package/$(PKG_NAME)/Module,cdr_mongodb,MongoDB CDR,MongoDB Call Detail Record handler.,))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,cdr_pg_csv,PostgreSQL CDR,PostgreSQL Call Detail Record handler.,@FS_STABLE_WITH_PGSQL))
|
$(eval $(call Package/$(PKG_NAME)/Module,cdr_pg_csv,PostgreSQL CDR,PostgreSQL Call Detail Record handler.,+libpq))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,cdr_sqlite,SQLite CDR,SQLite Call Detail Record handler.,))
|
$(eval $(call Package/$(PKG_NAME)/Module,cdr_sqlite,SQLite CDR,SQLite Call Detail Record handler.,))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,cidlookup,Caller ID lookup,This module provides an API for querying caller ID name and location\ndata.,))
|
$(eval $(call Package/$(PKG_NAME)/Module,cidlookup,Caller ID lookup,This module provides an API for querying caller ID name and location\ndata.,))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,clearmode,Clearmode,Clearmode codec passthrough support.,))
|
$(eval $(call Package/$(PKG_NAME)/Module,clearmode,Clearmode,Clearmode codec passthrough support.,))
|
||||||
|
@ -1061,7 +1065,8 @@ $(eval $(call Package/$(PKG_NAME)/Module,local_stream,Local stream,Connects mult
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,logfile,File logger,Logs FreeSWITCH output to a file.,))
|
$(eval $(call Package/$(PKG_NAME)/Module,logfile,File logger,Logs FreeSWITCH output to a file.,))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,loopback,Loopback,A loopback channel driver.,))
|
$(eval $(call Package/$(PKG_NAME)/Module,loopback,Loopback,A loopback channel driver.,))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,lua,Lua,Lua language interface for FreeSWITCH.,+liblua))
|
$(eval $(call Package/$(PKG_NAME)/Module,lua,Lua,Lua language interface for FreeSWITCH.,+liblua))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,mp4v,MP4 video passthrough,MP4 video passthrough..,))
|
$(eval $(call Package/$(PKG_NAME)/Module,mariadb,MariaDB,Adds MariaDB support.,+libmariadb @!USE_UCLIBCXX))
|
||||||
|
$(eval $(call Package/$(PKG_NAME)/Module,mp4v,MP4 video passthrough,MP4 video passthrough.,))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,native_file,Native file,Plays files that are already encoded in the right format.,))
|
$(eval $(call Package/$(PKG_NAME)/Module,native_file,Native file,Plays files that are already encoded in the right format.,))
|
||||||
$(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,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,odbc_cdr,ODBC CDR,ODBC Call Detail Record handler.,))
|
||||||
|
@ -1069,6 +1074,7 @@ $(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,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,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,perl,Perl,This package contains mod_perl for FreeSWITCH.,+libdb47 +libgdbm +perlbase-essential @PERL_THREADS))
|
||||||
|
$(eval $(call Package/$(PKG_NAME)/Module,pgsql,PostgreSQL,Adds PostgreSQL support.,+libpq))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,png,PNG,Allows playback of video using PNG files.,@FS_STABLE_WITH_PNG))
|
$(eval $(call Package/$(PKG_NAME)/Module,png,PNG,Allows playback of video using PNG files.,@FS_STABLE_WITH_PNG))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,pocketsphinx,Pocketsphinx,This module allows speech recognition. You might want to install\n$(PKG_NAME)-misc-grammar as well.,+libsamplerate)) # When libsamplerate is found it'll be linked against, there is no switch to turn it off
|
$(eval $(call Package/$(PKG_NAME)/Module,pocketsphinx,Pocketsphinx,This module allows speech recognition. You might want to install\n$(PKG_NAME)-misc-grammar as well.,+libsamplerate)) # When libsamplerate is found it'll be linked against, there is no switch to turn it off
|
||||||
$(eval $(call Package/$(PKG_NAME)/Module,portaudio,Portaudio,Voice through a local soundcard.,+portaudio))
|
$(eval $(call Package/$(PKG_NAME)/Module,portaudio,Portaudio,Voice through a local soundcard.,+portaudio))
|
||||||
|
@ -1149,5 +1155,6 @@ $(eval $(call Package/$(PKG_NAME)/Module,yuv,Raw YUV,Raw YUV I420 video codec su
|
||||||
$(eval $(call Package/$(PKG_NAME)/Util,fs_cli,CLI,The fs_cli program is a Command-Line Interface that allows a user to\nconnect to a FreeSWITCH instance running on the local or a remote\nsystem.,,n))
|
$(eval $(call Package/$(PKG_NAME)/Util,fs_cli,CLI,The fs_cli program is a Command-Line Interface that allows a user to\nconnect to a FreeSWITCH instance running on the local or a remote\nsystem.,,n))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Util,fs_encode,Sound file conversion,Format conversion of sound files so the result can be used by\nmod_native_file.,+$(PKG_NAME)-mod-native-file +$(PKG_NAME)-mod-sndfile +$(PKG_NAME)-mod-spandsp,n))
|
$(eval $(call Package/$(PKG_NAME)/Util,fs_encode,Sound file conversion,Format conversion of sound files so the result can be used by\nmod_native_file.,+$(PKG_NAME)-mod-native-file +$(PKG_NAME)-mod-sndfile +$(PKG_NAME)-mod-spandsp,n))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Util,fs_ivrd,IVR daemon,The FreeSWITCH IVR daemon is an abstraction layer that sits on top of\nthe ESL. The basic idea is that the ivrd will allow the user to have\na STDIN/STDOUT interface for simple call control.,,n))
|
$(eval $(call Package/$(PKG_NAME)/Util,fs_ivrd,IVR daemon,The FreeSWITCH IVR daemon is an abstraction layer that sits on top of\nthe ESL. The basic idea is that the ivrd will allow the user to have\na STDIN/STDOUT interface for simple call control.,,n))
|
||||||
|
$(eval $(call Package/$(PKG_NAME)/Util,fs_tts,TTS to sound file,Use TTS to generate a sound file.,,n))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Util,gentls_cert,TLS certificate,Can be used to create TLS certificates and setup CAs.,+openssl-util,y))
|
$(eval $(call Package/$(PKG_NAME)/Util,gentls_cert,TLS certificate,Can be used to create TLS certificates and setup CAs.,+openssl-util,y))
|
||||||
$(eval $(call Package/$(PKG_NAME)/Util,tone2wav,Sound file generation,Generates a sound file from a teletone script. The output can be in\nany format that is supported by libsndfile.,+$(PKG_NAME)-mod-sndfile,n))
|
$(eval $(call Package/$(PKG_NAME)/Util,tone2wav,Sound file generation,Generates a sound file from a teletone script. The output can be in\nany format that is supported by libsndfile.,+$(PKG_NAME)-mod-sndfile,n))
|
||||||
|
|
|
@ -31,16 +31,16 @@
|
||||||
else
|
else
|
||||||
CC_FOR_BUILD='$(CC)'
|
CC_FOR_BUILD='$(CC)'
|
||||||
fi
|
fi
|
||||||
@@ -649,7 +625,7 @@ AC_ARG_ENABLE(core-pgsql-pkgconfig,
|
@@ -659,7 +635,7 @@ path_push_unique () {
|
||||||
[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"])
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
if test x"$enable_core_pgsql_support" = x"yes" ; then
|
-AC_PATH_PROG([PG_CONFIG], [pg_config], [no])
|
||||||
- AC_PATH_PROG([PG_CONFIG], [pg_config], [no])
|
+AC_PATH_PROG([PG_CONFIG], [pg_config], [no], ["${STAGING_DIR}"/usr/bin])
|
||||||
+ AC_PATH_PROG([PG_CONFIG], [pg_config], [no], ["${STAGING_DIR}"/usr/bin])
|
AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
|
||||||
AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
|
|
||||||
if test "$PKG_CONFIG" = "no" \
|
case $host in
|
||||||
|| test x"$enable_core_pgsql_pkgconfig" = x"no" \
|
@@ -1620,13 +1596,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"
|
# -a "x$ac_cv_have_EXTERN_h" != "xno"
|
||||||
|
|
||||||
if test "x$ac_cv_have_perl" != "xno"; then
|
if test "x$ac_cv_have_perl" != "xno"; then
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
|
|
||||||
save_CFLAGS="$CFLAGS"
|
save_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$PERL_CFLAGS"
|
CFLAGS="$PERL_CFLAGS"
|
||||||
@@ -1714,24 +1684,12 @@ then
|
@@ -1721,24 +1691,12 @@ then
|
||||||
if test "$python_has_distutils" != "no" ; then
|
if test "$python_has_distutils" != "no" ; then
|
||||||
AC_MSG_CHECKING([location of site-packages])
|
AC_MSG_CHECKING([location of site-packages])
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -2018,7 +2018,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
|
@@ -2038,7 +2038,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
|
||||||
AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
|
AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
|
||||||
AC_SUBST(AM_MAKEFLAGS)
|
AC_SUBST(AM_MAKEFLAGS)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/Makefile.am
|
--- a/Makefile.am
|
||||||
+++ b/Makefile.am
|
+++ b/Makefile.am
|
||||||
@@ -577,8 +577,13 @@ libs/libedit/src/.libs/libedit.a:
|
@@ -585,8 +585,13 @@ libs/libedit/src/.libs/libedit.a:
|
||||||
libs/libzrtp/libzrtp.a:
|
libs/libzrtp/libzrtp.a:
|
||||||
cd libs/libzrtp && $(MAKE)
|
cd libs/libzrtp && $(MAKE)
|
||||||
|
|
||||||
|
@ -9,9 +9,9 @@
|
||||||
+# - added CPPFLAGS to CFLAGS, otherwise they would be ignored
|
+# - added CPPFLAGS to CFLAGS, otherwise they would be ignored
|
||||||
+# - disabled optimizations that would override OpenWrt's CFLAGS
|
+# - disabled optimizations that would override OpenWrt's CFLAGS
|
||||||
+
|
+
|
||||||
libs/libvpx/Makefile:
|
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 && 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-unit-tests --size-limit=16384x16384 --extra-cflags="$(VISIBILITY_FLAG)" --disable-optimizations
|
+ 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
|
||||||
|
|
||||||
libs/libvpx/libvpx.a: libs/libvpx/Makefile
|
libs/libvpx/libvpx.a: libs/libvpx/Makefile libs/libvpx/.update
|
||||||
@cd libs/libvpx && $(MAKE)
|
@cd libs/libvpx && $(MAKE)
|
||||||
|
|
|
@ -10,11 +10,9 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
||||||
src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c | 4 ++--
|
src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c | 4 ++--
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
|
|
||||||
index f591855a3e..fb952ce740 100644
|
|
||||||
--- a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
|
--- a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
|
||||||
+++ b/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 *event)
|
@@ -324,7 +324,7 @@ static void event_handler(switch_event_t
|
||||||
&tmplen, (unsigned char *) MAGIC, (int) strlen((char *) MAGIC));
|
&tmplen, (unsigned char *) MAGIC, (int) strlen((char *) MAGIC));
|
||||||
outlen += tmplen;
|
outlen += tmplen;
|
||||||
EVP_EncryptFinal(ctx, (unsigned char *) buf + SWITCH_UUID_FORMATTED_LENGTH + outlen, &tmplen);
|
EVP_EncryptFinal(ctx, (unsigned char *) buf + SWITCH_UUID_FORMATTED_LENGTH + outlen, &tmplen);
|
||||||
|
@ -23,7 +21,7 @@ index f591855a3e..fb952ce740 100644
|
||||||
#else
|
#else
|
||||||
EVP_CIPHER_CTX_init(&ctx);
|
EVP_CIPHER_CTX_init(&ctx);
|
||||||
EVP_EncryptInit(&ctx, EVP_bf_cbc(), NULL, NULL);
|
EVP_EncryptInit(&ctx, EVP_bf_cbc(), NULL, NULL);
|
||||||
@@ -570,7 +570,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_multicast_runtime)
|
@@ -577,7 +577,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event
|
||||||
EVP_DecryptInit(ctx, NULL, (unsigned char *) globals.psk, (unsigned char *) uuid_str);
|
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_DecryptUpdate(ctx, (unsigned char *) tmp, &outl, (unsigned char *) packet, (int) len);
|
||||||
EVP_DecryptFinal(ctx, (unsigned char *) tmp + outl, &tmplen);
|
EVP_DecryptFinal(ctx, (unsigned char *) tmp + outl, &tmplen);
|
||||||
|
@ -32,6 +30,3 @@ index f591855a3e..fb952ce740 100644
|
||||||
#else
|
#else
|
||||||
EVP_CIPHER_CTX_init(&ctx);
|
EVP_CIPHER_CTX_init(&ctx);
|
||||||
EVP_DecryptInit(&ctx, EVP_bf_cbc(), NULL, NULL);
|
EVP_DecryptInit(&ctx, EVP_bf_cbc(), NULL, NULL);
|
||||||
--
|
|
||||||
2.16.4
|
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/src/switch_console.c
|
--- a/src/switch_console.c
|
||||||
+++ b/src/switch_console.c
|
+++ b/src/switch_console.c
|
||||||
@@ -1053,10 +1053,12 @@ static void *SWITCH_THREAD_FUNC console_
|
@@ -1051,10 +1051,12 @@ static void *SWITCH_THREAD_FUNC console_
|
||||||
while (running) {
|
while (running) {
|
||||||
int32_t arg = 0;
|
int32_t arg = 0;
|
||||||
|
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
commit e114c6382e68824d4498f62562714860d20804e2
|
|
||||||
Author: Sebastian Kemper <sebastian_ml@gmx.net>
|
|
||||||
Date: Sun Apr 14 19:11:58 2019 +0200
|
|
||||||
|
|
||||||
FS-11783: [core] quiet gcc truncation warning
|
|
||||||
|
|
||||||
With -Wstringop-truncation gcc warns about calls to bounded string
|
|
||||||
manipulation function "strncpy" that may either truncate the copied
|
|
||||||
string or leave the destination unchanged. To avoid the warning when the
|
|
||||||
result is not expected to be NUL-terminated, it is suggested to call
|
|
||||||
"memcpy" instead.
|
|
||||||
|
|
||||||
src/switch_core_media.c: In function 'switch_core_media_patch_sdp':
|
|
||||||
src/switch_core_media.c:11854:4: error: 'strncpy' output truncated before terminating nul copying 2 bytes from a string of the same length [-Werror=stringop-truncation]
|
|
||||||
strncpy(q, strchr(a_engine->adv_sdp_ip, ':') ? "6 " : "4 ", 2);
|
|
||||||
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
This commit follows gcc's recommendation.
|
|
||||||
|
|
||||||
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
|
|
||||||
|
|
||||||
--- a/src/switch_core_media.c
|
|
||||||
+++ b/src/switch_core_media.c
|
|
||||||
@@ -11918,7 +11918,7 @@ SWITCH_DECLARE(void) switch_core_media_p
|
|
||||||
strncpy(q, p, 7);
|
|
||||||
p += 7;
|
|
||||||
q += 7;
|
|
||||||
- strncpy(q, strchr(a_engine->adv_sdp_ip, ':') ? "6 " : "4 ", 2);
|
|
||||||
+ memcpy(q, strchr(a_engine->adv_sdp_ip, ':') ? "6 " : "4 ", 2);
|
|
||||||
p +=2;
|
|
||||||
q +=2;
|
|
||||||
strncpy(q, a_engine->adv_sdp_ip, strlen(a_engine->adv_sdp_ip));
|
|
|
@ -1,42 +0,0 @@
|
||||||
commit 3ca75eb8efa4e50ebe083a269b75fcb1762daa91
|
|
||||||
Author: Sebastian Kemper <sebastian_ml@gmx.net>
|
|
||||||
Date: Sun Apr 14 19:23:41 2019 +0200
|
|
||||||
|
|
||||||
FS-11783: [mod_say_ja] quiet overflow warning
|
|
||||||
|
|
||||||
With -Wformat-overflow gcc warns about calls to formatted input/output
|
|
||||||
function "sprintf" that might overflow the destination buffer.
|
|
||||||
|
|
||||||
In this case gcc does not know the upper bound of tm_min and assumes
|
|
||||||
that up to 11 bytes might be written to buffer (3 bytes). But we know
|
|
||||||
that tm_min can only be within the range 0 to 59.
|
|
||||||
|
|
||||||
mod_say_ja.c: In function 'ja_say_time':
|
|
||||||
mod_say_ja.c:376:35: error: '%d' directive writing between 2 and 10 bytes into a region of size 3 [-Werror=format-overflow=]
|
|
||||||
sprintf(buffer, "%d", tm.tm_min);
|
|
||||||
^~
|
|
||||||
mod_say_ja.c:376:34: note: directive argument in the range [11, 2147483647]
|
|
||||||
sprintf(buffer, "%d", tm.tm_min);
|
|
||||||
^~~~
|
|
||||||
mod_say_ja.c:376:18: note: 'sprintf' output between 3 and 11 bytes into a destination of size 3
|
|
||||||
sprintf(buffer, "%d", tm.tm_min);
|
|
||||||
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
This commits adds a hint for gcc, which silences the warning.
|
|
||||||
|
|
||||||
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
|
|
||||||
|
|
||||||
diff --git a/src/mod/say/mod_say_ja/mod_say_ja.c b/src/mod/say/mod_say_ja/mod_say_ja.c
|
|
||||||
index 72c7c38131..d8e0692fd0 100644
|
|
||||||
--- a/src/mod/say/mod_say_ja/mod_say_ja.c
|
|
||||||
+++ b/src/mod/say/mod_say_ja/mod_say_ja.c
|
|
||||||
@@ -367,7 +367,8 @@ static switch_status_t ja_say_time(switch_core_session_t *session, char *tosay,
|
|
||||||
say_file("time/pm.wav");
|
|
||||||
}
|
|
||||||
say_file("time/hour-%d.wav", tm.tm_hour);
|
|
||||||
- if (tm.tm_min > 10) {
|
|
||||||
+ /* tm_min is always < 60 - this is just to silence gcc 8 warning */
|
|
||||||
+ if (tm.tm_min > 10 && tm.tm_min < 60) {
|
|
||||||
int temp;
|
|
||||||
char tch[1+1];
|
|
||||||
mod_min = tm.tm_min % 10;
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- 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
|
|
||||||
|
|
Loading…
Reference in a new issue