--- rpms/e-smith-base/sme9/e-smith-base.spec 2014/01/29 07:27:55 1.59 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2014/03/24 03:14:48 1.67 @@ -1,66 +1,15 @@ -# $Id: e-smith-base.spec,v 1.58 2013/12/15 01:21:33 vip-ire Exp $ +# $Id: e-smith-base.spec,v 1.66 2014/03/24 03:05:37 wellsi Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} -%define version 5.4.0 -%define release 56 +%define version 5.6.0 +%define release 2 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz -Patch0: e-smith-base-5.4.0-runlevel_4.patch -Patch1: e-smith-base-5.4.0-local_event.patch -Patch2: e-smith-base-5.4.0-noapmd.patch -Patch3: e-smith-base-5.4.0-rsysloglink.patch -Patch4: e-smith-base-5.4.0-optimize_user_modify_unix.patch -Patch5: e-smith-base-5.4.0-user_modify_in_bootstrap.patch -Patch6: e-smith-base-5.4.0-pppoeMlimit.patch -Patch7: e-smith-base-5.4.0-microcode.patch -Patch8: e-smith-base-5.4.0-PostUpgradeRestore.patch -Patch9: e-smith-base-5.4.0-inittab.patch -Patch10: e-smith-base-5.4.0-pwauth.patch -Patch11: e-smith-base-5.4.0-uidgid.patch -Patch12: e-smith-base-5.4.0-fixwww.patch -Patch13: e-smith-base-5.4.0-SystemName.patch -Patch14: e-smith-base-5.4.0-existing_hwaddr.patch -Patch15: e-smith-base-5.4.0-remove_syslogd_templates.patch -Patch16: e-smith-base-5.4.0-rsyslog_templates.patch -Patch17: e-smith-base-5.4.0-rsyslog_db.patch -Patch18: e-smith-base-5.4.0-rsyslog.conf.patch -Patch19: e-smith-base-5.4.0-rate_limit.patch -Patch20: e-smith-base-5.4.0-no_modprobe.patch -Patch21: e-smith-base-5.4.0-more_rsyslog.patch -Patch22: e-smith-base-5.4.0-ConsoleBackupText.patch -Patch23: e-smith-base-5.4.0-NICBonding.patch -Patch24: e-smith-base-5.4.0-rename_pam_ldap_conf.patch -Patch25: e-smith-base-5.4.0-fix_bash-in_run_pppoe_conf.patch -Patch26: e-smith-base-5.4.0-StartService.patch -Patch27: e-smith-base-5.4.0-rcesmith-removal.patch -Patch28: e-smith-base-5.4.0-add_template_to_ssl.pem.patch -Patch29: e-smith-base-5.4.0-init-accounts.patch -Patch30: e-smith-base-5.4.0-do_not_remove_utf8.patch -Patch31: e-smith-base-5.4.0-space_lf_on_receive.patch -Patch32: e-smith-base-5.4.0-disable_ipv6.patch -Patch33: e-smith-base-5.4.0-fix_group_create_with_ldap_auth.patch -Patch34: e-smith-base-5.4.0-OldSystemName.patch -Patch35: e-smith-base-5.4.0-OldServerName.patch -Patch36: e-smith-base-5.4.0-ConsoleBackupCompressionLevel.patch -Patch37: e-smith-base-5.4.0-ConsoleBackupBetterText.patch -Patch38: e-smith-base-5.4.0-pwauth_ibay.patch -Patch39: e-smith-base-5.4.0-manageRAID.patch -Patch40: e-smith-base-5.4.0-add_new_disk_to_raid1.patch -Patch41: e-smith-base-5.4.0-remove_hwaddress.patch -Patch42: e-smith-base-5.4.0-do_not_hardcode_nic_names.patch -Patch43: e-smith-base-5.4.0-remove_interface_swap.patch -Patch44: e-smith-base-5.4.0-define_udev_post_service.patch -Patch45: e-smith-base-5.4.0-load_bonding.patch -Patch46: e-smith-base-5.4.0-add_bond0_templates_metadata_back.patch -Patch47: e-smith-base-5.4.0-dont_reload_init.patch -Patch48: e-smith-base-5.4.0-set_servername.patch -Patch49: e-smith-base-5.4.0-restart_rsyslog.patch -Patch50: e-smith-base-5.4.0-CipherSuiteUpdate.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -109,6 +58,31 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Sun Mar 23 2014 Ian Wells 5.6.0-2.sme +- Roll new stream to really remove obsolete images [SME: 7962] + +* Sun Mar 23 2014 Ian Wells 5.6.0-1.sme +- Roll new stream to remove obsolete images [SME: 7962] + +* Thu Mar 20 2014 Ian Wells 5.4.0-62.sme +- Move console backup to e-smith-backup [SME: 3324] + +* Sun Mar 16 2014 Ian Wells 5.4.0-61.sme +- Remove support.pl from e-smith-base and move to smeserver-support [SME: 8264] + +* Sat Mar 15 2014 Ian Wells 5.4.0-60.sme +- Console restore should reboot [SME: 8259] + +* Sat Mar 8 2014 Ian Wells 5.4.0-59.sme +- Boostrap console should only offer restore if no password set [SME: 8259] + +* Thu Mar 6 2014 Ian Wells 5.4.0-58.sme +- Add restore backup as a console item for freshly installed servers [SME: 8259] +- Non-code changes to perform_restore.pm + +* Sun Feb 16 2014 Ian Wells 5.4.0-57.sme +- Refer to removable media not CDROM in console restore [SME: 8214] + * Tue Jan 28 2014 Ian Wells 5.4.0-56.sme - Remove insecure SSL ciphers [SME: 8138] @@ -1710,61 +1684,6 @@ e-smith server and gateway software - ba %prep %setup -%patch0 -p1 -%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 - -# We cannot remove an empy files or folders with a patch, see [SME: 7289] -# We remove this because it contains an empty template-begin file -rm -rf root/etc/e-smith/templates/etc/ldap.secret/ %pre /sbin/e-smith/create-system-user smelastsys 2999 \