Hi,
attached is the diff to update Yara to 3.7.1.
While here, enable python3 flavor for python bindings, and take
maintainership.
Ok?
Cheers,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/yara/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 18 Sep 2015 21:35:32 -0000 1.1.1.1
+++ Makefile 15 May 2018 18:51:08 -0000
@@ -3,5 +3,6 @@
SUBDIR =
SUBDIR += main
SUBDIR += python
+SUBDIR += python,python3
.include <bsd.port.subdir.mk>
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/security/yara/Makefile.inc,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile.inc
--- Makefile.inc 11 Nov 2017 13:14:39 -0000 1.7
+++ Makefile.inc 15 May 2018 18:51:08 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.7 2017/11/11 13:14:39 rpointel Exp $
-VERSION = 3.7.0
+VERSION ?= 3.7.0
CATEGORIES = security
@@ -12,3 +12,4 @@ GH_TAGNAME = v${VERSION}
# Apache v2
PERMIT_PACKAGE_CDROM = Yes
+MAINTAINER ?= Remi Pointel <[email protected]>
Index: main/Makefile
===================================================================
RCS file: /cvs/ports/security/yara/main/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- main/Makefile 7 Jun 2017 12:24:52 -0000 1.4
+++ main/Makefile 15 May 2018 18:51:08 -0000
@@ -4,6 +4,7 @@ COMMENT = pattern matching swiss knife
DISTNAME = yara-${VERSION}
+VERSION = 3.7.1
GH_PROJECT = yara
WANTLIB += c crypto m magic pthread z
Index: main/distinfo
===================================================================
RCS file: /cvs/ports/security/yara/main/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- main/distinfo 11 Nov 2017 13:14:40 -0000 1.7
+++ main/distinfo 15 May 2018 18:51:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (yara-3.7.0.tar.gz) = AfCEHnOHkYwrbQt/tIAUvaQdFIe+HKv3GKBXYBiWlkE=
-SIZE (yara-3.7.0.tar.gz) = 558035
+SHA256 (yara-3.7.1.tar.gz) = 3wd6KbD/+/TnxXX4OKRA9C0JshX8s5ceb7Y2AximSJI=
+SIZE (yara-3.7.1.tar.gz) = 558499
Index: python/Makefile
===================================================================
RCS file: /cvs/ports/security/yara/python/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- python/Makefile 31 May 2017 04:27:51 -0000 1.3
+++ python/Makefile 15 May 2018 18:51:08 -0000
@@ -6,20 +6,24 @@ GH_PROJECT = yara-python
MODPY_EGG_VERSION = ${VERSION}
PKGNAME = py-yara-${VERSION}
+REVISION = 0
WANTLIB += pthread ${MODPY_WANTLIB} yara
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
+FLAVORS = python3
+FLAVOR ?=
+
MODPY_DISTUTILS_BUILDARGS = --dynamic-linking
MAKE_FLAG += CPPFLAGS="-I${LOCALBASE}/include/yara/"
pre-configure:
${SUBST_CMD} ${WRKSRC}/setup.py
-BUILD_DEPENDS = security/yara/main=${VERSION}
-RUN_DEPENDS = security/yara/main=${VERSION}
+BUILD_DEPENDS = security/yara/main>=${VERSION}
+RUN_DEPENDS = security/yara/main>=${VERSION}
TEST_DEPENDS = security/yara/python
Index: python/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/yara/python/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- python/pkg/PLIST 31 May 2017 04:27:51 -0000 1.3
+++ python/pkg/PLIST 15 May 2018 18:51:08 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2017/05/31 04:27:51 rpointel Exp $
+lib/python${MODPY_VERSION}/
+lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/yara.so
lib/python${MODPY_VERSION}/site-packages/yara_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/yara_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO