--- rpms/e-smith-base/sme9/e-smith-base.spec 2015/06/25 15:15:03 1.92 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2017/05/04 10:55:44 1.103 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.91 2015/06/25 14:55:52 vip-ire Exp $ +# $Id: e-smith-base.spec,v 1.102 2017/02/09 12:40:36 vip-ire Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.6.0 -%define release 22 +%define release 31 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -26,6 +26,15 @@ Patch13: e-smith-base-5.6.0-only_reset_a Patch14: e-smith-base-5.6.0-only_fire_ip_change_on_wan.patch Patch15: e-smith-base-5.6.0-dummy_nic.patch Patch16: e-smith-base-5.6.0-disable_selinux.patch +Patch17: e-smith-base-5.6.0_sha256_cert.patch +Patch18: e-smith-base-5.6.0-update_mime_types.patch +Patch19: e-smith-base-5.6.0-ssl_update.patch +Patch20: e-smith-base-5.6.0-reload_ssl_when_renew_cert.patch +Patch21: e-smith-base-5.6.0-display_http_server_manager.patch +Patch22: e-smith-base-5.6.0-add_forward_column.patch +Patch23: e-smith-base-5.6.0-allow_32bits_mask.patch +Patch24: e-smith-base-5.6.0-ip_route_syntax.patch +Patch25: e-smith-base-5.8.0-expand_route_bond0.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -73,6 +82,35 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Thu May 4 2017 Daniel Berteaud 5.6.0-31.sme +- Backport from sme10: Expand route-bond0 when nic bonding is enabled + [SME: 10270] + +* Thu Feb 9 2017 Daniel Berteaud 5.6.0-30.sme +- Use ip route syntax to define routes to local network [SME: 9905] + +* Tue Sep 13 2016 Daniel Berteaud 5.6.0-29.sme +- Allow /32 masks on the external interface, in which case we don't + check if the gateway is on the correct network) [SME: 9765] + +* Sun Jan 31 2016 Daniel Berteaud 5.6.0-28.sme +- Add a column to display forwarding address [SME: 9174] + +* Sun Jan 31 2016 Daniel Berteaud 5.6.0-27.sme +- Correctly display http URL to the server-manager in the console [SME: 9163] + +* Sun Jan 17 2016 Daniel Berteaud 5.6.0-26.sme +- Fire ssl-update event when default cert is renewed [SME: 2257] + +* Sun Jan 17 2016 Daniel Berteaud 5.6.0-25.sme +- Expand /home/e-smith/ssl.pem/pem during ssl-update [SME: 9152] + +* Tue Sep 30 2015 Daniel Berteaud 5.6.0-24.sme +- Update /etc/mime.types templates [SME: 9078] + +* Mon Aug 24 2015 Charlie Brady 5.6.0-23.sme +- Use sha256 algorithm for signature of SSL cert. [SME: 8615] + * Thu Jun 25 2015 Daniel Berteaud 5.6.0-22.sme - Fix including /etc/selinux directory [SME: 8954] @@ -1781,6 +1819,15 @@ e-smith server and gateway software - ba %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \