[Amavisd-new-commits] [pkg-amavisd-new] 01/01: Disable Norman Virus control again

[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 ccb00f7a1f65c72055d484ae16be842d852688fe
Author: Brian May <brian at linuxpenguins.xyz>
Date:   Sat Nov 25 17:41:07 2017 +1100

    Disable Norman Virus control again
---
 debian/changelog                 |  6 ++++++
 debian/etc/conf.d/15-av_scanners | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5dadab8..c1e1338 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+amavisd-new (1:2.11.0-2) UNRELEASED; urgency=medium
+
+  * Really disable Norman Virus Control by default. Closes: #832511.
+
+ -- Brian May <bam at debian.org>  Sat, 25 Nov 2017 17:40:10 +1100
+
 amavisd-new (1:2.11.0-1) unstable; urgency=medium
 
   * Disable Norman Virus Control by default. Closes: #832511.
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',

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