Attachment 208528 Details for Bug 241433 – patch for clamfs-1.1.0

[patch] patch for clamfs-1.1.0

clamfs-1.1.0_1.diff (text/plain), 5.99 KB, created by Krzysztof Burghardt on 2019-10-23 11:46:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Burghardt

Created: 2019-10-23 11:46:54 UTC

Size: 5.99 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 515246)
>+++ Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	clamfs
>-PORTVERSION=	1.0.1
>-PORTREVISION=	15
>+PORTVERSION=	1.1.0
>+PORTREVISION=	1
> CATEGORIES=	security
>-MASTER_SITES=	SF
>+MASTER_SITES=	https://github.com/burghardt/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/
> 
> MAINTAINER=	anastasios@mageirias.com
> COMMENT=	User-space fs with on-access antivirus scanning
>@@ -12,19 +12,17 @@
> 
> LICENSE=	GPLv2
> 
>-BROKEN_armv6=		fails to compile: ./config.hxx:52:17: expected namespace name
>-BROKEN_armv7=		fails to compile: ./config.hxx:52:17: expected namespace name
>-
>-LIB_DEPENDS=	libccgnu2.so:devel/commoncpp \
>+LIB_DEPENDS=	libPocoFoundation.so:devel/poco \
> 		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
> 
>@@ -31,12 +29,18 @@
> 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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 515246)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (clamfs-1.0.1.tar.gz) = d4f8b0ce767fab3deeb356e8c7cd45a34b5e3de43177735b4f315fc16aa11d03
>-SIZE (clamfs-1.0.1.tar.gz) = 142386
>+TIMESTAMP = 1571827207
>+SHA256 (clamfs-1.1.0.tar.gz) = 64747d91af1c2a308c16a8fcfdae1ff8a43a72d600cae8397a93d9dc9c176ff2
>+SIZE (clamfs-1.1.0.tar.gz) = 181457
>Index: files/patch-src_clamfs.cxx
>===================================================================
>--- files/patch-src_clamfs.cxx	(revision 515246)
>+++ files/patch-src_clamfs.cxx	(nonexistent)
>@@ -1,15 +0,0 @@
>-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/");
>- 
>
>Property changes on: files/patch-src_clamfs.cxx
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_config.hxx
>===================================================================
>--- files/patch-src_config.hxx	(revision 515246)
>+++ files/patch-src_config.hxx	(nonexistent)
>@@ -1,23 +0,0 @@
>---- 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
>
>Property changes on: files/patch-src_config.hxx
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_scancache.cxx
>===================================================================
>--- files/patch-src_scancache.cxx	(revision 515246)
>+++ files/patch-src_scancache.cxx	(nonexistent)
>@@ -1,10 +0,0 @@
>---- src/scancache.cxx.orig	2016-06-17 06:02:30 UTC
>-+++ src/scancache.cxx
>-@@ -24,6 +24,7 @@
>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>- */
>- 
>-+#include <sys/stat.h>
>- #include "scancache.hxx"
>- 
>- namespace clamfs {
>
>Property changes on: files/patch-src_scancache.cxx
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 515246)
>+++ pkg-descr	(working copy)
>@@ -9,4 +9,4 @@
> 	- ScanCache speeds up file access
> 	- Sends mail to administrator when detect virus
> 
>-WWW: http://clamfs.sourceforge.net/
>+WWW: https://github.com/burghardt/clamfs
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 515246)
>+++ pkg-message	(working copy)
>@@ -1,11 +1,16 @@
> [
> { type: install
>   message: <<EOM
>-In order to use clamfs, you should load fuse.ko module.
>+In order to use clamfs, you should load fuse.ko module and start clamd.
> 
>-Type "sudo kldload fuse.ko"
>+Type:
> 
>-For more info please visit http://clamfs.sourceforge.net
>+ 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
> }
> ]

Actions: View | Diff

Attachments on bug 241433: 208528