--- rpms/e-smith-base/sme9/e-smith-base.spec 2013/05/05 05:00:45 1.30 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2013/07/05 22:53:04 1.42 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.29 2013/04/23 02:53:30 wellsi Exp $ +# $Id: e-smith-base.spec,v 1.41 2013/06/23 18:41:36 vip-ire Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.4.0 -%define release 29 +%define release 40 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -37,6 +37,16 @@ Patch23: e-smith-base-5.4.0-NICBonding.p 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 @@ -64,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 @@ -84,7 +95,40 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Mon Apr 22 2013 Ian Wells 5.4.0-29.sme +* 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 @@ -1626,17 +1670,20 @@ e-smith server and gateway software - ba %patch24 -p1 %patch25 -p1 %patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -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/ -# We cannot add an empy file with a patch, and we want to add an empty template-begin file -touch root/etc/e-smith/templates/etc/inittab/template-begin - %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