View | Details | Raw Unified | Return to bug 258565 | Differences between
and this patch

Collapse All | Expand All

(-)b/security/clamav/Makefile (-136 / +88 lines)
Lines 1-71 Link Here
1
PORTNAME=	clamav
1
PORTNAME=	clamav
2
PORTVERSION=	0.103.3
2
DISTVERSION=	0.104.0
3
PORTEPOCH=	1
3
PORTEPOCH=	1
4
CATEGORIES=	security
4
CATEGORIES=	security
5
MASTER_SITES=	https://www.clamav.net/downloads/production/
5
MASTER_SITES=	https://www.clamav.net/downloads/production/
6
6
7
MAINTAINER=	yasu@utahime.org
7
MAINTAINER=	yasu@utahime.org
8
COMMENT=	Command line virus scanner written entirely in C
8
COMMENT=	Open source (GPL) anti-virus engine
9
9
10
LICENSE=	GPLv2
10
LICENSE=	GPLv2
11
LICENSE_FILE=	${WRKSRC}/COPYING
11
LICENSE_FILE=	${WRKSRC}/COPYING.txt
12
12
13
LIB_DEPENDS=	libcurl.so:ftp/curl \
13
LIB_DEPENDS=	libcurl.so:ftp/curl \
14
		libltdl.so:devel/libltdl \
14
		libjson-c.so:devel/json-c \
15
		libmspack.so:archivers/libmspack
15
		libmspack.so:archivers/libmspack \
16
		libpcre2-8.so:devel/pcre2
16
17
17
USES=		compiler cpe gmake gnome libtool ncurses pathfix pkgconfig ssl
18
USES=		cmake cpe gnome iconv ncurses pkgconfig ssl
18
USE_RC_SUBR=	clamav-clamd clamav-freshclam
19
USE_GNOME=	libxml2
19
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
USE_RC_SUBR=	clamav-clamd clamav-freshclam
20
22
21
GNU_CONFIGURE=	yes
23
CMAKE_ARGS=	-DDATABASE_DIRECTORY:STRING=${_DBDIR}
22
INSTALL_TARGET=	install-strip
24
CMAKE_ON=	ENABLE_EXTERNAL_MSPACK
23
24
PLIST_SUB+=	CLAMAVGROUP=${CLAMAVGROUP} \
25
		CLAMAVUSER=${CLAMAVUSER} \
26
		DBDIR=${DBDIR} \
27
		LOGDIR=${LOGDIR} \
28
		RUNDIR=${RUNDIR}
29
30
CONFIGURE_ARGS=	--disable-dependency-tracking \
31
		--enable-bigstack \
32
		--enable-clamdtop \
33
		--libdir=${PREFIX}/lib \
34
		--with-dbdir=${DBDIR} \
35
		--with-libcurl=${LOCALBASE} \
36
		--with-openssl=${OPENSSLBASE} \
37
		--with-system-libmspack=${LOCALBASE}/lib/libmspack.so
38
39
CFLAGS_i386=	-march=i486
40
25
41
# This port has a problem with -pthread,
26
INSTALL_TARGET=	install/strip
42
# force to use -lthr until it's not fixed.
43
LDFLAGS+=	-lthr
44
27
45
SUB_FILES=	pkg-deinstall
28
SUB_FILES=	pkg-message
46
SUB_LIST+=	CHMOD=${CHMOD} \
29
SUB_LIST+=	CHMOD=${CHMOD} \
47
		CHOWN=${CHOWN} \
30
		CHOWN=${CHOWN} \
48
		CLAMAV_CLAMD_PIDFILE=${CLAMAV_CLAMD_PIDFILE} \
31
		CLAMAV_CLAMD_PIDFILE=${_CLAMAV_CLAMD_PIDFILE} \
49
		CLAMAV_CLAMD_SOCKET=${CLAMAV_CLAMD_SOCKET} \
32
		CLAMAV_CLAMD_SOCKET=${_CLAMAV_CLAMD_SOCKET} \
50
		CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET} \
33
		CLAMAV_MILTER_SOCKET=${_CLAMAV_MILTER_SOCKET} \
51
		CLAMAVGROUP=${CLAMAVGROUP} \
34
		CLAMAVGROUP=${_CLAMAVGROUP} \
52
		CLAMAVUSER=${CLAMAVUSER} \
35
		CLAMAVUSER=${_CLAMAVUSER} \
53
		DBDIR=${DBDIR} \
36
		DBDIR=${_DBDIR} \
54
		LOGDIR=${LOGDIR} \
37
		LOGDIR=${_LOGDIR} \
55
		RUNDIR=${RUNDIR}
38
		RUNDIR=${_RUNDIR}
56
39
57
PLIST_SUB+=	CLAMAVGROUP=${CLAMAVGROUP} \
40
USERS=		${_CLAMAVUSER}
58
		CLAMAVUSER=${CLAMAVUSER}
41
GROUPS=		${_CLAMAVGROUP} mail
59
42
60
OPTIONS_DEFINE=	ARC ARJ DMG_XAR DOCS EXPERIMENTAL ICONV IPV6 JSON LDAP LHA \
43
PLIST_SUB+=	CLAMAVGROUP=${_CLAMAVGROUP} \
61
		MILTER PCRE STDERR TESTS UNRAR UNZOO
44
		CLAMAVUSER=${_CLAMAVUSER} \
62
45
		DBDIR=${_DBDIR} \
63
OPTIONS_DEFAULT=	ARC ARJ DMG_XAR JSON MILTER PCRE UNRAR UNZOO
46
		LOGDIR=${_LOGDIR} \
47
		RUNDIR=${_RUNDIR}
48
49
OPTIONS_DEFINE=	ARC ARJ DOCS EXPERIMENTAL LHA MILTER STDERR TESTS UNRAR UNZOO
50
51
OPTIONS_DEFAULT=	ARC ARJ MILTER UNRAR UNZOO
64
OPTIONS_SUB=		yes
52
OPTIONS_SUB=		yes
65
53
66
ARC_DESC=		Enable arch archives support
54
ARC_DESC=		Enable arch archives support
67
ARJ_DESC=		Enable arj archives support
55
ARJ_DESC=		Enable arj archives support
68
DMG_XAR_DESC=		Enable DMG and XAR archives support
69
EXPERIMENTAL_DESC=	Build experimental code
56
EXPERIMENTAL_DESC=	Build experimental code
70
LHA_DESC=		Enable lha archives support
57
LHA_DESC=		Enable lha archives support
71
MILTER_DESC=		Compile the milter interface
58
MILTER_DESC=		Compile the milter interface
Lines 73-179 STDERR_DESC= Print logs to stderr instead of stdout Link Here
73
TESTS_DESC=		Run compile-time tests (req. python)
60
TESTS_DESC=		Run compile-time tests (req. python)
74
UNZOO_DESC=		Enable zoo archives support
61
UNZOO_DESC=		Enable zoo archives support
75
62
76
ARC_RUN_DEPENDS=		arc:archivers/arc
63
ARC_RUN_DEPENDS=	arc:archivers/arc
77
ARJ_RUN_DEPENDS=		arj:archivers/arj
64
ARJ_RUN_DEPENDS=	arj:archivers/arj
78
DMG_XAR_CONFIGURE_WITH=		xml=${LOCALBASE}
65
EXPERIMENTAL_CMAKE_ON=	-DENABLE_EXPERIMENTAL:BOOL=ON
79
DMG_XAR_USE=			GNOME=libxml2
66
EXPERIMENTAL_CMAKE_OFF=	-DENABLE_EXPERIMENTAL:BOOL=OFF
80
EXPERIMENTAL_CONFIGURE_ENABLE=	experimental
67
LHA_RUN_DEPENDS=	lha:archivers/lha
81
ICONV_CONFIGURE_WITH=		iconv
68
MILTER_USE=		RC_SUBR=clamav-milter
82
ICONV_USES=			iconv
69
MILTER_CMAKE_ON=	-DENABLE_MILTER:BOOL=ON
83
IPV6_CONFIGURE_ENABLE=		ipv6
70
MILTER_CMAKE_OFF=	-DENABLE_MILTER:BOOL=OFF
84
JSON_CONFIGURE_WITH=		libjson=${LOCALBASE}
85
JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
86
LDAP_LDFLAGS=			-lldap -L${LOCALBASE}/lib
87
LDAP_USE=			OPENLDAP=yes
88
LHA_RUN_DEPENDS=		lha:archivers/lha
89
MILTER_CONFIGURE_WITH=		sendmail=/usr/sbin/sendmail
90
MILTER_CONFIGURE_ENABLE=	milter
91
.if !exists(/usr/lib/libmilter.so)
71
.if !exists(/usr/lib/libmilter.so)
92
MILTER_CFLAGS=			-I${LOCALBASE}/include
72
MILTER_LIB_DEPENDS+=	libmilter.so:mail/libmilter
93
MILTER_LDFLAGS=			-L${LOCALBASE}/lib
73
MILTER_CFLAGS=		-I${LOCALBASE}/include
94
MILTER_LIB_DEPENDS+=		libmilter.so:mail/libmilter
74
MILTER_LDFLAGS=		-L${LOCALBASE}/lib
95
.endif
96
MILTER_USE=			RC_SUBR=clamav-milter
97
PCRE_CONFIGURE_WITH=		pcre
98
PCRE_LIB_DEPENDS=		libpcre2-8.so:devel/pcre2
99
STDERR_EXTRA_PATCHES=		${FILESDIR}/extra-patch-shared_output.c
100
TESTS_CONFIGURE_ENABLE=		check
101
TESTS_BUILD_DEPENDS=		${LOCALBASE}/include/check.h:devel/check
102
TESTS_USES=			python:build
103
UNRAR_CONFIGURE_ENABLE=		unrar
104
UNZOO_RUN_DEPENDS=		unzoo:archivers/unzoo
105
106
CLAMAVUSER?=	clamav
107
CLAMAVGROUP?=	clamav
108
109
CLAMAV_CLAMD_SOCKET?=	${RUNDIR}/clamd.sock
110
CLAMAV_CLAMD_PIDFILE?=	${RUNDIR}/clamd.pid
111
CLAMAV_MILTER_SOCKET?=	${RUNDIR}/clmilter.sock
112
113
.if ${CLAMAVUSER} == "clamav"
114
USERS=		clamav
115
.endif
116
117
.if ${CLAMAVGROUP} == "clamav"
118
GROUPS=		clamav mail
119
.endif
75
.endif
120
76
STDERR_EXTRA_PATCHES=	${FILESDIR}/extra-patch-common_output.c
121
DBDIR=		/var/db/clamav
77
TESTS_BUILD_DEPENDS=	${LOCALBASE}/include/check.h:devel/check
122
LOGDIR=		/var/log/clamav
78
TESTS_USES=		python:build
123
RUNDIR=		/var/run/clamav
79
TESTS_CMAKE_ON=		-DENABLE_TESTS:BOOL=ON
124
PY_NO_THREAD=	${WRKDIR}/.python-has-no-threads
80
TESTS_CMAKE_OFF=	-DENABLE_TESTS:BOOL=OFF
125
81
UNRAR_CMAKE_ON=		-DENABLE_UNRAR:BOOL=ON
126
SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' -e \
82
UNRAR_CMAKE_OFF=	-DENABLE_UNRAR:BOOL=OFF
127
		's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \
83
UNZOO_RUN_DEPENDS=	unzoo:archivers/unzoo
128
		-e 's|^\#?(PidFile) .*/([a-z\-]+\.pid)$$|\1 ${RUNDIR}/\2|' -e \
84
129
		's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' -e \
85
_CLAMAVUSER=	clamav
130
		's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' -e \
86
_CLAMAVGROUP=	clamav
87
88
_CLAMAV_CLAMD_SOCKET?=	${_RUNDIR}/clamd.sock
89
_CLAMAV_CLAMD_PIDFILE?=	${_RUNDIR}/clamd.pid
90
_CLAMAV_MILTER_SOCKET?=	${_RUNDIR}/clmilter.sock
91
92
_DBDIR=		/var/db/clamav
93
_LOGDIR=	/var/log/clamav
94
_RUNDIR=	/var/run/clamav
95
96
_SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' -e \
97
		's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${_LOGDIR}/\3|' \
98
		-e 's|^\#?(PidFile) .*/([a-z\-]+\.pid)$$|\1 ${_RUNDIR}/\2|' -e \
99
		's|^\#?(LocalSocket) .*$$|\1 ${_CLAMAV_CLAMD_SOCKET}|' -e \
100
		's|^\#?(User) .*$$|\1 ${_CLAMAVUSER}|' -e \
131
		's|^\#?(AllowSupplementaryGroups).*$$|\1 yes|' -e \
101
		's|^\#?(AllowSupplementaryGroups).*$$|\1 yes|' -e \
132
		's|^\#?(ScanMail).*$$|\1 yes|' -e \
102
		's|^\#?(ScanMail).*$$|\1 yes|' -e \
133
		's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' -e \
103
		's|^\#?(DatabaseDirectory) .*$$|\1 ${_DBDIR}|' -e \
134
		's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' -e \
104
		's|^\#?(DatabaseOwner) .*$$|\1 ${_CLAMAVUSER}|' -e \
135
		's|^\#?(FixStaleSocket).*$$|\1 yes|' -e \
105
		's|^\#?(FixStaleSocket).*$$|\1 yes|' -e \
136
		's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' -e \
106
		's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' -e \
137
		's|^\#?(MilterSocket) */tmp.*$$|\1 ${CLAMAV_MILTER_SOCKET}|' -e \
107
		's|^\#?(MilterSocket) */tmp.*$$|\1 ${_CLAMAV_MILTER_SOCKET}|' \
138
		's|^\#?(ClamdSocket).*$$|\1 unix:${CLAMAV_CLAMD_SOCKET}|'
108
		-e 's|^\#?(ClamdSocket).*$$|\1 unix:${_CLAMAV_CLAMD_SOCKET}|'
139
140
.include <bsd.port.pre.mk>
141
109
142
post-patch:
110
post-patch:
143
	@${REINPLACE_CMD} ${SED_CONF} \
111
	@${REINPLACE_CMD} ${_SED_CONF} \
144
		${WRKSRC}/etc/clamd.conf.sample \
112
		${WRKSRC}/etc/clamd.conf.sample \
145
		${WRKSRC}/etc/freshclam.conf.sample \
113
		${WRKSRC}/etc/freshclam.conf.sample \
146
		${WRKSRC}/etc/clamav-milter.conf.sample
114
		${WRKSRC}/etc/clamav-milter.conf.sample
147
.if ${CHOSEN_COMPILER_TYPE} == gcc
148
	@${REINPLACE_CMD} -e 's|-Wno-logical-op-parentheses||' \
149
			  -e 's|-Wno-dangling-else||' \
150
		${WRKSRC}/libclamav/Makefile.am \
151
		${WRKSRC}/libclamav/Makefile.in \
152
		${WRKSRC}/libclamunrar/makefile
153
.endif
154
155
pre-configure-TESTS-on:
156
	@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
157
		${ECHO_MSG} ""; \
158
		${ECHO_MSG} "==========================================================================="; \
159
		${ECHO_MSG} "= Unit tests REQUIRES python built with thread support, and yours is not. ="; \
160
		${ECHO_MSG} "= It will not be called during this build                                 ="; \
161
		${ECHO_MSG} "==========================================================================="; \
162
		${ECHO_MSG} ""; \
163
		${TOUCH} ${PY_NO_THREAD}; \
164
	fi
165
115
166
post-build-TESTS-on:
116
post-build-TESTS-on:
167
	@if [ ! -f "${PY_NO_THREAD}" ]; then \
117
	${MAKE_CMD} -C ${TEST_WRKSRC} check; \
168
		${MAKE_CMD} -C ${WRKSRC} check; \
169
	fi
170
118
171
post-install:
119
post-install:
172
	${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${STAGEDIR}${PREFIX}/include
120
	${INSTALL_DATA} ${INSTALL_WRKSRC}/clamav-config.h ${STAGEDIR}${PREFIX}/include
173
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html \
121
	@${MKDIR} ${STAGEDIR}${_DBDIR} \
174
		  ${STAGEDIR}${DBDIR} \
122
		  ${STAGEDIR}${_LOGDIR} \
175
		  ${STAGEDIR}${LOGDIR} \
123
		  ${STAGEDIR}${_RUNDIR}
176
		  ${STAGEDIR}${RUNDIR}
124
177
	(cd ${WRKSRC}/docs/html; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html)
125
post-install-DOCS-on:
178
126
	${MV} ${STAGEDIR}${PREFIX}/share/doc/ClamAV ${STAGEDIR}${DOCSDIR}
179
.include <bsd.port.post.mk>
127
128
post-install-DOCS-off:
129
	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/ClamAV
130
131
.include <bsd.port.mk>
(-)b/security/clamav/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1624295813
1
TIMESTAMP = 1631019092
2
SHA256 (clamav-0.103.3.tar.gz) = 9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9
2
SHA256 (clamav-0.104.0.tar.gz) = a079d64cd55d6184510adfe0f341b2f278f7fb1bcc080d28d374298160f19cb2
3
SIZE (clamav-0.103.3.tar.gz) = 13389239
3
SIZE (clamav-0.104.0.tar.gz) = 11896747
(-)b/security/clamav/files/clamav-clamd.in (-6 / +1 lines)
Lines 23-33 rcvar=clamav_clamd_enable Link Here
23
load_rc_config "$name"
23
load_rc_config "$name"
24
24
25
: ${clamav_clamd_enable:=NO}
25
: ${clamav_clamd_enable:=NO}
26
: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
27
: ${clamav_clamd_pidfile="%%CLAMAV_CLAMD_PIDFILE%%"}
26
: ${clamav_clamd_pidfile="%%CLAMAV_CLAMD_PIDFILE%%"}
28
: ${clamav_clamd_user="%%CLAMAVUSER%%"}
29
27
30
command=%%PREFIX%%/sbin/clamd
28
command=%%PREFIX%%/sbin/clamd
29
pidfile=${clamav_clamd_pidfile}
31
required_dirs=%%DBDIR%%
30
required_dirs=%%DBDIR%%
32
required_files=%%PREFIX%%/etc/clamd.conf
31
required_files=%%PREFIX%%/etc/clamd.conf
33
32
Lines 38-47 reload_cmd="%%PREFIX%%/bin/clamdscan --reload" Link Here
38
#clamav .93 won't start without a valid main.c[vl]d file
37
#clamav .93 won't start without a valid main.c[vl]d file
39
clamav_clamd_precmd()
38
clamav_clamd_precmd()
40
{
39
{
41
	local rundir=${clamav_clamd_pidfile%/*}
42
	if [ ! -d $rundir ] ; then
43
		install -d -m 0755 -o ${clamav_clamd_user} -g ${clamav_clamd_user} $rundir
44
	fi
45
	if [ ! -f %%DBDIR%%/main.cvd -a ! -f %%DBDIR%%/main.cld ];then
40
	if [ ! -f %%DBDIR%%/main.cvd -a ! -f %%DBDIR%%/main.cld ];then
46
		echo "Missing %%DBDIR%%/*.cvd or *.cld files.  You must run freshclam first"
41
		echo "Missing %%DBDIR%%/*.cvd or *.cld files.  You must run freshclam first"
47
		exit 1
42
		exit 1
(-)b/security/clamav/files/clamav-freshclam.in (-11 lines)
Lines 24-30 load_rc_config ${name} Link Here
24
24
25
: ${clamav_freshclam_enable:=NO}
25
: ${clamav_freshclam_enable:=NO}
26
: ${clamav_freshclam_pidfile=%%RUNDIR%%/freshclam.pid}
26
: ${clamav_freshclam_pidfile=%%RUNDIR%%/freshclam.pid}
27
: ${clamav_freshclam_user=%%CLAMAVUSER%%}
28
27
29
command=%%PREFIX%%/bin/freshclam
28
command=%%PREFIX%%/bin/freshclam
30
pidfile=${clamav_freshclam_pidfile}
29
pidfile=${clamav_freshclam_pidfile}
Lines 32-45 command_args="--daemon -p ${pidfile}" Link Here
32
required_dirs=%%DBDIR%%
31
required_dirs=%%DBDIR%%
33
required_files=%%PREFIX%%/etc/freshclam.conf
32
required_files=%%PREFIX%%/etc/freshclam.conf
34
33
35
start_precmd=clamav_freshclam_precmd
36
37
clamav_freshclam_precmd()
38
{
39
	local rundir=${clamav_freshclam_pidfile%/*}
40
	if [ ! -d $rundir ] ; then
41
		install -d -m 0755 -o ${clamav_freshclam_user} -g ${clamav_freshclam_user} $rundir
42
	fi
43
}
44
45
run_rc_command "$1"
34
run_rc_command "$1"
(-)b/security/clamav/files/extra-patch-common_output.c (-2 / +2 lines)
Lines 1-5 Link Here
1
--- shared/output.c.orig	Thu May 18 22:10:40 2006
1
--- common/output.c.orig	Thu May 18 22:10:40 2006
2
+++ shared/output.c	Thu May 18 22:12:43 2006
2
+++ common/output.c	Thu May 18 22:12:43 2006
3
@@ -236,7 +236,13 @@
3
@@ -236,7 +236,13 @@
4
 	return;
4
 	return;
5
     }
5
     }
(-)a/security/clamav/files/patch-libclamav_c++_llvm_include_llvm_Support_CFG.h (-62 lines)
Removed Link Here
1
--- libclamav/c++/llvm/include/llvm/Support/CFG.h.orig	2016-04-22 15:02:19 UTC
2
+++ libclamav/c++/llvm/include/llvm/Support/CFG.h
3
@@ -27,8 +27,9 @@ namespace llvm {
4
 
5
 template <class Ptr, class USE_iterator> // Predecessor Iterator
6
 class PredIterator : public std::iterator<std::forward_iterator_tag,
7
-                                          Ptr, ptrdiff_t> {
8
-  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t> super;
9
+                                          Ptr, ptrdiff_t, Ptr*, Ptr*> {
10
+  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t, Ptr*,
11
+                                                                    Ptr*> super;
12
   typedef PredIterator<Ptr, USE_iterator> Self;
13
   USE_iterator It;
14
 
15
@@ -40,6 +41,7 @@ class PredIterator : public std::iterator<std::forward
16
 
17
 public:
18
   typedef typename super::pointer pointer;
19
+  typedef typename super::reference reference;
20
 
21
   explicit inline PredIterator(Ptr *bb) : It(bb->use_begin()) {
22
     advancePastNonTerminators();
23
@@ -49,7 +51,7 @@ class PredIterator : public std::iterator<std::forward
24
   inline bool operator==(const Self& x) const { return It == x.It; }
25
   inline bool operator!=(const Self& x) const { return !operator==(x); }
26
 
27
-  inline pointer operator*() const {
28
+  inline reference operator*() const {
29
     assert(!It.atEnd() && "pred_iterator out of range!");
30
     return cast<TerminatorInst>(*It)->getParent();
31
   }
32
@@ -87,10 +89,11 @@ inline const_pred_iterator pred_end(const BasicBlock *
33
 
34
 template <class Term_, class BB_>           // Successor Iterator
35
 class SuccIterator : public std::iterator<std::bidirectional_iterator_tag,
36
-                                          BB_, ptrdiff_t> {
37
+                                          BB_, ptrdiff_t, BB_*, BB_*> {
38
   const Term_ Term;
39
   unsigned idx;
40
-  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super;
41
+  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t, BB_*,
42
+                                                                    BB_*> super;
43
   typedef SuccIterator<Term_, BB_> Self;
44
 
45
   inline bool index_is_valid(int idx) {
46
@@ -99,6 +102,7 @@ class SuccIterator : public std::iterator<std::bidirec
47
 
48
 public:
49
   typedef typename super::pointer pointer;
50
+  typedef typename super::reference reference;
51
   // TODO: This can be random access iterator, only operator[] missing.
52
 
53
   explicit inline SuccIterator(Term_ T) : Term(T), idx(0) {// begin iterator
54
@@ -122,7 +126,7 @@ class SuccIterator : public std::iterator<std::bidirec
55
   inline bool operator==(const Self& x) const { return idx == x.idx; }
56
   inline bool operator!=(const Self& x) const { return !operator==(x); }
57
 
58
-  inline pointer operator*() const { return Term->getSuccessor(idx); }
59
+  inline reference operator*() const { return Term->getSuccessor(idx); }
60
   inline pointer operator->() const { return operator*(); }
61
 
62
   inline Self& operator++() { ++idx; return *this; } // Preincrement
(-)a/security/clamav/files/pkg-deinstall.in (-25 lines)
Removed Link Here
1
#!/bin/sh
2
3
if [ "$2" != "POST-DEINSTALL" ]; then
4
	exit 0
5
fi
6
7
CLAMAVUSER=%%CLAMAVUSER%%
8
9
echo
10
echo "===================================================="
11
echo
12
echo "If you want remove clamav permanently from you system"
13
echo "execute following commands:"
14
echo
15
echo " # rm -rf %%LOGDIR%%"
16
echo " # rm -rf %%RUNDIR%%"
17
echo " # rm -rf %%DBDIR%%"
18
if pw usershow "${CLAMAVUSER}" 2>/dev/null 1>&2; then
19
	echo " # pw userdel ${CLAMAVUSER}"
20
fi
21
echo
22
echo "===================================================="
23
echo
24
25
exit 0
(-)b/security/clamav/files/pkg-message.in (+13 lines)
Added Link Here
1
[
2
{ type: remove
3
  message: <<EOM
4
If you want remove clamav permanently from you system
5
execute following commands:
6
7
 # rm -rf %%LOGDIR%%
8
 # rm -rf %%RUNDIR%%
9
 # rm -rf %%DBDIR%%
10
 # pw userdel %%CLAMAVUSER%%
11
EOM
12
}
13
]
(-)b/security/clamav/pkg-descr (-6 / +7 lines)
Lines 1-8 Link Here
1
This the stable version of Clam Antivirus.
1
ClamAV is an open source (GPL) anti-virus engine used in a variety of
2
Clam Antivirus is command line virus scanner written entirely in C
2
situations including email scanning, web scanning, and end point
3
and its database is kept up to date. It also detects polymorphic
3
security. It provides a number of utilities including a flexible and
4
viruses, scans compressed files and supported by AMaViS.
4
scalable multi-threaded daemon, a command line scanner and an advanced
5
Optionally you can use the clamav-milter interface to connect
5
tool for automatic database updates.
6
clamav with sendmail.
6
7
This is Regular (non-LTS) Feature Release of Clam Antivirus.
7
8
8
WWW: https://www.clamav.net/
9
WWW: https://www.clamav.net/
(-)b/security/clamav/pkg-plist (-40 / +126 lines)
Lines 4-45 bin/clamconf Link Here
4
bin/clamdscan
4
bin/clamdscan
5
bin/clamdtop
5
bin/clamdtop
6
bin/clamscan
6
bin/clamscan
7
%%JSON%%bin/clamsubmit
7
bin/clamsubmit
8
bin/freshclam
8
bin/freshclam
9
bin/sigtool
9
bin/sigtool
10
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual.html
11
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Contribute.html
12
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix.html
13
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix/Steps-Debian-Ubuntu.html
14
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix/Steps-Redhat-CentOS.html
15
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix/Steps-macOS.html
16
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Windows.html
17
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Introduction.html
18
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/OnAccess.html
19
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures.html
20
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/AllowLists.html
21
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/AuthenticodeRules.html
22
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/BodySignatureFormat.html
23
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/BytecodeSignatures.html
24
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/ContainerMetadata.html
25
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/DatabaseInfo.html
26
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/DynamicConfig.html
27
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/EncryptedArchives.html
28
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/ExtendedSignatures.html
29
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/FileTypeMagic.html
30
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/FileTypes.html
31
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/FunctionalityLevels.html
32
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/HashSignatures.html
33
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/LogicalSignatures.html
34
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/PhishSigs.html
35
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/YaraRules.html
36
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Usage.html
37
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Usage/Configuration.html
38
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Usage/Scanning.html
39
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Usage/SignatureManagement.html
40
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/development.html
41
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/images/demon.png
42
%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/libclamav.html
43
include/clamav-config.h
10
include/clamav-config.h
44
include/clamav-types.h
11
include/clamav-types.h
45
include/clamav-version.h
12
include/clamav-version.h
Lines 47-69 include/clamav.h Link Here
47
include/libfreshclam.h
14
include/libfreshclam.h
48
lib/libclamav.so
15
lib/libclamav.so
49
lib/libclamav.so.9
16
lib/libclamav.so.9
50
lib/libclamav.so.9.0.5
17
lib/libclamav.so.9.1.0
51
%%UNRAR%%lib/libclamunrar.so
18
%%UNRAR%%lib/libclamunrar.so
52
%%UNRAR%%lib/libclamunrar.so.9
19
%%UNRAR%%lib/libclamunrar.so.9
53
%%UNRAR%%lib/libclamunrar.so.9.0.5
20
%%UNRAR%%lib/libclamunrar.so.9.1.0
54
%%UNRAR%%lib/libclamunrar_iface.so
21
%%UNRAR%%lib/libclamunrar_iface.so
55
%%UNRAR%%lib/libclamunrar_iface.so.9
22
%%UNRAR%%lib/libclamunrar_iface.so.9
56
%%UNRAR%%lib/libclamunrar_iface.so.9.0.5
23
%%UNRAR%%lib/libclamunrar_iface.so.9.1.0
57
lib/libfreshclam.so
24
lib/libfreshclam.so
58
lib/libfreshclam.so.2
25
lib/libfreshclam.so.2
59
lib/libfreshclam.so.2.0.1
26
lib/libfreshclam.so.2.0.2
60
libdata/pkgconfig/libclamav.pc
27
libdata/pkgconfig/libclamav.pc
61
man/man1/clambc.1.gz
28
man/man1/clambc.1.gz
62
man/man1/clamconf.1.gz
29
man/man1/clamconf.1.gz
63
man/man1/clamdscan.1.gz
30
man/man1/clamdscan.1.gz
64
man/man1/clamdtop.1.gz
31
man/man1/clamdtop.1.gz
65
man/man1/clamscan.1.gz
32
man/man1/clamscan.1.gz
66
%%JSON%%man/man1/clamsubmit.1.gz
33
man/man1/clamsubmit.1.gz
67
man/man1/freshclam.1.gz
34
man/man1/freshclam.1.gz
68
man/man1/sigtool.1.gz
35
man/man1/sigtool.1.gz
69
man/man5/clamav-milter.conf.5.gz
36
man/man5/clamav-milter.conf.5.gz
Lines 71-76 man/man5/clamd.conf.5.gz Link Here
71
man/man5/freshclam.conf.5.gz
38
man/man5/freshclam.conf.5.gz
72
man/man8/clamav-milter.8.gz
39
man/man8/clamav-milter.8.gz
73
man/man8/clamd.8.gz
40
man/man8/clamd.8.gz
41
%%PORTDOCS%%%%DOCSDIR%%/html/404.html
42
%%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/css/font-awesome.css
43
%%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/FontAwesome.ttf
44
%%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.eot
45
%%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.svg
46
%%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.ttf
47
%%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.woff
48
%%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.woff2
49
%%PORTDOCS%%%%DOCSDIR%%/html/Introduction.html
50
%%PORTDOCS%%%%DOCSDIR%%/html/ace.js
51
%%PORTDOCS%%%%DOCSDIR%%/html/appendix/Appendix.html
52
%%PORTDOCS%%%%DOCSDIR%%/html/appendix/Authenticode.html
53
%%PORTDOCS%%%%DOCSDIR%%/html/appendix/CvdPrivateMirror.html
54
%%PORTDOCS%%%%DOCSDIR%%/html/appendix/FileTypes.html
55
%%PORTDOCS%%%%DOCSDIR%%/html/appendix/FunctionalityLevels.html
56
%%PORTDOCS%%%%DOCSDIR%%/html/appendix/Terminology.html
57
%%PORTDOCS%%%%DOCSDIR%%/html/ayu-highlight.css
58
%%PORTDOCS%%%%DOCSDIR%%/html/book.js
59
%%PORTDOCS%%%%DOCSDIR%%/html/clipboard.min.js
60
%%PORTDOCS%%%%DOCSDIR%%/html/css/chrome.css
61
%%PORTDOCS%%%%DOCSDIR%%/html/css/general.css
62
%%PORTDOCS%%%%DOCSDIR%%/html/css/print.css
63
%%PORTDOCS%%%%DOCSDIR%%/html/css/variables.css
64
%%PORTDOCS%%%%DOCSDIR%%/html/editor.js
65
%%PORTDOCS%%%%DOCSDIR%%/html/elasticlunr.min.js
66
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-cvd.html
67
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-eol.html
68
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-freshclam.html
69
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-ignore.html
70
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-misc.html
71
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-ml.html
72
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-pua.html
73
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-safebrowsing.html
74
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-scan-alerts.html
75
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-troubleshoot.html
76
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-uninstall.html
77
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-upgrade.html
78
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-whichversion.html
79
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-win32.html
80
%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq.html
81
%%PORTDOCS%%%%DOCSDIR%%/html/favicon.png
82
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/OPEN-SANS-LICENSE.txt
83
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/SOURCE-CODE-PRO-LICENSE.txt
84
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/fonts.css
85
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-300.woff2
86
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-300italic.woff2
87
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-600.woff2
88
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-600italic.woff2
89
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-700.woff2
90
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-700italic.woff2
91
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-800.woff2
92
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-800italic.woff2
93
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-italic.woff2
94
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-regular.woff2
95
%%PORTDOCS%%%%DOCSDIR%%/html/fonts/source-code-pro-v11-all-charsets-500.woff2
96
%%PORTDOCS%%%%DOCSDIR%%/html/highlight.css
97
%%PORTDOCS%%%%DOCSDIR%%/html/highlight.js
98
%%PORTDOCS%%%%DOCSDIR%%/html/images/change-fork-name.png
99
%%PORTDOCS%%%%DOCSDIR%%/html/images/cisco.png
100
%%PORTDOCS%%%%DOCSDIR%%/html/images/clone-your-fork.png
101
%%PORTDOCS%%%%DOCSDIR%%/html/images/create-a-fork.png
102
%%PORTDOCS%%%%DOCSDIR%%/html/images/demon.png
103
%%PORTDOCS%%%%DOCSDIR%%/html/images/flamegraph.svg
104
%%PORTDOCS%%%%DOCSDIR%%/html/images/fork-is-behind.png
105
%%PORTDOCS%%%%DOCSDIR%%/html/images/logo.png
106
%%PORTDOCS%%%%DOCSDIR%%/html/images/new-git-workflow.png
107
%%PORTDOCS%%%%DOCSDIR%%/html/images/old-git-workflow.png
108
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
109
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development.html
110
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/Contribute.html
111
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/build-installer-packages.html
112
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/clamav-git-work-flow.html
113
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/code-coverage.html
114
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/development-builds.html
115
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/fuzzing-sanitizers.html
116
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/github-pr-basics.html
117
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/libclamav.html
118
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/performance-profiling.html
119
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/personal-forks.html
120
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/testing-pull-requests.html
121
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/tips-and-tricks.html
122
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing.html
123
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Add-clamav-user.html
124
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Community-projects.html
125
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Docker.html
126
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Installing-from-source-Unix-old.html
127
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Installing-from-source-Unix.html
128
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Installing-from-source-Windows.html
129
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Packages.html
130
%%PORTDOCS%%%%DOCSDIR%%/html/manual/OnAccess.html
131
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures.html
132
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/AllowLists.html
133
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/AuthenticodeRules.html
134
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/BodySignatureFormat.html
135
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/BytecodeSignatures.html
136
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/ContainerMetadata.html
137
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/DatabaseInfo.html
138
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/DynamicConfig.html
139
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/EncryptedArchives.html
140
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/ExtendedSignatures.html
141
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/FileTypeMagic.html
142
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/HashSignatures.html
143
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/LogicalSignatures.html
144
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/PhishSigs.html
145
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/YaraRules.html
146
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage.html
147
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/Configuration.html
148
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/ReportABug.html
149
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/Scanning.html
150
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/Services.html
151
%%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/SignatureManagement.html
152
%%PORTDOCS%%%%DOCSDIR%%/html/mark.min.js
153
%%PORTDOCS%%%%DOCSDIR%%/html/mode-rust.js
154
%%PORTDOCS%%%%DOCSDIR%%/html/print.html
155
%%PORTDOCS%%%%DOCSDIR%%/html/searcher.js
156
%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
157
%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.json
158
%%PORTDOCS%%%%DOCSDIR%%/html/theme-dawn.js
159
%%PORTDOCS%%%%DOCSDIR%%/html/theme-tomorrow_night.js
160
%%PORTDOCS%%%%DOCSDIR%%/html/tomorrow-night.css
74
%%MILTER%%sbin/clamav-milter
161
%%MILTER%%sbin/clamav-milter
75
sbin/clamd
162
sbin/clamd
76
@sample etc/clamd.conf.sample
163
@sample etc/clamd.conf.sample
77
- 

Return to bug 258565