--- rpms/e-smith-ibays/sme10/e-smith-ibays.spec	2021/03/08 19:43:42	1.15
+++ rpms/e-smith-ibays/sme10/e-smith-ibays.spec	2021/03/10 05:11:30	1.18
@@ -1,10 +1,10 @@
-# $Id: e-smith-ibays.spec,v 1.14 2021/01/08 18:25:45 jpp Exp $
+# $Id: e-smith-ibays.spec,v 1.17 2021/03/09 23:24:41 jpp Exp $
 
 Summary: e-smith server and gateway - ibays module
 %define name e-smith-ibays
 Name: %{name}
 %define version 2.6.0
-%define release 14
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,6 +18,8 @@ Patch4: e-smith-ibays-2.6.0-bz10869-remo
 Patch5: e-smith-ibays-2.6.0-bz10968-remove-hardcoded-ports.patch
 Patch6: e-smith-ibays-2.6.0-bz11139-update.patch
 Patch7: e-smith-ibays-2.6.0-bz11412-update-php-properties.patch
+Patch8: e-smith-ibays-2.6.0-bz8150-SSLproperty2SSLRequireSSL.patch
+Patch9: e-smith-ibays-2.6.0-bz11407-force-https-on-DAV-and-httpauth.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -34,8 +36,16 @@ AutoReqProv: no
 e-smith server and gateway software - ibays module.
 
 %changelog
+* Tue Mar 09 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-16.sme
+- force https if auth or dav are enabled  [SME: 11407]
+
+* Tue Mar 09 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
+- merge SSL and SSLRequireSSL properties [SME: 8150]
+  now SSLRequireSSL will force SSL to the html ibay directory and redirect to https
+
 * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-14.sme
-- fix [SME: ]
+- update php properties and folders [SME: 11412]
+- remove last bit of atalk [SME: 668]
 
 * Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
 - add update event [SME: 11139]
@@ -395,6 +405,8 @@ e-smith server and gateway software - ib
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 /bin/mkdir -p root/var/cache/e-smith/files/ibays