--- rpms/e-smith-base/sme9/e-smith-base.spec 2013/05/19 16:01:25 1.35 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2013/06/08 09:58:58 1.40 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.34 2013/05/18 03:46:13 burnat Exp $ +# $Id: e-smith-base.spec,v 1.39 2013/06/08 09:09:47 vip-ire Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.4.0 -%define release 34 +%define release 38 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -40,6 +40,9 @@ Patch26: e-smith-base-5.4.0-StartService Patch27: e-smith-base-5.4.0-rcesmith-removal.patch Patch28: e-smith-base-5.4.0-add_template_to_ssl.pem.patch Patch29: e-smith-base-5.4.0-init-accounts.patch +Patch30: e-smith-base-5.4.0-do_not_remove_utf8.patch +Patch31: e-smith-base-5.4.0-space_lf_on_receive.patch +Patch32: e-smith-base-5.4.0-disable_ipv6.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -88,8 +91,20 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Sat Jun 8 2013 Daniel Berteaud 5.4.0-38.sme +- Disable IPv6 on a default install (patch by Shad Lords) [SME: 7531] + +* Sat Jun 8 2013 Daniel Berteaud 5.4.0-37.sme +- Continue escaping control chars in rsyslog, just replace LF with space [SME: 7662] + +* Fri Jun 7 2013 Daniel Berteaud 5.4.0-36.sme +- Don't escape control characters in rsyslog [SME: 7662] + +* Thu Jun 6 2013 Daniel Berteaud 5.4.0-35.sme +- Use UTF-8 in the console [SME: 7591] + * Sun May 19 2013 Ian Wells 5.4.0-34.sme -- Remove redundant parts of init-accounts [SME: 3350] +- Remove redundant parts of init-accounts [SME: 3550] * Sat May 18 2013 chris burnat 5.4.0-33.sme - Add_template_to_ssl.pem, codes by JP Pialasse [SME: 7601] @@ -1648,6 +1663,9 @@ e-smith server and gateway software - ba %patch27 -p1 %patch28 -p1 %patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 # We cannot remove an empy files or folders with a patch, see [SME: 7289] # We remove this because it contains an empty template-begin file