diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2011-02-08 12:13:53 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2011-02-08 12:13:53 +0000 |
| commit | 2640092f359175dac090ddbf1cdc482f216035eb (patch) | |
| tree | 8e9fa2e2c4ceae7b6bb5b92ded1f57c6a4099294 | |
| parent | 471fad759d3126b1e2938a80fd6ac74fcebd28fb (diff) | |
Notes
| -rw-r--r-- | security/clamav/Makefile | 3 | ||||
| -rw-r--r-- | security/clamav/distinfo | 4 | ||||
| -rw-r--r-- | security/clamav/files/patch-clamd__others.c | 11 | ||||
| -rw-r--r-- | security/clamav/files/patch-freshclam__manager.c | 30 |
4 files changed, 3 insertions, 45 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 0b5080db747b..ad42f1c08ef5 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -6,8 +6,7 @@ # PORTNAME= clamav -PORTVERSION= 0.96.5 -PORTREVISION= 1 +PORTVERSION= 0.97 CATEGORIES= security MASTER_SITES= SF diff --git a/security/clamav/distinfo b/security/clamav/distinfo index 72618dc281fb..cc33319f4990 100644 --- a/security/clamav/distinfo +++ b/security/clamav/distinfo @@ -1,2 +1,2 @@ -SHA256 (clamav-0.96.5.tar.gz) = 83a683d51eceb5aaf0c249efb3d9d95aa4fd8bbc1f05817ab7b1030f6d84d059 -SIZE (clamav-0.96.5.tar.gz) = 41164924 +SHA256 (clamav-0.97.tar.gz) = ec5d88303c0a6e1d8e1354b68ae8c184faee7989aac11dfacff466d9e0471932 +SIZE (clamav-0.97.tar.gz) = 41834871 diff --git a/security/clamav/files/patch-clamd__others.c b/security/clamav/files/patch-clamd__others.c deleted file mode 100644 index 8276847fa95c..000000000000 --- a/security/clamav/files/patch-clamd__others.c +++ /dev/null @@ -1,11 +0,0 @@ ---- clamd/others.c.orig 2010-11-05 10:48:02.000000000 +0100 -+++ clamd/others.c 2010-12-16 15:41:59.000000000 +0100 -@@ -146,7 +146,7 @@ - exit(execle("/bin/sh", "sh", "-c", buffer_cmd, NULL, env)); - } else if(pid > 0) { /* parent */ - pthread_mutex_unlock(&virusaction_lock); -- waitpid(pid, NULL, 0); -+ while(waitpid(pid, NULL, 0) == -1 && errno == EINTR); - } else { - logg("!VirusEvent: fork failed.\n"); - } diff --git a/security/clamav/files/patch-freshclam__manager.c b/security/clamav/files/patch-freshclam__manager.c deleted file mode 100644 index 38989c453a7a..000000000000 --- a/security/clamav/files/patch-freshclam__manager.c +++ /dev/null @@ -1,30 +0,0 @@ ---- freshclam/manager.c.orig 2010-11-23 12:41:18.000000000 +0100 -+++ freshclam/manager.c 2010-12-16 15:40:54.000000000 +0100 -@@ -1476,7 +1476,7 @@ - char lastline[256]; - int pipefd[2]; - pid_t pid; -- int status = 0; -+ int status = 0, ret; - FILE *f; - - if (pipe(pipefd) == -1) { -@@ -1513,7 +1513,8 @@ - } - fclose(f); - -- if (waitpid(pid, &status, 0) == -1 && errno != ECHILD) -+ while ((ret = waitpid(pid, &status, 0)) == -1 && errno == EINTR); -+ if (ret == -1 && errno != ECHILD) - logg("^waitpid() failed: %s\n", strerror(errno)); - cli_chomp(firstline); - cli_chomp(lastline); -@@ -1523,7 +1524,7 @@ - lastline); - } - if (WIFEXITED(status)) { -- int ret = WEXITSTATUS(status); -+ ret = WEXITSTATUS(status); - if (ret) { - logg("^Database load exited with status %d\n", ret); - return ret; |