kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

MFH: r459048 r459972

Browse source 
security/clamav: remove LHA from default options.

r459039 made distribution of the lha binary not allowed.

PR:		225180
Submitted by:	antoine

security/clamav: upgrade to 0.99.3.
* Update to 0.99.3.
* Fix following portlint warnings.
** Move position of USES in Makefile.
** Remove reference of undefined LLVM option.
** Regenerate files/patch-libclamav_regex_pcre.c by 'make makepatch
** add USES=ssl

PR:		225461
Submitted by:	yasu@utahime.org

Approved by:	ports-secteam (swills)
Security:	b464f61b-84c7-4e1c-8ad4-6cf9efffd025
This commit is contained in:
Larry Rosenman 2018-01-26 14:14:09 +00:00
parent cad478be0b
commit 0e062fb6ee
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q1/; revision=459992
4 changed files with 9 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
security/clamav/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= clamav
PORTVERSION= 0.99.2
PORTREVISION= 8
PORTVERSION= 0.99.3
CATEGORIES= security
MASTER_SITES= http://www.clamav.net/downloads/production/
@ -28,7 +27,7 @@ STDERR_DESC= Print logs to stderr instead of stdout
EXPERIMENTAL_DESC= Build experimental code
DMG_XAR_DESC= Enable DMG and XAR archives support
OPTIONS_DEFAULT= ARC ARJ LHA UNZOO UNRAR DMG_XAR \
OPTIONS_DEFAULT= ARC ARJ UNZOO UNRAR DMG_XAR \
JSON PCRE
ARC_RUN_DEPENDS= arc:archivers/arc
@ -51,9 +50,9 @@ IPV6_CONFIGURE_ENABLE= ipv6
DMG_XAR_CONFIGURE_ENABLE= xml
DMG_XAR_USE= GNOME=libxml2
USES= cpe gmake libtool ncurses pathfix ssl
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 @@ post-patch:
@${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} ""; \

5
security/clamav/distinfo
View file

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

23
security/clamav/files/patch-configure
View file

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

4
security/clamav/files/patch-libclamav_regex_pcre.c
View file

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