Attachment #209046 for bug #241860

Lines 13457-13459 Link Here

(-)MOVED (+1 lines)
13457	www/p5-WWW-Mechanize-PhantomJS\|\|2019-11-02\|Has expired: uses expired lang/phantomjs	13457	www/p5-WWW-Mechanize-PhantomJS\|\|2019-11-02\|Has expired: uses expired lang/phantomjs
13458	x11/xfwp\|\|2019-11-06\|Has expired: Deprecated upstream	13458	x11/xfwp\|\|2019-11-06\|Has expired: Deprecated upstream
13459	x11/xfindproxy\|\|2019-11-06\|Has expired: Deprecated upstream	13459	x11/xfindproxy\|\|2019-11-06\|Has expired: Deprecated upstream
		13460	security/clamav-milter\|security/clamav\|2019-11-10\|Now that MILTER option is enabled by default, use security/clamav instead

Lines 86-92 Link Here

(-)security/Makefile (-1 lines)
86	SUBDIR += cl-md5-sbcl	86	SUBDIR += cl-md5-sbcl
87	SUBDIR += clamassassin	87	SUBDIR += clamassassin
88	SUBDIR += clamav	88	SUBDIR += clamav
89	SUBDIR += clamav-milter
90	SUBDIR += clamav-unofficial-sigs	89	SUBDIR += clamav-unofficial-sigs
91	SUBDIR += clamd-stream-client	90	SUBDIR += clamd-stream-client
92	SUBDIR += clamfs	91	SUBDIR += clamfs




# $FreeBSD$

PORTNAME=	clamav
PORTVERSION=	0.102.0
PORTEPOCH=	1
CATEGORIES=	security
MASTER_SITES=	https://www.clamav.net/downloads/production/

LIB_DEPENDS=	libltdl.so:devel/libltdl \
		libcurl.so:ftp/curl

USES=		autoreconf compiler cpe gmake gnome libtool ncurses pathfix pkgconfig ssl
USE_RC_SUBR=	clamav-clamd clamav-freshclam
USE_LDCONFIG=	yes


# force to use -lthr until it's not fixed.
LDFLAGS+=	-lthr -L${LOCALBASE}/lib

CONFLICTS?=	clamav-milter-[0-9]*

SUB_FILES=	pkg-deinstall
SUB_LIST+=	DBDIR=${DBDIR} \
		LOGDIR=${LOGDIR} \

PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
		CLAMAVGROUP=${CLAMAVGROUP}

OPTIONS_DEFINE=	ARC ARJ DOCS DMG_XAR EXPERIMENTAL JSON LDAP ICONV IPV6 \
		LHA MILTER MSPACK PCRE STDERR TESTS UNZOO UNRAR

OPTIONS_DEFAULT=	ARC ARJ DMG_XAR JSON MILTER PCRE UNZOO UNRAR
			JSON PCRE MSPACK
OPTIONS_SUB=	yes

ARC_DESC=		Enable arch archives support
ARJ_DESC=		Enable arj archives support
DMG_XAR_DESC=		Enable DMG and XAR archives support
EXPERIMENTAL_DESC=	Build experimental code
LHA_DESC=		Enable lha archives support
UNZOO_DESC=		Enable zoo archives support
TESTS_DESC=		Run compile-time tests (req. python)
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

ARC_RUN_DEPENDS=	arc:archivers/arc
ARJ_RUN_DEPENDS=	arj:archivers/arj

Lines 1-3 Link Here

(-)security/clamav/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1566501172	1	TIMESTAMP = 1573089073
2	SHA256 (clamav-0.101.4.tar.gz) = 0bf094f0919d158a578421d66bc2569c8c8181233ba162bb51722f98c802bccd	2	SHA256 (clamav-0.102.0.tar.gz) = 48fe188c46c793c2d0cb5c81c106e4690251aff6dc8aa6575dc688343291bee1
3	SIZE (clamav-0.101.4.tar.gz) = 21408145	3	SIZE (clamav-0.102.0.tar.gz) = 13211357




--- configure.ac.orig	2019-11-07 02:02:07 UTC
+++ configure.ac
@@ -108,6 +108,7 @@ m4_include([m4/reorganization/libs/bzip.m4])
 m4_include([m4/reorganization/libs/unrar.m4])
 
 m4_include([m4/reorganization/libs/systemd.m4])
+m4_include([m4/reorganization/milter/enable.m4])
 m4_include([m4/reorganization/milter/check.m4])
 m4_include([m4/reorganization/clamdtop.m4])
 
@@ -147,7 +148,6 @@ m4_include([m4/reorganization/code_checks/ipv6.m4])
 m4_include([m4/reorganization/code_checks/dns.m4])
 m4_include([m4/reorganization/code_checks/fanotify.m4])
 m4_include([m4/reorganization/code_checks/setpgrp.m4])
-m4_include([m4/reorganization/milter/enable.m4])
 m4_include([m4/reorganization/utility_checks/id.m4])
 m4_include([m4/reorganization/utility_checks/yp.m4])
 m4_include([m4/reorganization/usergroup.m4])




%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/libclamav.html
%%UNRAR%%lib/libclamunrar.so
%%UNRAR%%lib/libclamunrar.so.9
%%UNRAR%%lib/libclamunrar.so.9.0.4
%%UNRAR%%lib/libclamunrar_iface.so
%%UNRAR%%lib/libclamunrar_iface.so.9
%%UNRAR%%lib/libclamunrar_iface.so.9.0.4
@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%

bin/sigtool
include/clamav-config.h
include/clamav-types.h
include/clamav-version.h
include/clamav.h
include/libfreshclam.h
lib/libclamav.so
lib/libclamav.so.9
lib/libclamav.so.9.0.4
lib/libfreshclam.so
lib/libfreshclam.so.2
lib/libfreshclam.so.2.0.0
libdata/pkgconfig/libclamav.pc
man/man1/clambc.1.gz
man/man1/clamconf.1.gz




# Created by: bz
# $FreeBSD$

PKGNAMESUFFIX=	-milter

OPTIONS_SLAVE+=	MILTER

MASTERDIR=	${.CURDIR}/../clamav
PKGNAMESUFFIX=	-milter

CONFLICTS=	clamav-[0-9]*

.include "${MASTERDIR}/Makefile"

Return to bug 241860

Lines 1-7 Link Here

(-)security/clamav/Makefile (-12 / +9 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= clamav	3	PORTNAME= clamav
4	PORTVERSION= 0.101.4	4	PORTVERSION= 0.102.0
5	PORTEPOCH= 1	5	PORTEPOCH= 1
6	CATEGORIES= security	6	CATEGORIES= security
7	MASTER_SITES= https://www.clamav.net/downloads/production/	7	MASTER_SITES= https://www.clamav.net/downloads/production/
Lines 15-21 Link Here
15	LIB_DEPENDS= libltdl.so:devel/libltdl \	15	LIB_DEPENDS= libltdl.so:devel/libltdl \
16	libcurl.so:ftp/curl	16	libcurl.so:ftp/curl
17		17
18	USES= compiler cpe gmake gnome libtool ncurses pathfix pkgconfig ssl	18	USES= autoreconf compiler cpe gmake gnome libtool ncurses pathfix pkgconfig ssl
19	USE_RC_SUBR= clamav-clamd clamav-freshclam	19	USE_RC_SUBR= clamav-clamd clamav-freshclam
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21		21
Lines 45-52 Link Here
45	# force to use -lthr until it's not fixed.	45	# force to use -lthr until it's not fixed.
46	LDFLAGS+= -lthr -L${LOCALBASE}/lib	46	LDFLAGS+= -lthr -L${LOCALBASE}/lib
47		47
48	CONFLICTS?= clamav-milter-[0-9]*
49
50	SUB_FILES= pkg-deinstall	48	SUB_FILES= pkg-deinstall
51	SUB_LIST+= DBDIR=${DBDIR} \	49	SUB_LIST+= DBDIR=${DBDIR} \
52	LOGDIR=${LOGDIR} \	50	LOGDIR=${LOGDIR} \
Lines 62-84 Link Here
62	PLIST_SUB+= CLAMAVUSER=${CLAMAVUSER} \	60	PLIST_SUB+= CLAMAVUSER=${CLAMAVUSER} \
63	CLAMAVGROUP=${CLAMAVGROUP}	61	CLAMAVGROUP=${CLAMAVGROUP}
64		62
65	OPTIONS_DEFINE= ARC ARJ LHA UNZOO UNRAR TESTS MILTER MSPACK LDAP ICONV STDERR \	63	OPTIONS_DEFINE= ARC ARJ DOCS DMG_XAR EXPERIMENTAL JSON LDAP ICONV IPV6 \
66	EXPERIMENTAL DOCS IPV6 DMG_XAR JSON PCRE	64	LHA MILTER MSPACK PCRE STDERR TESTS UNZOO UNRAR
67		65
68	OPTIONS_DEFAULT= ARC ARJ UNZOO UNRAR DMG_XAR \	66	OPTIONS_DEFAULT= ARC ARJ DMG_XAR JSON MILTER PCRE UNZOO UNRAR
69	JSON PCRE MSPACK
70	OPTIONS_SUB= yes	67	OPTIONS_SUB= yes
71		68
72	ARC_DESC= Enable arch archives support	69	ARC_DESC= Enable arch archives support
73	ARJ_DESC= Enable arj archives support	70	ARJ_DESC= Enable arj archives support
		71	DMG_XAR_DESC= Enable DMG and XAR archives support
		72	EXPERIMENTAL_DESC= Build experimental code
74	LHA_DESC= Enable lha archives support	73	LHA_DESC= Enable lha archives support
75	UNZOO_DESC= Enable zoo archives support
76	TESTS_DESC= Run compile-time tests (req. python)
77	MILTER_DESC= Compile the milter interface	74	MILTER_DESC= Compile the milter interface
78	MSPACK_DESC= Get mspack support from ports (otherwise use bundled)	75	MSPACK_DESC= Get mspack support from ports (otherwise use bundled)
79	STDERR_DESC= Print logs to stderr instead of stdout	76	STDERR_DESC= Print logs to stderr instead of stdout
80	EXPERIMENTAL_DESC= Build experimental code	77	TESTS_DESC= Run compile-time tests (req. python)
81	DMG_XAR_DESC= Enable DMG and XAR archives support	78	UNZOO_DESC= Enable zoo archives support
82		79
83	ARC_RUN_DEPENDS= arc:archivers/arc	80	ARC_RUN_DEPENDS= arc:archivers/arc
84	ARJ_RUN_DEPENDS= arj:archivers/arj	81	ARJ_RUN_DEPENDS= arj:archivers/arj

Line 0 Link Here

(-)security/clamav/files/patch-configure.ac (+18 lines)
	1	--- configure.ac.orig 2019-11-07 02:02:07 UTC
	2	+++ configure.ac
	3	@@ -108,6 +108,7 @@ m4_include([m4/reorganization/libs/bzip.m4])
	4	m4_include([m4/reorganization/libs/unrar.m4])
	5
	6	m4_include([m4/reorganization/libs/systemd.m4])
	7	+m4_include([m4/reorganization/milter/enable.m4])
	8	m4_include([m4/reorganization/milter/check.m4])
	9	m4_include([m4/reorganization/clamdtop.m4])
	10
	11	@@ -147,7 +148,6 @@ m4_include([m4/reorganization/code_checks/ipv6.m4])
	12	m4_include([m4/reorganization/code_checks/dns.m4])
	13	m4_include([m4/reorganization/code_checks/fanotify.m4])
	14	m4_include([m4/reorganization/code_checks/setpgrp.m4])
	15	-m4_include([m4/reorganization/milter/enable.m4])
	16	m4_include([m4/reorganization/utility_checks/id.m4])
	17	m4_include([m4/reorganization/utility_checks/yp.m4])
	18	m4_include([m4/reorganization/usergroup.m4])

Lines 39-48 Link Here

(-)security/clamav/pkg-plist (-3 / +8 lines)
39	%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/libclamav.html	39	%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/libclamav.html
40	%%UNRAR%%lib/libclamunrar.so	40	%%UNRAR%%lib/libclamunrar.so
41	%%UNRAR%%lib/libclamunrar.so.9	41	%%UNRAR%%lib/libclamunrar.so.9
42	%%UNRAR%%lib/libclamunrar.so.9.0.2	42	%%UNRAR%%lib/libclamunrar.so.9.0.4
43	%%UNRAR%%lib/libclamunrar_iface.so	43	%%UNRAR%%lib/libclamunrar_iface.so
44	%%UNRAR%%lib/libclamunrar_iface.so.9	44	%%UNRAR%%lib/libclamunrar_iface.so.9
45	%%UNRAR%%lib/libclamunrar_iface.so.9.0.2	45	%%UNRAR%%lib/libclamunrar_iface.so.9.0.4
46	@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%	46	@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
47	@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%	47	@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
48	@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%	48	@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%
Lines 58-67 Link Here
58	bin/sigtool	58	bin/sigtool
59	include/clamav-config.h	59	include/clamav-config.h
60	include/clamav-types.h	60	include/clamav-types.h
		61	include/clamav-version.h
61	include/clamav.h	62	include/clamav.h
		63	include/libfreshclam.h
62	lib/libclamav.so	64	lib/libclamav.so
63	lib/libclamav.so.9	65	lib/libclamav.so.9
64	lib/libclamav.so.9.0.2	66	lib/libclamav.so.9.0.4
		67	lib/libfreshclam.so
		68	lib/libfreshclam.so.2
		69	lib/libfreshclam.so.2.0.0
65	libdata/pkgconfig/libclamav.pc	70	libdata/pkgconfig/libclamav.pc
66	man/man1/clambc.1.gz	71	man/man1/clambc.1.gz
67	man/man1/clamconf.1.gz	72	man/man1/clamconf.1.gz

Lines 1-13 Link Here

(-)security/clamav-milter/Makefile (-13 lines)
1	# Created by: bz
2	# $FreeBSD$
3
4	PKGNAMESUFFIX= -milter
5
6	OPTIONS_SLAVE+= MILTER
7
8	MASTERDIR= ${.CURDIR}/../clamav
9	PKGNAMESUFFIX= -milter
10
11	CONFLICTS= clamav-[0-9]*
12
13	.include "${MASTERDIR}/Makefile"