[Midnightbsd-cvs] mports [18430] trunk/security/clamav: clamav 0.98.6 update

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Mar 28 17:27:56 EDT 2015 

Revision: 18430
          http://svnweb.midnightbsd.org/mports/?rev=18430
Author:   laffer1
Date:     2015-03-28 17:27:56 -0400 (Sat, 28 Mar 2015)
Log Message:
-----------
clamav 0.98.6 update

Modified Paths:
--------------
    trunk/security/clamav/Makefile
    trunk/security/clamav/distinfo
    trunk/security/clamav/pkg-plist

Removed Paths:
-------------
    trunk/security/clamav/files/patch-freshclam__Makefile.in
    trunk/security/clamav/files/patch-libclamav__scanners.c_bug_5252

Modified: trunk/security/clamav/Makefile
===================================================================
--- trunk/security/clamav/Makefile	2015-03-28 21:19:19 UTC (rev 18429)
+++ trunk/security/clamav/Makefile	2015-03-28 21:27:56 UTC (rev 18430)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	0.98.4
+PORTVERSION=	0.98.6
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -10,7 +10,8 @@
 
 LICENSE=	gpl2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
+		libcurl.so:${PORTSDIR}/ftp/curl
 
 OPTIONS_DEFINE=	ARC ARJ LHA UNZOO UNRAR LLVM TESTS MILTER LDAP ICONV STDERR \
 		EXPERIMENTAL DOCS IPV6 DMG_XAR
@@ -56,14 +57,12 @@
 DBDIR=		/var/db/clamav
 LOGDIR=		/var/log/clamav
 RUNDIR=		/var/run/clamav
-PLIST_SUB+=	DBDIR=${DBDIR:S/^\///} \
-		LOGDIR=${LOGDIR:S/^\///} \
-		RUNDIR=${RUNDIR:S/^\///} \
+PLIST_SUB+=	DBDIR=${DBDIR} \
+		LOGDIR=${LOGDIR} \
+		RUNDIR=${RUNDIR} \
 		CLAMAVUSER=${CLAMAVUSER} \
-		CLAMAVGROUP=${CLAMAVGROUP} \
-		RESETPREFIX=${PREFIX}
+		CLAMAVGROUP=${CLAMAVGROUP}
 PY_NO_THREAD=	${WRKDIR}/.python-has-no-threads
-USE_AUTOTOOLS=	libltdl
 OPTIONS_SUB=	yes
 
 CONFIGURE_ARGS=	--libdir=${PREFIX}/lib \
@@ -134,7 +133,7 @@
 .if ${PORT_OPTIONS:MLLVM} && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
 CONFIGURE_ARGS+=--enable-llvm
 . if ${PORT_OPTIONS:MTESTS}
-USE_PYTHON_BUILD=	yes
+USES+=		python:build
 . endif
 .else
 CONFIGURE_ARGS+=--disable-llvm
@@ -167,6 +166,7 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
+			  -e 's|LC_REVISION=22|LC_REVISION=24|' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's,^\(pkgconfigdir = \).*$$,\1$$\(prefix\)/libdata/pkgconfig,g' \
 		${WRKSRC}/Makefile.in

Modified: trunk/security/clamav/distinfo
===================================================================
--- trunk/security/clamav/distinfo	2015-03-28 21:19:19 UTC (rev 18429)
+++ trunk/security/clamav/distinfo	2015-03-28 21:27:56 UTC (rev 18430)
@@ -1,2 +1,2 @@
-SHA256 (clamav-0.98.4.tar.gz) = d3006747abcf750f395a8bfa8267ab314c7b63196c4b41e7717948aaaafa3e1c
-SIZE (clamav-0.98.4.tar.gz) = 15537593
+SHA256 (clamav-0.98.6.tar.gz) = 6591245d55445a2ddcc1700964c33b8bf62fe20c75bd9c7746f4fe0735502951
+SIZE (clamav-0.98.6.tar.gz) = 15148292

Deleted: trunk/security/clamav/files/patch-freshclam__Makefile.in
===================================================================
--- trunk/security/clamav/files/patch-freshclam__Makefile.in	2015-03-28 21:19:19 UTC (rev 18429)
+++ trunk/security/clamav/files/patch-freshclam__Makefile.in	2015-03-28 21:27:56 UTC (rev 18430)
@@ -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

Deleted: trunk/security/clamav/files/patch-libclamav__scanners.c_bug_5252
===================================================================
--- trunk/security/clamav/files/patch-libclamav__scanners.c_bug_5252	2015-03-28 21:19:19 UTC (rev 18429)
+++ trunk/security/clamav/files/patch-libclamav__scanners.c_bug_5252	2015-03-28 21:27:56 UTC (rev 18430)
@@ -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);
-+	    }
- 	}
-     }
- 

Modified: trunk/security/clamav/pkg-plist
===================================================================
--- trunk/security/clamav/pkg-plist	2015-03-28 21:19:19 UTC (rev 18429)
+++ trunk/security/clamav/pkg-plist	2015-03-28 21:27:56 UTC (rev 18430)
@@ -3,6 +3,7 @@
 bin/clamconf
 bin/clamdtop
 bin/clamscan
+bin/clamsubmit
 bin/clamdscan
 bin/freshclam
 bin/sigtool
@@ -10,15 +11,15 @@
 sbin/clamd
 include/clamav.h
 include/clamav-config.h
-lib/libclamav.la
 lib/libclamav.so
-lib/libclamav.so.7
-%%UNRAR%%lib/libclamunrar.la
+lib/libclamav.so.6
+lib/libclamav.so.6.1.25
 %%UNRAR%%lib/libclamunrar.so
-%%UNRAR%%lib/libclamunrar.so.7
-%%UNRAR%%lib/libclamunrar_iface.la
+%%UNRAR%%lib/libclamunrar.so.6
+%%UNRAR%%lib/libclamunrar.so.6.1.25
 %%UNRAR%%lib/libclamunrar_iface.so
-%%UNRAR%%lib/libclamunrar_iface.so.7
+%%UNRAR%%lib/libclamunrar_iface.so.6
+%%UNRAR%%lib/libclamunrar_iface.so.6.1.25
 libdata/pkgconfig/libclamav.pc
 man/man1/clambc.1.gz
 man/man1/clamconf.1.gz
@@ -25,6 +26,7 @@
 man/man1/clamdscan.1.gz
 man/man1/clamdtop.1.gz
 man/man1/clamscan.1.gz
+man/man1/clamsubmit.1.gz
 man/man1/freshclam.1.gz
 man/man1/sigtool.1.gz
 man/man5/clamav-milter.conf.5.gz
@@ -32,12 +34,9 @@
 man/man5/freshclam.conf.5.gz
 man/man8/clamav-milter.8.gz
 man/man8/clamd.8.gz
- at unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.sample; then rm -f %D/etc/clamd.conf; fi
-etc/clamd.conf.sample
- at exec [ -f %B/clamd.conf ] || cp %B/%f %B/clamd.conf
- at unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.sample; then rm -f %D/etc/freshclam.conf; fi
-etc/freshclam.conf.sample
- at exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf
-%%MILTER%%@unexec if cmp -s %D/etc/clamav-milter.conf %D/etc/clamav-milter.conf.sample; then rm -f %D/etc/clamav-milter.conf; fi
-%%MILTER%%etc/clamav-milter.conf.sample
-%%MILTER%%@exec [ -f %B/clamav-milter.conf ] || cp %B/%f %B/clamav-milter.conf
+ at sample etc/clamd.conf.sample
+ at sample etc/freshclam.conf.sample
+%%MILTER%%@sample etc/clamav-milter.conf.sample
+ at dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
+ at dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
+ at dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%

More information about the Midnightbsd-cvs mailing list