5 files changed, 221 insertions, 6 deletions
diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index 01c405595df9..f78ea2c906cd 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/squidguard
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.28 2008/12/16 07:38:24 mrness Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.29 2009/01/10 13:24:08 mrness Exp $
+
+*squidguard-1.4 (10 Jan 2009)
+
+  10 Jan 2009; Alin Năstac <mrness@gentoo.org>
+  +files/squidguard-1.4-autoheader.patch,
+  +files/squidguard-1.4-gentoo.patch, +squidguard-1.4.ebuild:
+  Version bump (#253370).
 
 *squidguard-1.3-r4 (16 Dec 2008)
 
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index f331fbcaa9e3..72a4c5a92532 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -7,15 +7,19 @@ AUX squidGuard.conf.minimal 61 RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b S
 AUX squidguard-1.3-autoheader.patch 1517 RMD160 75caa54a404eb93713f7cc29a6c9144c3867f957 SHA1 9729db3a9134f61f011514176f1ad20d90800cbe SHA256 70783a9141f4507ef309de2066c8f250ff1ec90545ed8c099969e13f29232e2b
 AUX squidguard-1.3-gentoo.patch 4238 RMD160 a24e51a3170dec1595348d8e3c5e611eca279a25 SHA1 b062fcfedf3506f609046080501ee515cc0ecb73 SHA256 bedfd2445aeec584d4720cecdb88002697254a2ca7d5c25043010a2b62c8e8bc
 AUX squidguard-1.3-nolog.patch 4902 RMD160 a4a4f6a147d06afa2f4d25b208c5c2ef1518c3f2 SHA1 b1ca4d1f747b87ef85a68c0222618e1e16b178b8 SHA256 cc6d96bf4c9fc4608519e834db3e6d69094723d385549df5bbd00b1e007b820f
+AUX squidguard-1.4-autoheader.patch 1782 RMD160 48279027a0b7daeb39ce5e0782f00edd9fcf6c4c SHA1 539ee1ca0e769af7519f925f7fc6231c33d39916 SHA256 4b49dfb34973fcfed40efc426657c8a5fd6513b239fc28bbd9dd94d04b19a476
+AUX squidguard-1.4-gentoo.patch 2492 RMD160 c38896fb9b99a5d178280d0add599b96e84501f3 SHA1 1c65168136321fb27b3c434ec392aeac6d619274 SHA256 01d0270a2f8d0b7f4dcce096b4eccb3d65c4397fbc9a0208d6b16b31ae3e855d
 DIST squidGuard-1.3-patch-20080714.tar.gz 10502 RMD160 493a6a868f34d0b066c943f1969cf1e39debe6e2 SHA1 4345b0da96ca3470e55a4fe4df66217acbcf63cc SHA256 77bc306482059e231e3a3c3ee0d906a4d6dd40942421e12679e2d38e03eeee74
 DIST squidGuard-1.3.tar.gz 1905252 RMD160 4a6a9b5cf36d9e1d0994b3ec410f741a7b7955d3 SHA1 4a1e359679f328cff5970e92e93cc94236ead6c7 SHA256 be3342be74dadbf5c27ce0396db675a989c4f919a19e5c8240ce72c6b3c361a4
+DIST squidGuard-1.4.tar.gz 1968492 RMD160 c44880ddbfd7d1ad63fcda1c6ed777f24feedbba SHA1 0508ccb7db5c656b9952eacbcff2c956c01677d3 SHA256 0711ce60b8e2bbba107b980fed446a88df35e1584b39f079c0cae54a172c5141
 EBUILD squidguard-1.3-r4.ebuild 2100 RMD160 8cd37e4a7a5b773f9f8c8ce0c787e5a2b3fefeab SHA1 4264a68b07506d814338b629c199816323241f24 SHA256 14fbde253c088b6fdf2ff3dcd9e6d7f3389ce9b0da103f516fdfc325479ee699
-MISC ChangeLog 7008 RMD160 4d689467767bb604bdb5855b01b5317a7d115b54 SHA1 d232b9a08a52262c39ad62114f46ab9d392b67d9 SHA256 6f6ceef8e02cd7725e08f7fa6218c4a3e47a3f0730f24c2edd11c0a51a79beea
+EBUILD squidguard-1.4.ebuild 1739 RMD160 bf445dd342bbbb73cfdaea159079fb81fceed836 SHA1 87416607bd8c638f493449f4c87564b24e1f5398 SHA256 9f7df82663c7b296522a18d910471c2c91983e8457769f59542b5c90c3b1ceb3
+MISC ChangeLog 7218 RMD160 8d378fd0f0afcbb860d0e5dc9d721f094732cf12 SHA1 5fd8bb9fa24e847ee8a1575b595a01c808ab02a3 SHA256 f27290d426d50db7685c28303ee7b9f3dd6534e6c6191dfb922fd63f013f57a7
 MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklHWvoACgkQPrHvTlXvhtseeACfZftzgiaw/5ouq2oTjY91URav
-EF0AnAxRLl88uLMumEbo0zQ6+FJLCQ8a
-=N7+B
+iEYEARECAAYFAklooYkACgkQts85UDFmaOW6PwCeOGenheYQgJwQRW9N0NFxgTuc
+vaEAn2tZP2hs9Q85L5XepMS0m2MqL/lY
+=GiJp
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squidguard/files/squidguard-1.4-autoheader.patch b/net-proxy/squidguard/files/squidguard-1.4-autoheader.patch
new file mode 100644
index 000000000000..af97d8e9a5ca
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.4-autoheader.patch
@@ -0,0 +1,61 @@
+diff -Nru squidGuard-1.4.orig/configure.in squidGuard-1.4/configure.in
+--- squidGuard-1.4.orig/configure.in	2009-01-03 20:04:30.000000000 +0000
++++ squidGuard-1.4/configure.in	2009-01-10 13:08:49.000000000 +0000
+@@ -93,18 +93,18 @@
+ 	     squiduser=$withval)
+ 
+ if test -n "$sg_config"; then
+-	AC_DEFINE(ACCONFIG)
++	AC_DEFINE(ACCONFIG, 1, [Defined if you supply --with-sg-config])
+ changequote(, )dnl
+ 	sg_cfgdir=`echo $sg_config|sed "s%/[^/][^/]*$%%"`
+ changequote([, ])dnl
+ fi
+ 
+ if test -n "$sg_logdir"; then
+-	AC_DEFINE(ACLOGDIR)
++	AC_DEFINE(ACLOGDIR, 1, [Defined if you supply --with-sg-logdir])
+ fi
+ 
+ if test -n "$sg_dbhome"; then
+-	AC_DEFINE(ACDBHOME)
++	AC_DEFINE(ACDBHOME, 1, [Defined if you supply --with-sg-dbhome])
+ fi
+ 
+ CFLAGS="$CFLAGS $db_inc"
+@@ -186,7 +186,7 @@
+ 	YACCLINE=""
+ fi
+ if test "$with_ldap" = "yes"; then
+-       AC_DEFINE(HAVE_LIBLDAP)
++       AC_DEFINE(HAVE_LIBLDAP, 1, [Define if LDAP support should be compiled])
+        AC_RUN_IFELSE([
+ 
+        #include <ldap.h>
+@@ -277,7 +277,7 @@
+       CPPFLAGS="${CPPFLAGS} -I${MYSQL_INC_DIR}"
+       AC_CHECK_LIB(z, compress)
+       LIBS="-lmysqlclient ${LIBS}"
+-      AC_DEFINE(HAVE_MYSQL)
++      AC_DEFINE(HAVE_MYSQL, 1, [Define if MySQL support should be compiled])
+     fi
+   fi
+ else
+@@ -380,7 +380,7 @@
+ 	], dbg2_ok_version=yes, dbg2_ok_version=no, dbg2_ok_version=no)
+ 
+ if test $dbg2_ok_version = yes; then
+-	AC_DEFINE(DB_VERSION_GT2)
++	AC_DEFINE(DB_VERSION_GT2, 1, [Define if you have dbversion greater than 3.2])
+ fi
+ 
+ AC_RUN_IFELSE([
+@@ -404,7 +404,7 @@
+         ], dbg3_ok_version=yes, dbg3_ok_version=no, dbg3_ok_version=no)
+ 
+ if test $dbg3_ok_version = yes; then
+-        AC_DEFINE(DB_VERSION_GT3)
++        AC_DEFINE(DB_VERSION_GT3, 1, [Define if you have dbversion greater than 4.0])
+ fi
+ 
+ 
diff --git a/net-proxy/squidguard/files/squidguard-1.4-gentoo.patch b/net-proxy/squidguard/files/squidguard-1.4-gentoo.patch
new file mode 100644
index 000000000000..60b5461e9ef2
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.4-gentoo.patch
@@ -0,0 +1,74 @@
+diff -Nru squidGuard-1.4.orig/Makefile.in squidGuard-1.4/Makefile.in
+--- squidGuard-1.4.orig/Makefile.in	2008-05-17 18:36:44.000000000 +0000
++++ squidGuard-1.4/Makefile.in	2009-01-10 13:02:14.000000000 +0000
+@@ -43,7 +43,7 @@
+ # Dependencies for installing
+ #	
+ 
+-install:	install-build install-conf
++install:	install-build
+ 
+ install-conf:
+ 	@echo Installing configuration file  ;
+@@ -85,10 +85,10 @@
+ 
+ install-build:
+ 	@echo Installing squidGuard 
+-	@if [ ! -d $(bindir) ]; then \
+-		$(MKINSTALLDIRS) $(bindir) ; \
++	@if [ ! -d "$(INSTDIR)"/$(bindir) ]; then \
++		$(MKINSTALLDIRS) "$(INSTDIR)"/$(bindir) ; \
+ 	fi ; \
+-	cp src/squidGuard $(bindir) || exit 1 ;  \
++	cp src/squidGuard "$(INSTDIR)"/$(bindir) || exit 1 ;  \
+ 	echo Done. ;
+ 
+ clean::
+diff -Nru squidGuard-1.4.orig/src/Makefile.in squidGuard-1.4/src/Makefile.in
+--- squidGuard-1.4.orig/src/Makefile.in	2009-01-03 20:05:39.000000000 +0000
++++ squidGuard-1.4/src/Makefile.in	2009-01-10 13:02:14.000000000 +0000
+@@ -110,6 +110,8 @@
+ 	mv -f y.tab.c y.tab.c.bison
+ 	mv -f y.tab.h y.tab.h.bison
+ 
++sg.y sg.l:
++
+ #
+ # Dependencies for installing
+ #
+@@ -122,8 +124,8 @@
+ 
+ install.bin:: squidGuard
+ 	@echo making $@ in `basename \`pwd\``
+-	@$(MKDIR) $(bindir) $(logdir) $(cfgdir)
+-	$(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard
++	@$(MKDIR) "$(INSTDIR)"/$(bindir) "$(INSTDIR)"/$(logdir) "$(INSTDIR)"/$(cfgdir)
++	$(INSTALL_PROGRAM) squidGuard "$(INSTDIR)"/$(bindir)/squidGuard
+ 
+ uninstall.bin::
+ 	@echo making $@ in `basename \`pwd\``
+diff -Nru squidGuard-1.4.orig/src/sgDb.c squidGuard-1.4/src/sgDb.c
+--- squidGuard-1.4.orig/src/sgDb.c	2008-07-14 18:29:41.000000000 +0000
++++ squidGuard-1.4/src/sgDb.c	2009-01-10 13:02:14.000000000 +0000
+@@ -103,13 +103,21 @@
+     if(createdb)
+       flag = flag | DB_TRUNCATE;
+     if ((ret = 
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
++	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
++#else
+ 	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
++#endif
+       (void) Db->dbp->close(Db->dbp, 0);
+       sgLogFatalError("Error db_open: %s", strerror(ret));
+     }
+   } else {
+     if ((ret = 
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
++	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
++#else
+ 	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
++#endif
+       sgLogFatalError("Error db_open: %s", strerror(ret));
+     }
+   }
diff --git a/net-proxy/squidguard/squidguard-1.4.ebuild b/net-proxy/squidguard/squidguard-1.4.ebuild
new file mode 100644
index 000000000000..492233d92e19
--- /dev/null
+++ b/net-proxy/squidguard/squidguard-1.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.4.ebuild,v 1.1 2009/01/10 13:24:08 mrness Exp $
+
+WANT_AUTOMAKE=none
+
+inherit eutils autotools
+
+DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
+HOMEPAGE="http://www.squidguard.org"
+SRC_URI="http://www.squidguard.org/Downloads/squidGuard-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ldap"
+
+RDEPEND=">=sys-libs/db-2
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/squidGuard-${PV}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-autoheader.patch"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with ldap) \
+		--with-sg-config=/etc/squidGuard/squidGuard.conf \
+		--with-sg-logdir=/var/log/squidGuard \
+		|| die "configure has failed"
+
+	emake || die "make has failed"
+}
+
+src_install() {
+	emake prefix="/usr" INSTDIR="${D}" install || die "emake install has failed"
+
+	keepdir /var/log/squidGuard
+	fowners squid:squid /var/log/squidGuard
+
+	insinto /etc/squidGuard/sample
+	doins "${FILESDIR}"/squidGuard.conf.*
+	insinto /etc/squidGuard/sample/db
+	doins "${FILESDIR}"/blockedsites
+
+	dodoc ANNOUNCE CHANGELOG README
+	dohtml doc/*.html
+	docinto text
+	dodoc doc/*.txt
+}
+
+pkg_postinst() {
+	einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:"
+	einfo "    url_rewrite_program /usr/bin/squidGuard"
+	einfo "    url_rewrite_children 10"
+	einfo ""
+	einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!"
+	einfo "Examples can be found in /etc/squidGuard/sample/"
+}