--- rpms/e-smith-manager/sme9/e-smith-manager.spec	2016/03/04 14:24:36	1.16
+++ 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.15 2016/02/05 16:41:09 vip-ire 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 5
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,11 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: e-smith-manager-2.4.0-access_sm_from_console_over_plain.patch
 Patch1: e-smith-manager-2.4.0-dont_rewrite_to_https_from_localhost.patch
+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
@@ -25,6 +30,41 @@ 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.
+- e-smith-manager-2.6.0-Koozali_manager.patch
+
+* Wed Jun 15 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-9.sme
+- Better syntax for removing Indexes option for the manager [SME: 9589]
+
+* Wed Jun 15 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-8.sme
+- Remove index option for manager's resources [SME: 9589]
+
+* Sun Jun 12 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- fix 307 redirection to http when https is used [SME: 8825]
+- update syntaxe for TKT Auth
+- bump 7 for typo
+
 * Fri Mar 4 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-5.sme
 - corrected typo in e-smith-manager-2.4.0-dont_rewrite_to_https_from_localhost.patch
 - code from John H. Bennett III bennettj@johnbennettservices.com [SME: 9271]
@@ -677,6 +717,11 @@ This RPM contributes the navigation bars
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks