--- rpms/e-smith-email/sme10/e-smith-email.spec	2022/04/16 16:32:01	1.16
+++ rpms/e-smith-email/sme10/e-smith-email.spec	2022/08/01 18:04:52	1.20
@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.15 2021/11/15 15:40:52 jpp Exp $
+# $Id: e-smith-email.spec,v 1.19 2022/07/30 02:28:01 jpp Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.6.0
-%define release 16
+%define release 19
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -22,6 +22,7 @@ Patch8: e-smith-email-5.6.0-bz11634-lock
 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
+Patch12: e-smith-email-5.6.0-bz12131-fetchids.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
@@ -40,6 +41,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
@@ -59,6 +61,8 @@ rm -rf root/var/service/ root/service
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+mkdir -p root/var/lib/fetchmail
+%patch12 -p1
 
 %build
 perl createlinks
@@ -77,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
 
@@ -98,6 +103,16 @@ fi
 e-smith server and gateway software - email module.
 
 %changelog
+* Mon Aug 01 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-19.sme
+- add quote around filename to .fetchids moving script [SME: 12131]
+
+* Fri Jul 29 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-18.sme
+- move fetchids from /run and avoid its loss on reboot [SME: 12131]
+  similar changes in contrib smesevrer-fetchmail
+
+* 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 
@@ -211,10 +226,12 @@ e-smith server and gateway software - em
 * Mon Oct 4 2010 Shad L. Lords <slords@mail.com> 5.2.0-11.sme
 - Enable auth for smtp traffic and migrate if necessary [SME: 5575]
 
-* Sun Sep 25 2010 Shad L. Lords <slords@mail.com> 5.2.0-10.sme
+* Sat Sep 25 2010 Shad L. Lords <slords@mail.com> 5.2.0-10.sme
+  Sun Sep 25 2010 --> Sun Sep 19 2010 or Sat Sep 25 2010 or Sun Sep 26 2010 or ....
 - Change enabled to transparent for mail proxy [SME: 5574]
 
-* Tue May 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-9.sme
+* Sat May 08 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-9.sme
+  Tue May 08 2010 --> Tue May 04 2010 or Sat May 08 2010 or Tue May 11 2010 or ....
 - Fix migrate fragment [SME: 5922]
 
 * Tue May 4 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-8.sme
@@ -328,7 +345,8 @@ e-smith server and gateway software - em
 * Tue Sep 26 2006 Gavin Weight <gweight@gmail.com> 4.16.0-09
 - Incorrect quoting in purge-junkmail-folders diagnostic. [SME: 1936]
 
-* Tue Sep 20 2006 Gavin Weight <gweight@gmail.com> 4.16.0-08
+* Wed Sep 20 2006 Gavin Weight <gweight@gmail.com> 4.16.0-08
+  Tue Sep 20 2006 --> Tue Sep 19 2006 or Wed Sep 20 2006 or Tue Sep 26 2006 or ....
 - Updated virus description in panel. [SME: 1729]
 
 * Wed Jun 21 2006 Gordon Rowell <gordonr@gormand.com.au> 4.16.0-07