--- rpms/e-smith-proftpd/sme10/e-smith-proftpd.spec	2020/12/10 14:44:21	1.8
+++ rpms/e-smith-proftpd/sme10/e-smith-proftpd.spec	2021/01/08 21:44:49	1.9
@@ -1,10 +1,10 @@
-# $Id: e-smith-proftpd.spec,v 1.7 2020/12/04 03:34:39 jpp Exp $
+# $Id: e-smith-proftpd.spec,v 1.8 2020/12/10 14:44:21 michel Exp $
 
 Summary: e-smith specific proftpd configuration files and templates
 %define name e-smith-proftpd
 Name: %{name}
 %define version 2.6.0
-%define release 8
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,7 @@ Patch0: e-smith-proftpd-2.6.0-TLS.patch
 Patch1: e-smith-proftpd-2.6.0-bz11106_11150_systemd_update_event.patch
 Patch2: e-smith-proftpd-2.6.0-bz11106_11150_remove_supervise_ftp.patch
 Patch3: e-smith-proftpd-2.6.0-bz11245_runit_required.patch
+Patch4: e-smith-proftpd-2.6.0-bz11106_protect_from_proftpd.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -24,6 +25,10 @@ Requires: iptables
 AutoReqProv: no
 
 %changelog
+* Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
+- protect from proftpd.service running in place of ftp.service [SME: 11106]
+- remove system-preset file from usr [SME: 10958]
+
 * Thu Dec 10 2020  Michel Begue <mab974@gmail.com> 2.6.0-8.sme
 - add Requires=runit.service [SME: 11245]
 
@@ -569,6 +574,7 @@ Configuration files and templates for th
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # Remove the empty template-begin and the directory
 rm -rf root/etc/e-smith/templates/etc/pam.d/proftpd/