--- rpms/e-smith-proftpd/sme8/e-smith-proftpd.spec	2008/01/09 22:23:27	1.4
+++ rpms/e-smith-proftpd/sme8/e-smith-proftpd.spec	2012/12/20 07:11:56	1.9
@@ -1,22 +1,17 @@
+# $Id: e-smith-proftpd.spec,v 1.8 2010/09/22 18:10:56 vip-ire Exp $
+
 Summary: e-smith specific proftpd configuration files and templates
 %define name e-smith-proftpd
 Name: %{name}
-%define version 1.12.0
-%define release 11
+%define version 2.2.0
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-proftpd-1.12.0-LogDirPerms.patch
-Patch1: e-smith-proftpd-1.12.0-ftpusersfix.patch
-Patch2: e-smith-proftpd-1.12.0-chroot.patch
-Patch3: e-smith-proftpd-1.12.0-globalroot.patch
-Patch4: e-smith-proftpd-1.12.0-logdir.patch
-Patch5: e-smith-proftpd-1.12.0-ftpuser_perm.patch
-Patch6: e-smith-proftpd-1-12-0-MovePam_d_ftpTemplates.patch
-Patch7: e-smith-proftpd-1.12.0-RenameDisplayFirstChdirToDisplayChdir.patch
-Patch8: e-smith-proftpd-1.12.0-ShowSymlinks.patch
+Patch1: e-smith-proftpd-2.2.0-persistent_passwd.patch
+Patch2: e-smith-proftpd-2.2.0-VRoot.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -26,7 +21,16 @@ Requires: iptables
 AutoReqProv: no
 
 %changelog
-* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.12.11
+* Wed Dec 19 2012 Ian Wells <esmith@wellsi.com> 2.2.0-3.sme
+- Add VRoot engine to avoid pam log error [SME: 7129]
+
+* Wed Sep 22 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-2.sme
+- Add PersistentPasswd directive to force proftpd to use pam [SME: 6219]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.12.0-11
 - ShowSymlinks off [SME: 993]
 
 * Wed Oct 31 2007 Gavin Weight <gweight@gmail.com> 1.12.0-10
@@ -508,15 +512,8 @@ Configuration files and templates for th
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 %build
 perl createlinks