Update squidguard 1.1.4 -> 1.2.0.

PR:		ports/33636
Submitted by:	MAINTAINER:  Dan Larsson <dl@tyfon.net>
Reviewed by:	nectar
Approved by:	MAINTAINER:  Dan Larsson <dl@tyfon.net>

3 files changed, 59 insertions, 43 deletions

diff --git a/www/squidguard/files/patch-ab b/www/squidguard/files/patch-ab
index 248dd6e013f3..a771cdbe5dd7 100644
--- a/www/squidguard/files/patch-ab
+++ b/www/squidguard/files/patch-ab
@@ -1,38 +1,28 @@
---- configure.orig	Wed Mar 29 11:40:54 2000
-+++ configure		Fri Jun  2 08:44:14 2000
-@@ -1085,7 +1085,7 @@
-     fi
-   done
-   IFS="$ac_save_ifs"
--  test -z "$ac_cv_path_LYNX" && ac_cv_path_LYNX="/bin/false"
-+  test -z "$ac_cv_path_LYNX" && ac_cv_path_LYNX="/usr/bin/false"
-   ;;
- esac
- fi
-@@ -1217,14 +1217,14 @@
+--- configure.orig	Tue Dec 18 11:16:53 2001
++++ configure	Thu Dec 27 01:46:53 2001
+@@ -2402,13 +2402,13 @@
+ CPPFLAGS="$CPPFLAGS $db_inc"
  LDFLAGS="$LDFLAGS $db_lib"
  
- 
--echo $ac_n "checking for db_version in -ldb""... $ac_c" 1>&6
--echo "configure:1222: checking for db_version in -ldb" >&5
-+echo $ac_n "checking for db_version in -ldb2""... $ac_c" 1>&6
-+echo "configure:1222: checking for db_version in -ldb2" >&5
- ac_lib_var=`echo db'_'db_version | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+-echo "$as_me:2405: checking for db_version in -ldb" >&5
+-echo $ECHO_N "checking for db_version in -ldb... $ECHO_C" >&6
++echo "$as_me:2405: checking for db_version in -ldb3" >&5
++echo $ECHO_N "checking for db_version in -ldb3... $ECHO_C" >&6
+ if test "${ac_cv_lib_db_db_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldb  $LIBS"
-+LIBS="-ldb2  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1230 "configure"
++LIBS="-ldb3  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 2413 "configure"
  #include "confdefs.h"
-@@ -1258,7 +1258,7 @@
- #define $ac_tr_lib 1
+@@ -2456,7 +2456,7 @@
+ #define HAVE_LIBDB 1
  EOF
  
 -  LIBS="-ldb $LIBS"
-+  LIBS="-ldb2 $LIBS"
++  LIBS="-ldb3 $LIBS"
  
  else
-   echo "$ac_t""no" 1>&6
+ 
diff --git a/www/squidguard/files/patch-ac b/www/squidguard/files/patch-ac
deleted file mode 100644
index 5a97ebbb6894..000000000000
--- a/www/squidguard/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- samples/sample.conf.in.orig	Sun Jun 11 21:45:41 2000
-+++ samples/sample.conf.in	Sun Jun 11 21:46:54 2000
-@@ -1,9 +1,9 @@
- #
--# CONFIG FILE FOR SQUIDGUARD
-+# SAMPLE CONFIG FILE FOR SQUIDGUARD
- #
- 
--dbhome @prefix@/squidGuard/db
--logdir @prefix@/squidGuard/logs
-+dbhome %%DATADIR%% 
-+logdir %%LOGDIR%% 
- 
- #
- # TIME RULES:
diff --git a/www/squidguard/files/sgcfg.in b/www/squidguard/files/sgcfg.in
new file mode 100644
index 000000000000..8d57a821c1dc
--- /dev/null
+++ b/www/squidguard/files/sgcfg.in
@@ -0,0 +1,41 @@
+#
+# SAMPLE CONFIG FILE FOR SQUIDGUARD
+# (for further configuration options see the
+# documentation and http://www.squidguard.org/)
+#
+dbhome DATADIR
+logdir LOGDIR
+
+#
+# TIME RULES:
+# abbrev for weekdays:
+# s = sun, m = mon, t =tue, w = wed, h = thu, f = fri, a = sat
+time workhours {
+     weekly mtwhf 08:00 - 16:30
+     date *-*-01  08:00 - 16:30
+}
+
+#
+# SOURCE ADDRESSES
+#
+source sample-clients {
+     ip 10.0.0.0/24
+}
+
+#
+# DESTINATION CLASSES
+#
+DEST_CLASSES
+
+acl {
+     sample-clients within workhours {
+         pass     BLACKLIST_DIRS !in-addr any
+     } else {
+         pass     any
+     }
+
+     default {
+         pass     none
+         redirect http://admin.foo.bar.no/cgi/blocked?clientaddr=%a+clientname=%n+clientident=%i+srcclass=%s+targetclass=%t+url=%u
+     }
+}