Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

yara: update to version 3.9.0

Browse source 
Changes:
Remove merged patch for OpenSSL THREADID
Add PKG_CPE_ID

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
This commit is contained in:
Jan Pavlinec 2019-04-09 14:21:36 +02:00
parent 3c6ca66a49
commit df00abe9c5
No known key found for this signature in database
GPG key ID: 60244CCEFB39E584
2 changed files with 4 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
utils/yara/Makefile
View file

@ -8,14 +8,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=yara PKG_NAME:=yara
PKG_VERSION:=3.8.1 PKG_VERSION:=3.9.0
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/VirusTotal/yara/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/VirusTotal/yara/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=283527711269354d3c60e2705f7f74b1f769d2d35ddba8f7f9ce97d0fd5cb1ca PKG_HASH:=ebe7fab0abadb90449a62afbd24e196e18b177efe71ffd8bf22df95c5386f64d
PKG_CPE_ID:=cpe:/a:virustotal:yara
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1

47
utils/yara/patches/010-libyara-Switch-to-OpenSSL-s-THREADID-API.patch
View file

@ -1,47 +0,0 @@
From cd73c968e896b8ba364510abdcd3dcc63d017110 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 8 Nov 2018 14:57:49 -0800
Subject: [PATCH] libyara: Switch to OpenSSL's THREADID API
The non THREADID API was deprecated back in OpenSSL 1.0.0
---
libyara/libyara.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libyara/libyara.c b/libyara/libyara.c
index f05d1f9..6f20488 100644
--- a/libyara/libyara.c
+++ b/libyara/libyara.c
@@ -87,9 +87,9 @@ char yr_altercase[256];
static YR_MUTEX *openssl_locks;
-static unsigned long _thread_id(void)
+static void _thread_id(CRYPTO_THREADID *id)
{
- return (unsigned long) yr_current_thread_id();
+ CRYPTO_THREADID_set_numeric(id, (unsigned long) yr_current_thread_id());
}
@@ -155,7 +155,7 @@ YR_API int yr_initialize(void)
for (i = 0; i < CRYPTO_num_locks(); i++)
yr_mutex_create(&openssl_locks[i]);
- CRYPTO_set_id_callback(_thread_id);
+ CRYPTO_THREADID_set_callback(_thread_id);
CRYPTO_set_locking_callback(_locking_function);
#elif defined(HAVE_WINCRYPT_H)
@@ -226,7 +226,7 @@ YR_API int yr_finalize(void)
yr_mutex_destroy(&openssl_locks[i]);
OPENSSL_free(openssl_locks);
- CRYPTO_set_id_callback(NULL);
+ CRYPTO_THREADID_set_callback(NULL);
CRYPTO_set_locking_callback(NULL);
#elif defined(HAVE_WINCRYPT_H)
--
2.19.1