--- rpms/e-smith-base/sme9/e-smith-base.spec 2014/03/24 03:14:48 1.67 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2014/07/25 13:32:54 1.74 @@ -1,15 +1,21 @@ -# $Id: e-smith-base.spec,v 1.66 2014/03/24 03:05:37 wellsi Exp $ +# $Id: e-smith-base.spec,v 1.73 2014/07/04 00:37:52 wellsi Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.6.0 -%define release 2 +%define release 9 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz +Patch1: e-smith-base-5.6.0-console.patch +Patch2: e-smith-base-5.6.0_added_verification_of_pptp_clients_against_dhcp.patch +Patch3: e-smith-base-5.6.0_console_verification_dhcp_vs_pptp.patch +Patch4: e-smith-base-5.6.0_remove_10runparts_for_anacron_compatibility.patch +Patch5: e-smith-base-5.6.0-mdevent.patch +Patch6: e-smith-base-5.6.0-pppoe_after_post_upgrade.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -25,7 +31,6 @@ Requires: perl(Data::UUID) Requires: perl(Net::IPv4Addr) Requires: /usr/sbin/irqbalance Requires: /usr/sbin/cpuspeed -Requires: /sbin/microcode_ctl Requires: /usr/sbin/smartd Requires: dbus Requires: hal @@ -58,6 +63,32 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Fri Jul 25 2014 Daniel Berteaud 5.6.0-9 +- Fix PPPoE after a post-upgrade [SME: 8493] + +* Thu Jul 3 2014 Ian Wells 5.6.0-8.sme +- Remove dependency on microcode_ctl [SME: 8468] + +* Sun May 11 2014 stephane de Labrusse 5.6.0-7.sme +- Prevent emailing about the normal, weekly, checks of RAID arrays, by Mark Casey +- [SME: 7748] + +* Tue May 06 2014 stephane de Labrusse 5.6.0-6.sme +- remove /etc/e-smith/templates/etc/crontab/10runparts for anacron compatibility +- [SME: 8364] + +* Wed Apr 23 2014 stephane de Labrusse 5.6.0-5.sme +- Add a verification in the console of number of pptp clients against ip allowed in dhcpd +- [SME: 8312] + +* Sun Apr 6 2014 stephane de Labrusse 5.6.0-4.sme +- Add a verification in remoteaccess panel of number of pptp clients against ip allowed in dhcpd +- [SME: 8312] + +* Sat Apr 5 2014 Ian Wells 5.6.0-3.sme +- Ensure console is run with taint checking [SME: 8311] +- Non-functional perl::Critic changes. + * Sun Mar 23 2014 Ian Wells 5.6.0-2.sme - Roll new stream to really remove obsolete images [SME: 7962] @@ -1684,7 +1715,12 @@ e-smith server and gateway software - ba %prep %setup - +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \ 'sme last system user marker' /tmp /bin/false