Update to librelp 1.6.0

ok sthen@
This commit is contained in:
remi 2020-08-25 05:48:54 +00:00
parent 85aad4451a
commit 153991bc6b
4 changed files with 7 additions and 33 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.16 2020/03/02 16:41:50 remi Exp $
# $OpenBSD: Makefile,v 1.17 2020/08/25 05:48:54 remi Exp $
COMMENT = reliable event logging protocol library
DISTNAME = librelp-1.5.0
DISTNAME = librelp-1.6.0
SHARED_LIBS += relp 3.1 # 5.0
SHARED_LIBS += relp 4.0 # 5.0
CATEGORIES = sysutils

View File

@ -1,2 +1,2 @@
SHA256 (librelp-1.5.0.tar.gz) = aShO8aBRqywvd2WVjoR77x/POPR+sbA3LGX2PwPIOV4=
SIZE (librelp-1.5.0.tar.gz) = 521793
SHA256 (librelp-1.6.0.tar.gz) = z2zJSKWz0eVrMlFYXBG+6hxbKF/L+OKa1olVx+t1+Mo=
SIZE (librelp-1.6.0.tar.gz) = 522827

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-src_tcp_c,v 1.2 2020/03/02 16:41:50 remi Exp $
LibreSSL has no support for @SECLEVEL and SSL_CONF_CTX_set_flags().
Index: src/tcp.c
--- src/tcp.c.orig
+++ src/tcp.c
@@ -1200,7 +1200,8 @@ relpTcpTLSSetPrio_ossl(relpTcp_t *const pThis)
/* Compute priority string (in simple cases where the user does not care...) */
if(pThis->pristring == NULL) {
if (pThis->authmode == eRelpAuthMode_None) {
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L \
+ && !defined(LIBRESSL_VERSION_NUMBER)
/* NOTE: do never use: +eNULL, it DISABLES encryption! */
strncpy(pristringBuf, "ALL:+COMPLEMENTOFDEFAULT:+ADH:+ECDH:+aNULL@SECLEVEL=0",
sizeof(pristringBuf));
@@ -1578,7 +1579,7 @@ relpTcpSetSslConfCmd_ossl(relpTcp_t *const pThis, char
} else {
pThis->pEngine->dbgprint("relpTcpSetSslConfCmd_ossl: set to '%s'\n", tlsConfigCmd);
char errmsg[1424];
-#if OPENSSL_VERSION_NUMBER >= 0x10020000L
+#if OPENSSL_VERSION_NUMBER >= 0x10020000L && !defined(LIBRESSL_VERSION_NUMBER)
char *pCurrentPos;
char *pNextPos;
char *pszCmd;

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:55 naddy Exp $
@comment $OpenBSD: PLIST,v 1.3 2020/08/25 05:48:54 remi Exp $
include/librelp.h
lib/librelp.a
@static-lib lib/librelp.a
lib/librelp.la
@lib lib/librelp.so.${LIBrelp_VERSION}
lib/pkgconfig/relp.pc