--- rpms/e-smith-base/sme8/e-smith-base.spec	2007/12/16 16:20:32	1.17
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/01/07 19:18:13	1.23
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - ba
 %define name e-smith-base
 Name: %{name}
 %define version 4.18.0
-%define release 78
+%define release 83
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -69,6 +69,11 @@ Patch58: e-smith-base-4.18.0-useracc_tex
 Patch59: e-smith-base-4.18.0-non_Removable_pseudonyms.patch
 Patch60: e-smith-base-4.18.0-delete_forwarder.patch
 Patch61: e-smith-base-4.18.0-part_size.patch
+Patch62: e-smith-base-4.18.0-passwdlock.patch
+Patch63: e-smith-base-4.18.0-smartd.patch
+Patch64: e-smith-base-4.18.0-smartdtemplates2expand.patch
+Patch65: e-smith-base-4.18.0-consoleValidatePassword.patch
+Patch66: e-smith-base-4.18.0-backupstatus.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-7
@@ -116,6 +121,21 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Sun Jan 06 2008 Stephen Noble <support@dungog.net> 4.18-83
+- ignore error returns from tar [SME: 3127]
+
+* Sun Jan 06 2008 Stephen Noble <support@dungog.net> 4.18-82
+- Use esmith::util::validatePassword on console [SME: 2173]
+
+* Mon Dec 24 2007 Gavin Weight <gweight@gmail.com> 4.18.0-81
+- Link smartd.conf to bootstrap-save-console and console-save. [SME: 1445]
+
+* Mon Dec 24 2007 Stephen Noble <support@dungog.net> 4.18-80
+- Add smartd as a disabled service with template [SME: 1445]
+
+* Sun Dec 16 2007 Shad L. Lords <slords@mail.com> 4.18.0-79
+- Lock user accounts with usermod instead of passwd [SME: 3595]
+
 * Sun Dec 16 2007 Gavin Weight <gweight@gmail.com> 4.18.0-78
 - Add symlink to fr-fr locale. [SME: 3648]
 
@@ -1226,6 +1246,11 @@ e-smith server and gateway software - ba
 %patch59 -p1
 %patch60 -p1
 %patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
+%patch66 -p1
 
 rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin
 rm -rf root/etc/e-smith/templates/etc/identd.masq