Hi,
this is the diff to update Yara to latest release. While here, removed
the OpenSSL dependency and link to LibreSSL.
Ok?
Cheers,
Remi.
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/security/yara/Makefile.inc,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile.inc
--- Makefile.inc 31 May 2017 04:27:50 -0000 1.3
+++ Makefile.inc 7 Jun 2017 05:47:04 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.3 2017/05/31 04:27:50 rpointel Exp $
-VERSION = 3.6.0
+VERSION = 3.6.1
CATEGORIES = security
Index: main/Makefile
===================================================================
RCS file: /cvs/ports/security/yara/main/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- main/Makefile 14 Sep 2016 20:40:53 -0000 1.3
+++ main/Makefile 7 Jun 2017 05:47:04 -0000
@@ -13,8 +13,8 @@ SHARED_LIBS += yara
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --with-crypto \
--enable-magic
-CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib/eopenssl -L${LOCALBASE}/lib" \
- CFLAGS="-I${LOCALBASE}/include/eopenssl -I${LOCALBASE}/include"
+CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib" \
+ CFLAGS="-I${LOCALBASE}/include"
pre-patch:
cd ${WRKSRC} && \
@@ -23,9 +23,7 @@ pre-patch:
BUILD_DEPENDS += devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS} \
- ${RUN_DEPENDS}
-RUN_DEPENDS += security/openssl
+ ${MODGNU_AUTOMAKE_DEPENDS}
LIB_DEPENDS += devel/libmagic
Index: main/distinfo
===================================================================
RCS file: /cvs/ports/security/yara/main/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- main/distinfo 31 May 2017 04:27:50 -0000 1.3
+++ main/distinfo 7 Jun 2017 05:47:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (yara-3.6.0.tar.gz) = +yd4SzmJ21CYcWUqriYGPYfpzGMwkpq+0auCTFvWAOA=
-SIZE (yara-3.6.0.tar.gz) = 499810
+SHA256 (yara-3.6.1.tar.gz) = nuDgzBwrNsniCV2rfU25KLQ/MwElSrCDajQqKGKClJ4=
+SIZE (yara-3.6.1.tar.gz) = 505302
Index: main/patches/patch-libyara_modules_pe_c
===================================================================
RCS file: main/patches/patch-libyara_modules_pe_c
diff -N main/patches/patch-libyara_modules_pe_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ main/patches/patch-libyara_modules_pe_c 7 Jun 2017 05:47:04 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libyara/modules/pe.c
+--- libyara/modules/pe.c.orig
++++ libyara/modules/pe.c
+@@ -41,7 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH D
+ #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
Index: python/distinfo
===================================================================
RCS file: /cvs/ports/security/yara/python/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- python/distinfo 31 May 2017 04:27:51 -0000 1.3
+++ python/distinfo 7 Jun 2017 05:47:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (yara-python-3.6.0.tar.gz) = //ZHsiajXDd0xrsFw9JbMJ6hbJ0ycqji9TzpMysO7Cw=
-SIZE (yara-python-3.6.0.tar.gz) = 29534
+SHA256 (yara-python-3.6.1.tar.gz) = mQqsu15G4pu7Xi31KlaOm5xWqHT9Iv2EPJy2JU8wSuM=
+SIZE (yara-python-3.6.1.tar.gz) = 29543
