Attachment 211392 Details for Bug 243914 – Patch file

[patch] Patch file

security_clamav.patch (text/plain), 3.20 KB, created by Yasuhiro Kimura on 2020-02-05 21:39:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2020-02-05 21:39:32 UTC

Size: 3.20 KB

patch

obsolete

>Index: security/clamav/Makefile
>===================================================================
>--- security/clamav/Makefile	(revision 525259)
>+++ security/clamav/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	clamav
>-PORTVERSION=	0.102.1
>+PORTVERSION=	0.102.2
> PORTEPOCH=	1
> CATEGORIES=	security
> MASTER_SITES=	https://www.clamav.net/downloads/production/
>@@ -12,7 +12,8 @@
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libltdl.so:devel/libltdl \
>+LIB_DEPENDS=	libmspack.so:archivers/libmspack \
>+		libltdl.so:devel/libltdl \
> 		libcurl.so:ftp/curl
> 
> USES=		compiler cpe gmake gnome libtool ncurses pathfix pkgconfig ssl
>@@ -30,13 +31,10 @@
> 
> CONFIGURE_ARGS=	--libdir=${LOCALBASE}/lib \
> 		--with-dbdir=${DBDIR} \
>-		--disable-clamuko \
>-		--disable-clamav \
> 		--enable-bigstack \
>-		--enable-readdir_r \
>-		--enable-gethostbyname_r \
> 		--disable-dependency-tracking \
>-		--enable-clamdtop
>+		--enable-clamdtop \
>+		--with-system-libmspack=${LOCALBASE}/lib/libmspack.so
> 
> CFLAGS_i386=	-march=i486
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -61,7 +59,7 @@
> 		CLAMAVGROUP=${CLAMAVGROUP}
> 
> OPTIONS_DEFINE=	ARC ARJ DOCS DMG_XAR EXPERIMENTAL JSON LDAP ICONV IPV6 \
>-		LHA MILTER MSPACK PCRE STDERR TESTS UNZOO UNRAR
>+		LHA MILTER PCRE STDERR TESTS UNZOO UNRAR
> 
> OPTIONS_DEFAULT=	ARC ARJ DMG_XAR JSON MILTER PCRE UNZOO UNRAR
> OPTIONS_SUB=	yes
>@@ -72,7 +70,6 @@
> EXPERIMENTAL_DESC=	Build experimental code
> LHA_DESC=		Enable lha archives support
> MILTER_DESC=		Compile the milter interface
>-MSPACK_DESC=		Get mspack support from ports (otherwise use bundled)
> STDERR_DESC=		Print logs to stderr instead of stdout
> TESTS_DESC=		Run compile-time tests (req. python)
> UNZOO_DESC=		Enable zoo archives support
>@@ -96,8 +93,6 @@
> MILTER_LIB_DEPENDS+=	libmilter.so:mail/libmilter
> .endif
> MILTER_USE=		RC_SUBR=clamav-milter
>-MSPACK_CONFIGURE_WITH=	system-libmspack=${LOCALBASE}/lib/libmspack.so
>-MSPACK_LIB_DEPENDS=	libmspack.so:archivers/libmspack
> PCRE_CONFIGURE_WITH=	pcre
> PCRE_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
> STDERR_EXTRA_PATCHES=	${FILESDIR}/extra-patch-shared_output.c
>Index: security/clamav/distinfo
>===================================================================
>--- security/clamav/distinfo	(revision 525259)
>+++ security/clamav/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1574671743
>-SHA256 (clamav-0.102.1.tar.gz) = 0dbda8d0d990d068732966f13049d112a26dce62145d234383467c1d877dedd6
>-SIZE (clamav-0.102.1.tar.gz) = 13215586
>+TIMESTAMP = 1580934691
>+SHA256 (clamav-0.102.2.tar.gz) = 89fcdcc0eba329ca84d270df09d2bb89ae55f5024b0c3bddb817512fb2c907d3
>+SIZE (clamav-0.102.2.tar.gz) = 13227538
>Index: security/clamav/pkg-plist
>===================================================================
>--- security/clamav/pkg-plist	(revision 525259)
>+++ security/clamav/pkg-plist	(working copy)
>@@ -2,9 +2,6 @@
> %%JSON%%man/man1/clamsubmit.1.gz
> %%MILTER%%@sample etc/clamav-milter.conf.sample
> %%MILTER%%sbin/clamav-milter
>-%%NO_MSPACK%%lib/libclammspack.so
>-%%NO_MSPACK%%lib/libclammspack.so.0
>-%%NO_MSPACK%%lib/libclammspack.so.0.1.0
> %%PORTDOCS%%%%DOCSDIR%%/html/UserManual.html
> %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix.html
> %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix/Steps-Debian-Ubuntu.html

Flags:

yasu: maintainer-approval+

Actions: View | Diff

Attachments on bug 243914: 211392