mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00
Code Issues Releases Activity

net-im/ricochet: Fix build with LibreSSL

Browse Source 
- Remove IGNORE for LibreSSL
 - Add checks for LIBRESSL_VERSION_NUMBER

PR:		217350
Approved by:	Yuri Victorovich <yuri@rawbw.com> (maintainer)
Obtained from:	https://github.com/ricochet-im/ricochet/pull/529
This commit is contained in:
Bernard Spil 2017-03-26 10:37:25 +00:00
parent ff7c06070b
commit 1cdca8b5d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=436951
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net-im/ricochet/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= ricochet
PORTVERSION= 1.1.4
DISTVERSIONPREFIX= v
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= net-im net-p2p
MAINTAINER= yuri@rawbw.com
@ -33,10 +33,6 @@ PLIST_FILES= bin/ricochet \
.include <bsd.port.pre.mk>
.if ${SSL_DEFAULT:Mlibressl*}
IGNORE= Detected LibreSSL (missing RSA_get0_factors)
.endif
post-patch:
@${REINPLACE_CMD} -E 's| -fsanitize=[a-z-]+| |g' \
${WRKSRC}/hardened.pri

11
net-im/ricochet/files/patch-src_main.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/main.cpp.orig 2016-11-04 22:05:33 UTC
+++ src/main.cpp
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
initTranslation();
/* Initialize OpenSSL's allocator */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
CRYPTO_malloc_init();
#else
OPENSSL_malloc_init();

11
net-im/ricochet/files/patch-src_utils_CryptoKey.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/utils/CryptoKey.cpp.orig 2016-11-04 22:05:33 UTC
+++ src/utils/CryptoKey.cpp
@@ -39,7 +39,7 @@
#include <openssl/bio.h>
#include <openssl/pem.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q)
{
*p = r->p;