mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
bump version to 2022.02.9
add miyoo_defconfig
This commit is contained in:
@@ -1,44 +0,0 @@
|
||||
From 0e0e95dbc380c5eede3a2fc1631294a98078e30f Mon Sep 17 00:00:00 2001
|
||||
From: Aymeric Moizard <amoizard@gmail.com>
|
||||
Date: Fri, 13 Mar 2020 16:34:41 +0100
|
||||
Subject: fix: fix OSIP_MONOTHREAD compilation error introduced with epoll
|
||||
implementation
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
http://git.savannah.nongnu.org/cgit/exosip.git/patch/?id=0e0e95dbc380c5eede3a2fc1631294a98078e30f]
|
||||
---
|
||||
src/eXconf.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/eXconf.c b/src/eXconf.c
|
||||
index baf90be..6165eb3 100644
|
||||
--- a/src/eXconf.c
|
||||
+++ b/src/eXconf.c
|
||||
@@ -801,12 +801,15 @@ eXosip_init (struct eXosip_t *excontext)
|
||||
}
|
||||
|
||||
if (excontext->poll_method == EXOSIP_USE_EPOLL_LT) {
|
||||
+#ifndef OSIP_MONOTHREAD
|
||||
struct epoll_event ev;
|
||||
+#endif
|
||||
excontext->epfdctl = epoll_create (1);
|
||||
if (excontext->epfdctl < 0) {
|
||||
return OSIP_UNDEFINED_ERROR;
|
||||
}
|
||||
|
||||
+#ifndef OSIP_MONOTHREAD
|
||||
memset(&ev, 0, sizeof(struct epoll_event));
|
||||
ev.events = EPOLLIN;
|
||||
ev.data.fd = jpipe_get_read_descr (excontext->j_socketctl_event);
|
||||
@@ -815,6 +818,7 @@ eXosip_init (struct eXosip_t *excontext)
|
||||
_eXosip_closesocket (excontext->epfdctl);
|
||||
return OSIP_UNDEFINED_ERROR;
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From 4201c0ff3fd75e09025d515c427f85f9fec89621 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 5 Apr 2022 22:27:35 +0200
|
||||
Subject: [PATCH] src/eXtl_dtls.c: fix build with libressl >= 3.4.1
|
||||
|
||||
Fix the following build failure with libressl >= 3.4.1 which provides
|
||||
SSL_set0_rbio() since
|
||||
https://github.com/libressl-portable/openbsd/commit/c99939f9665a9c3c648682b4987df46600b70efc:
|
||||
|
||||
In file included from eXtl_dtls.c:82:
|
||||
/home/autobuild/autobuild/instance-4/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/openssl/ssl.h:1272:6: note: previous declaration of 'SSL_set0_rbio' was here
|
||||
1272 | void SSL_set0_rbio(SSL *s, BIO *rbio);
|
||||
| ^~~~~~~~~~~~~
|
||||
eXtl_dtls.c: In function 'SSL_set0_rbio':
|
||||
eXtl_dtls.c:108:17: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'}
|
||||
108 | BIO_free_all(s->rbio);
|
||||
| ^~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/dfafdbf71b31fbda1b5ba491ac35239af4a20aa2
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: sent to amoizard@antisip.com]
|
||||
---
|
||||
src/eXtl_dtls.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/eXtl_dtls.c b/src/eXtl_dtls.c
|
||||
index 07c0dc2..d0bd7dc 100644
|
||||
--- a/src/eXtl_dtls.c
|
||||
+++ b/src/eXtl_dtls.c
|
||||
@@ -102,7 +102,7 @@
|
||||
#define RANDOM "random.pem"
|
||||
#define DHFILE "dh1024.pem"
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3040100L)
|
||||
|
||||
static void SSL_set0_rbio(SSL *s, BIO *rbio) {
|
||||
BIO_free_all(s->rbio);
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 21420c00bf8e0895ff36161766beec12b7e6f1d371030c389dba845e271272e2 libexosip2-5.1.1.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
sha256 5b7823986431ea5cedc9f095d6964ace966f093b2ae7d0b08404788bfcebc9c2 libexosip2-5.3.0.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
|
||||
@@ -4,13 +4,15 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBEXOSIP2_VERSION = 5.1.1
|
||||
LIBEXOSIP2_VERSION = 5.3.0
|
||||
# Since version 5.0, letter 'X' in library's name is in lower case
|
||||
LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz
|
||||
LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip
|
||||
LIBEXOSIP2_INSTALL_STAGING = YES
|
||||
LIBEXOSIP2_LICENSE = GPL-2.0+
|
||||
LIBEXOSIP2_LICENSE_FILES = COPYING
|
||||
LIBEXOSIP2_CPE_ID_VENDOR = gnu
|
||||
LIBEXOSIP2_CPE_ID_PRODUCT = exosip
|
||||
|
||||
LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user