Hi,
this is the diff to update yara to 3.5.0.
Ok?
Cheers,
Remi.
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/security/yara/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile.inc
--- Makefile.inc 18 Sep 2015 21:35:32 -0000 1.1.1.1
+++ Makefile.inc 1 Sep 2016 05:31:57 -0000
@@ -1,16 +1,14 @@
# $OpenBSD: Makefile.inc,v 1.1.1.1 2015/09/18 21:35:32 rpointel Exp $
-VERSION = 3.4.0
-DISTNAME = yara-${VERSION}
+VERSION = 3.5.0
CATEGORIES = security
-HOMEPAGE = http://plusvic.github.io/yara/
+HOMEPAGE = http://virustotal.github.io/yara/
+
+GH_ACCOUNT = VirusTotal
+GH_TAGNAME = v${VERSION}
# Apache v2
PERMIT_PACKAGE_CDROM = Yes
-
-GH_ACCOUNT = plusvic
-GH_PROJECT = yara
-GH_TAGNAME = v${VERSION}
Index: main/Makefile
===================================================================
RCS file: /cvs/ports/security/yara/main/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- main/Makefile 19 Sep 2015 17:39:55 -0000 1.2
+++ main/Makefile 1 Sep 2016 05:31:57 -0000
@@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2015/09/19 17:39:55 rpointel Exp $
-REVISION = 0
-
COMMENT = pattern matching swiss knife
+DISTNAME = yara-${VERSION}
+
+GH_PROJECT = yara
+
WANTLIB += c crypto m magic pthread z
SHARED_LIBS += yara 0.0 # 0.0
@@ -11,8 +13,8 @@ SHARED_LIBS += yara
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --with-crypto \
--enable-magic
-CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib" \
- CFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib/eopenssl -L${LOCALBASE}/lib" \
+ CFLAGS="-I${LOCALBASE}/include/eopenssl -I${LOCALBASE}/include"
pre-patch:
cd ${WRKSRC} && \
@@ -21,7 +23,9 @@ pre-patch:
BUILD_DEPENDS += devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
+ ${MODGNU_AUTOMAKE_DEPENDS} \
+ ${RUN_DEPENDS}
+RUN_DEPENDS += security/openssl
LIB_DEPENDS += devel/libmagic
Index: main/distinfo
===================================================================
RCS file: /cvs/ports/security/yara/main/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- main/distinfo 18 Sep 2015 21:35:32 -0000 1.1.1.1
+++ main/distinfo 1 Sep 2016 05:31:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (yara-3.4.0.tar.gz) = UoVx/3ITZCKfNPbR/w7tw81aKnW7lHJ9xleMbv49YYs=
-SIZE (yara-3.4.0.tar.gz) = 7642695
+SHA256 (yara-3.5.0.tar.gz) = /y7kQFFWhMJy31L+vItz5zDKmc4ZTCS9PLQ77CtMR/I=
+SIZE (yara-3.5.0.tar.gz) = 7673708
Index: main/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/yara/main/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- main/pkg/PLIST 18 Sep 2015 21:35:32 -0000 1.1.1.1
+++ main/pkg/PLIST 1 Sep 2016 05:31:57 -0000
@@ -11,6 +11,7 @@ include/yara/error.h
include/yara/exec.h
include/yara/filemap.h
include/yara/hash.h
+include/yara/integers.h
include/yara/libyara.h
include/yara/limits.h
include/yara/modules.h
@@ -21,6 +22,7 @@ include/yara/scan.h
include/yara/sizedstr.h
include/yara/stream.h
include/yara/strutils.h
+include/yara/threading.h
include/yara/types.h
include/yara/utils.h
lib/libyara.a
Index: python/Makefile
===================================================================
RCS file: /cvs/ports/security/yara/python/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- python/Makefile 18 Sep 2015 21:35:32 -0000 1.1.1.1
+++ python/Makefile 1 Sep 2016 05:31:57 -0000
@@ -2,13 +2,20 @@
COMMENT = Python extension that gives access to YARA
-PKGNAME = py-${DISTNAME}
+GH_PROJECT = yara-python
-WANTLIB += pthread ${MODPY_WANTLIB} yara
+PKGNAME = py-yara-${VERSION}
-WRKSRC = ${WRKDIR}/${DISTNAME}/yara-python
+WANTLIB += pthread ${MODPY_WANTLIB} yara
MODULES = lang/python
+MODPY_SETUPTOOLS = Yes
+
+MODPY_DISTUTILS_BUILDARGS = --dynamic-linking
+MAKE_FLAG += CPPFLAGS="-I${LOCALBASE}/include/yara/"
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/setup.py
BUILD_DEPENDS = security/yara/main
RUN_DEPENDS = security/yara/main
Index: python/distinfo
===================================================================
RCS file: /cvs/ports/security/yara/python/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- python/distinfo 18 Sep 2015 21:35:32 -0000 1.1.1.1
+++ python/distinfo 1 Sep 2016 05:31:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (yara-3.4.0.tar.gz) = UoVx/3ITZCKfNPbR/w7tw81aKnW7lHJ9xleMbv49YYs=
-SIZE (yara-3.4.0.tar.gz) = 7642695
+SHA256 (yara-python-3.5.0.tar.gz) = 4NVkwajJiVftqftJ1CWdzCS4aMmPB6jyiZ8k57/ebRg=
+SIZE (yara-python-3.5.0.tar.gz) = 22052
Index: python/patches/patch-setup_py
===================================================================
RCS file: python/patches/patch-setup_py
diff -N python/patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ python/patches/patch-setup_py 1 Sep 2016 05:31:57 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- setup.py.orig Thu Aug 11 14:22:08 2016
++++ setup.py Thu Aug 11 14:31:24 2016
+@@ -122,6 +122,10 @@ class BuildCommand(build):
+ else:
+ building_for_osx = False
+
++ if 'openbsd' in self.plat_name:
++ module.include_dirs.append('${LOCALBASE}/include')
++ module.library_dirs.append('${LOCALBASE}/lib')
++
+ if has_function('memmem'):
+ module.define_macros.append(('HAVE_MEMMEM', '1'))
+ if has_function('strlcpy'):
Index: python/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/yara/python/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- python/pkg/PLIST 18 Sep 2015 21:35:32 -0000 1.1.1.1
+++ python/pkg/PLIST 1 Sep 2016 05:31:57 -0000
@@ -1,3 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/18 21:35:32 rpointel Exp $
lib/python${MODPY_VERSION}/site-packages/yara.so
-lib/python${MODPY_VERSION}/site-packages/yara_python-3.4.0-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/yara_python-3.5.0-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/yara_python-3.5.0-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/yara_python-3.5.0-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/yara_python-3.5.0-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/yara_python-3.5.0-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/yara_python-3.5.0-py${MODPY_VERSION}.egg-info/top_level.txt
