--- rpms/e-smith-ibays/sme10/e-smith-ibays.spec	2016/06/23 08:29:20	1.5
+++ 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.4 2016/06/23 08:16:25 unnilennium 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 4
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,15 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: e-smith-ibays-2.6.0-create_tmp_folder_in_ibays.patch
 Patch1: e-smith-ibays-2.6.0-create_sess_folder_in_ibays.patch
+Patch2: e-smith-ibays-2.6.0-create_var_cache_and_fix_sess.patch
+Patch3: e-smith-ibays-2.6.0-bz10871-ifphpmodule.patch
+Patch4: e-smith-ibays-2.6.0-bz10869-remove-php3-refs.patch
+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
 Requires: e-smith-base >= 4.13.15-76
@@ -27,6 +36,46 @@ 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
+- 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]
+
+* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
+- remove hardcoded ports [SME: 10968]
+
+* Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
+- remove php3 reference [SME: 10869]
+
+* Mon Jun 22 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme
+- fix apache failing if ibay has dynamic content enabled and phpmodule is disabled [SME: 10871]
+
+* Thu Jan 30 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
+- revert patch, wrong rpm [SME: 10871]
+
+* Tue Jan 28 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
+- add support for php-fpm  [SME: 10871]
+
+* Wed Jul 06 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- fix typo thanks to Stephane de Labrusse [SME: 7011]
+- ibay to ibays
+
+* Sun Jun 26 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-6.sme
+- as per comment 2 of bug 0600 instead of 0700 for perms [SME: 9621]
+
+* Sun Jun 26 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-5.sme
+- as discussed, moving cache and tmp out of ibay folder [SME: 9105] [SME: 9621]
+- creating basedir /var/cache/e-smith/files/ibays for tmp and cache
+
 * Thu Jun 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
 - create tmp folder in ibays  when needed [SME: 9105]
 - create session folder in ibays when needed [SME: 9621]
@@ -350,6 +399,16 @@ e-smith server and gateway software - ib
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+
+/bin/mkdir -p root/var/cache/e-smith/files/ibays
 
 %pre
 %post