--- rpms/e-smith-base/sme9/e-smith-base.spec	2013/02/24 01:43:14	1.15
+++ rpms/e-smith-base/sme9/e-smith-base.spec	2013/03/16 15:30:02	1.23
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.14 2013/02/21 23:42:03 wellsi Exp $
+# $Id: e-smith-base.spec,v 1.22 2013/03/16 15:14:46 slords Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.4.0
-%define release 13
+%define release 22
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,9 +18,22 @@ Patch4: e-smith-base-5.4.0-optimize_user
 Patch5: e-smith-base-5.4.0-user_modify_in_bootstrap.patch
 Patch6: e-smith-base-5.4.0-pppoeMlimit.patch
 Patch7: e-smith-base-5.4.0-microcode.patch
+Patch8: e-smith-base-5.4.0-PostUpgradeRestore.patch
+Patch9: e-smith-base-5.4.0-inittab.patch
+Patch10: e-smith-base-5.4.0-pwauth.patch
+Patch11: e-smith-base-5.4.0-uidgid.patch
+Patch12: e-smith-base-5.4.0-fixwww.patch
+Patch13: e-smith-base-5.4.0-SystemName.patch
+Patch14: e-smith-base-5.4.0-existing_hwaddr.patch
+Patch15: e-smith-base-5.4.0-remove_syslogd_templates.patch
+Patch16: e-smith-base-5.4.0-rsyslog_templates.patch
+Patch17: e-smith-base-5.4.0-rsyslog_db.patch
+Patch18: e-smith-base-5.4.0-rsyslog.conf.patch
+Patch19: e-smith-base-5.4.0-rate_limit.patch
+Patch20: e-smith-base-5.4.0-no_modprobe.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-Requires: mod_auth_external
+Requires: pwauth
 Requires: e-smith-lib >= 2.2.0-2
 Requires: server-manager-images, server-manager
 Requires: e-smith-formmagick >= 1.4.0-12
@@ -65,6 +78,34 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Sat Mar 16 2013 Shad L. Lords <slords@mail.com> 5.4.0-22.sme
+- Remove modprobe stuff [SME: 7261]
+
+* Sat Mar 16 2013 Shad L. Lords <slords@mail.com> 5.4.0-21.sme
+- Don't be as agressive on rate limiting [SME: 7470]
+
+* Sat Mar 16 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-20.sme
+- Change syslog templates to rsyslog [SME: 7221]
+
+* Fri Mar 15 2013 Ian Wells <esmith@wellsi.com> 5.4.0-19.sme
+- Ensure existing_hwaddr is always initialized [SME: 7471]
+
+* Thu Mar 14 2013 Ian Wells <esmith@wellsi.com> 5.4.0-18.sme
+- Change System Name from mitel-networks-server to sme-server [SME: 7485]
+
+* Sat Mar 9 2013 Shad L. Lords <slords@mail.com> 5.4.0-17.sme
+- Fix user www creation in init-accounts [SME: 7319]
+
+* Wed Mar 6 2013 Shad L. Lords <slords@mail.com> 5.4.0-16.sme
+- Update package and path for pwauth [SME: 7319]
+- Update init-accounts to set uid/gid correctly for pwauth
+
+* Thu Feb 28 2013 Shad L. Lords <slords@mail.com> 5.4.0-15.sme
+- Remove fragments in inittab that are no longer needed [SME: 7227]
+
+* Mon Feb 25 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-14.sme
+- Post-upgrades not fired after restore from console [SME: 7390]
+
 * Sat Feb 23 2013 Ian Wells <esmith@wellsi.com> 5.4.0-13.sme
 - Remove microcode_ctl service as now udev-driven [SME: 7397]
 
@@ -1539,6 +1580,19 @@ e-smith server and gateway software - ba
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %pre
 /sbin/e-smith/create-system-user smelog 1002 \