From b2cccf35e679747629319a72f63f7ece65376f33 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 2 Mar 2024 11:40:06 +0100 Subject: freeswitch: update to 1.10.11 --- package/freeswitch/Makefile | 18 +++++++++++++----- .../patch-libs_srtp_crypto_hash_hmac_ossl_c | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 package/freeswitch/patches/patch-libs_srtp_crypto_hash_hmac_ossl_c diff --git a/package/freeswitch/Makefile b/package/freeswitch/Makefile index e5eeadf33..0d6f067c8 100644 --- a/package/freeswitch/Makefile +++ b/package/freeswitch/Makefile @@ -4,22 +4,25 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= freeswitch -PKG_VERSION:= 1.6.18 +PKG_VERSION:= 1.10.11 PKG_RELEASE:= 1 -PKG_HASH:= ac1b32f61e5c35680c5a2d6f145bc480cf26e6527af07d8b8b9fa2d5280252cd +PKG_HASH:= 4437edfa08558aa407c9fad5e4eed58f757357c53ca735aed9977e48aa1c53e3 PKG_DESCR:= cross-platform telephony platform PKG_SECTION:= net/voip PKG_DEPENDS:= libpcre libcurl zlib libjpeg-turbo libsqlite -PKG_DEPENDS+= libressl libopus +PKG_DEPENDS+= libressl libopus spandsp sofia-sip PKG_BUILDDEP:= util-linux zlib libjpeg-turbo sqlite curl pcre -PKG_BUILDDEP+= speex libressl opus +PKG_BUILDDEP+= speex libressl opus spandsp sofia-sip PKG_URL:= http://www.freeswitch.org/ -PKG_SITES:= http://files.freeswitch.org/freeswitch-releases/ +PKG_SITES:= https://github.com/signalwire/freeswitch/archive/refs/tags/ + +DISTFILES:= v$(PKG_VERSION).tar.gz include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FREESWITCH,freeswitch,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +AUTOTOOL_STYLE:= bootstrap CONFIGURE_ARGS+= --disable-core-libedit-support \ --disable-libvpx CONFIGURE_ENV+= ac_cv_file__dev_ptmx=yes \ @@ -35,10 +38,15 @@ CONFIGURE_ENV+= ac_cv_file__dev_ptmx=yes \ ac_cv_func_setpgrp_void=yes pre-configure: + $(SED) "/applications\/mod_av/d" $(WRKBUILD)/modules.conf $(SED) "/applications\/mod_enum/d" $(WRKBUILD)/modules.conf $(SED) "/applications\/mod_fsv/d" $(WRKBUILD)/modules.conf + $(SED) "/applications\/mod_signalwire/d" $(WRKBUILD)/modules.conf + $(SED) "/applications\/mod_spandsp/d" $(WRKBUILD)/modules.conf + $(SED) "/databases\/mod_pgsql/d" $(WRKBUILD)/modules.conf $(SED) "/languages\/mod_lua/d" $(WRKBUILD)/modules.conf $(SED) "/endpoints\/mod_sofia/d" $(WRKBUILD)/modules.conf + $(SED) "/endpoints\/mod_verto/d" $(WRKBUILD)/modules.conf $(SED) "/codecs\/mod_vpx/d" $(WRKBUILD)/modules.conf $(SED) "/formats\/mod_sndfile/d" $(WRKBUILD)/modules.conf diff --git a/package/freeswitch/patches/patch-libs_srtp_crypto_hash_hmac_ossl_c b/package/freeswitch/patches/patch-libs_srtp_crypto_hash_hmac_ossl_c new file mode 100644 index 000000000..aab43c797 --- /dev/null +++ b/package/freeswitch/patches/patch-libs_srtp_crypto_hash_hmac_ossl_c @@ -0,0 +1,22 @@ +--- freeswitch-1.10.11.orig/libs/srtp/crypto/hash/hmac_ossl.c 2023-12-22 19:08:31.000000000 +0100 ++++ freeswitch-1.10.11/libs/srtp/crypto/hash/hmac_ossl.c 2024-02-29 00:19:04.687821875 +0100 +@@ -80,7 +80,8 @@ static srtp_err_status_t srtp_hmac_alloc + + /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated + using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + { + /* allocate memory for auth and HMAC_CTX structures */ + uint8_t *pointer; +@@ -126,7 +127,8 @@ static srtp_err_status_t srtp_hmac_deall + + hmac_ctx = (HMAC_CTX *)a->state; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + HMAC_CTX_cleanup(hmac_ctx); + + /* zeroize entire state*/ -- cgit v1.2.3