--- rpms/e-smith-pop3/sme9/e-smith-pop3.spec	2014/12/19 15:33:54	1.5
+++ rpms/e-smith-pop3/sme9/e-smith-pop3.spec	2017/05/04 10:32:04	1.10
@@ -1,10 +1,10 @@
-# $Id: e-smith-pop3.spec,v 1.4 2014/12/19 15:33:20 vip-ire Exp $
+# $Id: e-smith-pop3.spec,v 1.9 2016/01/17 20:29:20 vip-ire Exp $
 
 Summary: startup scripts for pop3 package
 %define name e-smith-pop3
 Name: %{name}
 %define version 2.4.0
-%define release 3
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,10 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: e-smith-pop3-2.4.0-sslio2stunnel.patch
 Patch1: e-smith-pop3-2.4.0-disable_fips_for_stunnel.patch
+Patch2: e-smith-pop3-2.4.0-disable_tlsv1.patch
+Patch3: e-smith-pop3-2.4.0-ssl_proto_from_db.patch
+Patch4: e-smith-pop3-2.4.0-ssl_update.patch
+Patch5: e-smith-pop3-2.6.0-pop3_process_limit.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.13.0-04
 BuildArchitectures: noarch
@@ -25,10 +29,24 @@ Obsoletes: checkpassword
 AutoReqProv: no
 
 %changelog
-* Fri Dec 19 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-3
+* Thu May 4 2017 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-7.sme
+- Backport from sme10: honor ConcurrencyLimit and ConcurrencyLimitPerIP
+  for pop3 and pop3s [SME: 10257]
+
+* Sun Jan 17 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-6.sme
+- Hook into a new ssl-update event [SME: 9152]
+
+* Thu Jan 7 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-5.sme
+- Allow setting SSL protocols from DB (and set TLSv1 back to enabled
+  on a default install) [SME: 9175]
+
+* Wed Jan 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-4.sme
+- Disable TLSv1 [SME: 9169]
+
+* Fri Dec 19 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-3.sme
 - Disable fips mode on stunnel [SME: 8733]
 
-* Thu Dec 4 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-2
+* Thu Dec 4 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-2.sme
 - Use stunnel instead of sslio to support TLS [SME: 8716]
 
 * Thu Feb  7 2013 Shad L. Lords <slords@mail.com> 2.4.0-1.sme
@@ -88,6 +106,10 @@ Startup scripts for pop3 package.
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks