update librelp to version 1.9.0
The TLS tests currently fail when executed with libressl. Partly because of bogus information in the certificates used by the tests. GnuTLS and OpenSSL apparently accept that. Our rsyslog which uses librelp is linked with GnuTLS. ok tb
This commit is contained in:
parent
d686d0a53e
commit
a463e377b8
|
@ -1,10 +1,10 @@
|
|||
# $OpenBSD: Makefile,v 1.17 2020/08/25 05:48:54 remi Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2021/02/10 21:26:44 remi Exp $
|
||||
|
||||
COMMENT = reliable event logging protocol library
|
||||
|
||||
DISTNAME = librelp-1.6.0
|
||||
DISTNAME = librelp-1.9.0
|
||||
|
||||
SHARED_LIBS += relp 4.0 # 5.0
|
||||
SHARED_LIBS += relp 5.0 # 5.0
|
||||
|
||||
CATEGORIES = sysutils
|
||||
|
||||
|
@ -15,7 +15,7 @@ MAINTAINER = Remi Locherer <remi@openbsd.org>
|
|||
# GPLv3+
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB = ffi gmp gnutls hogweed iconv idn2 intl nettle p11-kit pthread
|
||||
WANTLIB = gmp gnutls hogweed iconv idn2 intl nettle p11-kit pthread
|
||||
WANTLIB += tasn1 unistring crypto ssl
|
||||
|
||||
MASTER_SITES = http://download.rsyslog.com/librelp/
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (librelp-1.6.0.tar.gz) = z2zJSKWz0eVrMlFYXBG+6hxbKF/L+OKa1olVx+t1+Mo=
|
||||
SIZE (librelp-1.6.0.tar.gz) = 522827
|
||||
SHA256 (librelp-1.9.0.tar.gz) = JO6ehDlg0UAKRP+u2wseyRRj34+KzKhpzAJ+0l7mvzM=
|
||||
SIZE (librelp-1.9.0.tar.gz) = 540477
|
||||
|
|
14
sysutils/librelp/patches/patch-src_tcp_c
Normal file
14
sysutils/librelp/patches/patch-src_tcp_c
Normal file
|
@ -0,0 +1,14 @@
|
|||
$OpenBSD: patch-src_tcp_c,v 1.4 2021/02/10 21:26:44 remi Exp $
|
||||
|
||||
Index: src/tcp.c
|
||||
--- src/tcp.c.orig
|
||||
+++ src/tcp.c
|
||||
@@ -1494,7 +1494,7 @@ relpTcpSslInitCerts(relpTcp_t *const pThis, char *ownC
|
||||
ENTER_RELPFUNC;
|
||||
|
||||
if( ownCertFile!= NULL ) {
|
||||
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
if (SSL_use_certificate_chain_file(pThis->ssl, ownCertFile) != 1) {
|
||||
#else
|
||||
if (SSL_use_certificate_file(pThis->ssl, ownCertFile, SSL_FILETYPE_PEM) != 1) {
|
Loading…
Reference in New Issue
Block a user