--- rpms/e-smith-base/sme8/e-smith-base.spec 2011/11/07 06:18:11 1.134 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2013/01/30 06:06:59 1.140 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.133 2011/11/06 18:20:53 slords Exp $ +# $Id: e-smith-base.spec,v 1.139 2013/01/23 03:47:15 wellsi Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 63 +%define release 68 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -59,6 +59,11 @@ Patch46: e-smith-base-5.2.0-list-only-wr Patch47: e-smith-base-5.2.0-string-fix.patch Patch48: e-smith-base-5.2.0-dont_set_gecos_in_ldap.patch Patch49: e-smith-base-5.2.0-initExternal.patch +Patch50: e-smith-base-5.2.0-ConsoleNetwork.patch +Patch51: e-smith-base-5.2.0-ConsoleNetworkText.patch +Patch52: e-smith-base-5.2.0-CipherSuite.patch +Patch53: e-smith-base-5.2.0-updatedb.patch +Patch54: e-smith-base-5.2.0-pppoeMlimit.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -106,9 +111,24 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Tue Jan 29 2013 Ian Wells 5.2.0-68.sme +- Updated previous patch to avoid migrate fragment [SME: 7000] + +* Tue Jan 22 2013 Ian Wells 5.2.0-67.sme +- Increase memory limit for pppoe to 100Mb [SME: 7000] + +* Sun Dec 30 2012 Ian Wells 5.2.0-66.sme +- Template /etc/updatedb.conf [SME: 7090] + +* Wed Jul 18 2012 Ian Wells 5.2.0-65.sme +- Make CipherSuite secure by default [SME: 7026] + +* Fri Mar 16 2012 Ian Wells 5.2.0-64.sme +- Add MAC address into console network selection [SME: 6844] + * Sun Nov 6 2011 Shad L. Lords 5.2.0-63.sme - Initialize ExternalInterface db structure so hwaddr in console works -[SME: 6775] + [SME: 6775] * Mon Mar 14 2011 Daniel Berteaud 5.2.0-62.sme - Stop using gecos attribute in LDAP [SME: 6539] @@ -1569,6 +1589,11 @@ e-smith server and gateway software - ba %patch47 -p1 %patch48 -p1 %patch49 -p1 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 +%patch54 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] @@ -1674,6 +1699,8 @@ do ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service done +mkdir -p root/var/service/wan/env.pppoe + # Remove (for now) supervised syslog and klogd services rm root/etc/rc.d/init.d/supervise/{syslog,klogd} rm root/service/{syslog,klogd}