Date: Sun, 26 Mar 2017 10:37:25 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436951 - in head/net-im/ricochet: . files Message-ID: <201703261037.v2QAbPKk018678@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sun Mar 26 10:37:25 2017 New Revision: 436951 URL: https://svnweb.freebsd.org/changeset/ports/436951 Log: net-im/ricochet: Fix build with LibreSSL - 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 Added: head/net-im/ricochet/files/patch-src_main.cpp (contents, props changed) head/net-im/ricochet/files/patch-src_utils_CryptoKey.cpp (contents, props changed) Modified: head/net-im/ricochet/Makefile Modified: head/net-im/ricochet/Makefile ============================================================================== --- head/net-im/ricochet/Makefile Sun Mar 26 10:30:44 2017 (r436950) +++ head/net-im/ricochet/Makefile Sun Mar 26 10:37:25 2017 (r436951) @@ -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 Added: head/net-im/ricochet/files/patch-src_main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/ricochet/files/patch-src_main.cpp Sun Mar 26 10:37:25 2017 (r436951) @@ -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(); Added: head/net-im/ricochet/files/patch-src_utils_CryptoKey.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/ricochet/files/patch-src_utils_CryptoKey.cpp Sun Mar 26 10:37:25 2017 (r436951) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703261037.v2QAbPKk018678>