Attachment #190070 for bug #225461

View | Details | Raw Unified | Return to bug 225461
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	clamav
PORTVERSION=	0.99.3
PORTREVISION=	9
CATEGORIES=	security
MASTER_SITES=	http://www.clamav.net/downloads/production/


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


	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
		${WRKSRC}/libclamunrar/unrar.c

.if ${PORT_OPTIONS:MTESTS}
pre-configure:
	@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
		${ECHO_MSG} ""; \

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (clamav-0.99.2.tar.gz) = 167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a	1	TIMESTAMP = 1516919350
2	SIZE (clamav-0.99.2.tar.gz) = 16067497	2	SHA256 (clamav-0.99.3.tar.gz) = 00fa5292a6e00a3a4035b826267748965d5d2c4943d8ff417d740238263e8e84
		3	SIZE (clamav-0.99.3.tar.gz) = 16082645




--- 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

Lines 1-5 Link Here

(-)files/patch-libclamav_regex_pcre.c (-2 / +2 lines)
1	--- libclamav/regex_pcre.c~ 2017-11-28 14:40:56.484208243 +0100	1	--- libclamav/regex_pcre.c.orig 2018-01-23 21:04:06 UTC
2	+++ libclamav/regex_pcre.c 2017-11-28 14:41:07.301207800 +0100	2	+++ libclamav/regex_pcre.c
3	@@ -112,7 +112,8 @@ int cli_pcre_addoptions(struct cli_pcre_	3	@@ -112,7 +112,8 @@ int cli_pcre_addoptions(struct cli_pcre_
4	#if USING_PCRE2	4	#if USING_PCRE2
5	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)	5	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)

Return to bug 225461

Lines 2-9 Link Here

(-)Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= clamav	4	PORTNAME= clamav
5	PORTVERSION= 0.99.2	5	PORTVERSION= 0.99.3
6	PORTREVISION= 9
7	CATEGORIES= security	6	CATEGORIES= security
8	MASTER_SITES= http://www.clamav.net/downloads/production/	7	MASTER_SITES= http://www.clamav.net/downloads/production/
9		8
Lines 51-59 Link Here
51	DMG_XAR_CONFIGURE_ENABLE= xml	50	DMG_XAR_CONFIGURE_ENABLE= xml
52	DMG_XAR_USE= GNOME=libxml2	51	DMG_XAR_USE= GNOME=libxml2
53		52
		53	USES= cpe gmake libtool ncurses pathfix
54	GNU_CONFIGURE= yes	54	GNU_CONFIGURE= yes
55	USE_LDCONFIG= yes	55	USE_LDCONFIG= yes
56	USES= cpe gmake libtool ncurses pathfix
57	INSTALL_TARGET= install-strip	56	INSTALL_TARGET= install-strip
58	USE_RC_SUBR= clamav-clamd clamav-freshclam	57	USE_RC_SUBR= clamav-clamd clamav-freshclam
59		58
Lines 177-183 Link Here
177	@${REINPLACE_CMD} -e 's\|0x100000000\|0x100000000ULL\|g' \	176	@${REINPLACE_CMD} -e 's\|0x100000000\|0x100000000ULL\|g' \
178	${WRKSRC}/libclamunrar/unrar.c	177	${WRKSRC}/libclamunrar/unrar.c
179		178
180	.if ${PORT_OPTIONS:MLLVM} && ${PORT_OPTIONS:MTESTS}	179	.if ${PORT_OPTIONS:MTESTS}
181	pre-configure:	180	pre-configure:
182	@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \	181	@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
183	${ECHO_MSG} ""; \	182	${ECHO_MSG} ""; \

Lines 1-23 Link Here

(-)files/patch-configure (-23 lines)
1	--- configure.orig 2016-04-22 16:19:50 UTC
2	+++ configure
3	@@ -18716,9 +18716,9 @@ then
4	as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5
5	else
6
7	- vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
8	+ vuln=`grep "ZLIB_VERSION \"1.2.0\"" $ZLIB_HOME/include/zlib.h`
9	if test -z "$vuln"; then
10	- vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h`
11	+ vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h`
12	fi
13
14	if test -n "$vuln"; then
15	@@ -20934,7 +20934,7 @@ esac
16	if test "$have_milter" = "yes"; then
17
18	save_LIBS="$LIBS"
19	- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
20	+ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS"
21	if test -d /usr/lib/libmilter ; then
22	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
23	fi