--- rpms/e-smith-base/sme9/e-smith-base.spec	2013/02/10 06:39:22	1.11
+++ rpms/e-smith-base/sme9/e-smith-base.spec	2013/03/09 22:28:20	1.19
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.10 2013/02/07 15:45:50 wellsi Exp $
+# $Id: e-smith-base.spec,v 1.18 2013/03/06 20:20:05 slords Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.4.0
-%define release 9
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,9 +14,18 @@ Patch0: e-smith-base-5.4.0-runlevel_4.pa
 Patch1: e-smith-base-5.4.0-local_event.patch
 Patch2: e-smith-base-5.4.0-noapmd.patch
 Patch3: e-smith-base-5.4.0-rsysloglink.patch
+Patch4: e-smith-base-5.4.0-optimize_user_modify_unix.patch
+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
 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
@@ -41,6 +50,7 @@ Requires: e-smith-bootloader
 Requires: mdadm
 Requires: pv
 Requires: pam_abl
+Requires: /usr/bin/passwd
 Requires: nss-pam-ldapd
 Obsoletes: nss_ldap < 254
 Requires: cpu >= 1.4.3
@@ -60,6 +70,31 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
+
+* Thu Feb 21 2013 Ian Wells <esmith@wellsi.com> 5.4.0-12.sme
+- Increase memory limit for pppoe to 100Mb matching SME8 solution [SME: 7391]
+
+* Thu Feb 21 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-11.sme
+- Optimize user-modify-unix script and link it in bootstrap-ldap-save [SME: 7387]
+
+* Tue Feb 19 2013 Shad L. Lords <slords@mail.com> 5.4.0-10.sme
+- Add /usr/bin/passwd as a required package [SME: 7350]
+
 * Sat Feb 9 2013 Ian Wells <esmith@wellsi.com> 5.4.0-9.sme
 - Update symlink to not conflict with /etc/init.d [SME: 7322]
 
@@ -1518,6 +1553,15 @@ e-smith server and gateway software - ba
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %pre
 /sbin/e-smith/create-system-user smelog 1002 \