jorti pushed to amavisd-new (epel7). "Update to 2.10.1"

[notifications at fedoraproject.org]

From 4dbc21cc696663c77f51f77fe03de1bc344e44c2 Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <juan.orti at miceliux.com>
Date: Mon, 27 Oct 2014 11:08:16 +0100
Subject: Update to 2.10.1


diff --git a/.gitignore b/.gitignore
index 32bff5c..90cd2fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ amavisd-new-2.8.0.tar.gz
 /amavisd-new-2.9.1.tar.xz
 /amavisd-new-2.10.0-rc2.tar.xz
 /amavisd-new-2.10.0.tar.xz
+/amavisd-new-2.10.1.tar.xz
diff --git a/amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch b/amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch
deleted file mode 100644
index 009f123..0000000
--- a/amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/amavisd b/amavisd
-index 278f0dd..97e3204 100755
---- a/amavisd
-+++ b/amavisd
-@@ -26474,7 +26474,8 @@ BEGIN {
-   import Amavis::rfc2821_2822_Tools;
-   import Amavis::Util qw(ll do_log do_log_safe min max minmax add_entropy
-                          untaint untaint_inplace format_time_interval
--                         truncate_utf_8 orcpt_encode idn_to_ascii
-+                         truncate_utf_8 orcpt_encode
-+                         idn_to_utf8 idn_to_ascii mail_addr_idn_to_ascii
-                          safe_encode safe_encode_utf8 safe_decode_mime
-                          snmp_count ccat_split ccat_maj);
-   import Amavis::Lookup qw(lookup lookup2);
diff --git a/amavisd-new.spec b/amavisd-new.spec
index b81d8b1..c847021 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -2,8 +2,8 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.10.0
-Release:        2%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.10.1
+Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
 License:        GPLv2+ and BSD and GFDL
 Group:          Applications/System
@@ -29,8 +29,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
-# Patch5: http://lists.amavis.org/pipermail/amavis-users/2014-October/003259.html
-Patch5:         amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  systemd
@@ -173,7 +171,6 @@ It supports communicating through 0MQ sockets.
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
-%patch5 -p1
 
 install -p -m 644 %{SOURCE4} %{SOURCE5} README_FILES/
 sed -e 's,/var/amavis/amavisd.sock\>,%{_localstatedir}/spool/amavisd/amavisd.sock,' -i amavisd-release
@@ -315,6 +312,10 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
 %{_sbindir}/amavisd-snmp-subagent-zmq
 
 %changelog
+* Mon Oct 27 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.1-1
+- Update to 2.10.1
+- Patch5 merged upstream
+
 * Sat Oct 25 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.0-2
 - Improve conf patch to fix amavis-mc daemon
 - Add patch to fix imports when SQL is used
diff --git a/sources b/sources
index bfb0a64..434a13e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a343a5201663b26519f3db53b6d8be3c  amavisd-new-2.10.0.tar.xz
+adb0c64ac6a91249ddeb4ed97747d755  amavisd-new-2.10.1.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/amavisd-new.git/commit/?h=epel7&id=4dbc21cc696663c77f51f77fe03de1bc344e44c2