commit
c6e238e23e
8 changed files with 20 additions and 199 deletions
|
@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=libks
|
||||
|
||||
PKG_VERSION:=1.6.0
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=1.7.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/signalwire/libks/tar.gz/$(PKG_VERSION)?
|
||||
PKG_HASH:=1638b489df1e7c4ef81ebe08c2b6256d942a2ac1b477fb36f3920b9d1f0b7166
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/signalwire/libks/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=73c5751eadad4d3390d61b9765e9b860e0aba7336044ecf8b007dfc1818baa69
|
||||
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
CMAKE_INSTALL:=1
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include(cmake/cotire.cmake)
|
||||
|
||||
+# Declare our project, libks
|
||||
+project(LibKS VERSION 1.6.0 LANGUAGES C CXX)
|
||||
+project(LibKS VERSION 1.7.0 LANGUAGES C CXX)
|
||||
+message("LibKS Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
|
||||
+
|
||||
# Load our common utility api and setup the platfomrm and build
|
||||
|
@ -16,7 +16,7 @@
|
|||
endif()
|
||||
|
||||
-# Declare our project, libks
|
||||
-project(LibKS VERSION 1.6.0 LANGUAGES C CXX)
|
||||
-project(LibKS VERSION 1.7.0 LANGUAGES C CXX)
|
||||
-message("LibKS Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
|
||||
-
|
||||
# Set package version
|
||||
|
|
|
@ -1,99 +0,0 @@
|
|||
--- a/src/include/libks/ks_ssl.h
|
||||
+++ b/src/include/libks/ks_ssl.h
|
||||
@@ -25,6 +25,8 @@
|
||||
#include <openssl/ssl.h>
|
||||
#include <openssl/engine.h>
|
||||
#include <openssl/x509v3.h>
|
||||
+#include <openssl/bn.h>
|
||||
+#include <openssl/rsa.h>
|
||||
|
||||
KS_BEGIN_EXTERN_C
|
||||
|
||||
--- a/src/include/libks/kws.h
|
||||
+++ b/src/include/libks/kws.h
|
||||
@@ -22,6 +22,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <openssl/err.h>
|
||||
+
|
||||
#define WEBSOCKET_GUID "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
|
||||
#define B64BUFFLEN 1024
|
||||
#define KWS_MAX_HEADERS 64
|
||||
--- a/src/ks_ssl.c
|
||||
+++ b/src/ks_ssl.c
|
||||
@@ -30,6 +30,7 @@ static int ssl_count = 0;
|
||||
static int is_init = 0;
|
||||
static ks_bool_t skip_ssl = KS_FALSE;
|
||||
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000
|
||||
static inline void ks_ssl_lock_callback(int mode, int type, char *file, int line)
|
||||
{
|
||||
if (mode & CRYPTO_LOCK) {
|
||||
@@ -44,6 +45,7 @@ static inline unsigned long ks_ssl_thread_id(void)
|
||||
{
|
||||
return ks_thread_self_id();
|
||||
}
|
||||
+#endif
|
||||
|
||||
KS_DECLARE(void) ks_ssl_init_skip(ks_bool_t skip)
|
||||
{
|
||||
@@ -58,6 +60,7 @@ KS_DECLARE(void) ks_ssl_init_ssl_locks(void)
|
||||
|
||||
is_init = 1;
|
||||
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000
|
||||
if (!skip_ssl) {
|
||||
SSL_library_init();
|
||||
SSL_load_error_strings();
|
||||
@@ -81,6 +84,7 @@ KS_DECLARE(void) ks_ssl_init_ssl_locks(void)
|
||||
|
||||
ssl_count++;
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
KS_DECLARE(void) ks_ssl_destroy_ssl_locks(void)
|
||||
@@ -91,6 +95,7 @@ KS_DECLARE(void) ks_ssl_destroy_ssl_locks(void)
|
||||
|
||||
is_init = 0;
|
||||
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000
|
||||
if (!skip_ssl) {
|
||||
if (ssl_count == 1) {
|
||||
CRYPTO_set_locking_callback(NULL);
|
||||
@@ -111,6 +116,7 @@ KS_DECLARE(void) ks_ssl_destroy_ssl_locks(void)
|
||||
ERR_free_strings();
|
||||
EVP_cleanup();
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
static int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days);
|
||||
@@ -159,6 +165,7 @@ KS_DECLARE(int) ks_gen_cert(const char *dir, const char *file)
|
||||
}
|
||||
}
|
||||
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000
|
||||
X509_free(x509);
|
||||
EVP_PKEY_free(pkey);
|
||||
|
||||
@@ -169,6 +176,7 @@ KS_DECLARE(int) ks_gen_cert(const char *dir, const char *file)
|
||||
|
||||
//CRYPTO_mem_leaks(bio_err);
|
||||
//BIO_free(bio_err);
|
||||
+#endif
|
||||
|
||||
|
||||
ks_safe_free(pvt);
|
||||
@@ -231,8 +239,8 @@ static int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days
|
||||
|
||||
X509_set_version(x, 0);
|
||||
ASN1_INTEGER_set(X509_get_serialNumber(x), serial);
|
||||
- X509_gmtime_adj(X509_get_notBefore(x), -(long)60*60*24*7);
|
||||
- X509_gmtime_adj(X509_get_notAfter(x), (long)60*60*24*days);
|
||||
+ X509_gmtime_adj(X509_getm_notBefore(x), -(long)60*60*24*7);
|
||||
+ X509_gmtime_adj(X509_getm_notAfter(x), (long)60*60*24*days);
|
||||
X509_set_pubkey(x, pk);
|
||||
|
||||
name = X509_get_subject_name(x);
|
|
@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=sofia-sip
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/freeswitch/sofia-sip.git
|
||||
PKG_SOURCE_DATE=2020-08-31
|
||||
PKG_SOURCE_VERSION:=f6f29b483e9c31ce8d3e87419ec3deea8679312d
|
||||
PKG_VERSION:=1.13.3
|
||||
PKG_RELEASE:=1
|
||||
PKG_MIRROR_HASH:=07b9b6198558542270699af2e31ff2331a49a5262e250cc78e3bf631dc444737
|
||||
|
||||
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:=6f9cc7ed674e2214809e390728da0df646f94e5b991cff9f393217176de9d7e4
|
||||
|
||||
# sofia-sip adds a version to include path
|
||||
# need to update this when the version changes
|
||||
|
|
|
@ -11,10 +11,10 @@ PKG_NAME:=spandsp3
|
|||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/freeswitch/spandsp.git
|
||||
PKG_SOURCE_DATE=2020-08-14
|
||||
PKG_SOURCE_VERSION:=6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6
|
||||
PKG_RELEASE:=2
|
||||
PKG_MIRROR_HASH:=fcfa13576a25ff27e3746c3db30de89d2afceb963072b352a34e7a4a9f492ae5
|
||||
PKG_SOURCE_DATE=2020-10-19
|
||||
PKG_SOURCE_VERSION:=e08c74db3f072db893c4d37de733f03c27bf7ed3
|
||||
PKG_RELEASE:=1
|
||||
PKG_MIRROR_HASH:=4c2b29f71e130548a539cb86e47b34a5bda19896d96050868193e5aa86860db0
|
||||
|
||||
PKG_INSTALL:=1
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
|
|
@ -9,19 +9,17 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=freeswitch-mod-bcg729
|
||||
|
||||
PKG_VERSION:=20170629
|
||||
PKG_RELEASE:=1
|
||||
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
|
||||
|
||||
PKG_LICENSE:=MPL-1.1
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
PKG_SOURCE:=freeswitch-mod-bcg729-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://github.com/xadhoom/mod_bcg729.git
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_SUBDIR:=freeswitch-mod-bcg729-$(PKG_VERSION)
|
||||
PKG_SOURCE_VERSION:=686eb06d4a395d94c364efff4b63579af76ebec7
|
||||
PKG_MIRROR_HASH:=efc9421223bba3ba7dd127531aa6887c39ed42d5fb8c0b0c67b15f3c98134b0a
|
||||
PKG_SOURCE_DATE:=2017-06-29
|
||||
PKG_MIRROR_HASH:=005a7d3c69beda7d32c1a671bfe0befa5477ac3c67f21bf086d588f4c760e303
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=freeswitch
|
||||
PKG_VERSION:=1.10.5
|
||||
PKG_RELEASE:=5
|
||||
PKG_RELEASE:=6
|
||||
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
|
||||
|
||||
PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz
|
||||
|
@ -233,17 +233,6 @@ PKG_CONFIG_DEPENDS:= \
|
|||
include $(INCLUDE_DIR)/package.mk
|
||||
# iconv support
|
||||
include $(INCLUDE_DIR)/nls.mk
|
||||
#######################################################
|
||||
# mod_gsmopen can't detect if iconv's inbuf is const. #
|
||||
# #
|
||||
# musl uclibc #
|
||||
# libiconv-stub - - #
|
||||
# libiconv-full - const #
|
||||
# #
|
||||
#######################################################
|
||||
ifeq ($(ICONV_FULL)$(CONFIG_USE_UCLIBC),1y)
|
||||
TARGET_CFLAGS+=-DFS_ICONV_INBUF_CONST
|
||||
endif
|
||||
|
||||
FS_PERL_FEED:=$(TOPDIR)/feeds/packages/lang/perl
|
||||
|
||||
|
@ -978,7 +967,7 @@ $(eval $(call Package/freeswitch/Module,esl,Single ESL,This module adds an API f
|
|||
$(eval $(call Package/freeswitch/Module,event_multicast,Multicast Event,Multicast Event System for FreeSWITCH.,))
|
||||
$(eval $(call Package/freeswitch/Module,event_socket,Event socket,Sends events via a single socket. Needed for fs_cli.,))
|
||||
$(eval $(call Package/freeswitch/Module,event_test,Event test,Event demo module.,))
|
||||
$(eval $(call Package/freeswitch/Module,event_zmq,ZMQ event,ZMQ event module.,@!USE_UCLIBCXX))
|
||||
$(eval $(call Package/freeswitch/Module,event_zmq,ZMQ event,ZMQ event module.,))
|
||||
$(eval $(call Package/freeswitch/Module,expr,Expr,This module adds expr support for expression evaluation.,))
|
||||
$(eval $(call Package/freeswitch/Module,fail2ban,Fail2ban logging,Provides support for Fail2ban logging.,))
|
||||
$(eval $(call Package/freeswitch/Module,fifo,FIFO,This module adds a first-in first-out queue system.,))
|
||||
|
@ -1004,7 +993,7 @@ $(eval $(call Package/freeswitch/Module,local_stream,Local stream,Connects multi
|
|||
$(eval $(call Package/freeswitch/Module,logfile,File logger,Logs FreeSWITCH output to a file.,))
|
||||
$(eval $(call Package/freeswitch/Module,loopback,Loopback,A loopback channel driver.,))
|
||||
$(eval $(call Package/freeswitch/Module,lua,Lua,Lua language interface for FreeSWITCH.,+liblua))
|
||||
$(eval $(call Package/freeswitch/Module,mariadb,MariaDB,Adds MariaDB support.,+libmariadb @!USE_UCLIBCXX))
|
||||
$(eval $(call Package/freeswitch/Module,mariadb,MariaDB,Adds MariaDB support.,+libmariadb))
|
||||
$(eval $(call Package/freeswitch/Module,mp4v,MP4 video passthrough,MP4 video passthrough.,))
|
||||
$(eval $(call Package/freeswitch/Module,native_file,Native file,Plays files that are already encoded in the right format.,))
|
||||
$(eval $(call Package/freeswitch/Module,nibblebill,Nibblebill,This module allows for real-time accounting of a cash balance and\nusing that information for call routing.,))
|
||||
|
|
|
@ -1,67 +0,0 @@
|
|||
--- a/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
|
||||
+++ b/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
|
||||
@@ -104,6 +104,12 @@ int gettimeofday(struct timeval *tv, str
|
||||
/***************/
|
||||
#endif /* WIN32 */
|
||||
|
||||
+#if defined(FS_ICONV_INBUF_CONST)
|
||||
+#define ICONV_INBUF_TYPE const char **
|
||||
+#else
|
||||
+#define ICONV_INBUF_TYPE char **
|
||||
+#endif
|
||||
+
|
||||
int gsmopen_serial_init(private_t *tech_pvt, int controldevice_speed)
|
||||
{
|
||||
if (!tech_pvt)
|
||||
@@ -2521,11 +2527,7 @@ int ucs2_to_utf8(private_t *tech_pvt, ch
|
||||
DEBUGA_GSMOPEN("1 ciao in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
|
||||
GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, converted, utf8_out);
|
||||
|
||||
-#ifdef WIN32
|
||||
- iconv_res = iconv(iconv_format, (const char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
-#else // WIN32
|
||||
- iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
-#endif // WIN32
|
||||
+ iconv_res = iconv(iconv_format, (ICONV_INBUF_TYPE)&inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
if (iconv_res == (size_t) -1) {
|
||||
DEBUGA_GSMOPEN("2 ciao in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
|
||||
GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, converted, utf8_out);
|
||||
@@ -2560,11 +2562,7 @@ int utf8_to_iso_8859_1(private_t *tech_p
|
||||
|
||||
DEBUGA_GSMOPEN("in=%s, inleft=%d, out=%s, outleft=%d, utf8_in=%s, iso_8859_1_out=%s\n",
|
||||
GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_in, iso_8859_1_out);
|
||||
-#ifdef WIN32
|
||||
- iconv_res = iconv(iconv_format, (const char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
-#else // WIN32
|
||||
- iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
-#endif // WIN32
|
||||
+ iconv_res = iconv(iconv_format, (ICONV_INBUF_TYPE)&inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
if (iconv_res == (size_t) -1) {
|
||||
DEBUGA_GSMOPEN("cannot translate in iso_8859_1 error: %s (errno: %d)\n", GSMOPEN_P_LOG, strerror(errno), errno);
|
||||
return -1;
|
||||
@@ -2597,11 +2595,7 @@ int iso_8859_1_to_utf8(private_t *tech_p
|
||||
}
|
||||
|
||||
inbytesleft = strlen(iso_8859_1_in) * 2;
|
||||
-#ifdef WIN32
|
||||
- iconv_res = iconv(iconv_format, (const char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
-#else // WIN32
|
||||
- iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
-#endif // WIN32
|
||||
+ iconv_res = iconv(iconv_format, (ICONV_INBUF_TYPE)&inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
if (iconv_res == (size_t) -1) {
|
||||
DEBUGA_GSMOPEN("ciao in=%s, inleft=%d, out=%s, outleft=%d, utf8_out=%s\n",
|
||||
GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_out);
|
||||
@@ -2642,11 +2636,7 @@ int utf8_to_ucs2(private_t *tech_pvt, ch
|
||||
|
||||
DEBUGA_GSMOPEN("in=%s, inleft=%d, out=%s, outleft=%d, utf8_in=%s, converted=%s\n",
|
||||
GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_in, converted);
|
||||
-#ifdef WIN32
|
||||
- iconv_res = iconv(iconv_format, (const char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
-#else // WIN32
|
||||
- iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
-#endif // WIN32
|
||||
+ iconv_res = iconv(iconv_format, (ICONV_INBUF_TYPE)&inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
||||
if (iconv_res == (size_t) -1) {
|
||||
ERRORA("error: %s %d\n", GSMOPEN_P_LOG, strerror(errno), errno);
|
||||
return -1;
|
Loading…
Reference in a new issue