--- rpms/smeserver-letsencrypt/contribs9/smeserver-letsencrypt.spec	2018/06/06 08:29:16	1.6
+++ rpms/smeserver-letsencrypt/contribs9/smeserver-letsencrypt.spec	2020/03/12 22:48:58	1.22
@@ -1,6 +1,6 @@
 %define name smeserver-letsencrypt
-%define version 0.4
-%define release 6
+%define version 0.5
+%define release 15
 Summary: Plugin to enable letsencrypt certificates
 Name: %{name}
 Version: %{version}
@@ -9,15 +9,21 @@ License: GNU GPL version 2
 URL: https://letsencrypt.org/
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
-Patch0: smeserver-letsencrypt-0.4-bz10253.patch
-Patch1: smeserver-letsencrypt-events.patch
-Patch2: smeserver-letsencrypt-events-fix.patch
+Patch0: smeserver-letsencrypt-remove-debug-lines.patch
+Patch1: smeserver-letsencrypt-remove-licence.patch
+Patch2: smeserver-letsencrypt-log-to-file.patch
+Patch3: smeserver-letsencrypt-API1-URL-change.patch
+Patch4: smeserver-letsencrypt-fix-logging.patch
+Patch5: smeserver-letsencrypt-fix-logging-reverse.patch
+Patch6: smeserver-letsencrypt-fix-acme-v01-url.patch
+Patch7: smeserver-letsencrypt-fix-hook-entry.patch
+Patch8: smeserver-letsencrypt-change-cron-entry.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
 Requires: e-smith-release >= 9.0
-Requires: dehydrated >= 0.5
+Requires: dehydrated >= 0.6.5
 AutoReqProv: no
 
 %description
@@ -25,6 +31,55 @@ Lets Encrypt is a free, automated, and o
 https://letsencrypt.org/
 
 %changelog
+* Thu Mar 12  2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-15.sme
+- take 3: remove dangling cron.daily dir missed in 0.5-12 [SME: 10862]
+
+* Wed Mar 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 0.5-14.sme
+- take 2: remove dangling cron.daily dir missed in 0.5-12 [SME: 10862]
+
+* Mon Mar 09 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-13.sme
+- remove dangling cron.daily dir missed in 0.5-12 [SME: 10862]
+
+* Sat Jan 18 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-12.sme
+- forgot to remove template-begin and cron.daily dir [SME: 10862]
+
+* Fri Jan 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-11.sme
+- force required version to 0.6.5 for EPEL version
+- Add new cron template for EPEL version of dehydrated [SME: 10862]
+
+* Fri Jan 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-10.sme
+- Fix incorrect HOOK entry in config [SME: 10861]
+
+* Fri Jan 04 2019 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-9.sme
+- Fix incorrect CA line in config [SME: 10688]
+
+* Mon Dec 31 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-8.sme
+- Reverse my previous error [SME: 10681]
+
+* Mon Dec 31 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-7.sme
+- fix spec file numbering
+
+* Mon Dec 31 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-6.sme
+- Fix typo error in cron.daily [SME: 10681]
+
+* Sun Dec 23 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-5.sme
+- Fix changed V1 staging URL [SME: 10595]
+- Thanks Terry Fage
+
+* Wed Dec 12 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-4.sme
+- log to file rather than /dev/null [SME: 10412]
+
+* Tue Oct 13 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-3.sme
+- remove Licence key from config template [SME:10636]
+
+* Tue Jun 19 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-2.sme
+- remove debug print lines
+
+* Tue Jun 12 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-1.sme
+- Update to v2 API [SME:10595]
+- Add key letsencrypt hostOverride to ignore 'Self' host check
+- This requires v0.6 of dehydrated
+
 * Wed Jun 06 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-6.sme
 - Fix missing event actions [SME: 10315]
 
@@ -173,6 +228,15 @@ https://letsencrypt.org/
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+
+# remove old template
+rm -rf root/etc/e-smith/templates/etc/cron.daily
 
 %build
 perl createlinks
@@ -234,6 +298,14 @@ if [[ -f /usr/local/bin/domain.txt ]];
 then mv -f /usr/local/bin/domains.txt /usr/local/bin/domains.txt.orig;
 fi
 
+if [[ -d /etc/cron.daily/letsencrypt ]];
+then rm -rf /etc/cron.daily/letsencrypt;
+fi
+
+if [[ -d /etc/e-smith/templates/etc/cron.daily/letsencrypt ]];
+then rm -rf /root/etc/e-smith/templates/etc/cron.daily/letsencrypt
+fi
+
 if [[ ! -e /home/e-smith/files/ibays/Primary/html/.well-known/acme-challenge ]];
 then mkdir -p /home/e-smith/files/ibays/Primary/html/.well-known/acme-challenge;
 fi
@@ -241,6 +313,8 @@ fi
 chmod -R 0775  /home/e-smith/files/ibays/Primary/html/.well-known
 chown -R apache:shared /home/e-smith/files/ibays/Primary/html/.well-known
 
-
-
+# remove old template file
+if [[  -e /etc/cron.daily/letsencrypt ]];
+then rm -rf /etc/cron.daily/letsencrypt
+fi
 %postun