diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-11-18 23:06:39 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-11-18 23:06:39 +0000 |
| commit | 049e68d8fa44a946aa895fd18d4c039174f22b73 (patch) | |
| tree | 11358c52c21a81df7054b4b2b8a7089e35aa3977 /security | |
| parent | b0d4f7466e3bc2419ba2ac3494ed655b825f0f4e (diff) | |
| download | ports-049e68d8fa44a946aa895fd18d4c039174f22b73.tar.gz ports-049e68d8fa44a946aa895fd18d4c039174f22b73.zip | |
Notes
Diffstat (limited to 'security')
| -rw-r--r-- | security/clamav/Makefile | 3 | ||||
| -rw-r--r-- | security/clamav/distinfo | 4 | ||||
| -rw-r--r-- | security/clamav/files/patch-freshclam__Makefile.in | 11 | ||||
| -rw-r--r-- | security/clamav/files/patch-libclamav__scanners.c_bug_5252 | 23 | ||||
| -rw-r--r-- | security/clamav/pkg-plist | 6 |
5 files changed, 6 insertions, 41 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 296af38bf45b..bb6b8c3d91ba 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= clamav -PORTVERSION= 0.98.4 -PORTREVISION= 2 +PORTVERSION= 0.98.5 CATEGORIES= security MASTER_SITES= SF diff --git a/security/clamav/distinfo b/security/clamav/distinfo index b4354f47cfef..dc0ac56eabdd 100644 --- a/security/clamav/distinfo +++ b/security/clamav/distinfo @@ -1,2 +1,2 @@ -SHA256 (clamav-0.98.4.tar.gz) = d3006747abcf750f395a8bfa8267ab314c7b63196c4b41e7717948aaaafa3e1c -SIZE (clamav-0.98.4.tar.gz) = 15537593 +SHA256 (clamav-0.98.5.tar.gz) = 9c2f37d5fa9033936468237f6f4b29289f30791caa84765ef510acb56c8daa4d +SIZE (clamav-0.98.5.tar.gz) = 15146379 diff --git a/security/clamav/files/patch-freshclam__Makefile.in b/security/clamav/files/patch-freshclam__Makefile.in deleted file mode 100644 index fcadc5a0525d..000000000000 --- a/security/clamav/files/patch-freshclam__Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- freshclam/Makefile.in.orig 2014-06-09 10:19:33.000000000 -0300 -+++ freshclam/Makefile.in 2014-06-09 10:20:12.000000000 -0300 -@@ -414,7 +414,7 @@ - mirman.h - - AM_CFLAGS = @WERR_CFLAGS@ --AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ -+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ - AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT) - CLEANFILES = *.gcda *.gcno - all: all-am diff --git a/security/clamav/files/patch-libclamav__scanners.c_bug_5252 b/security/clamav/files/patch-libclamav__scanners.c_bug_5252 deleted file mode 100644 index 6a21dedb24ef..000000000000 --- a/security/clamav/files/patch-libclamav__scanners.c_bug_5252 +++ /dev/null @@ -1,23 +0,0 @@ ---- libclamav/scanners.c.orig -+++ libclamav/scanners.c -@@ -2369,7 +2369,19 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type) - ret = res; - cli_bitset_free(ctx->hook_lsig_matches); - ctx->hook_lsig_matches = old_hook_lsig_matches; -- ret_from_magicscan(ret); -+ /* Same switch as end of magic_scandesc function */ -+ switch(ret) { -+ case CL_EFORMAT: -+ case CL_EMAXREC: -+ case CL_EMAXSIZE: -+ case CL_EMAXFILES: -+ cli_dbgmsg("Descriptor: %s\n", cl_strerror(ret)); -+ case CL_CLEAN: /* here, only from cli_checkfp() */ -+ cache_add(hash, hashed_size, ctx); -+ ret_from_magicscan(CL_CLEAN); -+ default: -+ ret_from_magicscan(ret); -+ } - } - } - diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist index a65f36cf50b3..a89a39224ddb 100644 --- a/security/clamav/pkg-plist +++ b/security/clamav/pkg-plist @@ -13,13 +13,13 @@ include/clamav.h include/clamav-config.h lib/libclamav.so lib/libclamav.so.6 -lib/libclamav.so.6.1.23 +lib/libclamav.so.6.1.22 %%UNRAR%%lib/libclamunrar.so %%UNRAR%%lib/libclamunrar.so.6 -%%UNRAR%%lib/libclamunrar.so.6.1.23 +%%UNRAR%%lib/libclamunrar.so.6.1.22 %%UNRAR%%lib/libclamunrar_iface.so %%UNRAR%%lib/libclamunrar_iface.so.6 -%%UNRAR%%lib/libclamunrar_iface.so.6.1.23 +%%UNRAR%%lib/libclamunrar_iface.so.6.1.22 libdata/pkgconfig/libclamav.pc man/man1/clambc.1.gz man/man1/clamconf.1.gz |