--- rpms/e-smith-lib/sme9/e-smith-lib.spec	2013/01/25 16:28:41	1.1
+++ rpms/e-smith-lib/sme9/e-smith-lib.spec	2013/05/07 15:02:51	1.10
@@ -1,33 +1,62 @@
-# $Id: e-smith-lib.spec,v 1.24 2010/10/11 22:27:51 slords Exp $
+# $Id: e-smith-lib.spec,v 1.9 2013/05/05 05:53:12 wellsi Exp $
 
 Summary: e-smith server and gateway - library module
 %define name e-smith-lib
 Name: %{name}
 %define version 2.4.0
-%define release 1
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
 Group: Networking/Daemons
 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
+Patch4: e-smith-lib-2.4.0-CreateSystemUser.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: pciutils
 
 %description
 e-smith server and gateway software - library module.
 
 %changelog
+* Sun May 05 2013 Ian Wells <esmith@wellsi.com> 2.4.0-8.sme
+- Add e-smith as a prereq to enable removal of adding users in %pre [SME: 7547]
+
+* Sat Mar 9 2013 Shad L. Lords <slords@mail.com> 2.4.0-7.sme
+- Ensure group www exists before user [SME: 7319]
+
+* Wed Mar 6 2013 Shad L. Lords <slords@mail.com> 2.4.0-6.sme
+- Fix pre script to make www and apache the same [SME: 7319]
+
+* Tue Mar 5 2013 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-5.sme
+- Untaint variable in probeAdapters() [SME: 7416]
+
+* Thu Feb 28 2013 Ian Wells <esmith@wellsi.com> 2.4.0-4.sme
+- Improve error checking in isValidIP [SME: 7410]
+
+* Sun Feb 24 2013 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-3.sme
+- Fix MAC detection for bond slaves [SME: 3596]
+
+* Thu Jan 31 2013 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-2.sme
+- Stop using kudzu for NIC detection [SME: 3596]
+
 * Fri Jan 25 2013 Shad L. Lords <slords@mail.com> 2.4.0-1.sme
 - Bump version in prep for SME9
+- Perl module rpms moved to /usr/share/perl5/vendor_perl [SME: 7223]
 
 * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 2.2.0-7.sme
 - Serialize configure_peers to prevent errors [SME: 5831]
@@ -742,27 +771,14 @@ e-smith server and gateway software - li
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %pre
-#--------------------------------------------------
-# add admin, public and www user accounts
-#--------------------------------------------------
-/usr/sbin/groupadd \
-  -g 500 shared 2>/dev/null || :
-/usr/sbin/useradd \
-  -u 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 \
-  -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