Attachment 192392 Details for Bug 227420 – Update to 0.100.0

[patch] Update to 0.100.0

clamav-0.100.0.diff (text/plain), 5.20 KB, created by Leonid Nevecherya on 2018-04-10 15:56:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leonid Nevecherya

Created: 2018-04-10 15:56:07 UTC

Size: 5.20 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 466967)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	clamav
>-PORTVERSION=	0.99.4
>+PORTVERSION=	0.100.0
> CATEGORIES=	security
> MASTER_SITES=	http://www.clamav.net/downloads/production/
> 
>@@ -79,8 +79,7 @@
> 		--enable-gethostbyname_r \
> 		--disable-dependency-tracking \
> 		--disable-zlib-vcheck \
>-		--enable-clamdtop \
>-		--disable-llvm
>+		--enable-clamdtop
> CPPFLAGS+=	-I${LOCALBASE}/include
> 
> # This port has a problem with -pthread,
>@@ -202,7 +201,6 @@
> 		  ${STAGEDIR}${DBDIR} \
> 		  ${STAGEDIR}${LOGDIR} \
> 		  ${STAGEDIR}${RUNDIR}
>-	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html
> 
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 466967)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1520002083
>-SHA256 (clamav-0.99.4.tar.gz) = d72ac3273bde8d2e5e28ec9978373ee3ab4529fd868bc3fc4d2d2671228f2461
>-SIZE (clamav-0.99.4.tar.gz) = 16083015
>+TIMESTAMP = 1523370392
>+SHA256 (clamav-0.100.0.tar.gz) = c5c5edaf75a3c53ac0f271148fd6447310bce53f448ec7e6205124a25918f65c
>+SIZE (clamav-0.100.0.tar.gz) = 16036757
>Index: files/patch-libclamav_bytecode__api.c
>===================================================================
>--- files/patch-libclamav_bytecode__api.c	(revision 466967)
>+++ files/patch-libclamav_bytecode__api.c	(nonexistent)
>@@ -1,44 +0,0 @@
>---- libclamav/bytecode_api.c.orig	2016-04-22 15:02:19 UTC
>-+++ libclamav/bytecode_api.c
>-@@ -811,8 +811,19 @@ int32_t cli_bcapi_inflate_init(struct cli_bc_ctx *ctx,
>-         cli_dbgmsg("bytecode api: inflate_init: invalid buffers!\n");
>-         return -1;
>-     }
>--    memset(&stream, 0, sizeof(stream));
>--    ret = inflateInit2(&stream, windowBits);
>-+    b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
>-+    if (!b) {
>-+        return -1;
>-+    }
>-+    ctx->inflates = b;
>-+    ctx->ninflates = n;
>-+    b = &b[n-1];
>-+
>-+    b->from = from;
>-+    b->to = to;
>-+    b->needSync = 0;
>-+    memset(&b->stream, 0, sizeof(stream));
>-+    ret = inflateInit2(&b->stream, windowBits);
>-     switch (ret) {
>-         case Z_MEM_ERROR:
>-             cli_dbgmsg("bytecode api: inflateInit2: out of memory!\n");
>-@@ -830,19 +841,6 @@ int32_t cli_bcapi_inflate_init(struct cli_bc_ctx *ctx,
>-             return -1;
>-     }
>- 
>--    b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
>--    if (!b) {
>--        inflateEnd(&stream);
>--        return -1;
>--    }
>--    ctx->inflates = b;
>--    ctx->ninflates = n;
>--    b = &b[n-1];
>--
>--    b->from = from;
>--    b->to = to;
>--    b->needSync = 0;
>--    memcpy(&b->stream, &stream, sizeof(stream));
>-     return n-1;
>- }
>- 
>
>Property changes on: files/patch-libclamav_bytecode__api.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-libclamav_regex_pcre.c
>===================================================================
>--- files/patch-libclamav_regex_pcre.c	(revision 466967)
>+++ files/patch-libclamav_regex_pcre.c	(nonexistent)
>@@ -1,12 +0,0 @@
>---- libclamav/regex_pcre.c.orig	2018-01-23 21:04:06 UTC
>-+++ libclamav/regex_pcre.c
>-@@ -112,7 +112,8 @@ int cli_pcre_addoptions(struct cli_pcre_
>- #if USING_PCRE2
>- int cli_pcre_compile(struct cli_pcre_data *pd, long long unsigned match_limit, long long unsigned match_limit_recursion, unsigned int options, int opt_override)
>- {
>--    int errornum, erroffset;
>-+    int errornum;
>-+    size_t erroffset;
>-     pcre2_general_context *gctx;
>-     pcre2_compile_context *cctx;
>- 
>
>Property changes on: files/patch-libclamav_regex_pcre.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 466967)
>+++ pkg-plist	(working copy)
>@@ -1,10 +1,10 @@
> bin/clamav-config
> bin/clambc
> bin/clamconf
>+bin/clamdscan
> bin/clamdtop
> bin/clamscan
> bin/clamsubmit
>-bin/clamdscan
> bin/freshclam
> bin/sigtool
> %%MILTER%%sbin/clamav-milter
>@@ -14,13 +14,18 @@
> lib/libclamav.so
> lib/libclamav.so.7
> lib/libclamav.so.7.1.1
>-%%UNRAR%%lib/libclamunrar.so
>-%%UNRAR%%lib/libclamunrar.so.7
>-%%UNRAR%%lib/libclamunrar.so.7.1.1
>-%%UNRAR%%lib/libclamunrar_iface.so
>-%%UNRAR%%lib/libclamunrar_iface.so.7
>-%%UNRAR%%lib/libclamunrar_iface.so.7.1.1
>+lib/libclammspack.a
>+lib/libclammspack.so
>+lib/libclammspack.so.0
>+lib/libclammspack.so.0.1.0
>+lib/libclamunrar.so
>+lib/libclamunrar.so.7
>+lib/libclamunrar.so.7.1.1
>+lib/libclamunrar_iface.so
>+lib/libclamunrar_iface.so.7
>+lib/libclamunrar_iface.so.7.1.1
> libdata/pkgconfig/libclamav.pc
>+libdata/pkgconfig/libclammspack.pc
> man/man1/clambc.1.gz
> man/man1/clamconf.1.gz
> man/man1/clamdscan.1.gz

Flags:

nevecherya: maintainer-approval?

Actions: View | Diff

Attachments on bug 227420: 192392 | 192459