--- rpms/e-smith-manager/sme9/e-smith-manager.spec	2013/02/24 06:05:04	1.7
+++ rpms/e-smith-manager/sme9/e-smith-manager.spec	2017/01/17 00:09:21	1.25
@@ -1,28 +1,86 @@
-# $Id: e-smith-manager.spec,v 1.6 2013/02/07 16:08:52 charliebrady Exp $
+# $Id: e-smith-manager.spec,v 1.24 2017/01/17 00:01:32 unnilennium Exp $
 
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
-%define version 2.4.0
-%define release 5
+%define version 2.6.0
+%define release 13
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
-Patch1: e-smith-manager-2.4.0-Back.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
 BuildArchitectures: noarch
 Requires: e-smith-lib >= 1.18.0-26
 Requires: mod_auth_tkt
+Requires: pwauth
 Requires: perl(Apache::AuthTkt)
 Requires: perl-suidperl
 Provides: server-manager
 AutoReqProv: no
 
 %changelog
+* 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]
+
+* Fri Feb 5 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-4.sme
+- Really don't redirect to http when login in/out of the server-manager
+  [SME: 9163]
+
+* Sun Jan 31 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-3.sme
+- Don't redirect to http when login in/out of the server-manager from
+  localhost [SME: 9163]
+
+* Wed Jan 6 2015 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-2.sme
+- Allow access to the server-manager without SSL from the loopback
+  [SME: 9163]
+
+* Sun Mar 23 2014 Ian Wells <esmith@wellsi.com> 2.6.0-1.sme
+- Roll new stream to remove obsolete images [SME: 7962] 
+
+* Sun Mar 23 2014 Ian Wells <esmith@wellsi.com> 2.4.0-9.sme
+- Remove references to obsolete images, by Stephane de Labrusse [SME: 7962]
+
+* Fri Oct 11 2013 Ian Wells <esmith@wellsi.com> 2.4.0-8.sme
+- Renew donation text in server-manager, by John Crisp [SME: 7897]
+
+* Thu Jun 6 2013 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-7.sme
+- Do not load mod_ssl [SME: 7602]
+
+* Wed Mar 6 2013 Shad L. Lords <slords@mail.com> 2.4.0-6.sme
+- Correct path to pwauth [SME: 7319]
+
 * Sat Feb 23 2013 Ian Wells <esmith@wellsi.com> 2.4.0-5.sme
 - Correct processing of server-manager URL [SME: 7254]
 
@@ -642,7 +700,13 @@ This RPM contributes the navigation bars
 
 %prep
 %setup
+%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+#%patch4 -p1
+%patch5 -p1
+
 
 %build
 perl createlinks