From c18640bc0f46374b20e9a92981abd2fdc295c1dc Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 18 Aug 2023 12:36:41 +0200 Subject: [PATCH 1/5] spandsp3: bump to commit from June 16th Same commit is used by freeswitch 1.10.10 for Windows. Signed-off-by: Sebastian Kemper --- libs/spandsp3/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/spandsp3/Makefile b/libs/spandsp3/Makefile index c6b0696..fa04b2f 100644 --- a/libs/spandsp3/Makefile +++ b/libs/spandsp3/Makefile @@ -11,10 +11,10 @@ PKG_NAME:=spandsp3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/freeswitch/spandsp.git -PKG_SOURCE_DATE=2023-02-06 -PKG_SOURCE_VERSION:=67d2455efe02e7ff0d897f3fd5636fed4d54549e +PKG_SOURCE_DATE=2023-06-16 +PKG_SOURCE_VERSION:=0d2e6ac65e0e8f53d652665a743015a88bf048d4 PKG_RELEASE:=1 -PKG_MIRROR_HASH:=2bb858566fae644fc18a60092ac0224500cb8117c9ed106d6a7cf825fab98459 +PKG_MIRROR_HASH:=2d25c0f73f15aab37af7f09cf84f379b3fafb7c4d4e867ed1643dd3b3f594920 PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 From 4cce5ebdd0c3447c68052e44a985e3030bfd1315 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 18 Aug 2023 12:38:12 +0200 Subject: [PATCH 2/5] sofia-sip: bump to 1.13.16 Signed-off-by: Sebastian Kemper --- libs/sofia-sip/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/sofia-sip/Makefile b/libs/sofia-sip/Makefile index cf1f528..7e5e281 100644 --- a/libs/sofia-sip/Makefile +++ b/libs/sofia-sip/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sofia-sip -PKG_VERSION:=1.13.14 +PKG_VERSION:=1.13.16 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 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 # need to update this when the version changes From 04f03b98a52fc52b12f7ccf2f706667bcadee927 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 18 Aug 2023 14:23:30 +0200 Subject: [PATCH 3/5] libks: bump to 2.0.2 Signed-off-by: Sebastian Kemper --- libs/libks/Makefile | 32 +++++++++---------- .../patches/02-correct-signal_h-include.patch | 2 +- libs/libks/patches/03-fix-flags.patch | 12 +++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/libs/libks/Makefile b/libs/libks/Makefile index 243f7a7..cf6a6cf 100644 --- a/libs/libks/Makefile +++ b/libs/libks/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libks -PKG_VERSION:=1.8.2 +PKG_VERSION:=2.0.2 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_HASH:=131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 +PKG_HASH:=af94f9fcdb2022b8f09187309ac2d372a5a4cc639af77cd4375f2d5c88b4fd63 PKG_BUILD_PARALLEL:=1 CMAKE_INSTALL:=1 @@ -33,13 +33,13 @@ PKG_MAINTAINER:=Sebastian Kemper include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -define Package/$(PKG_NAME) +define Package/libks SUBMENU:=Telephony SECTION:=libs CATEGORY:=Libraries TITLE:=Foundational support for SignalWire C products URL:=https://github.com/signalwire/libks - ABI_VERSION:=1 + ABI_VERSION:=2 DEPENDS:=+libatomic +libopenssl +libuuid endef @@ -47,20 +47,20 @@ endef TARGET_CFLAGS += $(TARGET_CPPFLAGS) define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME) - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/*.h \ - $(1)/usr/include/$(PKG_NAME) - $(INSTALL_DIR) $(1)/usr/lib/{cmake/$(PKG_NAME),pkgconfig} - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/cmake/* \ - $(1)/usr/lib/cmake/$(PKG_NAME) - $(CP) $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME).so* $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(PKG_NAME).pc \ + $(INSTALL_DIR) $(1)/usr/include/libks2/libks/cmake + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libks2/libks/*.h \ + $(1)/usr/include/libks2/libks + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libks2/libks/cmake/* \ + $(1)/usr/include/libks2/libks/cmake + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libks2.so* $(1)/usr/lib + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libks2.pc \ $(1)/usr/lib/pkgconfig endef -define Package/$(PKG_NAME)/install +define Package/libks/install $(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 -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,libks)) diff --git a/libs/libks/patches/02-correct-signal_h-include.patch b/libs/libks/patches/02-correct-signal_h-include.patch index a128a8d..c0739b4 100644 --- a/libs/libks/patches/02-correct-signal_h-include.patch +++ b/libs/libks/patches/02-correct-signal_h-include.patch @@ -1,6 +1,6 @@ --- a/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 #include #include diff --git a/libs/libks/patches/03-fix-flags.patch b/libs/libks/patches/03-fix-flags.patch index a496764..f936e9d 100644 --- a/libs/libks/patches/03-fix-flags.patch +++ b/libs/libks/patches/03-fix-flags.patch @@ -4,9 +4,9 @@ # Must include cotire before anything else for auto pch setup #include(cmake/cotire.cmake) -+# Declare our project, libks -+project(LibKS VERSION 1.8.2 LANGUAGES C CXX) -+message("LibKS Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") ++# Declare our project, libks2 ++project(LibKS2 VERSION 2.0.2 LANGUAGES C CXX) ++message("LibKS2 Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") + # Load our common utility api and setup the platfomrm and build include(cmake/ksutil.cmake) @@ -15,9 +15,9 @@ endif() endif() --# Declare our project, libks --project(LibKS VERSION 1.8.2 LANGUAGES C CXX) --message("LibKS Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") +-# Declare our project, libks2 +-project(LibKS2 VERSION 2.0.2 LANGUAGES C CXX) +-message("LibKS2 Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") - # Set package version set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) From bd1a8deebe7060a80461047637b4c04ed3e096bf Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 18 Aug 2023 14:23:41 +0200 Subject: [PATCH 4/5] signalwire-client-c: bump to 2.0.0 Signed-off-by: Sebastian Kemper --- libs/signalwire-client-c/Makefile | 37 ++++++++++--------- .../patches/01-set-libks-cmake-dir.patch | 11 ------ 2 files changed, 19 insertions(+), 29 deletions(-) delete mode 100644 libs/signalwire-client-c/patches/01-set-libks-cmake-dir.patch diff --git a/libs/signalwire-client-c/Makefile b/libs/signalwire-client-c/Makefile index d9ea0b8..debb119 100644 --- a/libs/signalwire-client-c/Makefile +++ b/libs/signalwire-client-c/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=signalwire-client-c -PKG_VERSION:=1.3.0 +PKG_VERSION:=2.0.0 PKG_RELEASE:=1 PKG_SOURCE:=signalwire-c-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/signalwire/signalwire-c/tar.gz/$(PKG_VERSION)? -PKG_HASH:=77bc7fbd8405283ef64ccbc22fba6687fc936ed76fafcc15e7e90290e2906884 +PKG_SOURCE_URL:=https://codeload.github.com/signalwire/signalwire-c/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=7916ad76b2c2c75ff616d19bf044894771b3f8602b80a6f74d8ba26206faef79 PKG_BUILD_DIR:=$(BUILD_DIR)/signalwire-c-$(PKG_VERSION) @@ -29,40 +29,41 @@ PKG_MAINTAINER:=Sebastian Kemper include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -define Package/$(PKG_NAME) +define Package/signalwire-client-c SUBMENU:=Telephony SECTION:=libs CATEGORY:=Libraries TITLE:=SignalWire C client library URL:=https://github.com/signalwire/signalwire-c - ABI_VERSION:=1 + ABI_VERSION:=2 DEPENDS:=+libatomic +libks +libopenssl endef # Otherwise OpenWrt's CPPFLAGS are ignored TARGET_CFLAGS += $(TARGET_CPPFLAGS) -define Package/$(PKG_NAME)/install/headers - $(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME)/$(2) +define Package/signalwire-client-c/install/headers + $(INSTALL_DIR) $(1)/usr/include/signalwire-client-c2/signalwire-client-c/$(2) $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/$(2)/*.h \ - $(1)/usr/include/$(PKG_NAME)/$(2) + $(PKG_INSTALL_DIR)/usr/include/signalwire-client-c2/signalwire-client-c/$(2)/*.h \ + $(1)/usr/include/signalwire-client-c2/signalwire-client-c/$(2) endef define Build/InstallDev - $(foreach s,./ JSON blade signalwire transport,$(call Package/$(PKG_NAME)/install/headers,$(1),$(s));) - $(INSTALL_DIR) $(1)/usr/lib/{cmake/$(PKG_NAME),pkgconfig} - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/cmake/* \ - $(1)/usr/lib/cmake/$(PKG_NAME) - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsignalwire_client.so* $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/signalwire_client.pc \ + $(foreach s,./ JSON blade signalwire transport,$(call Package/signalwire-client-c/install/headers,$(1),$(s));) + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig \ + $(1)/usr/include/signalwire-client-c2/signalwire-client-c/cmake + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/signalwire-client-c2/signalwire-client-c/cmake/* \ + $(1)/usr/include/signalwire-client-c2/signalwire-client-c/cmake + $(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 endef -define Package/$(PKG_NAME)/install +define Package/signalwire-client-c/install $(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 endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,signalwire-client-c)) diff --git a/libs/signalwire-client-c/patches/01-set-libks-cmake-dir.patch b/libs/signalwire-client-c/patches/01-set-libks-cmake-dir.patch deleted file mode 100644 index c2a961f..0000000 --- a/libs/signalwire-client-c/patches/01-set-libks-cmake-dir.patch +++ /dev/null @@ -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) From 999a8a9ff1df8af205dcb0d43603f316334b6592 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 18 Aug 2023 14:23:53 +0200 Subject: [PATCH 5/5] freeswitch: bump to 1.10.10 - bump to 1.10.10 - remove TARGET_CFLAGS workarounds - remove BROKEN from modules av & python3 - remove 500-libshout-deprecated.patch - refresh other patches Signed-off-by: Sebastian Kemper --- net/freeswitch/Makefile | 16 +++----- .../patches/030-fix-configure-ac.patch | 2 +- net/freeswitch/patches/120-fix-copts.patch | 2 +- .../patches/380-disable-luajit.patch | 4 +- .../460-remove-python-configure-checks.patch | 2 +- ...490-build-properly-fix-time_t-issues.patch | 10 ++--- .../patches/492-mod_verto_time64.patch | 4 +- ...ore-fix-switch_mprintf-format-string.patch | 2 +- .../patches/500-libshout-deprecated.patch | 41 ------------------- 9 files changed, 18 insertions(+), 65 deletions(-) delete mode 100644 net/freeswitch/patches/500-libshout-deprecated.patch diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index b8cd607..c195e00 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeswitch -PKG_VERSION:=1.10.9 -PKG_RELEASE:=2 +PKG_VERSION:=1.10.10 +PKG_RELEASE:=1 PKG_MAINTAINER:=Sebastian Kemper PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz PKG_SOURCE_URL:=https://files.freeswitch.org/releases/freeswitch -PKG_HASH:=f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 +PKG_HASH:=d2c702c7f4bd6eca539c3981cf859ad5c1846d9283829e24cd75686f2322b9df 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 $(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) 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,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,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,b64,Base64,Transfers data Base64 encoded.,)) $(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,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,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,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.,)) diff --git a/net/freeswitch/patches/030-fix-configure-ac.patch b/net/freeswitch/patches/030-fix-configure-ac.patch index 9dcae0b..9ac3a02 100644 --- a/net/freeswitch/patches/030-fix-configure-ac.patch +++ b/net/freeswitch/patches/030-fix-configure-ac.patch @@ -40,7 +40,7 @@ AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) 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" if test "x$ac_cv_have_perl" != "xno"; then diff --git a/net/freeswitch/patches/120-fix-copts.patch b/net/freeswitch/patches/120-fix-copts.patch index b70405f..e56ae64 100644 --- a/net/freeswitch/patches/120-fix-copts.patch +++ b/net/freeswitch/patches/120-fix-copts.patch @@ -1,6 +1,6 @@ --- a/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(AM_MAKEFLAGS) diff --git a/net/freeswitch/patches/380-disable-luajit.patch b/net/freeswitch/patches/380-disable-luajit.patch index f384b3a..37ecd16 100644 --- a/net/freeswitch/patches/380-disable-luajit.patch +++ b/net/freeswitch/patches/380-disable-luajit.patch @@ -4,8 +4,8 @@ AC_SUBST(SYS_XMLRPC_LDFLAGS) 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 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.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]) if test ${have_lua} = yes; then break diff --git a/net/freeswitch/patches/460-remove-python-configure-checks.patch b/net/freeswitch/patches/460-remove-python-configure-checks.patch index 9c69ebc..1a577a5 100644 --- a/net/freeswitch/patches/460-remove-python-configure-checks.patch +++ b/net/freeswitch/patches/460-remove-python-configure-checks.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1856,36 +1856,24 @@ then +@@ -1876,36 +1876,24 @@ then fi AC_MSG_RESULT([$PYTHON3_VER]) diff --git a/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch b/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch index f5bcb62..395f7ac 100644 --- a/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch +++ b/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch @@ -62,7 +62,7 @@ The most portable fix for time_t handling is to always cast it to #else --- a/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), "%" 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 +++ 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) " "values ('%q','%q','%q','seized','%q',%"TIME_T_FMT",%ld,'%q')", 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); --- a/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); 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_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hold_accum); 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); 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); --- a/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; oglobals->originate_status[i].per_channel_progress_timelimit_sec = elapsed + extend_timeout; oglobals->originate_status[i].per_channel_timelimit_sec = elapsed + extend_timeout; diff --git a/net/freeswitch/patches/492-mod_verto_time64.patch b/net/freeswitch/patches/492-mod_verto_time64.patch index 50ad5de..dfddff2 100644 --- a/net/freeswitch/patches/492-mod_verto_time64.patch +++ b/net/freeswitch/patches/492-mod_verto_time64.patch @@ -1,6 +1,6 @@ --- a/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) { jsock->exptime = tmp; @@ -9,7 +9,7 @@ } else { 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; -@@ -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) { switch_set_flag(jsock, JPFLAG_AUTH_EXPIRED); diff --git a/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch b/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch index 2c9cf0c..effb550 100644 --- a/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch +++ b/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch @@ -12,7 +12,7 @@ Reported-by: Sebastian Kemper --- a/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) { sql = switch_mprintf("delete from registrations where hostname='%q'", switch_core_get_switchname()); } else { diff --git a/net/freeswitch/patches/500-libshout-deprecated.patch b/net/freeswitch/patches/500-libshout-deprecated.patch deleted file mode 100644 index 4bc6209..0000000 --- a/net/freeswitch/patches/500-libshout-deprecated.patch +++ /dev/null @@ -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