Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #826 from micmac1/fs-1.10.10

Browse source 
freeswitch: bump to 1.10.10
This commit is contained in:
micmac1 2023-08-19 11:20:16 +02:00 committed by GitHub
commit 1488eb0db4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 65 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libs/libks/Makefile
View file

@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libks PKG_NAME:=libks
PKG_VERSION:=1.8.2 PKG_VERSION:=2.0.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=libks-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/signalwire/libks/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/signalwire/libks/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 PKG_HASH:=af94f9fcdb2022b8f09187309ac2d372a5a4cc639af77cd4375f2d5c88b4fd63
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
@ -33,13 +33,13 @@ PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
define Package/$(PKG_NAME) define Package/libks
SUBMENU:=Telephony SUBMENU:=Telephony
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Foundational support for SignalWire C products TITLE:=Foundational support for SignalWire C products
URL:=https://github.com/signalwire/libks URL:=https://github.com/signalwire/libks
ABI_VERSION:=1 ABI_VERSION:=2
DEPENDS:=+libatomic +libopenssl +libuuid DEPENDS:=+libatomic +libopenssl +libuuid
endef endef
@ -47,20 +47,20 @@ endef
TARGET_CFLAGS += $(TARGET_CPPFLAGS) TARGET_CFLAGS += $(TARGET_CPPFLAGS)
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME) $(INSTALL_DIR) $(1)/usr/include/libks2/libks/cmake
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/*.h \ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libks2/libks/*.h \
$(1)/usr/include/$(PKG_NAME) $(1)/usr/include/libks2/libks
$(INSTALL_DIR) $(1)/usr/lib/{cmake/$(PKG_NAME),pkgconfig} $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/cmake/* \ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libks2/libks/cmake/* \
$(1)/usr/lib/cmake/$(PKG_NAME) $(1)/usr/include/libks2/libks/cmake
$(CP) $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME).so* $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libks2.so* $(1)/usr/lib
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(PKG_NAME).pc \ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libks2.pc \
$(1)/usr/lib/pkgconfig $(1)/usr/lib/pkgconfig
endef endef
define Package/$(PKG_NAME)/install define Package/libks/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME).so.$(ABI_VERSION)* $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libks2.so.$(ABI_VERSION)* $(1)/usr/lib
endef endef
$(eval $(call BuildPackage,$(PKG_NAME))) $(eval $(call BuildPackage,libks))

2
libs/libks/patches/02-correct-signal_h-include.patch
View file

@ -1,6 +1,6 @@
--- a/src/include/libks/ks_platform.h --- a/src/include/libks/ks_platform.h
+++ b/src/include/libks/ks_platform.h +++ b/src/include/libks/ks_platform.h
@@ -91,7 +91,7 @@ KS_BEGIN_EXTERN_C @@ -93,7 +93,7 @@ KS_BEGIN_EXTERN_C
#include <sys/time.h> #include <sys/time.h>
#include <sys/select.h> #include <sys/select.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>

12
libs/libks/patches/03-fix-flags.patch
View file

@ -4,9 +4,9 @@
# Must include cotire before anything else for auto pch setup # Must include cotire before anything else for auto pch setup
#include(cmake/cotire.cmake) #include(cmake/cotire.cmake)
+# Declare our project, libks +# Declare our project, libks2
+project(LibKS VERSION 1.8.2 LANGUAGES C CXX) +project(LibKS2 VERSION 2.0.2 LANGUAGES C CXX)
+message("LibKS Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") +message("LibKS2 Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ +
# Load our common utility api and setup the platfomrm and build # Load our common utility api and setup the platfomrm and build
include(cmake/ksutil.cmake) include(cmake/ksutil.cmake)
@ -15,9 +15,9 @@
endif() endif()
endif() endif()
-# Declare our project, libks -# Declare our project, libks2
-project(LibKS VERSION 1.8.2 LANGUAGES C CXX) -project(LibKS2 VERSION 2.0.2 LANGUAGES C CXX)
-message("LibKS Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") -message("LibKS2 Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
- -
# Set package version # Set package version
set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})

37
libs/signalwire-client-c/Makefile
View file

@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=signalwire-client-c PKG_NAME:=signalwire-client-c
PKG_VERSION:=1.3.0 PKG_VERSION:=2.0.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=signalwire-c-$(PKG_VERSION).tar.gz PKG_SOURCE:=signalwire-c-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/signalwire/signalwire-c/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/signalwire/signalwire-c/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=77bc7fbd8405283ef64ccbc22fba6687fc936ed76fafcc15e7e90290e2906884 PKG_HASH:=7916ad76b2c2c75ff616d19bf044894771b3f8602b80a6f74d8ba26206faef79
PKG_BUILD_DIR:=$(BUILD_DIR)/signalwire-c-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/signalwire-c-$(PKG_VERSION)
@ -29,40 +29,41 @@ PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
define Package/$(PKG_NAME) define Package/signalwire-client-c
SUBMENU:=Telephony SUBMENU:=Telephony
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=SignalWire C client library TITLE:=SignalWire C client library
URL:=https://github.com/signalwire/signalwire-c URL:=https://github.com/signalwire/signalwire-c
ABI_VERSION:=1 ABI_VERSION:=2
DEPENDS:=+libatomic +libks +libopenssl DEPENDS:=+libatomic +libks +libopenssl
endef endef
# Otherwise OpenWrt's CPPFLAGS are ignored # Otherwise OpenWrt's CPPFLAGS are ignored
TARGET_CFLAGS += $(TARGET_CPPFLAGS) TARGET_CFLAGS += $(TARGET_CPPFLAGS)
define Package/$(PKG_NAME)/install/headers define Package/signalwire-client-c/install/headers
$(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME)/$(2) $(INSTALL_DIR) $(1)/usr/include/signalwire-client-c2/signalwire-client-c/$(2)
$(INSTALL_DATA) \ $(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/$(2)/*.h \ $(PKG_INSTALL_DIR)/usr/include/signalwire-client-c2/signalwire-client-c/$(2)/*.h \
$(1)/usr/include/$(PKG_NAME)/$(2) $(1)/usr/include/signalwire-client-c2/signalwire-client-c/$(2)
endef endef
define Build/InstallDev define Build/InstallDev
$(foreach s,./ JSON blade signalwire transport,$(call Package/$(PKG_NAME)/install/headers,$(1),$(s));) $(foreach s,./ JSON blade signalwire transport,$(call Package/signalwire-client-c/install/headers,$(1),$(s));)
$(INSTALL_DIR) $(1)/usr/lib/{cmake/$(PKG_NAME),pkgconfig} $(INSTALL_DIR) $(1)/usr/lib/pkgconfig \
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/cmake/* \ $(1)/usr/include/signalwire-client-c2/signalwire-client-c/cmake
$(1)/usr/lib/cmake/$(PKG_NAME) $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/signalwire-client-c2/signalwire-client-c/cmake/* \
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsignalwire_client.so* $(1)/usr/lib $(1)/usr/include/signalwire-client-c2/signalwire-client-c/cmake
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/signalwire_client.pc \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsignalwire_client2.so* $(1)/usr/lib
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/signalwire_client2.pc \
$(1)/usr/lib/pkgconfig $(1)/usr/lib/pkgconfig
endef endef
define Package/$(PKG_NAME)/install define Package/signalwire-client-c/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsignalwire_client.so.$(ABI_VERSION)* \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsignalwire_client2.so.$(ABI_VERSION)* \
$(1)/usr/lib $(1)/usr/lib
endef endef
$(eval $(call BuildPackage,$(PKG_NAME))) $(eval $(call BuildPackage,signalwire-client-c))

11
libs/signalwire-client-c/patches/01-set-libks-cmake-dir.patch
View file

@ -1,11 +0,0 @@
--- a/cmake/FindLibKS.cmake
+++ b/cmake/FindLibKS.cmake
@@ -19,7 +19,7 @@ if (NOT TARGET ks)
endif()
# From here we can bootstrap into cmake stuff
- set(LIBKS_CMAKE_DIR ${LIBKS_INCLUDE_DIRS}/cmake)
+ set(LIBKS_CMAKE_DIR ${LIBKS_LIBRARY_DIRS}/cmake/libks)
# Load ks utils for our build macros
include(${LIBKS_CMAKE_DIR}/ksutil.cmake)

4
libs/sofia-sip/Makefile
View file

@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=sofia-sip PKG_NAME:=sofia-sip
PKG_VERSION:=1.13.14 PKG_VERSION:=1.13.16
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/freeswitch/$(PKG_NAME)/tar.gz/v${PKG_VERSION}? PKG_SOURCE_URL:=https://codeload.github.com/freeswitch/$(PKG_NAME)/tar.gz/v${PKG_VERSION}?
PKG_HASH:=a517e31c6a406af3d7ec8cb0154e46ad12fbcb54dadfc3deada5d97bdbd9cc5a PKG_HASH:=125a9653bea1fc1cb275e4aec3445aa2deadf1fe3f1adffae9559d2349bfab36
# sofia-sip adds a version to include path # sofia-sip adds a version to include path
# need to update this when the version changes # need to update this when the version changes

6
libs/spandsp3/Makefile
View file

@ -11,10 +11,10 @@ PKG_NAME:=spandsp3
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/freeswitch/spandsp.git PKG_SOURCE_URL:=https://github.com/freeswitch/spandsp.git
PKG_SOURCE_DATE=2023-02-06 PKG_SOURCE_DATE=2023-06-16
PKG_SOURCE_VERSION:=67d2455efe02e7ff0d897f3fd5636fed4d54549e PKG_SOURCE_VERSION:=0d2e6ac65e0e8f53d652665a743015a88bf048d4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MIRROR_HASH:=2bb858566fae644fc18a60092ac0224500cb8117c9ed106d6a7cf825fab98459 PKG_MIRROR_HASH:=2d25c0f73f15aab37af7f09cf84f379b3fafb7c4d4e867ed1643dd3b3f594920
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1

16
net/freeswitch/Makefile
View file

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=freeswitch PKG_NAME:=freeswitch
PKG_VERSION:=1.10.9 PKG_VERSION:=1.10.10
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz
PKG_SOURCE_URL:=https://files.freeswitch.org/releases/freeswitch PKG_SOURCE_URL:=https://files.freeswitch.org/releases/freeswitch
PKG_HASH:=f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 PKG_HASH:=d2c702c7f4bd6eca539c3981cf859ad5c1846d9283829e24cd75686f2322b9df
PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch
@ -234,12 +234,6 @@ FS_PERL_FEED:=$(TOPDIR)/feeds/packages/lang/perl
include $(TOPDIR)/feeds/packages/lang/python/python3-version.mk include $(TOPDIR)/feeds/packages/lang/python/python3-version.mk
include $(FS_PERL_FEED)/perlver.mk include $(FS_PERL_FEED)/perlver.mk
# https://github.com/signalwire/freeswitch/issues/1670
TARGET_CFLAGS+=-Wno-error=address
# Allow compiling with OpenSSL 3.0
TARGET_CFLAGS+=-Wno-error=deprecated-declarations
PERL_SITELIB:=/usr/lib/perl$(PERL_MAJOR)/$(PERL_VERSION2) PERL_SITELIB:=/usr/lib/perl$(PERL_MAJOR)/$(PERL_VERSION2)
FS_PERL_LIBS:=$(shell grep "^libs=" \ FS_PERL_LIBS:=$(shell grep "^libs=" \
@ -875,7 +869,7 @@ $(eval $(call Package/freeswitch/Module,abstraction,API abstraction,This module
$(eval $(call Package/freeswitch/Module,alsa,ALSA endpoint,ALSA endpoint module.,+alsa-lib)) $(eval $(call Package/freeswitch/Module,alsa,ALSA endpoint,ALSA endpoint module.,+alsa-lib))
$(eval $(call Package/freeswitch/Module,amr,AMR passthrough,Passthrough AMR codec support.,)) $(eval $(call Package/freeswitch/Module,amr,AMR passthrough,Passthrough AMR codec support.,))
$(eval $(call Package/freeswitch/Module,amrwb,AMR wideband passthrough,Passthrough AMR wideband codec support.,)) $(eval $(call Package/freeswitch/Module,amrwb,AMR wideband passthrough,Passthrough AMR wideband codec support.,))
$(eval $(call Package/freeswitch/Module,av,AV,Video codec and format support via FFmpeg.,+libffmpeg-full @BROKEN @x86_64)) $(eval $(call Package/freeswitch/Module,av,AV,Video codec and format support via FFmpeg.,+libffmpeg-full @x86_64))
$(eval $(call Package/freeswitch/Module,avmd,Voicemail detection,This module attempts to determine when a voicemail system has answered\nthe call.,)) $(eval $(call Package/freeswitch/Module,avmd,Voicemail detection,This module attempts to determine when a voicemail system has answered\nthe call.,))
$(eval $(call Package/freeswitch/Module,b64,Base64,Transfers data Base64 encoded.,)) $(eval $(call Package/freeswitch/Module,b64,Base64,Transfers data Base64 encoded.,))
$(eval $(call Package/freeswitch/Module,basic,BASIC,BASIC module for FreeSWITCH.,)) $(eval $(call Package/freeswitch/Module,basic,BASIC,BASIC module for FreeSWITCH.,))
@ -950,7 +944,7 @@ $(eval $(call Package/freeswitch/Module,portaudio,Portaudio,Voice through a loca
$(eval $(call Package/freeswitch/Module,portaudio_stream,Portaudio streaming,Stream from an external audio source for Music on Hold.,+portaudio)) $(eval $(call Package/freeswitch/Module,portaudio_stream,Portaudio streaming,Stream from an external audio source for Music on Hold.,+portaudio))
$(eval $(call Package/freeswitch/Module,posix_timer,POSIX timer,Add POSIX timer support.,)) $(eval $(call Package/freeswitch/Module,posix_timer,POSIX timer,Add POSIX timer support.,))
$(eval $(call Package/freeswitch/Module,prefix,Prefix match,This module provides a data store with fast lookups by the longest\nprefix match rule.,)) $(eval $(call Package/freeswitch/Module,prefix,Prefix match,This module provides a data store with fast lookups by the longest\nprefix match rule.,))
$(eval $(call Package/freeswitch/Module,python3,Python3,Python3 support module.,@BROKEN +python3-light)) $(eval $(call Package/freeswitch/Module,python3,Python3,Python3 support module.,+python3-light))
$(eval $(call Package/freeswitch/Module,radius_cdr,Radius CDR,Radius Call Detail Record handler.,)) $(eval $(call Package/freeswitch/Module,radius_cdr,Radius CDR,Radius Call Detail Record handler.,))
$(eval $(call Package/freeswitch/Module,random,Entropy,This module extracts entropy from FreeSWITCH and feeds it into\n/dev/random.,)) $(eval $(call Package/freeswitch/Module,random,Entropy,This module extracts entropy from FreeSWITCH and feeds it into\n/dev/random.,))
$(eval $(call Package/freeswitch/Module,raven,Raven logging,Adds support for logging to Raven instances.,)) $(eval $(call Package/freeswitch/Module,raven,Raven logging,Adds support for logging to Raven instances.,))

2
net/freeswitch/patches/030-fix-configure-ac.patch
View file

@ -40,7 +40,7 @@
AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
case $host in case $host in
@@ -1663,13 +1639,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl @@ -1683,13 +1659,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

2
net/freeswitch/patches/120-fix-copts.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2280,7 +2280,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) @@ -2300,7 +2300,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)

4
net/freeswitch/patches/380-disable-luajit.patch
View file

@ -4,8 +4,8 @@
AC_SUBST(SYS_XMLRPC_LDFLAGS) AC_SUBST(SYS_XMLRPC_LDFLAGS)
AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"]) AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"])
-for luaversion in luajit lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do -for luaversion in luajit lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
+for luaversion in lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do +for luaversion in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
PKG_CHECK_MODULES([LUA],[${luaversion}],[have_lua=yes],[have_lua=no]) PKG_CHECK_MODULES([LUA],[${luaversion}],[have_lua=yes],[have_lua=no])
if test ${have_lua} = yes; then if test ${have_lua} = yes; then
break break

2
net/freeswitch/patches/460-remove-python-configure-checks.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1856,36 +1856,24 @@ then @@ -1876,36 +1876,24 @@ then
fi fi
AC_MSG_RESULT([$PYTHON3_VER]) AC_MSG_RESULT([$PYTHON3_VER])

10
net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch
View file

@ -62,7 +62,7 @@ The most portable fix for time_t handling is to always cast it to
#else #else
--- a/src/mod/applications/mod_httapi/mod_httapi.c --- a/src/mod/applications/mod_httapi/mod_httapi.c
+++ b/src/mod/applications/mod_httapi/mod_httapi.c +++ b/src/mod/applications/mod_httapi/mod_httapi.c
@@ -2744,7 +2744,7 @@ static switch_status_t write_meta_file(h @@ -2742,7 +2742,7 @@ static switch_status_t write_meta_file(h
switch_snprintf(write_data, sizeof(write_data), switch_snprintf(write_data, sizeof(write_data),
"%" TIME_T_FMT ":%s", "%" TIME_T_FMT ":%s",
@ -73,7 +73,7 @@ The most portable fix for time_t handling is to always cast it to
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c --- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c +++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -4200,7 +4200,8 @@ void sofia_presence_handle_sip_i_subscri @@ -4198,7 +4198,8 @@ void sofia_presence_handle_sip_i_subscri
sql = switch_mprintf("insert into sip_dialogs (sip_from_user,sip_from_host,call_info,call_info_state,hostname,expires,rcd,profile_name) " sql = switch_mprintf("insert into sip_dialogs (sip_from_user,sip_from_host,call_info,call_info_state,hostname,expires,rcd,profile_name) "
"values ('%q','%q','%q','seized','%q',%"TIME_T_FMT",%ld,'%q')", "values ('%q','%q','%q','seized','%q',%"TIME_T_FMT",%ld,'%q')",
to_user, to_host, switch_str_nil(p), mod_sofia_globals.hostname, to_user, to_host, switch_str_nil(p), mod_sofia_globals.hostname,
@ -85,7 +85,7 @@ The most portable fix for time_t handling is to always cast it to
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SEIZE SQL %s\n", sql); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SEIZE SQL %s\n", sql);
--- a/src/switch_channel.c --- a/src/switch_channel.c
+++ b/src/switch_channel.c +++ b/src/switch_channel.c
@@ -4643,39 +4643,39 @@ SWITCH_DECLARE(switch_status_t) switch_c @@ -4662,39 +4662,39 @@ SWITCH_DECLARE(switch_status_t) switch_c
tt_created = (time_t) (caller_profile->times->created / 1000000); tt_created = (time_t) (caller_profile->times->created / 1000000);
mtt_created = (time_t) (caller_profile->times->created / 1000); mtt_created = (time_t) (caller_profile->times->created / 1000);
@ -131,7 +131,7 @@ The most portable fix for time_t handling is to always cast it to
switch_channel_set_variable(channel, "hold_accum_seconds", tmp); switch_channel_set_variable(channel, "hold_accum_seconds", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hold_accum); switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hold_accum);
switch_channel_set_variable(channel, "hold_accum_usec", tmp); switch_channel_set_variable(channel, "hold_accum_usec", tmp);
@@ -4683,28 +4683,28 @@ SWITCH_DECLARE(switch_status_t) switch_c @@ -4702,28 +4702,28 @@ SWITCH_DECLARE(switch_status_t) switch_c
switch_channel_set_variable(channel, "hold_accum_ms", tmp); switch_channel_set_variable(channel, "hold_accum_ms", tmp);
tt_resurrected = (time_t) (caller_profile->times->resurrected / 1000000); tt_resurrected = (time_t) (caller_profile->times->resurrected / 1000000);
@ -166,7 +166,7 @@ The most portable fix for time_t handling is to always cast it to
switch_channel_set_variable(channel, "end_uepoch", tmp); switch_channel_set_variable(channel, "end_uepoch", tmp);
--- a/src/switch_ivr_originate.c --- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c +++ b/src/switch_ivr_originate.c
@@ -797,7 +797,7 @@ static uint8_t check_channel_status(orig @@ -800,7 +800,7 @@ static uint8_t check_channel_status(orig
time_t elapsed = switch_epoch_time_now(NULL) - start; time_t elapsed = switch_epoch_time_now(NULL) - start;
oglobals->originate_status[i].per_channel_progress_timelimit_sec = elapsed + extend_timeout; oglobals->originate_status[i].per_channel_progress_timelimit_sec = elapsed + extend_timeout;
oglobals->originate_status[i].per_channel_timelimit_sec = elapsed + extend_timeout; oglobals->originate_status[i].per_channel_timelimit_sec = elapsed + extend_timeout;

4
net/freeswitch/patches/492-mod_verto_time64.patch
View file

@ -1,6 +1,6 @@
--- a/src/mod/endpoints/mod_verto/mod_verto.c --- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c +++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -1126,7 +1126,7 @@ static switch_bool_t check_auth(jsock_t @@ -1121,7 +1121,7 @@ static switch_bool_t check_auth(jsock_t
if (tmp > now) { if (tmp > now) {
jsock->exptime = tmp; jsock->exptime = tmp;
@ -9,7 +9,7 @@
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid expire time for %s. Defaulting to 300 sec\n", jsock->uid); 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; jsock->exptime = now + 300;
@@ -2008,7 +2008,7 @@ static void client_run(jsock_t *jsock) @@ -2003,7 +2003,7 @@ static void client_run(jsock_t *jsock)
if (now >= jsock->exptime) { if (now >= jsock->exptime) {
switch_set_flag(jsock, JPFLAG_AUTH_EXPIRED); switch_set_flag(jsock, JPFLAG_AUTH_EXPIRED);

2
net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch
View file

@ -12,7 +12,7 @@ Reported-by: Sebastian Kemper <sebastian_ml@gmx.net>
--- a/src/switch_core_sqldb.c --- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c +++ b/src/switch_core_sqldb.c
@@ -3549,7 +3549,7 @@ SWITCH_DECLARE(switch_status_t) switch_c @@ -3551,7 +3551,7 @@ SWITCH_DECLARE(switch_status_t) switch_c
if (force) { if (force) {
sql = switch_mprintf("delete from registrations where hostname='%q'", switch_core_get_switchname()); sql = switch_mprintf("delete from registrations where hostname='%q'", switch_core_get_switchname());
} else { } else {

41
net/freeswitch/patches/500-libshout-deprecated.patch
View file

@ -1,41 +0,0 @@
Prevent compile from failing due to mod-shout using deprecated libshout
declarations.
---
--- a/configure.ac
+++ b/configure.ac
@@ -373,8 +373,20 @@ if test "$ax_cv_c_compiler_vendor" = "gn
[ac_cv_gcc_supports_w_no_err_format_truncation=no])])
CFLAGS="$saved_CFLAGS"
AC_MSG_RESULT($ac_cv_gcc_supports_w_no_err_format_truncation)
+
+ saved_CFLAGS="$CFLAGS"
+ AC_CACHE_CHECK([whether compiler supports -Wno-error=deprecated-declarations],
+ [ac_cv_gcc_supports_w_no_err_deprecated_declarations], [
+ CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
+ AC_TRY_COMPILE([],[return 0;],
+ [ac_cv_gcc_supports_w_no_err_deprecated_declarations=yes],
+ [ac_cv_gcc_supports_w_no_err_deprecated_declarations=no])])
+ CFLAGS="$saved_CFLAGS"
+ AC_MSG_RESULT($ac_cv_gcc_supports_w_no_err_deprecated_declarations)
fi
+AM_CONDITIONAL([W_NO_ERR_DEPRECATED_DECLARATIONS], [test x$ac_cv_gcc_supports_w_no_err_deprecated_declarations = xyes])
+
# tweak compiler specific flags
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
APR_ADDTO(SWITCH_AM_CFLAGS, -KPIC)
--- a/src/mod/formats/mod_shout/Makefile.am
+++ b/src/mod/formats/mod_shout/Makefile.am
@@ -12,6 +12,10 @@ mod_shout_la_CPPFLAGS = $(CURL_CFLAGS) $
mod_shout_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_shout_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared $(SHOUT_LIBS) $(MP3LAME_LIBS) $(MPG123_LIBS)
+if W_NO_ERR_DEPRECATED_DECLARATIONS
+mod_shout_la_CFLAGS += -Wno-error=deprecated-declarations
+endif
+
else
install: error
all: error