svn commit: r422564 - in head/security/yara: . files

[Antoine Brodin]

Author: antoine
Date: Wed Sep 21 15:11:37 2016
New Revision: 422564
URL: https://svnweb.freebsd.org/changeset/ports/422564

Log:
  - Fix build when a previous version is insalled and ssl from ports is used
  - Fix build with libressl
  - Take maintainership
  
  PR:		212610
  Approved by:	wxs (maintainer)

Added:
  head/security/yara/files/
  head/security/yara/files/patch-libyara_modules_pe.c   (contents, props changed)
Modified:
  head/security/yara/Makefile

Modified: head/security/yara/Makefile
==============================================================================
--- head/security/yara/Makefile	Wed Sep 21 15:00:35 2016	(r422563)
+++ head/security/yara/Makefile	Wed Sep 21 15:11:37 2016	(r422564)
@@ -5,7 +5,7 @@ PORTVERSION=	3.5.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
-MAINTAINER=	wxs at FreeBSD.org
+MAINTAINER=	antoine at FreeBSD.org
 COMMENT=	Malware identification and classification tool
 
 LICENSE=	BSD3CLAUSE
@@ -19,7 +19,7 @@ INSTALL_TARGET=	install-strip
 USES=		alias autoreconf libtool pathfix ssl
 USE_LDCONFIG=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
-CPPFLAGS+=	-I${OPENSSLINC}
+CPPFLAGS+=	-isystem ${OPENSSLINC}
 LIBS+=		-L${OPENSSLLIB}
 
 .include <bsd.port.mk>

Added: head/security/yara/files/patch-libyara_modules_pe.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/yara/files/patch-libyara_modules_pe.c	Wed Sep 21 15:11:37 2016	(r422564)
@@ -0,0 +1,11 @@
+--- libyara/modules/pe.c.orig	2016-09-06 20:09:47 UTC
++++ libyara/modules/pe.c
+@@ -42,7 +42,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include <openssl/bio.h>
+ #include <openssl/pkcs7.h>
+ #include <openssl/x509.h>
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define X509_get_signature_nid(o) OBJ_obj2nid((o)->sig_alg->algorithm)
+ #endif
+ #endif