--- rpms/e-smith-lib/sme9/e-smith-lib.spec 2013/05/05 05:53:12 1.9 +++ rpms/e-smith-lib/sme9/e-smith-lib.spec 2015/06/25 15:51:01 1.19 @@ -1,10 +1,10 @@ -# $Id: e-smith-lib.spec,v 1.8 2013/03/09 22:31:57 slords Exp $ +# $Id: e-smith-lib.spec,v 1.18 2014/04/05 16:51:17 wellsi Exp $ Summary: e-smith server and gateway - library module %define name e-smith-lib Name: %{name} %define version 2.4.0 -%define release 7 +%define release 15 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -14,23 +14,62 @@ Patch0: e-smith-lib-2.4.0-dont_use_kudzu Patch1: e-smith-lib-2.4.0-fix_bonding.patch Patch2: e-smith-lib-2.4.0-ipv4check.patch Patch3: e-smith-lib-2.4.0-untaint_nic_names.patch +Patch4: e-smith-lib-2.4.0-CreateSystemUser.patch +Patch5: e-smith-lib-2.4.0-consoleUTF8.patch +Patch6: e-smith-lib-2.4.0-return_nic_name_in_adapters_list.patch +Patch7: e-smith-lib-2.4.0-remove_interface_swap.patch +Patch8: e-smith-lib-2.4.0-SMEServerCopyright.patch +Patch9: e-smith-lib-2.4.0-textboxLicenseFile.patch +Patch10: e-smith-lib-2.4.0-untaintLicenseFile.patch +Patch11: e-smith-lib-2.4.0-PerlCritic-getLicenseFile.patch +Patch12: e-smith-lib-2.4.0.set-secret_password-creation.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch BuildRequires: e-smith-devtools >= 1.6.3-01 Obsoletes: %{name}-Tai64n Obsoletes: whiptail +Requires(pre): e-smith Requires: dialog Requires: perl, perl(Text::Template) Requires: perl(Time::HiRes), perl(MIME::Base64) Requires: perl(Authen::PAM), perl(I18N::AcceptLanguage) Requires: perl(I18N::LangTags) >= 0.27 Requires: perl(Net::IPv4Addr) >= 0.10 +Requires: perl(Taint::Util) Requires: pciutils %description e-smith server and gateway software - library module. %changelog +* Thu Jun 18 2015 stephane de Labrusse 2.4.0-15.sme +- Added a password creation (set_secret) [SME : 8943] +- code from Charlie Brady + +* Sat Apr 5 2014 Ian Wells 2.4.0-14.sme +- Untaint the license filename [SME: 8305] +- Non-functional perl::Critic changes. + +* Sun Mar 16 2014 Ian Wells 2.4.0-13.sme +- Add textbox() to console.pm, getLicenseFile to util.pm [SME: 8264] + +* Sun Feb 2 2014 Ian Wells 2.4.0-12.sme +- Update frame header and footer [SME: 8183] + +* Sat Nov 30 2013 Daniel Berteaud 2.4.0-11.sme +- Remove the "swap interface" feature [SME: 7993] + +* Sat Nov 30 2013 Daniel Berteaud 2.4.0-10.sme +- Return nic names in probeAdapters so we can drop HWAddress [SME: 7991] + +* Sat May 25 2013 Ian Wells 2.4.0-9.sme +- Correctly display accented letters in the console [SME: 7591] + by Filippo Carletti + +* Sun May 05 2013 Ian Wells 2.4.0-8.sme +- Add e-smith as a Requires(pre) and remove adding users in %pre +- Fix uid and gid to be the same in create-system-user [SME: 7547] + * Sat Mar 9 2013 Shad L. Lords 2.4.0-7.sme - Ensure group www exists before user [SME: 7319] @@ -770,29 +809,18 @@ e-smith server and gateway software - li %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %pre -#-------------------------------------------------- -# add admin, public and www user accounts -#-------------------------------------------------- -/usr/sbin/groupadd \ - -g 500 shared 2>/dev/null || : -/usr/sbin/groupadd \ - -g 102 -o www 2>/dev/null || : -/usr/sbin/useradd \ - -u 102 -g 102 -o -c 'e-smith web server' -d /home/e-smith \ - -G shared -M -s /bin/false www 2>/dev/null || : -/usr/sbin/useradd \ - -u 101 -c 'e-smith administrator' -d /home/e-smith \ - -G shared,root,www -M -s /sbin/e-smith/console admin 2>/dev/null || : -/usr/sbin/useradd \ - -u 103 -c 'e-smith guest' -d /home/e-smith \ - -G shared -M -s /bin/false public 2>/dev/null || : -/usr/sbin/useradd \ - -u 1002 -c 'sme log user' -d /var/log/smelog \ - -M -s /bin/false smelog 2>/dev/null || : -exit 0 %post