Version bump

Package-Manager: portage-2.1.2.7

7 files changed, 274 insertions, 9 deletions

diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index 9f9da8730a2b..8d325ec86120 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/squidguard
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.8 2007/04/11 13:41:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.9 2007/06/17 15:59:01 mrness Exp $
+
+*squidguard-1.2.1 (17 Jun 2007)
+
+  17 Jun 2007; Alin Năstac <mrness@gentoo.org>
+  +files/squidguard-1.2.1-db4.patch, +files/squidguard-1.2.1-makefile.patch,
+  +files/squidguard-1.2.1-tests.patch, +squidguard-1.2.1.ebuild:
+  Version bump.
 
   11 Apr 2007; Alin Năstac <mrness@gentoo.org> squidguard-1.2.0-r1.ebuild:
   Simplify postinst info messages.
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index 979378c7c7ec..548915be9171 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -17,15 +17,32 @@ AUX squidguard-1.2.0-db4.patch 1756 RMD160 363f3299f83ae318719618a8aa6167b882976
 MD5 2934b894c1c9934e4e1ededec79c6bfa files/squidguard-1.2.0-db4.patch 1756
 RMD160 363f3299f83ae318719618a8aa6167b882976f49 files/squidguard-1.2.0-db4.patch 1756
 SHA256 bb8c327ee367d656c8a598bda57a3b253dcb9320871ac8e90829337f4c8e82e8 files/squidguard-1.2.0-db4.patch 1756
+AUX squidguard-1.2.1-db4.patch 1916 RMD160 e467271e850f41d580d1e6cb51a526f36ecaf9d7 SHA1 dc258cdf3f0414c083e205df589ae4481000cfbb SHA256 4e25edca9b033a44fb35ffc0e5b82e54a3cbc44d2ef1d64c179d997488354188
+MD5 530105ba3b413999b59f58b03e14b002 files/squidguard-1.2.1-db4.patch 1916
+RMD160 e467271e850f41d580d1e6cb51a526f36ecaf9d7 files/squidguard-1.2.1-db4.patch 1916
+SHA256 4e25edca9b033a44fb35ffc0e5b82e54a3cbc44d2ef1d64c179d997488354188 files/squidguard-1.2.1-db4.patch 1916
+AUX squidguard-1.2.1-makefile.patch 1376 RMD160 71e7cd620c0150da7f31e2c0d98f86774efde6c8 SHA1 215bbd2dd271616fcb4414d4bb61bc28a4830524 SHA256 324f5ad9c59bb03d8cd7f0447df896b284204fec38aa94353d4de8ec7648d8a2
+MD5 8493875281f71d66fd4d3ae6ea5bfdbf files/squidguard-1.2.1-makefile.patch 1376
+RMD160 71e7cd620c0150da7f31e2c0d98f86774efde6c8 files/squidguard-1.2.1-makefile.patch 1376
+SHA256 324f5ad9c59bb03d8cd7f0447df896b284204fec38aa94353d4de8ec7648d8a2 files/squidguard-1.2.1-makefile.patch 1376
+AUX squidguard-1.2.1-tests.patch 6170 RMD160 b1eb1c2f56c75cb28cb6887182b36a6c99725013 SHA1 f22f70544aaf50d7ad5ca74c42f4c93c9587b44c SHA256 116664588ac5dfc1d41a93ab8d42c482a9f1ff069592c305cfe1c726695a1184
+MD5 85a1cbad7e9cde56dc3ff720ea5f0e8b files/squidguard-1.2.1-tests.patch 6170
+RMD160 b1eb1c2f56c75cb28cb6887182b36a6c99725013 files/squidguard-1.2.1-tests.patch 6170
+SHA256 116664588ac5dfc1d41a93ab8d42c482a9f1ff069592c305cfe1c726695a1184 files/squidguard-1.2.1-tests.patch 6170
 DIST squidGuard-1.2.0.tar.gz 1852737 RMD160 7c8d0f612b4e6bf459bf367fa56f309ce5cfe6e3 SHA1 8eb27b6eb85a3f8ed073b12a593a2c9ad97d7478 SHA256 6e88025d2906d635d170c53bf6ae7cc13e06839dfa2a6e5d92b5e6bb38e6ec6d
+DIST squidGuard-1.2.1.tar.gz 1947273 RMD160 0b998792a3612db28adb795c9fb0ea9b70118af3 SHA1 f8134ad0627ce61659f0d79a4a0bcf60e8b25796 SHA256 bc658e9bbadde5d5424caddc6a592c6fcd3346230269b0233092985e4b773592
 EBUILD squidguard-1.2.0-r1.ebuild 1793 RMD160 c9344daf319fd05efeec726cde7bd224febab215 SHA1 62c094af1503e4b26d241734dec0813af08bd376 SHA256 af86fdfc14c709843de3738956880b66e753ad9b1819c620517ceb409d373c56
 MD5 7c3f31e9d9779d3a39ac2e1bdfb17a0b squidguard-1.2.0-r1.ebuild 1793
 RMD160 c9344daf319fd05efeec726cde7bd224febab215 squidguard-1.2.0-r1.ebuild 1793
 SHA256 af86fdfc14c709843de3738956880b66e753ad9b1819c620517ceb409d373c56 squidguard-1.2.0-r1.ebuild 1793
-MISC ChangeLog 3600 RMD160 809d6bdbd5f5e00c60f9ea1b2190599d6c35a63e SHA1 cf7ca09012808827954f303d2f6fddaeac1b863f SHA256 7449d10b02f6328e02fb54f0c7c749d292b6b44583448363b92a8f32ca40834a
-MD5 a83068d0d44e1d7cabdf88b18ed11c3e ChangeLog 3600
-RMD160 809d6bdbd5f5e00c60f9ea1b2190599d6c35a63e ChangeLog 3600
-SHA256 7449d10b02f6328e02fb54f0c7c749d292b6b44583448363b92a8f32ca40834a ChangeLog 3600
+EBUILD squidguard-1.2.1.ebuild 1739 RMD160 937b9d9d625b93b24fa5a37dd81f799ebfb1f6da SHA1 07c3716b3009f2cf974161d9d14ea253b9f46364 SHA256 b874c1b566139dd50d1e9c45f64c4693aae2c73bf89d22b961e645ab8e87c714
+MD5 00dc1b0320dd07d94e17271509a67ca5 squidguard-1.2.1.ebuild 1739
+RMD160 937b9d9d625b93b24fa5a37dd81f799ebfb1f6da squidguard-1.2.1.ebuild 1739
+SHA256 b874c1b566139dd50d1e9c45f64c4693aae2c73bf89d22b961e645ab8e87c714 squidguard-1.2.1.ebuild 1739
+MISC ChangeLog 3840 RMD160 a791f43e5818bcbf665549416305726c59d4fa32 SHA1 9c564f421fc5e591d8cab681edcf5b3324cedac7 SHA256 fe4730700bc42ce4cd021b779819315fa1b5b3d9edfda2fb9a73d7e5e64bfe28
+MD5 0a851437c64dc6d54a55225d418a026a ChangeLog 3840
+RMD160 a791f43e5818bcbf665549416305726c59d4fa32 ChangeLog 3840
+SHA256 fe4730700bc42ce4cd021b779819315fa1b5b3d9edfda2fb9a73d7e5e64bfe28 ChangeLog 3840
 MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057
 MD5 35bcd0f162808937c8e8dcfa3ffca0c4 metadata.xml 264
 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 metadata.xml 264
@@ -33,10 +50,13 @@ SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057 metadata
 MD5 ec8ea45f424d2c3340cf2d1ea2d81317 files/digest-squidguard-1.2.0-r1 253
 RMD160 8b9dcfec3a88a47c69bbb818dab89778cb3657a9 files/digest-squidguard-1.2.0-r1 253
 SHA256 8dece5394be00ae9f361a1cfc8f6ab43ad2f8c03cd499810f55038ca4821f435 files/digest-squidguard-1.2.0-r1 253
+MD5 7c40dfc7cc8a264fc15132ad35c92a7d files/digest-squidguard-1.2.1 253
+RMD160 47e20f3ef4c4988bc954e45c6c312be0a18a7e87 files/digest-squidguard-1.2.1 253
+SHA256 70a44707f5483a735541fc3f8230ad36a9e41213455be81c7e655e4c2ca37193 files/digest-squidguard-1.2.1 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGHOWtJnxX6mF440QRAgB6AKCGjN4xIk0EZowhq153zBmIcBTVvwCfT2tH
-Ps04fkc5ZAmmIPzY736ODEs=
-=eHIk
+iD8DBQFGdVpRJnxX6mF440QRAl2HAJ9P8GsgNoaR71T9zYaW/FXnaRjoLQCfcHwS
+jUimGqsuEsUOlcsd7qQKny8=
+=Ny25
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squidguard/files/digest-squidguard-1.2.1 b/net-proxy/squidguard/files/digest-squidguard-1.2.1
new file mode 100644
index 000000000000..b8df36f399bf
--- /dev/null
+++ b/net-proxy/squidguard/files/digest-squidguard-1.2.1
@@ -0,0 +1,3 @@
+MD5 b6700f59c48fde5ad4d12f871acba93a squidGuard-1.2.1.tar.gz 1947273
+RMD160 0b998792a3612db28adb795c9fb0ea9b70118af3 squidGuard-1.2.1.tar.gz 1947273
+SHA256 bc658e9bbadde5d5424caddc6a592c6fcd3346230269b0233092985e4b773592 squidGuard-1.2.1.tar.gz 1947273
diff --git a/net-proxy/squidguard/files/squidguard-1.2.1-db4.patch b/net-proxy/squidguard/files/squidguard-1.2.1-db4.patch
new file mode 100644
index 000000000000..25cb495bca42
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.2.1-db4.patch
@@ -0,0 +1,54 @@
+diff -Nru squidGuard-1.2.1.orig/configure.in squidGuard-1.2.1/configure.in
+--- squidGuard-1.2.1.orig/configure.in	2007-06-17 11:24:29.000000000 +0300
++++ squidGuard-1.2.1/configure.in	2007-06-17 11:24:55.000000000 +0300
+@@ -85,7 +85,7 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(db.h regex.h unistd.h)
+ 
+-+AC_CHECK_HEADER(db.h,,[
++AC_CHECK_HEADER(db.h,,[
+ 	echo
+ 	echo "** No db.h found"
+ 	echo "   The Berkley DB library is required for squidGuard"
+@@ -141,15 +141,7 @@
+        ])
+ 
+ dnl Check DB
+-AC_CHECK_LIB(db,db_version,,[
+-       echo
+-       echo "** The Berkley DB library is required for squidGuard"
+-       echo "   to compile. Get it from http://www.sleepycat.com"
+-       echo "   use --with-db=DIR or --with-db-lib=DIR to specify"
+-       echo "   its location. (default is $dbprefix/BerkeleyDB)"
+-       echo
+-       exit 1
+-       ])
++LIBS="$LIBS -ldb"
+ AC_RUN_IFELSE([
+ 	#include <db.h>
+ 	int main() 
+diff -Nru squidGuard-1.2.1.orig/src/sgDb.c squidGuard-1.2.1/src/sgDb.c
+--- squidGuard-1.2.1.orig/src/sgDb.c	2007-06-17 11:24:29.000000000 +0300
++++ squidGuard-1.2.1/src/sgDb.c	2007-06-17 11:15:27.000000000 +0300
+@@ -101,13 +101,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/files/squidguard-1.2.1-makefile.patch b/net-proxy/squidguard/files/squidguard-1.2.1-makefile.patch
new file mode 100644
index 000000000000..9ffa99971bef
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.2.1-makefile.patch
@@ -0,0 +1,40 @@
+diff -Nru squidGuard-1.2.1.orig/Makefile.in squidGuard-1.2.1/Makefile.in
+--- squidGuard-1.2.1.orig/Makefile.in	2006-12-29 11:03:53.000000000 +0200
++++ squidGuard-1.2.1/Makefile.in	2007-06-17 18:47:13.000000000 +0300
+@@ -40,7 +40,7 @@
+ # Dependencies for installing
+ #	
+ 
+-install:	install-build install-conf
++install:	install-build
+ 
+ install-conf:
+ 	@echo Installing configuration file 
+@@ -67,10 +67,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.2.1.orig/src/Makefile.in squidGuard-1.2.1/src/Makefile.in
+--- squidGuard-1.2.1.orig/src/Makefile.in	2007-03-16 17:58:37.000000000 +0200
++++ squidGuard-1.2.1/src/Makefile.in	2007-06-17 18:41:35.000000000 +0300
+@@ -103,8 +103,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 --git a/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch b/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch
new file mode 100644
index 000000000000..28cf378cb81a
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch
@@ -0,0 +1,74 @@
+diff -Nru squidGuard-1.2.1.orig/test/requests squidGuard-1.2.1/test/requests
+--- squidGuard-1.2.1.orig/test/requests	1999-08-09 15:20:06.000000000 +0300
++++ squidGuard-1.2.1/test/requests	2007-06-17 11:51:48.000000000 +0300
+@@ -954,7 +954,7 @@
+ http://www.oslo-energi.no/gifs/nav5off.gif 10.0.5.15/- - GET
+ http://www.oslo-energi.no/gifs/tittel_1_fade.gif 10.0.5.15/- - GET
+ http://www.fotball.no/_img/toppframe_bg.gif 10.0.3.125/- gurr GET
+-http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http%3a//www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
++http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http://www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
+ http://www.pornodungeon.com/pics/samp27.jpg 10.0.3.174/- foo GET
+ http://www.sportnews.gr/_img/polo/image2223.jpg 10.0.2.130/- - GET
+ http://www.sol.no/no/www.sol.no/graphics/partner/cnn_norge.gif 10.0.3.144/- - GET
+diff -Nru squidGuard-1.2.1.orig/test/test1.expected squidGuard-1.2.1/test/test1.expected
+--- squidGuard-1.2.1.orig/test/test1.expected	2000-03-27 14:08:14.000000000 +0300
++++ squidGuard-1.2.1/test/test1.expected	2007-06-17 11:52:40.000000000 +0300
+@@ -954,7 +954,7 @@
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.5.15&clientname=&clientuser=&clientgroup=default&targetgroup=none&url=http://www.oslo-energi.no/gifs/nav5off.gif 10.0.5.15/- - GET
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.5.15&clientname=&clientuser=&clientgroup=default&targetgroup=none&url=http://www.oslo-energi.no/gifs/tittel_1_fade.gif 10.0.5.15/- - GET
+ 
+-http://info.foo.bar/cgi/blocked?clientaddr=10.0.3.144&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http%3a//www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
++http://info.foo.bar/cgi/blocked?clientaddr=10.0.3.144&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http://www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
+ 
+ 
+ 
+diff -Nru squidGuard-1.2.1.orig/test/test2.expected squidGuard-1.2.1/test/test2.expected
+--- squidGuard-1.2.1.orig/test/test2.expected	2000-03-27 14:09:17.000000000 +0300
++++ squidGuard-1.2.1/test/test2.expected	2007-06-17 11:53:08.000000000 +0300
+@@ -6,8 +6,8 @@
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.23&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.book-mark.net/Mark.gif 10.0.1.23/- - GET
+ 
+ 
+-http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.23&clientname=&clientuser=gurr&clientgroup=kids&targetgroup=blacklist&url=http://www.angrydragon.com/sexing/sex/tn_316_jpg.jpg 10.0.1.23/- gurr GET
+-http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.23&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.angrydragon.com/sexing/sex/phc057.gif 10.0.1.23/- - GET
++
++
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.23&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.freesexsites.net/book-mark/22/tn_09.jpg 10.0.1.23/- - GET
+ 
+ 
+@@ -251,7 +251,7 @@
+ 
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://counter10.sextracker.com/c5/id/0/109497 10.0.0.64/- - GET
+ 
+-http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.angrydragon.com/sexing/sex/tn_536_jpg.jpg 10.0.0.64/- - GET
++
+ 
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.freesexsites.net/book-mark/tartban2.gif 10.0.0.64/- - GET
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://the-strip.porncity.net/866/fritz/buttons/germ.gif 10.0.0.64/- - GET
+@@ -261,7 +261,7 @@
+ 
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.ultrasexe.com/image/tnoire6.jpg 10.0.0.64/- - GET
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://artemis.porntrack.com/0/20807/? 10.0.0.64/- - GET
+-http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.amateur-space.com/aec/images/hardcore/tn_sunshine35_jpg.jpg 10.0.0.64/- - GET
++
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=gurr&clientgroup=kids&targetgroup=blacklist&url=http://amateur.freepictures.com/amateur/images/tn_fpcheer017_jpg.jpg 10.0.0.64/- gurr GET
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://amateur.freepictures.com/amateur/images/fpcheer018.jpg 10.0.0.64/- - GET
+ 
+@@ -330,7 +330,7 @@
+ 
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.39&clientname=&clientuser=gurr&clientgroup=kids&targetgroup=blacklist&url=http://c1.xxxcounter.com/c7/id/16/44847/0/ 10.0.1.39/- gurr GET
+ 
+-http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.39&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.pinkswap.com/teen/folder.gif 10.0.1.39/- - GET
++
+ 
+ 
+ 
+@@ -954,7 +954,7 @@
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.5.15&clientname=&clientuser=&clientgroup=default&targetgroup=none&url=http://www.oslo-energi.no/gifs/nav5off.gif 10.0.5.15/- - GET
+ http://info.foo.bar/cgi/blocked?clientaddr=10.0.5.15&clientname=&clientuser=&clientgroup=default&targetgroup=none&url=http://www.oslo-energi.no/gifs/tittel_1_fade.gif 10.0.5.15/- - GET
+ 
+-http://info.foo.bar/cgi/blocked?clientaddr=10.0.3.144&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http%3a//www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
++http://info.foo.bar/cgi/blocked?clientaddr=10.0.3.144&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http://www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
+ 
+ 
+ 
diff --git a/net-proxy/squidguard/squidguard-1.2.1.ebuild b/net-proxy/squidguard/squidguard-1.2.1.ebuild
new file mode 100644
index 000000000000..4dd625ce1ff9
--- /dev/null
+++ b/net-proxy/squidguard/squidguard-1.2.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.1.ebuild,v 1.1 2007/06/17 15:59:01 mrness Exp $
+
+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=""
+
+RDEPEND="net-proxy/squid
+	>=sys-libs/db-2"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/squidGuard-${PV}"
+
+src_unpack() {
+	unpack ${A} || die "unpack problem"
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-db4.patch"
+	epatch "${FILESDIR}/${P}-tests.patch"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+	eautoconf
+}
+
+src_compile() {
+	econf \
+		--with-sg-config=/etc/squidGuard/squidGuard.conf \
+		--with-sg-logdir=/var/log/squidGuard \
+		|| die "configure has failed"
+
+	emake || die "make has failed"
+}
+
+src_install() {
+	make prefix="/usr" INSTDIR="${D}" install || die "make 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/"
+}