Attachment #208528 for bug #241433

View | Details | Raw Unified | Return to bug 241433
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	clamfs
PORTVERSION=	1.1.0
PORTREVISION=	1
CATEGORIES=	security
MASTER_SITES=	https://github.com/burghardt/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/

MAINTAINER=	anastasios@mageirias.com
COMMENT=	User-space fs with on-access antivirus scanning


LICENSE=	GPLv2

LIB_DEPENDS=	libPocoFoundation.so:devel/poco \
BROKEN_armv7=		fails to compile: ./config.hxx:52:17: expected namespace name

LIB_DEPENDS=	libccgnu2.so:devel/commoncpp \
		libPocoNet.so:devel/poco \
		libPocoXML.so:devel/poco \
		librlog.so:devel/rlog
BUILD_DEPENDS=	boost-libs>=1.33:devel/boost-libs
RUN_DEPENDS=	clamd:security/clamav

USES=		compiler:c++11-lib autoreconf fuse

GNU_CONFIGURE=	yes

USES=		compiler:c++11-lib fuse

PLIST_FILES=	bin/clamfs \
		man/man1/clamfs.1.gz


OPTIONS_DEFINE=	DOCS
DOCS_PORTDOCS=	*

post-patch:
	@${REINPLACE_CMD} -e 's|-Werror ||g' ${WRKSRC}/configure.ac

post-patch-DOCS-on:
	@${REINPLACE_CMD} -e '/socket=/s/ctl/sock/' \
		${WRKSRC}/doc/clamfs.xml
	@${REINPLACE_CMD} -e '/socket=/s/ctl/sock/' \
		${WRKSRC}/doc/debug.xml

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/doc/clamfs.xml ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/doc/debug.xml ${STAGEDIR}${DOCSDIR}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (clamfs-1.0.1.tar.gz) = d4f8b0ce767fab3deeb356e8c7cd45a34b5e3de43177735b4f315fc16aa11d03	1	TIMESTAMP = 1571827207
2	SIZE (clamfs-1.0.1.tar.gz) = 142386	2	SHA256 (clamfs-1.1.0.tar.gz) = 64747d91af1c2a308c16a8fcfdae1ff8a43a72d600cae8397a93d9dc9c176ff2
		3	SIZE (clamfs-1.1.0.tar.gz) = 181457




clamfs.cxx:963:26: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
    rLog(Info, "ClamFS v"VERSION);
                         ^

--- src/clamfs.cxx.orig	2009-11-29 21:04:33 UTC
+++ src/clamfs.cxx
@@ -960,7 +960,7 @@ int main(int argc, char *argv[])
     RLogInit(argc, argv);
     RLogOpenStdio();
 
-    rLog(Info, "ClamFS v"VERSION);
+    rLog(Info, "ClamFS v" VERSION);
     rLog(Info, "Copyright (c) 2007,2008 Krzysztof Burghardt <krzysztof@burghardt.pl>");
     rLog(Info, "http://clamfs.sourceforge.net/");
 




--- src/config.hxx.orig	2009-11-29 19:19:33 UTC
+++ src/config.hxx
@@ -30,7 +30,7 @@
 #include "config.h"
 
 #include <map>
-#include <tr1/unordered_map>
+#include <unordered_map>
 #include <cc++/xml.h>
 
 #ifdef DMALLOC
@@ -45,11 +45,6 @@ namespace clamfs {
    \brief STanDard namespace
 */
 using namespace std;
-
-/*!\namespace tr1
-   \brief ISO/IEC TR 19768 namespace
-*/
-using namespace tr1;
 
 /*!\namespace ost
    \brief GNU CommonC++ namespace

Lines 1-10 Link Here

(-)files/patch-src_scancache.cxx (-10 lines)
1	--- src/scancache.cxx.orig 2016-06-17 06:02:30 UTC
2	+++ src/scancache.cxx
3	@@ -24,6 +24,7 @@
4	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
5	*/
6
7	+#include <sys/stat.h>
8	#include "scancache.hxx"
9
10	namespace clamfs {

Lines 9-12 Link Here

(-)pkg-descr (-1 / +1 lines)
9	- ScanCache speeds up file access	9	- ScanCache speeds up file access
10	- Sends mail to administrator when detect virus	10	- Sends mail to administrator when detect virus
11		11
12	WWW: http://clamfs.sourceforge.net/	12	WWW: https://github.com/burghardt/clamfs




[
{ type: install
  message: <<EOM
In order to use clamfs, you should load fuse.ko module and start clamd.

Type:

 sudo kldload fuse.ko
 sudo service clamav-freshclam onestart
 sudo service clamav-daemon onestart

For more info please visit:
 https://github.com/burghardt/clamfs#additional-configuration-steps-for-freebsd
EOM
}
]

Return to bug 241433

Lines 2-11 Link Here

(-)Makefile (-9 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= clamfs	4	PORTNAME= clamfs
5	PORTVERSION= 1.0.1	5	PORTVERSION= 1.1.0
6	PORTREVISION= 15	6	PORTREVISION= 1
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= SF	8	MASTER_SITES= https://github.com/burghardt/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/
9		9
10	MAINTAINER= anastasios@mageirias.com	10	MAINTAINER= anastasios@mageirias.com
11	COMMENT= User-space fs with on-access antivirus scanning	11	COMMENT= User-space fs with on-access antivirus scanning
Lines 12-30 Link Here
12		12
13	LICENSE= GPLv2	13	LICENSE= GPLv2
14		14
15	BROKEN_armv6= fails to compile: ./config.hxx:52:17: expected namespace name	15	LIB_DEPENDS= libPocoFoundation.so:devel/poco \
16	BROKEN_armv7= fails to compile: ./config.hxx:52:17: expected namespace name
17
18	LIB_DEPENDS= libccgnu2.so:devel/commoncpp \
19	libPocoNet.so:devel/poco \	16	libPocoNet.so:devel/poco \
		17	libPocoXML.so:devel/poco \
20	librlog.so:devel/rlog	18	librlog.so:devel/rlog
21	BUILD_DEPENDS= boost-libs>=1.33:devel/boost-libs	19	BUILD_DEPENDS= boost-libs>=1.33:devel/boost-libs
22	RUN_DEPENDS= clamd:security/clamav	20	RUN_DEPENDS= clamd:security/clamav
23		21
		22	USES= compiler:c++11-lib autoreconf fuse
		23
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
25		25
26	USES= compiler:c++11-lib fuse
27
28	PLIST_FILES= bin/clamfs \	26	PLIST_FILES= bin/clamfs \
29	man/man1/clamfs.1.gz	27	man/man1/clamfs.1.gz
30		28
Lines 31-42 Link Here
31	OPTIONS_DEFINE= DOCS	29	OPTIONS_DEFINE= DOCS
32	DOCS_PORTDOCS= *	30	DOCS_PORTDOCS= *
33		31
		32	post-patch:
		33	@${REINPLACE_CMD} -e 's\|-Werror \|\|g' ${WRKSRC}/configure.ac
		34
34	post-patch-DOCS-on:	35	post-patch-DOCS-on:
35	@${REINPLACE_CMD} -e '/socket=/s/ctl/sock/' \	36	@${REINPLACE_CMD} -e '/socket=/s/ctl/sock/' \
36	${WRKSRC}/doc/clamfs.xml	37	${WRKSRC}/doc/clamfs.xml
		38	@${REINPLACE_CMD} -e '/socket=/s/ctl/sock/' \
		39	${WRKSRC}/doc/debug.xml
37		40
38	post-install-DOCS-on:	41	post-install-DOCS-on:
39	@${MKDIR} ${STAGEDIR}${DOCSDIR}	42	@${MKDIR} ${STAGEDIR}${DOCSDIR}
40	${INSTALL_DATA} ${WRKSRC}/doc/clamfs.xml ${STAGEDIR}${DOCSDIR}	43	${INSTALL_DATA} ${WRKSRC}/doc/clamfs.xml ${STAGEDIR}${DOCSDIR}
		44	${INSTALL_DATA} ${WRKSRC}/doc/debug.xml ${STAGEDIR}${DOCSDIR}
41		45
42	.include <bsd.port.mk>	46	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)files/patch-src_clamfs.cxx (-15 lines)
1	clamfs.cxx:963:26: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
2	rLog(Info, "ClamFS v"VERSION);
3	^
4
5	--- src/clamfs.cxx.orig 2009-11-29 21:04:33 UTC
6	+++ src/clamfs.cxx
7	@@ -960,7 +960,7 @@ int main(int argc, char *argv[])
8	RLogInit(argc, argv);
9	RLogOpenStdio();
10
11	- rLog(Info, "ClamFS v"VERSION);
12	+ rLog(Info, "ClamFS v" VERSION);
13	rLog(Info, "Copyright (c) 2007,2008 Krzysztof Burghardt <krzysztof@burghardt.pl>");
14	rLog(Info, "http://clamfs.sourceforge.net/");
15

Lines 1-23 Link Here

(-)files/patch-src_config.hxx (-23 lines)
1	--- src/config.hxx.orig 2009-11-29 19:19:33 UTC
2	+++ src/config.hxx
3	@@ -30,7 +30,7 @@
4	#include "config.h"
5
6	#include <map>
7	-#include <tr1/unordered_map>
8	+#include <unordered_map>
9	#include <cc++/xml.h>
10
11	#ifdef DMALLOC
12	@@ -45,11 +45,6 @@ namespace clamfs {
13	\brief STanDard namespace
14	*/
15	using namespace std;
16	-
17	-/*!\namespace tr1
18	- \brief ISO/IEC TR 19768 namespace
19	-*/
20	-using namespace tr1;
21
22	/*!\namespace ost
23	\brief GNU CommonC++ namespace

Lines 1-11 Link Here

(-)pkg-message (-3 / +8 lines)
1	[	1	[
2	{ type: install	2	{ type: install
3	message: <<EOM	3	message: <<EOM
4	In order to use clamfs, you should load fuse.ko module.	4	In order to use clamfs, you should load fuse.ko module and start clamd.
5		5
6	Type "sudo kldload fuse.ko"	6	Type:
7		7
8	For more info please visit http://clamfs.sourceforge.net	8	sudo kldload fuse.ko
		9	sudo service clamav-freshclam onestart
		10	sudo service clamav-daemon onestart
		11
		12	For more info please visit:
		13	https://github.com/burghardt/clamfs#additional-configuration-steps-for-freebsd
9	EOM	14	EOM
10	}	15	}
11	]	16	]