--- 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/09 22:23:26	1.24
@@ -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 87
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -69,9 +69,19 @@ 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
+Patch67: e-smith-base-4.18.0-usb-revDrive.patch 
+Patch68: e-smith-base-4.18.0-consoleValidateFirst.patch
+Patch69: e-smith-base-4.18.0-MTU.patch
+Patch70: e-smith-base-4.18.0-adminIsNotRoot.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
-Requires: e-smith-lib >= 1.18.0-7
+Requires: e-smith-lib >= 1.18.0-19
 Requires: server-manager-images, server-manager
 Requires: e-smith-formmagick >= 0.2.0
 Requires: initscripts >= 6.67-1es17
@@ -116,6 +126,33 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 4.18-87
+- db prop to dissociate admin password from root in useraccounts.pm [SME: 3117]
+
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 4.18-86
+- pptp connections setting mtu/mru > 1400 [SME: 549]
+
+* Tue Jan 08 2008 Stephen Noble <support@dungog.net> 4.18-85
+- console to strength validate password choice on first entry [SME: 3131]
+
+* Tue Jan 08 2008 Stephen Noble <support@dungog.net> 4.18-84
+- Auto-mount USB REV-drive as usbdisk [SME: 2972]
+
+* 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 +1263,15 @@ e-smith server and gateway software - ba
 %patch59 -p1
 %patch60 -p1
 %patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
+%patch66 -p1
+%patch67 -p1
+%patch68 -p1
+%patch69 -p1
+%patch70 -p1
 
 rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin
 rm -rf root/etc/e-smith/templates/etc/identd.masq