--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/11/02 17:19:26 1.109 +++ 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.108 2010/10/14 16:21:30 vip-ire 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 41 +%define release 68 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -46,6 +46,24 @@ Patch33: e-smith-base-5.2.0-fix_empty_fi Patch34: e-smith-base-5.2.0-cpu-conf.patch Patch35: e-smith-base-5.2.0-ldap-auth.patch Patch36: e-smith-base-5.2.0-enable-cpu.patch +Patch37: e-smith-base-5.2.0-better-ldap.patch +Patch38: e-smith-base-5.2.0-add-extra-ldap.patch +Patch39: e-smith-base-5.2.0-cpu-can-delete.patch +Patch40: e-smith-base-5.2.0-supp-groups.patch +Patch41: e-smith-base-5.2.0-fix_gpasswd_path.patch +Patch42: e-smith-base-5.2.0-fix-gid.patch +Patch43: e-smith-base-5.2.0-weak-updates.patch +Patch44: e-smith-base-5.2.0-apache_alias_for_www.patch +Patch45: e-smith-base-5.2.0-no-nic2.patch +Patch46: e-smith-base-5.2.0-list-only-write-enabled-backup-targets.patch +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 @@ -93,13 +111,99 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Mon Nov 1 2010 Daniel Berteaud 5.2.0-40.sme +* 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] + +* Mon Mar 14 2011 Daniel Berteaud 5.2.0-62.sme +- Stop using gecos attribute in LDAP [SME: 6539] + +* Mon Mar 14 2011 Jonathan Martens 5.2.0-61.sme +- Fix a typo in strings [SME: 5932] + +* Mon Mar 14 2011 Jonathan Martens 5.2.0-60.sme +- Rework text changes in console screen in previous revision [SME: 5932] + +* Mon Mar 14 2011 Jonathan Martens 5.2.0-59.sme +- Only list backup targets that are writeable [SME: 5932] + +* Sun Mar 13 2011 Jonathan Martens 5.2.0-58.sme +- Revert admin password change through user-manager [SME: 3759] + +* Sun Mar 13 2011 Jonathan Martens 5.2.0-57.sme +- Allow admin password change through user-manager [SME: 3759] + +* Wed Mar 2 2011 Jonathan Martens 5.2.0-57.sme +- Handle no network interface scenario in console and bootstrap-console [SME: 6023] + +* Mon Dec 6 2010 Daniel Berteaud 5.2.0-56.sme +- change apache uid and gid so they become aliases for www [SME: 6425] + +* Tue Nov 30 2010 Shad L. Lords 5.2.0-55.sme +- Only remove dangling symlinks in weak-updates directories [SME: 6376] + +* Tue Nov 30 2010 Shad L. Lords 5.2.0-54.sme +- Fix create user gid parameter [SME: 6416] + +* Mon Nov 29 2010 Daniel Berteaud 5.2.0-53.sme +- Fix gpasswd path [SME: 6412] + +* Mon Nov 22 2010 Shad L. Lords 5.2.0-52.sme +- Fix relocation of dhclient conf file [SME: 6385] + +* Sun Nov 7 2010 Shad L. Lords 5.2.0-51.sme +- No longer need to pass supplemental groups to cpu [SME: 6349] + +* Fri Nov 5 2010 Shad L. Lords 5.2.0-50.sme +- Allow cpu to remove empty attributes [SME: 6343] + +* Thu Nov 4 2010 Shad L. Lords 5.2.0-49.sme +- Fix maxUsers patch (again) to not break setting passwords [SME: 5537] + +* Thu Nov 4 2010 Shad L. Lords 5.2.0-48.sme +- Fix maxUsers patch to not break setting passwords [SME: 5537] + +* Thu Nov 4 2010 Shad L. Lords 5.2.0-47.sme +- Don't put empty attributes in file for cpu [SME: 6334] + +* Thu Nov 4 2010 Shad L. Lords 5.2.0-46.sme +- Add flush to tmpfile so that data is available to cpu [SME: 6334] + +* Thu Nov 4 2010 Shad L. Lords 5.2.0-45.sme +- Add extra attributes to ldap objects with cpu call [SME: 6334] + +* Wed Nov 3 2010 Shad L. Lords 5.2.0-44.sme +- Fix cpu critical patch missing ' [SME: 6330] + +* Wed Nov 3 2010 Shad L. Lords 5.2.0-43.sme +- Make cpu calls critical only with ldap{Auth} is enabled [SME: 6330] +- Add cpu.conf and cpu-system.conf to post-upgrade event [SME: 6327] + +* Tue Nov 2 2010 Shad L. Lords 5.2.0-42.sme +- Always use cpu, do unix if ldap{Auth} is disabled [SME: 6328] + +* Mon Nov 1 2010 Shad L. Lords 5.2.0-41.sme - Switch to cpu commands if ldap is master [SME: 6328] -* Mon Nov 1 2010 Daniel Berteaud 5.2.0-40.sme +* Mon Nov 1 2010 Shad L. Lords 5.2.0-40.sme - Add templates for ldap authentication if enabled [SME: 6329] -* Mon Nov 1 2010 Daniel Berteaud 5.2.0-39.sme +* Mon Nov 1 2010 Shad L. Lords 5.2.0-39.sme - Add cpu.conf and cpu-system.conf template/program to SME [SME: 6327] * Thu Oct 14 2010 Daniel Berteaud 5.2.0-38.sme @@ -1472,6 +1576,24 @@ e-smith server and gateway software - ba %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 +%patch46 -p1 +%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 ] @@ -1577,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}