--- rpms/smeserver-dansguardian/contribs7/smeserver-dansguardian.spec	2007/12/23 21:39:30	1.1
+++ rpms/smeserver-dansguardian/contribs7/smeserver-dansguardian.spec	2009/06/08 20:58:52	1.8
@@ -1,6 +1,10 @@
+# $Id: smeserver-dansguardian.spec,v 1.7 2009/04/30 10:35:51 dungog Exp $
+# Authority: dungog
+# Name: Stephen Noble
+
 %define name smeserver-dansguardian
 %define version 2.9
-%define release 3
+%define release 7
 
 Summary: Set up dansguardian to filter www content.
 Name: %{name}
@@ -11,6 +15,8 @@ URL: http://www.dungog.net/sme
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-dansguardian-2.9-unblock80.patch
+Patch1: smeserver-dansguardian-2.9-block8080.patch
+Patch2: smeserver-dansguardian-2.9-block8080-2.patch
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools >= 1.13.1-03
@@ -22,6 +28,18 @@ AutoReqProv: no
 rpm to setup dansguardian.org web content filter
 
 %changelog
+* Tue Jun 09 2009 Stephen Noble <support@dungog.net> 2.9-7
+- undo portblocking on 443
+
+* Wed Apr 30 2009 Stephen Noble <support@dungog.net> 2.9-6
+- portblocking now blocks 443 as well as 3128
+
+* Fri May 30 2008 Stephen Noble <support@dungog.net> 2.9-5
+- fix portblocking on 8080
+
+* Fri May 30 2008 Stephen Noble <support@dungog.net> 2.9-4
+- $dansguardian{portblocking} = yes, blocks external 8080
+
 * Thu Jul 05 2007 Stephen Noble <support@dungog.net> 2.9-3
 - $dansguardian{portblocking} = yes, just blocks 3128 
 
@@ -65,6 +83,8 @@ rpm to setup dansguardian.org web conten
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks
@@ -90,10 +110,6 @@ rm -rf %{name}-%{version}
 
 %preun
 %post
-#new installs
-#if [ $1 = 1 ] ; then
-#fi
-#/etc/e-smith/events/actions/initialize-default-databases
 
 #gzip old log files
 if [ -z /var/log/dansguardian/access.log.1 ] ; then