mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Update to 0.96.3

Browse Source
This commit is contained in:
Renato Botelho 2010-09-20 17:54:22 +00:00
parent d4cdf34e25
commit 094fc9c03e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=261500
5 changed files with 4 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
security/clamav/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= clamav
DISTVERSION= 0.96.2
PORTREVISION= 3
DISTVERSION= 0.96.3
CATEGORIES= security
MASTER_SITES= SF

6
security/clamav/distinfo
View File

@ -1,3 +1,3 @@
MD5 (clamav-0.96.2.tar.gz) = a2c2555d86868f91a01d0e2c2403bbec
SHA256 (clamav-0.96.2.tar.gz) = 6aa0b0d96ed25ffb4b5aca53f6348978c94771503c299f86e480fef475abcefa
SIZE (clamav-0.96.2.tar.gz) = 59109021
MD5 (clamav-0.96.3.tar.gz) = 663274565c4da17abb112ff88895e510
SHA256 (clamav-0.96.3.tar.gz) = db324d50a2d4e71a9b647198a607e56b952eb480f75ad6a28231d1f713736c8b
SIZE (clamav-0.96.3.tar.gz) = 42129283

12
security/clamav/files/patch-libclamav__bytecode.c
View File

@ -1,12 +0,0 @@
--- libclamav/bytecode.c
+++ libclamav/bytecode.c
@@ -2107,6 +2107,7 @@ static int run_selfcheck(struct cli_all_bc *bcs)
cli_bytecode_context_setfuncid(ctx, bc, 0);
cli_dbgmsg("bytecode self test running\n");
+ ctx->bytecode_timeout = 0;
rc = cli_bytecode_run(bcs, bc, ctx);
cli_bytecode_context_destroy(ctx);
if (rc != CL_SUCCESS) {
diff --git a/libclamav/c++/bytecode2llvm.cpp b/libclamav/c++/bytecode2llvm.cpp
index 0f1de1a..f0b12fe 100644

10
security/clamav/files/patch-libclamav__bytecode_detect.c
View File

@ -1,10 +0,0 @@
--- libclamav/bytecode_detect.c.orig 2010-08-16 08:30:31.000000000 -0300
+++ libclamav/bytecode_detect.c 2010-08-16 08:29:48.000000000 -0300
@@ -185,6 +185,7 @@
/* -- Detect arch -- */
CHECK_ARCH(i386);
else CHECK_ARCH(x86_64);
+ else if (!strcmp(TARGET_ARCH_TYPE,"amd64")) env->arch = arch_x86_64;
else if (!strcmp(TARGET_ARCH_TYPE,"ppc")) env->arch = arch_ppc32;/* llvm will fix ppc64 */
else CHECK_ARCH(arm);
else CHECK_ARCH(sparc);

34
security/clamav/files/patch-libclamav__c++__bytecode2llvm.cpp
View File

@ -1,34 +0,0 @@
--- libclamav/c++/bytecode2llvm.cpp
+++ libclamav/c++/bytecode2llvm.cpp
@@ -1637,11 +1637,15 @@ int cli_vm_execute_jit(const struct cli_all_bc *bcs, struct cli_bc_ctx *ctx,
0
};
- if ((ret = pthread_create(&thread, NULL, bytecode_watchdog, &w))) {
- errs() << "Bytecode: failed to create new thread!";
- errs() << cli_strerror(ret, buf, sizeof(buf));
- errs() << "\n";
- return CL_EBYTECODE;
+ if (ctx->bytecode_timeout) {
+ /* only spawn if timeout is set.
+ * we don't set timeout for selfcheck (see bb #2235) */
+ if ((ret = pthread_create(&thread, NULL, bytecode_watchdog, &w))) {
+ errs() << "Bytecode: failed to create new thread!";
+ errs() << cli_strerror(ret, buf, sizeof(buf));
+ errs() << "\n";
+ return CL_EBYTECODE;
+ }
}
ret = bytecode_execute((intptr_t)code, ctx);
@@ -1649,7 +1653,9 @@ int cli_vm_execute_jit(const struct cli_all_bc *bcs, struct cli_bc_ctx *ctx,
w.finished = 1;
pthread_cond_signal(&w.cond);
pthread_mutex_unlock(&w.mutex);
- pthread_join(thread, NULL);
+ if (ctx->bytecode_timeout) {
+ pthread_join(thread, NULL);
+ }
if (cli_debug_flag) {
gettimeofday(&tv1, NULL);