SF.net SVN: gar:[24442] csw/mgar/pkg/clamav/trunk
bonivart at users.sourceforge.net
bonivart at users.sourceforge.net
Thu Dec 11 17:52:41 CET 2014
Revision: 24442
http://sourceforge.net/p/gar/code/24442
Author: bonivart
Date: 2014-12-11 16:52:40 +0000 (Thu, 11 Dec 2014)
Log Message:
-----------
clamav/trunk: update to 0.98.5
Modified Paths:
--------------
csw/mgar/pkg/clamav/trunk/Makefile
csw/mgar/pkg/clamav/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/clamav/trunk/files/0001-config.patch
Removed 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 2014-12-11 16:49:07 UTC (rev 24441)
+++ csw/mgar/pkg/clamav/trunk/Makefile 2014-12-11 16:52:40 UTC (rev 24442)
@@ -1,5 +1,5 @@
NAME = clamav
-VERSION = 0.98.4
+VERSION = 0.98.5
GARTYPE = v2
DESCRIPTION = Clam AntiVirus
@@ -38,7 +38,7 @@
RUNTIME_DEP_PKGS_CSWlibclam6-dev = CSWlibclam6
INCOMPATIBLE_PKGS_CSWlibclam6-dev = CSWlibclamav-devel CSWlibclamav6-devel
-PATCHFILES += 0001-Enable-conf-files-fix-some-paths.patch
+PATCHFILES += 0001-config.patch
# Must have 64-bit libmilter for this to work
#BUILD64 = 1
@@ -93,15 +93,29 @@
# These are harmless examples
CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW
-CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.23
+#CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.23
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamav-milter.conf.CSW
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/sbin/clamav-milter
+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/bin/sigtool
+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/clamscan
+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/clamdscan
+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_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.22
# We don't split to three separate packages
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.23|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.23|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.23|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
+#CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.23|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
+#CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.23|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
+#CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.23|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.22|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.22|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.22|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
# Weirdly needed for sparc
-CHECKPKG_OVERRIDES_CSWlibclam6 += surplus-dependency|CSWlibstdc++6
+#CHECKPKG_OVERRIDES_CSWlibclam6 += surplus-dependency|CSWlibstdc++6
# Weirdly needed for i386
CHECKPKG_OVERRIDES_CSWclamav += surplus-dependency|CSWlibbz2-1-0
Modified: csw/mgar/pkg/clamav/trunk/checksums
===================================================================
--- csw/mgar/pkg/clamav/trunk/checksums 2014-12-11 16:49:07 UTC (rev 24441)
+++ csw/mgar/pkg/clamav/trunk/checksums 2014-12-11 16:52:40 UTC (rev 24442)
@@ -1 +1 @@
-6d409eab6c311de05a0a591fccd2ec83 clamav-0.98.4.tar.gz
+abb5c7efaff3394c0a49ff970841a2ac clamav-0.98.5.tar.gz
Deleted: 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 2014-12-11 16:49:07 UTC (rev 24441)
+++ csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch 2014-12-11 16:52:40 UTC (rev 24442)
@@ -1,85 +0,0 @@
-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
-@@ -509,7 +509,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 you to 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
-
Added: csw/mgar/pkg/clamav/trunk/files/0001-config.patch
===================================================================
--- csw/mgar/pkg/clamav/trunk/files/0001-config.patch (rev 0)
+++ csw/mgar/pkg/clamav/trunk/files/0001-config.patch 2014-12-11 16:52:40 UTC (rev 24442)
@@ -0,0 +1,62 @@
+From c3a191a59fd3f45c594ff54b571549725b6cdd88 Mon Sep 17 00:00:00 2001
+From: Peter Bonivart <bonivart at opencsw.org>
+Date: Thu, 11 Dec 2014 16:00:10 +0100
+Subject: [PATCH] config
+
+---
+ etc/clamav-milter.conf.sample | 2 +-
+ etc/clamd.conf.sample | 4 ++--
+ etc/freshclam.conf.sample | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/etc/clamav-milter.conf.sample b/etc/clamav-milter.conf.sample
+index b7d66a4..cdf54c5 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
+
+
+ ##
+diff --git a/etc/clamd.conf.sample b/etc/clamd.conf.sample
+index 30515cb..75371d4 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 1cc4a81..c5c2bbf 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!
+--
+2.1.3
+
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