--- rpms/e-smith-manager/sme9/e-smith-manager.spec	2016/07/19 13:47:57	1.23
+++ rpms/e-smith-manager/sme9/e-smith-manager.spec	2017/03/26 03:34:56	1.28
@@ -1,10 +1,10 @@
-# $Id: e-smith-manager.spec,v 1.22 2016/07/19 13:14:59 unnilennium Exp $
+# $Id: e-smith-manager.spec,v 1.27 2017/01/23 16:51:44 unnilennium Exp $
 
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
 %define version 2.6.0
-%define release 12
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,6 +15,8 @@ Patch1: e-smith-manager-2.4.0-dont_rewri
 Patch2: e-smith-manager-2.4.0-newTKTsyntax.patch
 Patch3: e-smith-manager-2.6.0-no_index_for_manager_common.patch
 Patch4: e-smith-manager-2.6.0-Koozali_manager.patch
+Patch5: e-smith-manager-2.6.0-bz9920.badredirection.patch
+Patch6: e-smith-manager-2.6.0-bz10186-timeout.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -28,6 +30,25 @@ Provides: server-manager
 AutoReqProv: no
 
 %changelog
+* Sat Mar 25 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-16.sme
+- fix too short timeout in server-manager [SME: 10186]
+- now 30 min as default instead of 5
+- possibility to change this and adapt the default 0.66 of timeout remaining to reset it
+- by default only a session cookie, can activate persistent cookie
+- sha256 as encryption.
+
+* Mon Jan 23 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
+- reapply patch 4
+-  Update server-manager to Koozali branding [SME: 9678]
+
+* Thu Jan 19 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-14.sme
+- move fix to the right line to be effective [SME: 9920]
+
+* Mon Jan 16 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
+- fix bad redirection parameter that might reveal session information to remote site [SME: 9920]
+- temporarily reverting patch 4 for fast release of security fix
+- please put it back at next release
+
 * Tue Jul 19 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
 - Update server-manager to Koozali branding [SME: 9678]
 - We thanks John Crisp for his wonderful work.
@@ -699,6 +720,8 @@ This RPM contributes the navigation bars
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks