--- rpms/e-smith-portforwarding/sme8/e-smith-portforwarding.spec	2009/10/20 16:22:08	1.12
+++ rpms/e-smith-portforwarding/sme8/e-smith-portforwarding.spec	2010/03/09 19:02:49	1.15
@@ -1,10 +1,10 @@
-# $Id: e-smith-portforwarding.spec,v 1.11 2009/10/19 17:42:32 filippocarletti Exp $
+# $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 2.2.0
-%define release 3
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,8 @@ 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
@@ -26,6 +28,12 @@ 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]
 
@@ -411,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
@@ -424,6 +432,8 @@ Adds a Port Forwarding panel to the SME
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 perl createlinks