Attachment 190070 Details for Bug 225461 – patch file

[patch] patch file

security_clamav.patch (text/plain), 3.04 KB, created by Yasuhiro Kimura on 2018-01-25 22:57:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2018-01-25 22:57:21 UTC

Size: 3.04 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 459963)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	clamav
>-PORTVERSION=	0.99.2
>-PORTREVISION=	9
>+PORTVERSION=	0.99.3
> CATEGORIES=	security
> MASTER_SITES=	http://www.clamav.net/downloads/production/
> 
>@@ -51,9 +50,9 @@
> DMG_XAR_CONFIGURE_ENABLE=	xml
> DMG_XAR_USE=		GNOME=libxml2
> 
>+USES=		cpe gmake libtool ncurses pathfix
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-USES=		cpe gmake libtool ncurses pathfix
> INSTALL_TARGET=	install-strip
> USE_RC_SUBR=	clamav-clamd clamav-freshclam
> 
>@@ -177,7 +176,7 @@
> 	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
> 		${WRKSRC}/libclamunrar/unrar.c
> 
>-.if ${PORT_OPTIONS:MLLVM} && ${PORT_OPTIONS:MTESTS}
>+.if ${PORT_OPTIONS:MTESTS}
> pre-configure:
> 	@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
> 		${ECHO_MSG} ""; \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 459963)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (clamav-0.99.2.tar.gz) = 167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a
>-SIZE (clamav-0.99.2.tar.gz) = 16067497
>+TIMESTAMP = 1516919350
>+SHA256 (clamav-0.99.3.tar.gz) = 00fa5292a6e00a3a4035b826267748965d5d2c4943d8ff417d740238263e8e84
>+SIZE (clamav-0.99.3.tar.gz) = 16082645
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 459963)
>+++ files/patch-configure	(nonexistent)
>@@ -1,23 +0,0 @@
>---- configure.orig	2016-04-22 16:19:50 UTC
>-+++ configure
>-@@ -18716,9 +18716,9 @@ then
>-     as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5
>- else
>- 
>--    vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
>-+    vuln=`grep "ZLIB_VERSION \"1.2.0\"" $ZLIB_HOME/include/zlib.h`
>-     if test -z "$vuln"; then
>--	vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h`
>-+	vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h`
>-     fi
>- 
>-     if test -n "$vuln"; then
>-@@ -20934,7 +20934,7 @@ esac
>- if test "$have_milter" = "yes"; then
>- 
>-         save_LIBS="$LIBS"
>--    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
>-+    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS"
>-     if test -d /usr/lib/libmilter ; then
>- 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
>-     fi
>Index: files/patch-libclamav_regex_pcre.c
>===================================================================
>--- files/patch-libclamav_regex_pcre.c	(revision 459963)
>+++ files/patch-libclamav_regex_pcre.c	(working copy)
>@@ -1,5 +1,5 @@
>---- libclamav/regex_pcre.c~	2017-11-28 14:40:56.484208243 +0100
>-+++ libclamav/regex_pcre.c	2017-11-28 14:41:07.301207800 +0100
>+--- 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)

Actions: View | Diff

Attachments on bug 225461: 190070