[amavisd-new] Fix imports when SQL is used and improve conf patch

[Juan Orti]

commit 10b6fdb4006a9c8a2434b8d627664807649daf5e
Author: Juan Orti Alcaine <juan.orti at miceliux.com>
Date:   Sat Oct 25 23:08:35 2014 +0200

    Fix imports when SQL is used and improve conf patch

 amavisd-new-2.10.0-conf.patch                      |   44 +++++++++++++++++++-
 ...-2.10.0-missing_import_when_sql_is_in_use.patch |   14 ++++++
 amavisd-new.spec                                   |    9 ++++-
 3 files changed, 64 insertions(+), 3 deletions(-)
---
diff --git a/amavisd-new-2.10.0-conf.patch b/amavisd-new-2.10.0-conf.patch
index fc4d197..a98823e 100644
--- a/amavisd-new-2.10.0-conf.patch
+++ b/amavisd-new-2.10.0-conf.patch
@@ -1,6 +1,46 @@
-commit f7532ce0714440ed6649a7794eb97c9f6191789e
+commit 45e7e93efb71dfe3d1f1ca93636c592e17689b09
 Author: Juan Orti Alcaine <juan.orti at miceliux.com>
-Date:   Mon Oct 20 10:15:29 2014 +0200
+Date:   Sat Oct 25 22:48:40 2014 +0200
+
+    Fix running user in amavis-mc and amavisd-signer
+
+diff --git a/amavis-mc b/amavis-mc
+index 88d9701..f6f8081 100755
+--- a/amavis-mc
++++ b/amavis-mc
+@@ -70,10 +70,10 @@ use vars qw(@path @services $daemon_user $daemon_group $pid_file $log_level
+ 
+ ### USER CONFIGURABLE:
+ 
+-$daemon_user  = 'vscan';
+-$daemon_group = 'vscan';
++$daemon_user  = 'amavis';
++$daemon_group = 'amavis';
+ 
+-$pid_file = '/var/amavis/amavis-mc.pid';
++$pid_file = '/var/run/amavisd/amavis-mc.pid';
+ 
+ $log_level = 0;
+ $syslog_ident = 'amavis-mc';
+diff --git a/amavisd-signer b/amavisd-signer
+index f154646..3042b7c 100755
+--- a/amavisd-signer
++++ b/amavisd-signer
+@@ -86,8 +86,8 @@ $VERSION = 1.001;  # 20100730
+ # Please adjust the following settings as necessary:
+ #
+ 
+-$daemon_user  = 'vscan';
+-$daemon_group = 'vscan';
++$daemon_user  = 'amavis';
++$daemon_group = 'amavis';
+ # $daemon_chroot_dir = '/var/amavis';   # chroot directory or undef
+ 
+ # $daemonize = 1;
+
+commit 587b25f96031ab8ef4d8eab78065c2fa2a469df9
+Author: Juan Orti Alcaine <juan.orti at miceliux.com>
+Date:   Sat Oct 25 22:44:00 2014 +0200
 
     amavisd-new-2.10.0-conf.patch
 
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
new file mode 100644
index 0000000..009f123
--- /dev/null
+++ b/amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch
@@ -0,0 +1,14 @@
+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 d3ea75b..b81d8b1 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.10.0
-Release:        1%{?prerelease:.%{prerelease}}%{?dist}
+Release:        2%{?prerelease:.%{prerelease}}%{?dist}
 # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
 License:        GPLv2+ and BSD and GFDL
 Group:          Applications/System
@@ -29,6 +29,8 @@ 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
@@ -171,6 +173,7 @@ 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
@@ -312,6 +315,10 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
 %{_sbindir}/amavisd-snmp-subagent-zmq
 
 %changelog
+* 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
+
 * Thu Oct 23 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.0-1
 - Update to 2.10.0
 - Replace IO::Socket::INET6 with IO::Socket::IP