From owner-svn-ports-all@freebsd.org Wed Sep 21 15:11:39 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02D9DBE4767; Wed, 21 Sep 2016 15:11:39 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A9C121159; Wed, 21 Sep 2016 15:11:38 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8LFBbXL007187; Wed, 21 Sep 2016 15:11:37 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8LFBb4b007185; Wed, 21 Sep 2016 15:11:37 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201609211511.u8LFBb4b007185@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 21 Sep 2016 15:11:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422564 - in head/security/yara: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Sep 2016 15:11:39 -0000 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@FreeBSD.org +MAINTAINER= antoine@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 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 + #include + #include +-#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