--- rpms/e-smith-base/sme8/e-smith-base.spec 2008/03/15 07:07:53 1.35 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2014/03/15 21:35:09 1.165 @@ -1,102 +1,21 @@ +# $Id: e-smith-base.spec,v 1.164 2014/03/10 13:25:54 burnat Exp $ + Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} -%define version 4.18.0 -%define release 102 +%define version 5.2.0 +%define release 91 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons -Source: %{name}-%{version}.tar.gz -Patch1: e-smith-base-4.18.0-backtitle.patch -Patch2: e-smith-base-4.18.0-consolebackup.patch -Patch3: e-smith-base-4.18.0-backupcancel.patch -Patch4: e-smith-base-4.18.0-gatewaydev.patch -Patch5: e-smith-base-4.18.0-elinks_caching.patch -Patch6: e-smith-base-4.18.0-unused_templates.patch -Patch7: e-smith-base-4.18.0-backuphome.patch -Patch8: e-smith-base-4.18.0-mediaglob.patch -Patch9: e-smith-base-4.18.0-setbeforeexpand.patch -Patch10: e-smith-base-4.18.0-runit17.patch -Patch11: e-smith-base-4.18.0-infobox.patch -Patch12: e-smith-base-4.18.0-infobox.patch2 -Patch13: e-smith-base-4.18.0-mediaglob.patch2 -Patch14: e-smith-base-4.18.0-run.static.patch -Patch15: e-smith-base-4.18.0-ethdriver.patch -Patch16: e-smith-base-4.18.0-ethdriver.patch2 -Patch17: e-smith-base-4.18.0-ethdriver.patch3 -Patch18: e-smith-base-4.18.0-ethdriver.patch4 -Patch19: e-smith-base-4.18.0-raid_no.patch -Patch20: e-smith-base-4.18.0-commonname.patch -Patch21: e-smith-base-4.18.0-noutf.patch -Patch22: e-smith-base-4.18.0-commonname.patch2 -Patch23: e-smith-base-4.18.0-pamtemplate.patch -Patch24: e-smith-base-4.18.0-pamtemplate.patch2 -Patch25: e-smith-base-4.18.0-rcscript.patch -Patch26: e-smith-base-4.18.0-logfile_rotation.patch -Patch27: e-smith-base-4.18.0-login_pam.patch -Patch28: e-smith-base-4.18.0-depmod.patch -Patch29: e-smith-base-4.18.0-perms.patch -Patch30: e-smith-base-4.18.0-dhcpd_perms.patch -Patch31: e-smith-base-4.18.0-noraid.patch -Patch32: e-smith-base-4.18.0-suborder.patch -Patch33: e-smith-base-4.18.0-standby.patch -Patch34: e-smith-base-4.18.0-usbback.patch -Patch35: e-smith-base-4.18.0-remoteaccess.pmfm2self.patch -Patch36: e-smith-base-4.18.0-SSHport.patch -Patch37: e-smith-base-4.18.0-gateway_validation.patch -Patch38: e-smith-base-4.18.0-service_re.patch -Patch39: e-smith-base-4.18.0-xencons.patch -Patch40: e-smith-base-4.18.0-lib64.patch -Patch41: e-smith-base-4.18.0-cracklib.patch -Patch42: e-smith-base-4.18.0-raid_no.patch2 -Patch43: e-smith-base-4.18.0-raidfix.patch -Patch44: e-smith-base-4.18.0-bootstrap.patch -Patch45: e-smith-base-4.18.0-pamtemplate.patch3 -Patch46: e-smith-base-4.18.0-restoredev.patch -Patch47: e-smith-base-4.18.0-no_kmodule.patch -Patch48: e-smith-base-4-18-0-MovePam_d_ftpTemplates.patch -Patch49: e-smith-base-4.18.0-usbback_errcheck.patch -Patch50: e-smith-base-4.18.0-devicechk.patch -Patch51: e-smith-base-4.18.0-devicechk.patch2 -Patch52: e-smith-base-4.18.0-conf_modules.patch -Patch53: e-smith-base-4.18.0-restoredev.patch2 -Patch54: e-smith-base-4.18.0-groups.pm.pod.patch -Patch55: e-smith-base-4.18.0-rename_apache2httpd.patch -Patch56: e-smith-base-4.18.0-remove_httpd__logrotate.patch -Patch57: e-smith-base-4.18.0-cert_regen.patch -Patch58: e-smith-base-4.18.0-useracc_text_adjust.patch -Patch59: e-smith-base-4.18.0-non_Removable_pseudonyms.patch -Patch60: e-smith-base-4.18.0-delete_forwarder.patch -Patch61: e-smith-base-4.18.0-part_size.patch -Patch62: e-smith-base-4.18.0-passwdlock.patch -Patch63: e-smith-base-4.18.0-smartd.patch -Patch64: e-smith-base-4.18.0-smartdtemplates2expand.patch -Patch65: e-smith-base-4.18.0-consoleValidatePassword.patch -Patch66: e-smith-base-4.18.0-backupstatus.patch -Patch67: e-smith-base-4.18.0-usb-revDrive.patch -Patch68: e-smith-base-4.18.0-consoleValidateFirst.patch -Patch69: e-smith-base-4.18.0-MTU.patch -Patch70: e-smith-base-4.18.0-adminIsNotRoot.patch -Patch71: e-smith-base-4.18.0-noMTU.patch -Patch72: e-smith-base-4.18.0-ROUTER_DESC.patch -Patch73: e-smith-base-4.18.0-rmDuplicates.patch -Patch74: e-smith-base-4.18.0-tags2general.patch -Patch75: e-smith-base-4.18.0-useracc_single_char-fix.patch -Patch76: e-smith-base-4.18.0-gettextErrors.patch -Patch77: e-smith-base-4.18.0-rmPleasewait.patch -Patch78: e-smith-base-4.18.0-gettextErrors.patch2 -Patch79: e-smith-base-4.18.0-rmDuplicates.patch2 -Patch80: e-smith-base-4.18.0-gettextStrings.patch2 -Patch81: e-smith-base-4.18.0-customDynDNS.patch -Patch82: e-smith-base-4.18.0-fixSAVE.patch -Patch83: e-smith-base-4.18.0-test_FORM_TITLE.patch -Patch84: e-smith-base-4.18.0-translationfix.patch +Source: e-smith-base-5.2.0.90.tar.gz +Patch1: e-smith-base-5.2.0-reset_ibay_default_type.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external -Requires: e-smith-lib >= 1.18.0-19 +Requires: e-smith-lib >= 2.2.0-2 Requires: server-manager-images, server-manager -Requires: e-smith-formmagick >= 1.4.0-9 +Requires: e-smith-formmagick >= 1.4.0-12 Requires: initscripts >= 6.67-1es17 Requires: e-smith-daemontools >= 1.7.1-04 Requires: perl(Locale::gettext) @@ -107,10 +26,10 @@ 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 -Requires: whiptail Requires: rssh Requires: bridge-utils Requires: vconfig @@ -118,13 +37,13 @@ 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 Obsoletes: e-smith-rp-pppoe -%if "%{?rhel}" == "5" Obsoletes: perl-Data-UUID -%endif BuildRequires: perl, perl(Test::Inline) >= 0.12 BuildRequires: e-smith-devtools >= 1.13.1-03 BuildRequires: gettext @@ -139,7 +58,384 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Sat Mar 10 2008 Stephen Noble 4.18-102 +* Mon Mar 10 2014 Chris Burnat 5.2.0-91.sme +- Reset primary ibay default type [SME: 8267] + +* Mon Feb 17 2014 Ian Wells 5.2.0-90.sme +- Remove old images and roll new tarball [SME: 8213] + +* Sun Feb 16 2014 Ian Wells 5.2.0-89.sme +- Refer to removable media not CDROM in console restore [SME: 8212] + +* Fri Feb 7 2014 Daniel Berteaud 5.2.0-88.sme +- Add the apache group if it's missing [SME: 7932] + +* Mon Jan 13 2014 Ian Wells 5.2.0-87.sme +- Remove insecure SSL ciphers [SME: 7916] + +* Mon Jan 13 2014 Ian Wells 5.2.0-86.sme +- Change System Name from mitel-networks-server to sme-server [SME: 8131] + +* Sat Sep 14 2013 Ian Wells 5.2.0-85.sme +- Reverse change: Use UTF-8 in the console [SME: 7699] + +* Sun Jul 7 2013 Ian Wells 5.2.0-84.sme +- Improve text in console backup for success and failure [SME: 3121] + +* Mon Jul 01 2013 Ian Wells 5.2.0-83.sme +- Compression level of the console backup is now -6 by default [SME: 6304] + +* Sat Jun 29 2013 Ian Wells 5.2.0-82.sme +- Console USB Backup, allow user setting of compression level [SME: 6304] + +* Sat Jun 29 2013 Ian Wells 5.2.0-81.sme +- Use UTF-8 in the console, by Daniel Berteaud [SME: 7699] + +* Sat Jun 29 2013 Ian Wells 5.2.0-80.sme +- Update ServerName (Samba netbios name) when SystemName is updated [SME: 7703] + +* Mon Jun 24 2013 Ian Wells 5.2.0-79.sme +- Remove old System Name from the Hosts DB, by Charlie Brady [SME: 5010] + +* Mon Jun 24 2013 Ian Wells 5.2.0-78.sme +- Prevent emailing about the normal, weekly, checks of RAID arrays, + by Mark Casey [SME: 6160] + +* Fri Jun 14 2013 Daniel Berteaud 5.2.0-77.sme +- Fix init-account script when LDAP auth is enabled [SME: 7670] + +* Fri Jun 14 2013 Daniel Berteaud 5.2.0-76.sme +- Fix group creation/modification when LDAP auth is enabled [SME: 7049] + +* Fri May 17 2013 chris burnat 5.2.0-75.sme +- Add_template_to_ssl.pem [SME: 4450] + +* Sat Mar 16 2013 Ian Wells 5.2.0-74.sme +- Ensure existing_hwaddr is always initialized [SME: 6087] + +* Thu Feb 28 2013 Terry Fage 5.2.0-73.sme +- In the console refer to removable media instead of USB disk [SME: 6835] + +* Thu Feb 21 2013 Daniel Berteaud 5.2.0-72.sme +- Optimize user-modify-unix script and link it in bootstrap-ldap-save [SME: 7167] + +* Tue Feb 5 2013 John Crisp 5.2.0-71.sme +- Post-upgrades not fired after restore from console [SME: 7060] + +* Mon Feb 4 2013 Ian Wells 5.2.0-70.sme +- Correction for when DB value is lower than MIN_MEMORY_LIMIT [SME: 7000] + +* Sat Feb 2 2013 Ian Wells 5.2.0-69.sme +- Simplified patch after review comments [SME: 7000] + +* 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 Shad L. Lords 5.2.0-40.sme +- Add templates for ldap authentication if enabled [SME: 6329] + +* 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 +- 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] + +* Sat Jan 30 2010 Jonathan Martens 5.2.0-12.sme +- Bump certificate encryption from 1024 bits to 2048 bits [SME: 5735] + +* Thu Jan 14 2010 Filippo Carletti 5.2.0-11.sme +- Fix console restore from removable media (Federico Simoncelli) [SME: 4809] + +* Mon Nov 23 2009 Gavin Weight 5.2.0-10.sme +- Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 5571] + +* Fri Nov 6 2009 Jonathan Martens 5.2.0-9.sme +- Translate $ifName in console configuration pages [SME: 5571] + +* Sat Oct 24 2009 Jonathan Martens 5.2.0-8.sme +- Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501] + +* Tue Oct 20 2009 Filippo Carletti 5.2.0-7.sme +- Clean up: remove unused nonetworkdrivers [SME: 5521] + +* Sat Jun 6 2009 Shad L. Lords 5.2.0-6.sme +- Clean up stray symlinks in /lib/modules before depmod [SME: 5336] + +* Mon May 18 2009 Gavin Weight 5.2.0-5.sme +- Allow for different mdadm output formats for DeviceSize. [SME: 5230] + +* Sat Feb 14 2009 Jonathan Martens 5.2.0-4.sme +- Auto-mount USB REV70-drive as usbdisk [SME: 5006] + +* Sat Oct 25 2008 Stephen Noble 5.2.0-3.sme +- create service link for smartd [SME: 1445] + +* Mon Oct 13 2008 Shad L. Lords 5.2.0-2.sme +- Add patch to support multiple samba roles [SME: 4172] + +* Tue Oct 7 2008 Shad L. Lords 5.2.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Tue Sep 23 2008 Stephen Noble 4.19.0-6 +- Add locale tags for email in review panel [SME: 4267] + +* Sat Sep 20 2008 Shad L. Lords 4.19.0-5 +- Correct gettext type during build process [SME: 570] + +* Mon Sep 15 2008 Shad L. Lords 4.19.0-4 +- Fix screen corruption in console [SME: 4155] + +* Sat Sep 13 2008 Shad L. Lords 4.19.0-3 +- Fix detection of xen instance against newer kernels [SME: 4555] + +* Thu Aug 28 2008 Jonathan Martens 4.19.0-2 +- Fixed warnings generated during build process [SME: 570] + +* Wed Aug 20 2008 Shad L. Lords 4.19.0-1 +- Roll new dev stream. + +* Sun Aug 17 2008 Gavin Weight 4.18.1-22 +- Add gettext to creating backup file title for localization. [SME: 4467] + +* Mon Aug 11 2008 Charlie Brady 4.18.1-21 +- Fix race condition in VPN ip-down handling which could cause loss of + LAN connectivity. [SME: 4405] + +* Sat Aug 9 2008 Shad L. Lords 4.18.1-20 +- Remove requires for whiptail. No longer needed [SME: 4491] + +* Fri Aug 8 2008 Jonathan Martens 4.18.1-19 +- Change userpassword panel to use PASSWORD_VERIFY_NEW instead of PASSWORD_NEW_VERIFY [SME: 4487] + +* Thu Aug 7 2008 Jonathan Martens 4.18.1-18 +- Revert locale key PASSWORD_RESET_TITLE to RESET_PASSWORD_TITLE and move it + to e-smith-formmagick's general [SME: 4475] +- Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476] +- Remove invalid entry tag from userpassword's locale file preventing the + form from displaying properly [SME: 4479] + +* Tue Aug 5 2008 Jonathan Martens 4.18.1-17 +- Revert previous invalid locale changes (reverting to 4.18.1-15) [SME: 4472] + +* Mon Aug 4 2008 Jonathan Martens 4.18.1-16 +- Revert some locale changes + +* Tue Jul 22 2008 Gavin Weight 4.18.1-15 +- Add regex to support cciss device names in manageRAID.pl. [SME: 4455] + +* Sat Jul 5 2008 Jonathan Martens 4.18.1-14 +- Add common tags to e-smith-formmagick's general [SME: 4279] + +* Sun Apr 27 2008 Jonathan Martens 4.18.1-13 +- Add common tags to e-smith-formmagick's general [SME: 4279] + +* Wed Apr 23 2008 Shad L. Lords 4.18.1-12 +- Fix for > 5 nics detected [SME: 4232] + +* Tue Apr 22 2008 Shad L. Lords 4.18.1-11 +- Remove use of Date::Manip from ssl.crt [SME: 3155] + +* Sat Apr 19 2008 Shad L. Lords 4.18.1-10 +- Fix FreeBusy param when disabled [SME: 1806] +- Remove .orig file [SME: 4228] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-9 +- Remove quitConsole from menu [SME: 4154] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-8 +- Really fix free/busy in usermanager [SME: 4157] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-7 +- Use frames in elinks [SME: 4156] +- Set homepage for elinks [SME: 4160] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-6 +- Fix free/busy field in useraccounts [SME: 4157] + +* Tue Apr 1 2008 Shad L. Lords 4.18.1-5 +- Add free/busy URL entry to help kronolith contribs [SME: 1806] + +* Fri Mar 28 2008 Shad L. Lords 4.18.1-4 +- Fix insert_mode for elinks on el5 platform [SME: 4127] + +* Wed Mar 26 2008 Shad L. Lords 4.18.1-3 +- Set accounts to deleted before template expansion [SME: 4122] + +* Wed Mar 26 2008 Shad L. Lords 4.18.1-2 +- Fix gettext strings returned by password checks [SME: 4104] + +* Wed Mar 26 2008 Shad L. Lords 4.18.1-1 +- Roll new stable stream consolidating patches. + +* Mon Mar 24 2008 Shad L. Lords 4.18.0-104 +- Finish removing pleasewait [SME: 126] + +* Tue Mar 18 2008 Shad L. Lords 4.18.0-103 +- Add gettext to console titles. [SME: 4089] + +* Sat Mar 15 2008 Stephen Noble 4.18.0-102 - Minor translation fixes [SME: 4058] [SME: 4059] * Wed Mar 12 2008 Shad L. Lords 4.18.0-101 @@ -1262,92 +1558,6 @@ e-smith server and gateway software - ba %prep %setup %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%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 -%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 -%patch55 -p1 -%patch56 -p1 -%patch57 -p1 -%patch58 -p1 -%patch59 -p1 -%patch60 -p1 -%patch61 -p1 -%patch62 -p1 -%patch63 -p1 -%patch64 -p1 -%patch65 -p1 -%patch66 -p1 -%patch67 -p1 -%patch68 -p1 -%patch69 -p1 -%patch70 -p1 -%patch71 -p1 -%patch72 -p1 -%patch73 -p1 -%patch74 -p1 -%patch75 -p1 -%patch76 -p1 -%patch77 -p1 -%patch78 -p1 -%patch79 -p1 -%patch80 -p1 -%patch81 -p1 -%patch82 -p1 -%patch83 -p1 -%patch84 -p1 - -rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin -rm -rf root/etc/e-smith/templates/etc/identd.masq %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] @@ -1393,7 +1603,7 @@ echo "disabled" > root/etc/e-smith/db/c %endif LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \ - -type f | grep -v CVS | grep -v pleasewait) + -type f | grep -v CVS) for lexicon in $LEXICONS do @@ -1412,7 +1622,7 @@ ln -s /etc/rc.d/rc7.d root/etc/rc7.d mkdir -p root/etc/rc.d/rc1.d mkdir -p root/usr/share/locale/en_US/LC_MESSAGES -xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console +xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console mkdir -p root/etc/e-smith/locale # Make the fr-ca link in %pre to ease upgrades @@ -1427,6 +1637,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 @@ -1457,7 +1670,6 @@ rm root/service/{syslog,klogd} mkdir -p root/etc/e-smith/events/local mkdir -p root/etc/e-smith/events/user-modify-admin mkdir -p root/home/e-smith/db -touch root/home/e-smith/db/configuration mkdir -p root/etc/e-smith/pam mkdir -p root/home/e-smith/ssl.key @@ -1469,8 +1681,6 @@ mkdir -p root/var/state/e-smith for file in %{dbfiles} do mkdir -p root/etc/e-smith/db/$file/{defaults,migrate,force} - # Create ghost file for rpm - touch root/home/e-smith/db/$file done mkdir -p root/etc/tcprules