--- rpms/e-smith-portforwarding/sme8/e-smith-portforwarding.spec	2007/06/12 19:21:27	1.1
+++ rpms/e-smith-portforwarding/sme8/e-smith-portforwarding.spec	2010/03/09 19:02:49	1.15
@@ -1,18 +1,25 @@
+# $Id: e-smith-portforwarding.spec,v 1.14 2010/03/05 20:07:37 slords Exp $
+
 Summary: portforwarding panel for SME Server
 %define name e-smith-portforwarding
 Name: %{name}
-%define version 1.2.0
-%define release 2
+%define version 2.2.0
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
+Patch1: e-smith-portforwarding-2.2.0-AllowHosts.patch
+Patch2: e-smith-portforwarding-2.2.0-AllowHosts.patch2
+Patch3: e-smith-portforwarding-2.2.0-fwd2local_serveronly.patch
+Patch4: e-smith-portforwarding-2.2.0-filter-source-address.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
 Requires: e-smith-packetfilter >= 1.13.0-13
 Requires: e-smith-lib >= 1.15.1-19
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: e-smith-ipportfw dmc-mitel-portforwarding
 AutoReqProv: no
@@ -21,6 +28,43 @@ AutoReqProv: no
 Adds a Port Forwarding panel to the SME server-manager.
 
 %changelog
+* Tue Mar 9 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme
+- Rework 91adjustPortForward template fragment [SME: 2379]
+
+* Tue Dec 15 2009 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-4.sme
+- Enable port forwards to localhost if mode is serveronly [SME: 1003]
+
+* Tue Oct 20 2009 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-3.sme
+- Adjust xml entry in locale [SME: 2379]
+
+* Mon Oct 19 2009 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-2.sme
+- Add option to limit port forwards from source ip [SME: 2379]
+
+* 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]
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-9
+- Add common <base> tags to e-smith-formmagick's general [SME: 4282]
+
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.2.0-8
+- Remove <base> tags now in general [SME: 3913]
+
+* Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.2.0-7
+- Remove duplicate <base> entries [SME: 3888]
+
+* Thu Nov 08 2007 Gavin Weight<gweight@mail.com> 1.2.0-6
+- Remove/Fix portforwarding.pm.orig file. [SME: 3526]
+
+* Tue Oct 16 2007 Charlie Brady <charlie_brady@mitel.com> 1.2.0-5
+- Use $OUTERNET for target of localhost port forwards, not externalIP
+  pulled from db at template expansion time. [SME: 2760]
+
+* Wed Jun 26 2007 Shad L. Lords <slords@mail.com> 1.2.0-4
+- Ensure portforwarding dbs exists [SME: 54]
+
+* Tue Jun 26 2007 Shad L. Lords <slords@mail.com> 1.2.0-3
+- Migrate portforwarding to own databases [SME: 54]
+
 * Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
 - Clean up spec so package can be built by koji/plague
 
@@ -375,7 +419,7 @@ Adds a Port Forwarding panel to the SME
 - merged in e-smith-ipportfw-0.1.1-1.noarch.rpm
 - [0.0.1-3]
 * Mon Dec 31 2001 Darrell May <dmay@netsourced.com>
-- added "Shad L. Lords" <lists@lordsfam.net>, e-smith-iportfw 35SetPortFW
+- added "Shad L. Lords" <slords@mail.com>, e-smith-iportfw 35SetPortFW
 - templates-custom fragment supporting dest port addresses
 - updated portforwarding panel to match
 - removed first/last portforward panel bug by adding return on Operation Status
@@ -386,6 +430,10 @@ Adds a Port Forwarding panel to the SME
 
 %prep
 %setup
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 perl createlinks
@@ -396,6 +444,14 @@ rm -rf $RPM_BUILD_ROOT
 rm -f e-smith-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
 
+for proto in tcp udp
+do
+    mkdir -p $RPM_BUILD_ROOT/home/e-smith/db
+    touch $RPM_BUILD_ROOT/home/e-smith/db/portforward_$proto
+    echo "%config(noreplace) %attr(0640,root,admin) /home/e-smith/db/portforward_$proto" \
+        >> %{name}-%{version}-filelist
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT