[Amavisd-new-commits] [pkg-amavisd-new] 01/01: Disable Norman Virus Control by default

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch master
in repository pkg-amavisd-new.

commit 0226df0eaa667f40aecde6737a6eafb9c37b803a
Author: Brian May <brian at linuxpenguins.xyz>
Date:   Thu Sep 1 18:22:26 2016 +1000

    Disable Norman Virus Control by default
---
 debian/changelog               |  6 ++++++
 debian/patches/10_disable_nvcc | 21 +++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bc0ad32..4358332 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+amavisd-new (1:2.10.1-5) UNRELEASED; urgency=medium
+
+  * Disable Norman Virus Control by default. Closes: #832511.
+
+ -- Brian May <bam at debian.org>  Fri, 05 Aug 2016 07:59:32 +1000
+
 amavisd-new (1:2.10.1-4) unstable; urgency=medium
 
   * Fix typo in recommends.
diff --git a/debian/patches/10_disable_nvcc b/debian/patches/10_disable_nvcc
new file mode 100644
index 0000000..db43f52
--- /dev/null
+++ b/debian/patches/10_disable_nvcc
@@ -0,0 +1,21 @@
+diff --git a/debian/etc/conf.d/15-av_scanners b/debian/etc/conf.d/15-av_scanners
+index 59ac2f3..1e0b527 100644
+--- a/debian/etc/conf.d/15-av_scanners
++++ b/debian/etc/conf.d/15-av_scanners
+@@ -247,10 +247,12 @@ use strict;
+ #   ["SCAN {}/*\r\n", '127.0.0.1:8448' ],
+ #   qr/^200 File OK/m, qr/^201 /m, qr/^201 (.+)/m ],
+ 
+-  ### http://www.norman.com/products_nvc.shtml
+-  ['Norman Virus Control v5 / Linux', 'nvcc',
+-    '-c -l:0 -s -u -temp:$TEMPBASE {}', [0,10,11], [1,2,14],
+-    qr/(?i).* virus in .* -> \'(.+)\'/m ],
++# Disabled as it conflicts with packaged /usr/bin/nvcc of "nvidia-cuda-toolkit"
++# (LP: 1582318)
++#  ### http://www.norman.com/products_nvc.shtml
++#  ['Norman Virus Control v5 / Linux', 'nvcc',
++#    '-c -l:0 -s -u -temp:$TEMPBASE {}', [0,10,11], [1,2,14],
++#    qr/(?i).* virus in .* -> \'(.+)\'/m ],
+ 
+   ### http://www.pandasoftware.com/
+   ['Panda CommandLineSecure 9 for Linux',
diff --git a/debian/patches/series b/debian/patches/series
index 141aac4..80d7eee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+10_disable_nvcc
 20_safe_path_at_init.patch
 30_conf.d_support_builtin.patch
 40_fix_paths.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/amavisd-new/pkg-amavisd-new.git