--- rpms/e-smith-base/sme9/e-smith-base.spec 2013/03/16 02:56:31 1.21 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2013/07/05 23:16:21 1.44 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.20 2013/03/14 15:12:22 wellsi Exp $ +# $Id: e-smith-base.spec,v 1.43 2013/07/05 22:57:45 wellsi Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.4.0 -%define release 19 +%define release 42 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -25,6 +25,28 @@ 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -52,6 +74,7 @@ Requires: e-smith-bootloader Requires: mdadm Requires: pv Requires: pam_abl +Requires: diald Requires: /usr/bin/passwd Requires: nss-pam-ldapd Obsoletes: nss_ldap < 254 @@ -72,6 +95,76 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Fri Jul 5 2013 Ian Wells 5.4.0-42.sme +- Console USB Backup, allow user setting of compression level [SME: 7745] + Compression level of the console backup is now -6 by default + +* Fri Jul 5 2013 Ian Wells 5.4.0-41.sme +- Update ServerName (Samba netbios name) when SystemName is updated [SME: 7746] + +* Fri Jul 5 2013 Ian Wells 5.4.0-40.sme +- Remove old System Name from the Hosts DB, by Charlie Brady [SME: 7747] + +* Sun Jun 23 2013 Daniel Berteaud 5.4.0-39.sme +- Fix group creation when LDAP auth is enabled [SME: 7672] + +* Sat Jun 8 2013 Daniel Berteaud 5.4.0-38.sme +- Disable IPv6 on a default install (patch by Shad Lords) [SME: 7531] + +* Sat Jun 8 2013 Daniel Berteaud 5.4.0-37.sme +- Continue escaping control chars in rsyslog, just replace LF with space [SME: 7662] + +* Fri Jun 7 2013 Daniel Berteaud 5.4.0-36.sme +- Don't escape control characters in rsyslog [SME: 7662] + +* Thu Jun 6 2013 Daniel Berteaud 5.4.0-35.sme +- Use UTF-8 in the console [SME: 7591] + +* Sun May 19 2013 Ian Wells 5.4.0-34.sme +- Remove redundant parts of init-accounts [SME: 3550] + +* Sat May 18 2013 chris burnat 5.4.0-33.sme +- Add_template_to_ssl.pem, codes by JP Pialasse [SME: 7601] + +* Tue May 07 2013 Ian Wells 5.4.0-32.sme +- Require diald [SME: 7279] + +* Mon May 06 2013 Ian Wells 5.4.0-31.sme +- Removal of rc.e-smith now functionality is in e-smith-service [SME: 7267] + +* Sun May 05 2013 Ian Wells 5.4.0-30.sme +- Revert last change. [SME: 7227] + +* Sat May 04 2013 Ian Wells 5.4.0-29.sme +- Suppress template text from /etc/inittab [SME: 7227] + +* Mon Apr 22 2013 Ian Wells 5.4.0-28.sme +- Replacement of rc.e-smith by moving code into e-smith-service [SME: 7267] + +* Mon Apr 21 2013 chris burnat 5.4.0-27.sme +- Fix the way '.' works in bash [SME: 7532] + +* Fri Mar 22 2013 Daniel Berteaud 5.4.0-26.sme +- rename /etc/ldap.conf to /etc/pam_ldap.conf (and same for .secret) [SME: 7289] + +* Sat Mar 16 2013 Ian Wells 5.4.0-25.sme +- Always define InternalInterface NICBonding [SME: 7498] + +* Sat Mar 16 2013 Terry Fage 5.4.0-24.sme +- In the console refer to removable media instead of USB disk [SME: 7414] + +* Sat Mar 16 2013 Shad L. Lords 5.4.0-23.sme +- Fix a few more syslog => rsyslog items [SME: 7221] + +* Sat Mar 16 2013 Shad L. Lords 5.4.0-22.sme +- Remove modprobe stuff [SME: 7261] + +* Sat Mar 16 2013 Shad L. Lords 5.4.0-21.sme +- Don't be as agressive on rate limiting [SME: 7470] + +* Sat Mar 16 2013 Daniel Berteaud 5.4.0-20.sme +- Change syslog templates to rsyslog [SME: 7221] + * Fri Mar 15 2013 Ian Wells 5.4.0-19.sme - Ensure existing_hwaddr is always initialized [SME: 7471] @@ -1572,10 +1665,34 @@ e-smith server and gateway software - ba %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 + +# 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 smelog 1002 \ - 'smelog log user' /var/log/smelog /bin/false /sbin/e-smith/create-system-user smelastsys 2999 \ 'sme last system user marker' /tmp /bin/false