Update yara and py-yara to 3.8.0

svn path=/head/; revision=476939

security/py-yara/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yara
-PORTVERSION=	3.7.0
+PORTVERSION=	3.8.0
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

security/py-yara/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1510327536
-SHA256 (yara-python-3.7.0.tar.gz) = bedb10a9be398616fc1a5d4bb14f369ed88e4dec5f6455047e3e4efee01890e0
-SIZE (yara-python-3.7.0.tar.gz) = 313646
+TIMESTAMP = 1533641320
+SHA256 (yara-python-3.8.0.tar.gz) = dc6d15822762e394040b1f6ffb1a627ec58b44d5a6228569689a04341387941a
+SIZE (yara-python-3.8.0.tar.gz) = 355175

security/yara/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yara
-PORTVERSION=	3.7.1
+PORTVERSION=	3.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
@@ -15,7 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	VirusTotal
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-magic --enable-dotnet
+CONFIGURE_ARGS=	--enable-magic --enable-dotnet --enable-macho --enable-dex
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USES=		alias autoreconf libtool pathfix ssl

security/yara/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1516136851
-SHA256 (VirusTotal-yara-v3.7.1_GH0.tar.gz) = df077a29b0fffbf4e7c575f838a440f42d09b215fcb3971e6fb6360318a64892
-SIZE (VirusTotal-yara-v3.7.1_GH0.tar.gz) = 558499
+TIMESTAMP = 1533639650
+SHA256 (VirusTotal-yara-v3.8.0_GH0.tar.gz) = eb6cade9eaf09b8242dff0476ff690c4c428fbdcf7e5df93ac762346e81198da
+SIZE (VirusTotal-yara-v3.8.0_GH0.tar.gz) = 714919

security/yara/files/patch-libyara_modules_macho.c

@@ -0,0 +1,11 @@
+--- libyara/modules/macho.c.orig	2018-08-06 13:28:12 UTC
++++ libyara/modules/macho.c
+@@ -262,7 +262,7 @@ MACHO_HANDLE_MAIN(be)
+ #define MACHO_HANDLE_SEGMENT(bits,bo)                                          \
+ void macho_handle_segment_##bits##_##bo(                                       \
+     const uint8_t* command,                                                    \
+-    const uint64_t i,                                                          \
++    const unsigned i,                                                          \
+     YR_OBJECT* object)                                                         \
+ {                                                                              \
+   yr_segment_command_##bits##_t* sg = (yr_segment_command_##bits##_t*)command; \

security/yara/files/patch-threading.c

@@ -1,37 +0,0 @@
-# Work around FreeBSD bug #189353 when /tmp is using tmpfs(5)
-
---- threading.c.orig	2017-11-28 16:54:05 UTC
-+++ threading.c
-@@ -33,6 +33,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
- #include <errno.h>
- #endif
- 
-+#if defined(__FreeBSD__)
-+#include <stdlib.h>
-+#endif
-+
- #include "threading.h"
- 
- 
-@@ -88,6 +92,11 @@ int semaphore_init(
-   *semaphore = CreateSemaphore(NULL, value, 65535, NULL);
-   if (*semaphore == NULL)
-     return GetLastError();
-+  #elif defined(__FreeBSD__)
-+  *semaphore = malloc(sizeof(sem_t));
-+  if (*semaphore == NULL)
-+    return errno;
-+  return sem_init(*semaphore, 0, value);
-   #else
-   // Mac OS X doesn't support unnamed semaphores via sem_init, that's why
-   // we use sem_open instead sem_init and immediately unlink the semaphore
-@@ -112,6 +121,9 @@ void semaphore_destroy(
- {
-   #if defined(_WIN32) || defined(__CYGWIN__)
-   CloseHandle(*semaphore);
-+  #elif defined(__FreeBSD__)
-+  sem_close(*semaphore);
-+  free(*semaphore);
-   #else
-   sem_close(*semaphore);
-   #endif

security/yara/pkg-plist

@@ -4,6 +4,7 @@ include/yara.h
 include/yara/ahocorasick.h
 include/yara/arena.h
 include/yara/atoms.h
+include/yara/bitmask.h
 include/yara/compiler.h
 include/yara/error.h
 include/yara/exec.h
@@ -21,7 +22,9 @@ include/yara/proc.h
 include/yara/re.h
 include/yara/rules.h
 include/yara/scan.h
+include/yara/scanner.h
 include/yara/sizedstr.h
+include/yara/stopwatch.h
 include/yara/stream.h
 include/yara/strutils.h
 include/yara/threading.h
@@ -30,7 +33,7 @@ include/yara/utils.h
 lib/libyara.a
 lib/libyara.so
 lib/libyara.so.3
-lib/libyara.so.3.7.1
+lib/libyara.so.3.8.0
 libdata/pkgconfig/yara.pc
 man/man1/yara.1.gz
 man/man1/yarac.1.gz