--- rpms/qpsmtpd/sme10/qpsmtpd.spec	2016/04/16 11:27:05	1.4
+++ rpms/qpsmtpd/sme10/qpsmtpd.spec	2016/04/21 15:38:19	1.9
@@ -1,8 +1,8 @@
-# $Id: qpsmtpd.spec,v 1.12 2015/02/15 16:25:57 vip-ire Exp $
+# $Id: qpsmtpd.spec,v 1.8 2016/04/18 20:17:14 vip-ire Exp $
 
 Name: qpsmtpd
 Version: 0.96
-Release: 1%{?dist}
+Release: 4%{?dist}
 Summary: qpsmtpd + qpsmtpd-apache
 License: MIT
 Group: System Environment/Daemons
@@ -12,6 +12,7 @@ BuildRequires: perl >= 0:5.00503
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildArch: noarch
 Requires: perl(Mail::Header), perl(Net::DNS) perl(Net::IP)
+Requires: perl(IO::Socket::SSL) >= 1.70
 Requires(pre): coreutils, shadow-utils, perl
 
 Source0: %{name}-%{version}.tar.gz
@@ -28,6 +29,9 @@ Patch3: qpsmtpd-0.95-notls_conf.patch
 Patch4: qpsmtpd-0.95-allow_tls_proto_from_conf.patch
 Patch5: qpsmtpd-0.96-set_hooks.patch
 Patch6: qpsmtpd-0.96-warn_implicit_split.patch
+Patch7: qpsmtpd-0.96-dont_log_credentials_except_in_debug.patch
+Patch8: qpsmtpd-0.96-uribl_data_post.patch
+Patch9: qpsmtpd-0.96-karma_strikes.patch
 
 %description
 qpsmtpd is a flexible smtpd daemon written in Perl. Apart from the core
@@ -56,6 +60,9 @@ that turns Apache into an SMTP server us
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"
@@ -125,19 +132,19 @@ fi
 %doc %{_docdir}/%{name}-apache-%{version}/README.selinux
 
 %pre
-if ! id smtpd >/dev/null 2>&1
-then
-    # need to create smtpd user.
-    if perl -e 'exit ! defined(getgrnam("postdrop"))'
-    then
-        # if postfix is installed, we will probably use
-        # queue/postfix, which will need this:
-        supp="-G postdrop"
-    fi
-    useradd -r -M -s /bin/false $supp smtpd
-fi
+
 
 %changelog
+* Thu Apr 21 2016 Daniel Berteaud <daniel@firewall-services.com> 0.96-4.sme
+- Backport the karma strikes param patch [SME: 9462]
+
+* Mon Apr 18 2016 Daniel Berteaud <daniel@firewall-services.com> 0.96-3.sme
+- hook uribl in data_post so it has access to the body [SME: 9467]
+
+* Sun Apr 17 2016 Daniel Berteaud <daniel@firewall-services.com> 0.96-2.sme
+- Don't log user credentials except when using the higher log level
+  [SME: 9466]
+
 * Sat Apr 16 2016 Daniel Berteaud <daniel@firewall-services.com> 0.96-1.sme
 - Update to 0.96 [SME: 9460]