[amavisd-new] - Commented ripole(1) decoder as the binary is not packaged - Commented tnef(1) decoder as the perl

[Robert Scheck]

commit 30edeb10d4e25c8950cefe9acee3855a83350ade
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Dec 2 16:28:13 2013 +0100

    - Commented ripole(1) decoder as the binary is not packaged
    - Commented tnef(1) decoder as the perl module is a dependency

 amavisd-conf.patch |   14 +++++++++++++-
 amavisd-new.spec   |    6 +++++-
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/amavisd-conf.patch b/amavisd-conf.patch
index 0143277..ef1b7a1 100644
--- a/amavisd-conf.patch
+++ b/amavisd-conf.patch
@@ -1,5 +1,5 @@
 --- amavisd-new-2.8.0/amavisd.conf		2012-06-30 23:33:32.000000000 +0200
-+++ amavisd-new-2.8.0/amavisd.conf.conf		2012-07-05 22:14:48.000000000 +0200
++++ amavisd-new-2.8.0/amavisd.conf.conf		2013-12-02 16:24:05.000000000 +0100
 @@ -14,25 +14,25 @@
  # $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
  
@@ -64,6 +64,18 @@
  # $bad_header_quarantine_method = undef;
  
  # $os_fingerprint_method = 'p0f:*:2345';  # to query p0f-analyzer.pl
+@@ -335,9 +335,9 @@
+   ['arj',  \&do_unarj, ['unarj', 'arj'] ],
+   ['arc',  \&do_arc,   ['nomarch', 'arc'] ],
+   ['zoo',  \&do_zoo,   ['zoo', 'unzoo'] ],
+-  ['doc',  \&do_ole,   'ripole'],
++# ['doc',  \&do_ole,   'ripole'],  # no ripole package so far
+   ['cab',  \&do_cabextract, 'cabextract'],
+-  ['tnef', \&do_tnef_ext, 'tnef'],
++# ['tnef', \&do_tnef_ext, 'tnef'],  # use internal do_tnef() instead
+   ['tnef', \&do_tnef],
+ # ['lha',  \&do_lha,   'lha'],  # not safe, use 7z instead
+ # ['sit',  \&do_unstuff, 'unstuff'],  # not safe
 @@ -375,16 +375,16 @@
  #   qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ],
  # settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 1a1a435..491f45a 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.8.0
-Release:        7%{?prerelease:.%{prerelease}}%{?dist}
+Release:        8%{?prerelease:.%{prerelease}}%{?dist}
 # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
 License:        GPLv2+ and BSD and GFDL
 Group:          Applications/System
@@ -227,6 +227,10 @@ fi
 %{_sbindir}/amavisd-snmp-subagent
 
 %changelog
+* Mon Dec 02 2013 Robert Scheck <robert at fedoraproject.org> 2.8.0-8
+- Commented ripole(1) decoder as the binary is not packaged
+- Commented tnef(1) decoder as the perl module is a dependency
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild