Update squidGuard to 1.3 with patch-20071117.

pkgsrc changes:

- Honor squidGuard's name.
- Use PKGINSTALL frame work.
- More integration to squid; common configuration and logging directories.
  Now depends on squid package.
- Switch to use db4; it might be selectable by option.
- Install some examples of configuration.

Todo:
- LDAP support option.
- Installing documents.
- DESTDIR support.


Release 1.3
2007-09-19	Included configurable logging. New configure option --nolog
		suppress all runtime logmessages. Start and stop is still logged.
		Default behaviour is now to log the non debug messages except
		when the runtime option -d is supplied to squidGuard. May need
		some more finetuning in later versions. (bug 11)
		Made some slight changes to the outdated FAQ file.
2007-09-13	Modified auth code to work with and without ldap (choosing
		subroutine rfc1738_unescape or sgFindUser in sg.y.in)
2007-08-20	Corrected include statement in sg.h.in.
2007-07-16	Added patch by Marc Clayton to include a progressbar to the
	 	build of the database files (bug 6).
2007-07-01	Added patch by Eric Harrison to enable full sed compliance
		to rewrite statements (bug 7).
2007-06-02	Corrected missing evaluation of configure parameters for
		logdir, dbhome and config file (bug 11).
2007-05-25	Added patch from satish to block urls entries that include
		hostnames (bug 4).
2007-05-20	Fixed broken regex evaluation (bug 12)
		Fixed a compile problem on some systems (bug 10).
2007-05-10	Corrected an issue with the fix for the double
		slash vulnerability (incorrectly found double
		slashes) (bug 1).


Release 1.2.1
2007-04-10      Fixed multiple slash bypass vulnerabilty.
2007-03-17	Fixed some bugs in squidGuard-simple.cgi and added a
		German version of it.
2007-03-16	Fixed encoding bypass vulnerabilty.
2007-03-16	Updated y.tab.c.bison and y.tab.h.bison to the recent
		version.
2007-02-02	Fixed bug in user authentication.
2007-01-20	Fixed some typos which broke compilation on Sun Solaris
		when using the Sun CC compiler.
2007-01-12	Corrected unproper evaluated if-clause, which broke the
		BerkeleyDB 2 compatibility.
		Fixed minor typo in samples/Makefile.in.
2006-12-29	Replaced the sleepycat links from the configure program with
		the oracle links.
		Corrected typo in Makefile.in.
2006-12-16	Removed a stupid bug from the Makefile in the docs directory.
2006-12-10	Removed references to squidguard.org in Makefile.in in the
		Doc directory (squidguard.org is down).
		Added ISSUES.txt file about known problem with the current
		code (any information that is missing and should go in there
		is gladly welcomed).
2006-06-17	Release now supports LDAP queries for authentication:
		Added Chris Frey's ldap patches and fixes (03, 05, 06,
		07 and 10; Patches from:
		http://www.netdirect.ca/software/category.php?cat=SquidGuard).
		The LDAP feature can be included during the configure run
		by setting --with-ldap. Per default ldap support will not
		be compiled in.
		Added a fix provided by Francesco Ranieri to solve an issue
		with the (un)escaping of the authentication "domain%5cusername".

Patch Release 1.2.0p3

2005-12-09	Modfied configure Skript to allow to specify the name of
		the useraccount the squid cache is using.
		Modified Makefile.in that during the installation the
		necessary squidGuard directories are created if they are
		not existing. Additionally a default configuration file
		will be copied to the default location for squidGuard unless
		an old one is found there.

Patch Release 1.2.0p2

2005-10-13	Added Adam Gorski's bugfix to correct a a null pointer access
	 	bug in logging.
		Added Chris Freys bugfix a bug where it won't search the url
		db if the domain db is empty.
		Added Chris Frey's buffer overflow checks (except for commenting
		out the part from line 446 to 470 in sgDb.c).
		(Patches from:
		http://www.netdirect.ca/software/category.php?cat=SquidGuard)

Patch Release 1.2.0p1

2005-10-11      Added support for Berkeley DB 4.x

6 files changed, 141 insertions, 43 deletions

diff --git a/www/squidGuard/MESSAGE b/www/squidGuard/MESSAGE
new file mode 100644
index 00000000000..08d70f76781
--- /dev/null
+++ b/www/squidGuard/MESSAGE
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2007/12/20 03:36:59 taca Exp $
+
+If you update ${PKGNAME} package from version 1.2.0nb3 or before,
+please be careful for these changes.
+
+- Now squidGuard use db4 as Berkely DB.  If you have any trouble
+  with db, please recreate db files manually.
+
+- Default configuration file are changed to
+  ${PKG_SYSCONFDIR}/squidGuard.conf.
+
+===========================================================================
diff --git a/www/squidGuard/Makefile b/www/squidGuard/Makefile
index e619cd0c991..c9ef9c3a39d 100644
--- a/www/squidGuard/Makefile
+++ b/www/squidGuard/Makefile
@@ -1,24 +1,65 @@
-# $NetBSD: Makefile,v 1.13 2006/07/10 00:58:39 minskim Exp $
+# $NetBSD: Makefile,v 1.14 2007/12/20 03:37:00 taca Exp $
 #
 
-DISTNAME=	squidGuard-1.2.0
-PKGREVISION=	3
+DISTNAME=	squidGuard-1.3
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.teledanmark.no/pub/www/proxy/squidGuard/		\
-		http://ftp.teledanmark.no/pub/www/proxy/squidGuard/
+MASTER_SITES=	http://www.squidguard.org/Downloads/ \
+		http://www.squidguard.org/Downloads/Patches/1.3/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		squidGuard-1.3-patch-20071117${EXTRACT_SUFX}
 
 MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://www.squidguard.org/
 COMMENT=	Ultrafast and free filter, redirector and access controller for Squid
 
+BDB_ACCEPTED=	db4
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	lex yacc
+USE_TOOLS+=	lex yacc perl
 
-CONFIGURE_ARGS+=	--with-db-inc=${BUILDLINK_PREFIX.db3}/include/db3
-CONFIGURE_ARGS+=	--with-db-lib=${BUILDLINK_PREFIX.db3}/lib/db3
-CONFIGURE_ARGS+=	--with-sg-config=${PKG_SYSCONFDIR}/squidguard/filter.conf
-CONFIGURE_ARGS+=	--with-sg-logdir=${VARBASE}/squidguard/log
-CONFIGURE_ARGS+=	--with-sg-dbhome=${VARBASE}/squidguard/db
+DEPENDS+=	squid>=1.0:../../www/squid
 
-.include "../../databases/db3/buildlink3.mk"
+#DOCDIR=	${PREFIX}/share/doc/squidGuard
+EXAMPLESDIR=	${PREFIX}/share/examples/squidGuard
+DBDIR=		${VARBASE}/squidGuard
+
+EXAMPLES=	squidGuard-simple.cgi squidGuard-simple-de.cgi squidGuard.cgi
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-db-inc=${BUILDLINK_PREFIX.db4}/include/db4
+CONFIGURE_ARGS+=	--with-db-lib=${BUILDLINK_PREFIX.db4}/lib/db4
+CONFIGURE_ARGS+=	--with-sg-config=${PKG_SYSCONFDIR:Q}/squidGuard.conf
+CONFIGURE_ARGS+=	--with-sg-logdir=${LOGDIR}
+CONFIGURE_ARGS+=	--with-sg-dbhome=${DBDIR}
+CONFIGURE_ARGS+=	--squiduser=${SQUID_USER}
+
+CONF_FILES_PERMS+=	${EXAMPLESDIR}/squidGuard-simple.cgi \
+			${CGIBINDIR}/squidGuard.cgi ${BINOWN} ${BINGRP} 0755
+CONF_FILES_PERMS+=	${EXAMPLESDIR}/squidGuard.conf \
+			${PKG_SYSCONFDIR}/squidGuard.conf \
+			${BINOWN} ${SQUID_GROUP} 0640
+MAKE_DIRS+=		${CGIBINDIR}
+OWN_DIRS+=		${DBDIR}
+OWN_DIRS_PERMS+= 	${DBDIR} ${SQUID_USER} ${SQUID_GROUP} 0750
+
+BUILD_DEFS+=		VARBASE
+INSTALLATION_DIRS+=	bin ${DOCDIR} ${EXAMPLESDIR}
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../www/squid/Makefile.common"
+
+CGIBINDIR?=		${PREFIX}/libexec/cgi-bin/
+PKG_SYSCONFSUBDIR?=	squidguard
+
+post-extract:
+	${MV} ${WRKDIR}/squidGuard-1.3-patch-20071117/sgDb.c ${WRKSRC}/src
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/squidGuard ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/samples/sample.conf \
+		${EXAMPLESDIR}/squidGuard.conf
+.for f in ${EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${EXAMPLESDIR}
+.endfor
+
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/squidGuard/PLIST b/www/squidGuard/PLIST
index 9b6fa8c5bd4..62c7aef4563 100644
--- a/www/squidGuard/PLIST
+++ b/www/squidGuard/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:52 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/12/20 03:37:00 taca Exp $
 bin/squidGuard
-@unexec ${RMDIR} /var/squidguard/log 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} /var/squidguard 2>/dev/null || ${TRUE}
+share/examples/squidGuard/squidGuard.conf
+share/examples/squidGuard/squidGuard-simple-de.cgi
+share/examples/squidGuard/squidGuard-simple.cgi
+share/examples/squidGuard/squidGuard.cgi
+@dirrm share/examples/squidGuard
diff --git a/www/squidGuard/distinfo b/www/squidGuard/distinfo
index 358ff7427c5..025e92649b4 100644
--- a/www/squidGuard/distinfo
+++ b/www/squidGuard/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:39 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/12/20 03:37:00 taca Exp $
 
-SHA1 (squidGuard-1.2.0.tar.gz) = 8eb27b6eb85a3f8ed073b12a593a2c9ad97d7478
-RMD160 (squidGuard-1.2.0.tar.gz) = 7c8d0f612b4e6bf459bf367fa56f309ce5cfe6e3
-Size (squidGuard-1.2.0.tar.gz) = 1852737 bytes
-SHA1 (patch-aa) = 97b85010e7f9ca59aecbd85eab53c74d6f4fbb37
+SHA1 (squidGuard-1.3-patch-20071117.tar.gz) = 8b8566fc3d6ddc375eae000ead6a1fb0de221606
+RMD160 (squidGuard-1.3-patch-20071117.tar.gz) = 916706c3bea0b000552168d8af93e57607e13389
+Size (squidGuard-1.3-patch-20071117.tar.gz) = 4966 bytes
+SHA1 (squidGuard-1.3.tar.gz) = 4a1e359679f328cff5970e92e93cc94236ead6c7
+RMD160 (squidGuard-1.3.tar.gz) = 4a6a9b5cf36d9e1d0994b3ec410f741a7b7955d3
+Size (squidGuard-1.3.tar.gz) = 1905252 bytes
+SHA1 (patch-aa) = 5e9f5e064e771419c62b0f66bc24fc99016a4620
+SHA1 (patch-ab) = 9fcecd93e3cc52ad1a9e14eb73d0be8fad054200
diff --git a/www/squidGuard/patches/patch-aa b/www/squidGuard/patches/patch-aa
index e211fdd42ec..e563599a1af 100644
--- a/www/squidGuard/patches/patch-aa
+++ b/www/squidGuard/patches/patch-aa
@@ -1,40 +1,62 @@
-$NetBSD: patch-aa,v 1.2 2002/08/06 01:02:45 zuntum Exp $
+$NetBSD: patch-aa,v 1.3 2007/12/20 03:37:01 taca Exp $
 
---- configure.orig	Tue Dec 18 10:16:53 2001
+--- configure.orig	2007-09-19 21:22:37.000000000 +0900
 +++ configure
-@@ -2265,8 +2265,7 @@ for ac_dir in $ac_dummy; do
-   IFS=$ac_save_IFS
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
--   ac_cv_path_LYNX="$ac_dir/$ac_word"
--   echo "$as_me:2269: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2269: found $ac_dir/$ac_word but ommiting deliberately" >&5
-    break
+@@ -3793,7 +3793,7 @@ fi
+ echo "$as_me:$LINENO: checking suppress runtime logging " >&5
+ echo $ECHO_N "checking suppress runtime logging... $ECHO_C" >&6
+ 
+-if [ "x$nolog" == x"yes" ]; then
++if [ "x$nolog" = x"yes" ]; then
+   echo $ECHO_N " $ECHO_C" >&6
+ else
+   echo $ECHO_N " no" >&6
+@@ -3802,7 +3802,7 @@ fi
+ echo "$as_me:$LINENO: result: $nolog" >&5
+ echo "${ECHO_T}$nolog" >&6
+ 
+-if [ "x$nolog" == x"yes" ]; then
++if [ "x$nolog" = x"yes" ]; then
+ NOLOG1="/* nolog option set:"
+ NOLOG2="*/"
  fi
- done
-@@ -2402,13 +2401,13 @@ CFLAGS="$CFLAGS $db_inc"
- CPPFLAGS="$CPPFLAGS $db_inc"
- LDFLAGS="$LDFLAGS $db_lib"
+@@ -3822,11 +3822,11 @@ fi  
+ echo "$as_me:$LINENO: result: $with_ldap" >&5
+ echo "${ECHO_T}$with_ldap" >&6
+ 
+-if [ "x$with_ldap" == x"no" ]; then
++if [ "x$with_ldap" = x"no" ]; then
+ ldap_yacc=""
+ fi
+ 
+-if [ "x$with_ldap" == x"yes" ]; then
++if [ "x$with_ldap" = x"yes" ]; then
+ 
+ ldap_yacc="                     | LDAPUSERSEARCH WORD { sgSourceLdapUserSearch(\$2); }"
+ echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
+@@ -4052,13 +4052,13 @@ fi
+ #
+ ################################################################
  
--echo "$as_me:2405: checking for db_version in -ldb" >&5
+-echo "$as_me:$LINENO: 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
++echo "$as_me:$LINENO: checking for db_version in -ldb4" >&5
++echo $ECHO_N "checking for db_version in -ldb4... $ECHO_C" >&6
  if test "${ac_cv_lib_db_db_version+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldb  $LIBS"
-+LIBS="-ldb3  $LIBS"
++LIBS="-ldb4  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 2413 "configure"
- #include "confdefs.h"
-@@ -2456,7 +2455,7 @@ if test $ac_cv_lib_db_db_version = yes; 
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4122,7 +4122,7 @@ if test $ac_cv_lib_db_db_version = yes; 
  #define HAVE_LIBDB 1
- EOF
+ _ACEOF
  
 -  LIBS="-ldb $LIBS"
-+  LIBS="-ldb3 $LIBS"
++  LIBS="-ldb4 $LIBS"
  
  else
  
diff --git a/www/squidGuard/patches/patch-ab b/www/squidGuard/patches/patch-ab
new file mode 100644
index 00000000000..b48b18fe335
--- /dev/null
+++ b/www/squidGuard/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2007/12/20 03:37:01 taca Exp $
+
+# Don't try to update documents now.
+
+--- Makefile.in.orig	2007-07-02 00:37:14.000000000 +0900
++++ Makefile.in
+@@ -24,7 +24,7 @@ configfile = @sg_config@
+ dbhomedir = @sg_dbhome@
+ SQUIDUSER = @squiduser@
+ 
+-SUBDIRS = src doc test samples contrib
++SUBDIRS = src test samples contrib
+ INSTALL_TARGETS = install-conf install-build
+ 
+ all::