--- rpms/e-smith-lib/sme9/e-smith-lib.spec 2013/03/01 04:34:31 1.5 +++ rpms/e-smith-lib/sme9/e-smith-lib.spec 2013/03/06 20:20:15 1.7 @@ -1,10 +1,10 @@ -# $Id: e-smith-lib.spec,v 1.4 2013/02/24 15:12:29 vip-ire Exp $ +# $Id: e-smith-lib.spec,v 1.6 2013/03/05 21:28:24 vip-ire Exp $ Summary: e-smith server and gateway - library module %define name e-smith-lib Name: %{name} %define version 2.4.0 -%define release 4 +%define release 6 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -13,6 +13,7 @@ Source: %{name}-%{version}.tar.xz Patch0: e-smith-lib-2.4.0-dont_use_kudzu_to_probe_nics.patch 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch BuildRequires: e-smith-devtools >= 1.6.3-01 @@ -30,6 +31,12 @@ Requires: pciutils e-smith server and gateway software - library module. %changelog +* Wed Mar 6 2013 Shad L. Lords 2.4.0-6.sme +- Fix pre script to make www and apache the same [SME: 7319] + +* Tue Mar 5 2013 Daniel Berteaud 2.4.0-5.sme +- Untaint variable in probeAdapters() [SME: 7416] + * Thu Feb 28 2013 Ian Wells 2.4.0-4.sme - Improve error checking in isValidIP [SME: 7410] @@ -758,6 +765,7 @@ e-smith server and gateway software - li %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %pre #-------------------------------------------------- @@ -766,7 +774,7 @@ e-smith server and gateway software - li /usr/sbin/groupadd \ -g 500 shared 2>/dev/null || : /usr/sbin/useradd \ - -u 102 -c 'e-smith web server' -d /home/e-smith \ + -u 102 -g 102 -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 \