--- rpms/e-smith-email/sme10/e-smith-email.spec	2021/11/15 15:40:52	1.15
+++ rpms/e-smith-email/sme10/e-smith-email.spec	2022/07/30 02:25:41	1.18
@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.14 2021/09/16 18:57:31 jpp Exp $
+# $Id: e-smith-email.spec,v 1.17 2022/05/19 04:24:53 jpp Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.6.0
-%define release 15
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -21,6 +21,7 @@ Patch7: e-smith-email-5.6.0-bz11265-rar.
 Patch8: e-smith-email-5.6.0-bz11634-lock.patch
 Patch9: e-smith-email-5.6.0-bz11690-fixtypo.patch
 Patch10: e-smith-email-5.6.0-bz11716-untaint.patch
+Patch11: e-smith-email-5.6.0-bz11799.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
@@ -39,6 +40,7 @@ Requires: runit
 Requires: e-smith-formmagick >= 1.4.0-12
 Obsoletes: e-smith-smtp-authentication
 Obsoletes: e-smith-securemail
+Conflicts: smeserver-fetchmail < 1.6-24
 BuildRequires: e-smith-devtools >= 1.13.0-03
 BuildArchitectures: noarch
 AutoReqProv: no
@@ -57,6 +59,10 @@ rm -rf root/var/service/ root/service
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+
+mkdir -p root/var/lib/fetchmail
+%patch12 -p1
 
 %build
 perl createlinks
@@ -75,6 +81,7 @@ rm -f %{name}-%{version}-%{release}-file
     --dir '/home/e-smith/Maildir/.junkmail/tmp' 'attr(0700,admin,admin)' \
     --dir '/home/e-smith/Maildir/.junkmail/new' 'attr(0700,admin,admin)' \
     --dir '/home/e-smith/Maildir/.junkmail/cur' 'attr(0700,admin,admin)' \
+    --dir '/var/lib/fetchmail' 'attr(0750,qmailr,qmail)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
 
@@ -96,6 +103,16 @@ fi
 e-smith server and gateway software - email module.
 
 %changelog
+* Fri Jul 29 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-18.sme
+- fix [SME: ]
+
+* Thu May 19 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-17.sme
+- fix typo in regex [SME: 11799]
+
+* Sat Apr 16 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-16.sme
+- fix missing dot in regex for untainting [SME: 11799]
+  would delete any account named with the string before the dot 
+
 * Mon Nov 15 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-15.sme
 - untainting string correctly [SME: 11716]