--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/01/31 05:14:04 1.83 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/11/04 20:02:03 1.113 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.82 2010/01/30 21:34:04 snetram Exp $ +# $Id: e-smith-base.spec,v 1.112 2010/11/03 18:55:06 slords Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 12 +%define release 45 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -22,6 +22,32 @@ Patch9: e-smith-base-5.2.0-FixLocale_Ext Patch10: e-smith-base-5.2.0-perform_restore-hal.patch Patch11: e-smith-base-5.2.0-generate-2048-bits-keys.patch Patch12: e-smith-base-5.2.0-perform_backup-hal.patch +Patch13: e-smith-base-5.2.0-hwaddress.patch +Patch14: e-smith-base-5.2.0-sha1.patch +Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch +Patch16: e-smith-base-5.2.0-gettext.patch +Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch +Patch18: e-smith-base-5.2.0-no-nic.patch +Patch19: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch +Patch20: e-smith-base-5.2.0-freebusy-user-modify-fix.patch +Patch21: e-smith-base-5.2.0-condrestart.patch +Patch22: e-smith-base-5.2.0-condrestart.patch2 +Patch23: e-smith-base-5.2.0-cpuspeed.patch +Patch24: e-smith-base-5.2.0-nss_ldap.patch +Patch25: e-smith-base-5.2.0-ibay_groups.patch +Patch26: e-smith-base-5.2.0-keep_external.patch +Patch27: e-smith-base-5.2.0-checkMaxUsers.patch +Patch28: e-smith-base-5.2.0-apmd64bit.patch +Patch29: e-smith-base-5.2.0-relocate_dhclient_conf.patch +Patch30: e-smith-base-5.2.0-echo-options.patch +Patch31: e-smith-base-5.2.0-migrateHWaddr.patch +Patch32: e-smith-base-5.2.0-relocate_dhcpd_leases_file.patch +Patch33: e-smith-base-5.2.0-fix_empty_file_test.patch +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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -37,6 +63,7 @@ Requires: perl(Net::IPv4Addr) Requires: /usr/sbin/irqbalance Requires: /usr/sbin/cpuspeed Requires: /sbin/microcode_ctl +Requires: /usr/sbin/smartd Requires: dbus Requires: hal Requires: acpid @@ -47,6 +74,8 @@ Requires: e-smith-bootloader Requires: mdadm Requires: pv Requires: pam_abl +Requires: nss_ldap +Requires: cpu >= 1.4.3 Obsoletes: rlinetd, e-smith-mod_ssl Obsoletes: e-smith-serial-console Obsoletes: sshell @@ -66,6 +95,104 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Thu Nov 4 2010 Shad L. Lords 5.2.0-38.sme +- Fix empty leases file test [SME: 6274] + +* Tue Oct 12 2010 Daniel Berteaud 5.2.0-37.sme +- Relocate dhcpd leases file [SME: 6274] + +* Mon Oct 11 2010 Shad L. Lords 5.2.0-36.sme +- Add migrate script to add missing HWaddr to interface records [SME: 6267] + +* Mon Oct 11 2010 Shad L. Lords 5.2.0-35.sme +- Make lcp options configurable [SME: 6277] + +* Mon Oct 11 2010 Daniel Berteaud 5.2.0-34.sme +- Relocate dhclient conf file [SME: 5833] + +* Fri Oct 8 2010 Shad L. Lords 5.2.0-33.sme +- Disable apmd on 64-bit arch [SME: 6170] + +* Fri Oct 8 2010 Shad L. Lords 5.2.0-32.sme +- Remove check for maxUsers [SME: 5537] + +* Wed Oct 6 2010 Shad L. Lords 5.2.0-31.sme +- Try and keep same external address for pppoe connections [SME: 6263] + +* Mon Sep 27 2010 Shad L. Lords 5.2.0-30.sme +- Add ibay groups to group membership [SME: 6247] + +* Thu Sep 23 2010 Daniel Berteaud 5.2.0-29.sme +- Prepare nss_ldap [SME: 6227] + +* Sun Aug 8 2010 Ian Wells 5.2.0-28.sme +- Enable cpuspeed by default [SME: 6066] + +* Sun Jul 25 2010 Charlie Brady 5.2.0-27.sme +- Fix syntax error in last patch. [SME: 5830] + +* Mon Jul 19 2010 Charlie Brady 5.2.0-26.sme +- Don't exit 99 from e-smith-service script when called with 'condrestart' + and service is disabled. [SME: 5830] + +* Fri Jun 11 2010 Federico Simoncelli 5.2.0-25.sme +- FreeBusy patch fix (save account changes) [SME: 5941] + +* Fri Jun 11 2010 Ian Wells 5.2.0-24.sme +- Remove checkMaxUsers patch due to regression. [SME: 5537] + +* Tue Jun 8 2010 Jonathan Martens 5.2.0-23.sme +- Fix translation of local nic string in console [SME: 5571] + +* Sun Jun 6 2010 Jonathan Martens 5.2.0-22.sme +- Handle no network interface scenario in console [SME: 6023] + +* Sat Jun 5 2010 Ian Wells 5.2.0-21.sme +- Remove checkMaxUsers(). [SME: 5537] + +* Mon May 10 2010 John H. Bennett III 5.2.0-20.sme +- Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941] + +* Wed Mar 3 2010 Federico Simoncelli 5.2.0-19.sme +- Restate smartd dependency. [SME: 5814] + +* Mon Mar 1 2010 Shad L. Lords 5.2.0-18.sme +- Fix gettext errors in WAN/LAN subnet error message [SME: 5501] + +* Sun Feb 14 2010 Jonathan Martens 5.2.0-17.sme +- Really fix template expansion error [SME: 4528] + +* Sun Feb 14 2010 Jonathan Martens 5.2.0-16.sme +- Fix template expansion error [SME: 4528] + +* Mon Feb 8 2010 Jonathan Martens 5.2.0-15.sme +- Improve security by using SHA1 algorithm for certificate signing [SME: 5737] + +* Fri Feb 5 2010 Stephen Noble 5.2.0-14.sme +- Fix eth? swapping [SME: 4528] + * Sun Jan 31 2010 Stephen Noble 5.2.0-13.sme - Fix console backup from removable media [SME: 4809] @@ -1336,6 +1463,32 @@ e-smith server and gateway software - ba %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] @@ -1415,6 +1568,9 @@ mkdir -p root/etc/e-smith/templates/etc/ ln -s /etc/e-smith/templates-default/template-begin-shell \ root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin +mkdir -p root/etc/e-smith/templates/etc/ldap.secret/ +touch root/etc/e-smith/templates/etc/ldap.secret/template-begin + for file in imap login passwd pwauth system-auth do mkdir -p root/etc/e-smith/templates/etc/pam.d/$file