--- rpms/e-smith-base/sme8/e-smith-base.spec 2008/09/23 14:03:23 1.61.2.5 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2015/11/28 22:24:48 1.173 @@ -1,37 +1,25 @@ +# $Id: e-smith-base.spec,v 1.172 2015/10/16 14:52:45 stephdl Exp $ + Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} -%define version 4.18.1 -%define release 27 +%define version 5.2.0 +%define release 97 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons -Source: %{name}-%{version}.tar.gz -Patch1: e-smith-base-4.18.1-fixgettext.patch -Patch2: e-smith-base-4.18.1-deleteorder.patch -Patch3: e-smith-base-4.18.1-insertmode.patch -Patch4: e-smith-base-4.18.1-freebusy.patch -Patch5: e-smith-base-4.18.1-frames.patch -Patch6: e-smith-base-4.18.1-quitconsole.patch -Patch7: e-smith-base-4.18.1-freebusy.patch2 -Patch8: e-smith-base-4.18.1-dateManip.patch -Patch9: e-smith-base-4.18.1-ethernetlist.patch -Patch10: e-smith-base-4.18.1-add2general.patch -Patch11: e-smith-base-4.18.1-get_raid_details_cciss.patch -Patch12: e-smith-base-4.18.1-RevertInvalidLocaleReversion.patch -Patch13: e-smith-base-4.18.1-FixAndMoveRESET_PASSWORD_TITLE.patch -Patch14: e-smith-base-4.18.1-removeInvalidEntryTag.patch -Patch15: e-smith-base-4.18.1-fixPASSWORD_VERIFY_ERROR.patch -Patch16: e-smith-base-4.18.1-fixPASSWORD_VERIFY_NEW.patch -Patch17: e-smith-base-4.18.1-ip-down.race.patch -Patch18: e-smith-base-4.18.1-FixLocalizedTitle.patch -Patch19: e-smith-base-4.18.1-xenfix.patch -Patch20: e-smith-base-4.18.1-profile.patch -Patch21: e-smith-base-4.18.1-localeemail.patch +Source: e-smith-base-5.2.0.90.tar.gz +Patch1: e-smith-base-5.2.0-reset_ibay_default_type.patch +Patch2: e-smith-base-5.2.0_added_verification_of_pptp_clients_against_dhcp.patch +Patch3: e-smith-base-5.2.0_console_verification_dhcp_vs_pptp.patch +Patch4: e-smith-base-5.2.0-default_to_no_on_quit_console_app.patch +Patch5: e-smith-base-5.2.0-only_fire_ip_change_on_wan.patch +Patch6: e-smith-base-5.2.0_sha256_cert.patch +Patch7: e-smith-backup-5.2.0.bz9097.Test_Backup_MountPoint.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-12 Requires: initscripts >= 6.67-1es17 @@ -44,6 +32,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 @@ -54,13 +43,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 @@ -75,21 +64,327 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Tue Sep 23 2008 Stephen Noble 4.18.1-27 +* Fri Oct 16 2015 Stephane de Labrusse 5.2.0-97.sme +- Verify the mountpoint during the console backup [SME: 9097] +- Added e-smith-backup-5.2.0.bz9097.Test_Backup_MountPoint.patch + +* Mon Aug 24 2015 Charlie Brady 5.2.0-96.sme +* Use sha256 algorithm for signature of SSL cert. [SME: 8607] + +* Tue Mar 31 2015 Daniel Berteaud 5.2.0-95.sme +- Only fire the ip-change event when IP is assigned to WAN nic + (Code by Charlie Brady and John Crisp) [SME: 8891] + +* Sun Jan 11 2015 Stephane de Labrusse 5.2.0-94.sme +- When quiting the console app with unsaved changes set the default selected +- answer to NO, Hsing-Foo Wang [SME: 8794] + +* Wed Apr 23 2014 stephane de Labrusse 5.2.0-93.sme +- Add a verification in the console of number of pptp clients against ip allowed in dhcpd +- [SME: 8298] + +* Sun Apr 6 2014 stephane de Labrusse 5.2.0-92.sme +- Add a verification in remoteaccess panel of number of pptp clients against ip allowed in dhcpd +- [SME: 8298] + +* 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.18.1-26 +* 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.18.1-25 +* 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.18.1-24 +* 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.18.1-23 +* 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] @@ -1293,27 +1588,11 @@ e-smith server and gateway software - ba %setup %patch1 -p1 %patch2 -p1 -%if "%{?rhel}" == "5" %patch3 -p1 -%endif %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 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] @@ -1393,6 +1672,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