Pullup ticket #5475 - requested by khorben

security/py-yara: security fix
security/yara: security fix

Revisions pulled up:
- security/py-yara/Makefile                                     1.5
- security/py-yara/PLIST                                        1.2
- security/py-yara/distinfo                                     1.5-1.7
- security/yara/Makefile                                        1.3
- security/yara/Makefile.common                                 1.5-1.8
- security/yara/PLIST                                           1.3
- security/yara/distinfo                                        1.6-1.8

---
   Module Name:	pkgsrc
   Committed By:	khorben
   Date:		Mon May 15 15:27:31 UTC 2017

   Modified Files:
   	pkgsrc/security/py-yara: Makefile PLIST distinfo
   	pkgsrc/security/yara: Makefile Makefile.common PLIST distinfo

   Log Message:
   Update security/{,py-yara} to version 3.5.0

   The release notes mention:

      * Match length operator
   (http://yara.readthedocs.io/en/v3.5.0/writingrules.html#match-length)
      * Performance improvements
      * Less memory consumption while scanning processes
      * Exception handling when scanning memory blocks
      * Negative integers in meta fields
      * Added the --stack-size command-argument
      * Functions import_ordinal, is_dll, is_32bit and is_64bit added to PE
   module
      * Functions rich_signature.toolid and rich_signature.version added to
   PE module
      * Lots of bug fixes

   The Python bindings are now released from a different tree, with the same
   versioning apparently though.

   "welcome to update" pettai@

---
   Module Name:	pkgsrc
   Committed By:	khorben
   Date:		Mon May 15 15:34:12 UTC 2017

   Modified Files:
   	pkgsrc/security/yara: Makefile.common

   Log Message:
   Set myself as the maintainer

---
   Module Name:	pkgsrc
   Committed By:	khorben
   Date:		Wed Jun  7 20:11:42 UTC 2017

   Modified Files:
   	pkgsrc/security/py-yara: distinfo
   	pkgsrc/security/yara: Makefile.common distinfo

   Log Message:
   Package yara 3.6.0

   In the release notes:
     * .NET module (Wesley Shields)
     * New features for ELF module (Jacob Baines)
     * Fix endianness issues (Hilko Bengen)
     * Function yr_compiler_add_fd added to libyara
     * MAX_THREADS limit can be arbitrarily increased (Emerson R. Wiley)
     * Added --fail-on-warnings command-line option
     * Multiple bug fixes

---
   Module Name:	pkgsrc
   Committed By:	khorben
   Date:		Wed Jun  7 20:27:37 UTC 2017

   Modified Files:
   	pkgsrc/security/py-yara: distinfo
   	pkgsrc/security/yara: Makefile.common distinfo

   Log Message:
   Package yara 3.6.1

   In the release notes:

     * BUGFIX: Stack overflow caused by uncontrolled recursiveness
   (CVE-2017-9304)
     * BUGFIX: pe.overlay.size was undefined if the PE didn't have an
   overlay. Now it's set to 0 in those cases.
     * BUGFIX: Fix initalization issue that could cause a crash if rules
   compiled with a 32bit yarac is used with a 64bit yara.

7 files changed, 35 insertions, 24 deletions

diff --git a/security/py-yara/Makefile b/security/py-yara/Makefile
index 50c3ce02066..f62c34bba87 100644
--- a/security/py-yara/Makefile
+++ b/security/py-yara/Makefile
@@ -1,17 +1,21 @@
-# $NetBSD: Makefile,v 1.4 2017/01/01 14:43:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2017/06/13 18:41:37 bsiegert Exp $
 
 PKGNAME=	${PYPKGPREFIX}-yara-${YAVER}
 CATEGORIES=	security python
 
+MASTER_SITES=	${MASTER_SITE_GITHUB:=VirusTotal/yara-python/archive/}
+
+DIST_SUBDIR=	yara-python
+
 COMMENT=	Yara python bindings
 
-WRKSRC=		${WRKDIR}/yara-${YAVER}/yara-python
+WRKSRC=		${WRKDIR}/yara-python-${YAVER}
 
 PYDISTUTILSPKG= yes
 PYTHON_VERSIONS_INCOMPATIBLE=   34 35 36
 
 .include "../../security/yara/Makefile.common"
 .include "../../security/yara/buildlink3.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-yara/PLIST b/security/py-yara/PLIST
index b8682663916..3248d314cd2 100644
--- a/security/py-yara/PLIST
+++ b/security/py-yara/PLIST
@@ -1,2 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2015/06/06 09:13:27 pettai Exp $
+@comment $NetBSD: PLIST,v 1.1.16.1 2017/06/13 18:41:37 bsiegert Exp $
 ${PYSITELIB}/yara.so
+${PYSITELIB}/yara_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
+${PYSITELIB}/yara_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
+${PYSITELIB}/yara_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
+${PYSITELIB}/yara_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/not-zip-safe
+${PYSITELIB}/yara_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
diff --git a/security/py-yara/distinfo b/security/py-yara/distinfo
index 78a2c417022..94fbfc3b790 100644
--- a/security/py-yara/distinfo
+++ b/security/py-yara/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2016/05/26 14:44:17 khorben Exp $
+$NetBSD: distinfo,v 1.4.8.1 2017/06/13 18:41:37 bsiegert Exp $
 
-SHA1 (yara/v3.4.0.tar.gz) = 70756b291a08254de751726ee565cf454a1eb566
-RMD160 (yara/v3.4.0.tar.gz) = b683037083c93ff4f2cc5ad80632d2ff535ce8b1
-SHA512 (yara/v3.4.0.tar.gz) = 27286107882c70de6f2c227d5307fbaa97437f8bbb221d4f0fcb17c4935f65ef01e772c18a14eb814727ca1854f5e3f9f219771706d9f4a748ae9433f475d669
-Size (yara/v3.4.0.tar.gz) = 7642695 bytes
+SHA1 (yara-python/v3.6.1.tar.gz) = 30d6005070099b40845e8e6417de5fc4c80c57a2
+RMD160 (yara-python/v3.6.1.tar.gz) = 04245acacd2f20b71c612cca5efefdf5b28cd2df
+SHA512 (yara-python/v3.6.1.tar.gz) = ccd0bd402ffc7d8686a9f2cef283c2c8cf58511235bff700188214f226911b5b0af6f5b1c1e8a3000531c0e35489cd8c7670b2208ce9372e4ecbab00d2479fa2
+Size (yara-python/v3.6.1.tar.gz) = 29543 bytes
diff --git a/security/yara/Makefile b/security/yara/Makefile
index ff930ca89a4..1c50cb298ff 100644
--- a/security/yara/Makefile
+++ b/security/yara/Makefile
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2015/06/06 08:57:18 pettai Exp $
+# $NetBSD: Makefile,v 1.2.16.1 2017/06/13 18:41:37 bsiegert Exp $
 
 PKGNAME=	yara-${YAVER}
 CATEGORIES=	security
 
+MASTER_SITES=	${MASTER_SITE_GITHUB:=VirusTotal/yara/archive/}
+
+DIST_SUBDIR=	yara
+
 COMMENT=        Pattern matching swiss knife for malware researchers
 
 WRKSRC=		${WRKDIR}/yara-${YAVER}
diff --git a/security/yara/Makefile.common b/security/yara/Makefile.common
index 48ae02fd44a..9e229e17968 100644
--- a/security/yara/Makefile.common
+++ b/security/yara/Makefile.common
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile.common,v 1.4 2016/05/26 14:41:48 khorben Exp $
+# $NetBSD: Makefile.common,v 1.4.8.1 2017/06/13 18:41:37 bsiegert Exp $
 #
 # used by security/yara/Makefile
 # used by security/py-yara/Makefile
 
-DISTNAME=	v3.4.0
+DISTNAME=	v3.6.1
 YAVER=		${DISTNAME:S/v//}
 
-MASTER_SITES=	${MASTER_SITE_GITHUB:=plusvic/yara/archive/}
-
-DIST_SUBDIR=	yara
-
-MAINTAINER=	pettai@NetBSD.org
-HOMEPAGE=	https://plusvic.github.io/yara/
+MAINTAINER=	khorben@defora.org
+HOMEPAGE=	https://virustotal.github.io/yara/
 LICENSE=	apache-2.0
diff --git a/security/yara/PLIST b/security/yara/PLIST
index 822b96aac34..82a63cec828 100644
--- a/security/yara/PLIST
+++ b/security/yara/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/05/26 14:41:48 khorben Exp $
+@comment $NetBSD: PLIST,v 1.2.8.1 2017/06/13 18:41:37 bsiegert Exp $
 bin/yara
 bin/yarac
 include/yara.h
@@ -10,6 +10,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
@@ -20,6 +21,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.la
diff --git a/security/yara/distinfo b/security/yara/distinfo
index 16815ccb882..b931caeaa35 100644
--- a/security/yara/distinfo
+++ b/security/yara/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2016/05/26 14:41:48 khorben Exp $
+$NetBSD: distinfo,v 1.5.8.1 2017/06/13 18:41:37 bsiegert Exp $
 
-SHA1 (yara/v3.4.0.tar.gz) = 70756b291a08254de751726ee565cf454a1eb566
-RMD160 (yara/v3.4.0.tar.gz) = b683037083c93ff4f2cc5ad80632d2ff535ce8b1
-SHA512 (yara/v3.4.0.tar.gz) = 27286107882c70de6f2c227d5307fbaa97437f8bbb221d4f0fcb17c4935f65ef01e772c18a14eb814727ca1854f5e3f9f219771706d9f4a748ae9433f475d669
-Size (yara/v3.4.0.tar.gz) = 7642695 bytes
+SHA1 (yara/v3.6.1.tar.gz) = 67705f7516e70b9b2a627618af7c842711472359
+RMD160 (yara/v3.6.1.tar.gz) = 9e36654aa360277c7b45946c46a2f159400fd40a
+SHA512 (yara/v3.6.1.tar.gz) = 0b3b6deeb83f979898ef2711233b9e856b39a43098549173f81e627b0c35454c68cb3e8f64115b265cf483bfc3ce2d14e916fbcdeba95648fb1795ff77bf0bbf
+Size (yara/v3.6.1.tar.gz) = 505302 bytes
 SHA1 (patch-libyara_proc.c) = cbe52e79c63eb6389a5f7d1107d15a57ca4890f9