[csw-devel] SF.net SVN: gar:[21985] csw/mgar/pkg/clamav/trunk
bonivart at users.sourceforge.net
bonivart at users.sourceforge.net
Sun Sep 22 16:26:38 CEST 2013
Revision: 21985
http://gar.svn.sourceforge.net/gar/?rev=21985&view=rev
Author: bonivart
Date: 2013-09-22 14:26:38 +0000 (Sun, 22 Sep 2013)
Log Message:
-----------
clamav/trunk: new patch style, fix conf samples
Modified Paths:
--------------
csw/mgar/pkg/clamav/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch
Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile 2013-09-22 13:59:20 UTC (rev 21984)
+++ csw/mgar/pkg/clamav/trunk/Makefile 2013-09-22 14:26:38 UTC (rev 21985)
@@ -1,7 +1,5 @@
NAME = clamav
VERSION = 0.98
-#VERSION = 0.97rc
-#DISTNAME = $(NAME)-devel-latest
GARTYPE = v2
DESCRIPTION = Clam AntiVirus
@@ -10,10 +8,7 @@
SF_PROJECT = clamav
MASTER_SITES = $(SF_MIRRORS)
-#MASTER_SITES = http://www.clamav.net/snapshot/
-#MASTER_SITES = http://www.clamav.net/internal/
DISTFILES = $(NAME)-$(VERSION).tar.gz
-#DISTFILES = $(NAME)-devel-latest.tar.gz
PACKAGES += CSWclamav
CATALOGNAME_CSWclamav = clamav
@@ -39,16 +34,11 @@
RUNTIME_DEP_PKGS_CSWlibclam6-dev = CSWlibclam6
INCOMPATIBLE_PKGS_CSWlibclam6-dev = CSWlibclamav-devel CSWlibclamav6-devel
-#PATCHFILES = CSWclamav.freshclam.conf.p
-#PATCHFILES += CSWclamav.clamd.conf.p
-#PATCHFILES += CSWclamav.clamav-milter.conf.p
-#PATCHFILES += CSWclamav.optparser.c.p
+PATCHFILES += 0001-Enable-conf-files-fix-some-paths.patch
# Must have 64-bit libmilter for this to work
#BUILD64 = 1
-#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-
GARCOMPILER = GNU
sysconfdir = /etc/opt/csw
@@ -93,20 +83,9 @@
#SKIPTEST = 1
-CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.sample
-CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamav-milter.conf.sample
-CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clambc
-CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/freshclam
-CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamconf
-CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamscan
-CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamdscan
-CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamdtop
-CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/sigtool
-CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/sbin/clamd
-CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/sbin/clamav-milter
-
# These are harmless examples
CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.18
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW
# We don't split to three separate packages
CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.18|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
@@ -144,6 +123,9 @@
@ginstall -d $(DOCDEST)/html
@ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html
# @chmod 600 $(DESTDIR)$(sysconfdir)/freshclam.conf
+ @mv $(DESTDIR)$(sysconfdir)/freshclam.conf.sample $(DESTDIR)$(sysconfdir)/freshclam.conf
+ @mv $(DESTDIR)$(sysconfdir)/clamav-milter.conf.sample $(DESTDIR)$(sysconfdir)/clamav-milter.conf
+ @mv $(DESTDIR)$(sysconfdir)/clamd.conf.sample $(DESTDIR)$(sysconfdir)/clamd.conf
# rm -f $(DESTDIR)/var/opt/csw/$(NAME)/db/*
@ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/db
@$(MAKECOOKIE)
Added: csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch
===================================================================
--- csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch (rev 0)
+++ csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch 2013-09-22 14:26:38 UTC (rev 21985)
@@ -0,0 +1,85 @@
+From e9e2ae967643bd37ed0533aadffac2f7503d8006 Mon Sep 17 00:00:00 2001
+From: Peter Bonivart <bonivart at opencsw.org>
+Date: Sun, 22 Sep 2013 14:55:21 +0200
+Subject: [PATCH] Enable conf files, fix some paths
+
+---
+ etc/clamav-milter.conf.sample | 4 ++--
+ etc/clamd.conf.sample | 4 ++--
+ etc/freshclam.conf.sample | 2 +-
+ shared/optparser.c | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/etc/clamav-milter.conf.sample b/etc/clamav-milter.conf.sample
+index b7d66a4..2a968c7 100644
+--- a/etc/clamav-milter.conf.sample
++++ b/etc/clamav-milter.conf.sample
+@@ -3,7 +3,7 @@
+ ##
+
+ # Comment or remove the line below.
+-Example
++#Example
+
+
+ ##
+@@ -201,7 +201,7 @@ Example
+ # Note #3: clamav-milter will wait for the process to exit. Be quick or fork to
+ # avoid unnecessary delays in email delievery
+ # Default: disabled
+-#VirusAction /usr/local/bin/my_infected_message_handler
++#VirusAction /opt/csw/bin/my_infected_message_handler
+
+ ##
+ ## Logging options
+diff --git a/etc/clamd.conf.sample b/etc/clamd.conf.sample
+index 9aab51a..4c3f4d6 100644
+--- a/etc/clamd.conf.sample
++++ b/etc/clamd.conf.sample
+@@ -5,7 +5,7 @@
+
+
+ # Comment or remove the line below.
+-Example
++#Example
+
+ # Uncomment this option to enable logging.
+ # LogFile must be writable for the user running daemon.
+@@ -82,7 +82,7 @@ Example
+
+ # Path to a local socket file the daemon will listen on.
+ # Default: disabled (must be specified by a user)
+-#LocalSocket /tmp/clamd.socket
++LocalSocket /tmp/clamd.socket
+
+ # Sets the group ownership on the unix socket.
+ # Default: disabled (the primary group of the user running clamd)
+diff --git a/etc/freshclam.conf.sample b/etc/freshclam.conf.sample
+index d2ea3d1..859bfea 100644
+--- a/etc/freshclam.conf.sample
++++ b/etc/freshclam.conf.sample
+@@ -5,7 +5,7 @@
+
+
+ # Comment or remove the line below.
+-Example
++#Example
+
+ # Path to the database directory.
+ # WARNING: It must match clamd.conf's directive!
+diff --git a/shared/optparser.c b/shared/optparser.c
+index d706098..b34db39 100644
+--- a/shared/optparser.c
++++ b/shared/optparser.c
+@@ -483,7 +483,7 @@ const struct clam_option __clam_options[] = {
+
+ { "ReportHostname", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "When AddHeader is in use, this option allows to arbitrary set the reported\nhostname. This may be desirable in order to avoid leaking internal names.\nIf unset the real machine name is used.", "my.mail.server.name" },
+
+- { "VirusAction", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Execute a command when an infected message is processed.\nThe following parameters are passed to the invoked program in this order:\nvirus name, queue id, sender, destination, subject, message id, message date.\nNote #1: this requires MTA macroes to be available (see LogInfected below)\nNote #2: the process is invoked in the context of clamav-milter\nNote #3: clamav-milter will wait for the process to exit. Be quick or fork to\navoid unnecessary delays in email delievery", "/usr/local/bin/my_infected_message_handler" },
++ { "VirusAction", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Execute a command when an infected message is processed.\nThe following parameters are passed to the invoked program in this order:\nvirus name, queue id, sender, destination, subject, message id, message date.\nNote #1: this requires MTA macroes to be available (see LogInfected below)\nNote #2: the process is invoked in the context of clamav-milter\nNote #3: clamav-milter will wait for the process to exit. Be quick or fork to\navoid unnecessary delays in email delievery", "/opt/csw/bin/my_infected_message_handler" },
+
+ { "Chroot", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Chroot to the specified directory.\nChrooting is performed just after reading the config file and before\ndropping privileges.", "/newroot" },
+
+--
+1.8.3.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list