[amavisd-new] Update to 2.10.0-rc2

[Juan Orti]

commit 260a13ba446746e6e724503385ed06e1f4fe2da0
Author: Juan Orti Alcaine <juan.orti at miceliux.com>
Date:   Mon Oct 20 10:22:35 2014 +0200

    Update to 2.10.0-rc2

 .gitignore                                         |    1 +
 ...9.0-conf.patch => amavisd-new-2.10.0-conf.patch |   14 +++++++-------
 amavisd-new.spec                                   |   15 +++++++--------
 sources                                            |    2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b70741..6ebf46e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ amavisd-new-2.8.0.tar.gz
 /amavisd-new-2.8.1.tar.gz
 /amavisd-new-2.9.0.tar.xz
 /amavisd-new-2.9.1.tar.xz
+/amavisd-new-2.10.0-rc2.tar.xz
diff --git a/amavisd-new-2.9.0-conf.patch b/amavisd-new-2.10.0-conf.patch
similarity index 95%
rename from amavisd-new-2.9.0-conf.patch
rename to amavisd-new-2.10.0-conf.patch
index 54cfc35..fc4d197 100644
--- a/amavisd-new-2.9.0-conf.patch
+++ b/amavisd-new-2.10.0-conf.patch
@@ -1,8 +1,8 @@
-commit 44707666dd30b5196e75002f1661da6b77e360f8
-Author: Juan Orti Alcaine <j.orti.alcaine at gmail.com>
-Date:   Mon May 12 09:59:27 2014 +0200
+commit f7532ce0714440ed6649a7794eb97c9f6191789e
+Author: Juan Orti Alcaine <juan.orti at miceliux.com>
+Date:   Mon Oct 20 10:15:29 2014 +0200
 
-    amavisd-conf.patch
+    amavisd-new-2.10.0-conf.patch
 
 diff --git a/amavisd-agent b/amavisd-agent
 index 1ebe2bb..b8271a3 100755
@@ -31,7 +31,7 @@ index 80b84dc..164549f 100755
  my($repeatcount);     # -c, repeat count (when defined)
  
 diff --git a/amavisd.conf b/amavisd.conf
-index a09597f..25db750 100644
+index d023e10..eecd17d 100644
 --- a/amavisd.conf
 +++ b/amavisd.conf
 @@ -14,25 +14,25 @@ use strict;
@@ -98,7 +98,7 @@ index a09597f..25db750 100644
  # $bad_header_quarantine_method = undef;
  
  # $os_fingerprint_method = 'p0f:*:2345';  # to query p0f-analyzer.pl
-@@ -338,9 +338,9 @@ $banned_filename_re = new_RE(
+@@ -339,9 +339,9 @@ $banned_filename_re = new_RE(
    ['arj',  \&do_unarj, ['unarj', 'arj'] ],
    ['arc',  \&do_arc,   ['nomarch', 'arc'] ],
    ['zoo',  \&do_zoo,   ['zoo', 'unzoo'] ],
@@ -110,7 +110,7 @@ index a09597f..25db750 100644
    ['tnef', \&do_tnef],
  # ['lha',  \&do_lha,   'lha'],  # not safe, use 7z instead
  # ['sit',  \&do_unstuff, 'unstuff'],  # not safe
-@@ -378,16 +378,16 @@ $banned_filename_re = new_RE(
+@@ -379,16 +379,16 @@ $banned_filename_re = new_RE(
  #   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 44d996a..e559eaf 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,9 +1,9 @@
-#%%define prerelease rc2
+%global prerelease rc2
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.9.1
-Release:        3%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.10.0
+Release:        0.1%{?prerelease:.%{prerelease}}%{?dist}
 # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
 License:        GPLv2+ and BSD and GFDL
 Group:          Applications/System
@@ -19,7 +19,7 @@ Source11:       amavisd-clean-tmp.service
 Source12:       amavisd-clean-tmp.timer
 Source13:       amavisd-clean-quarantine.service
 Source14:       amavisd-clean-quarantine.timer
-Patch0:         amavisd-new-2.9.0-conf.patch
+Patch0:         amavisd-new-2.10.0-conf.patch
 Patch1:         amavisd-init.patch
 Patch2:         amavisd-condrestart.patch
 # Don't source /etc/sysconfig/network in init script; the network check
@@ -27,9 +27,6 @@ Patch2:         amavisd-condrestart.patch
 # and it can't be relied upon to exist in recent Fedora builds. Mail
 # sent upstream to amavis-users ML 2013-05-10. -adamw
 Patch3:         amavisd-new-2.8.0-init_network.patch
-# Fix bug #1121552
-# http://lists.amavis.org/pipermail/amavis-users/2014-June/002957.html
-Patch4:         amavisd-new-2.9.1-release_mail_from_sql_quarantine.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  systemd
@@ -130,7 +127,6 @@ alerting purposes.
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
-%patch4 -p1
 
 install -p -m 644 %{SOURCE4} %{SOURCE5} README_FILES/
 sed -e 's,/var/amavis/amavisd.sock\>,%{_localstatedir}/spool/amavisd/amavisd.sock,' -i amavisd-release
@@ -235,6 +231,9 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
 %{_sbindir}/amavisd-snmp-subagent
 
 %changelog
+* Mon Oct 20 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.0-0.1.rc2
+- Update to 2.10.0-rc2
+
 * Wed Aug 20 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.9.1-3
 - Add ExecReload and Wants=postfix.service to systemd unit
 
diff --git a/sources b/sources
index d81113a..77899e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b83d60b49855943c297743db0029218  amavisd-new-2.9.1.tar.xz
+f43dbf102e3f028e43b6d2b7d2f5cc03  amavisd-new-2.10.0-rc2.tar.xz