Version bump (#208855).

Package-Manager: portage-2.1.3.19

6 files changed, 278 insertions, 3 deletions

diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index 8c7d9ca53471..7ee2012d44f1 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2007/11/02 15:54:11 mrness Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.18 2008/02/17 08:05:47 mrness Exp $
+
+*squidguard-1.3 (17 Feb 2008)
+
+  17 Feb 2008; Alin Năstac <mrness@gentoo.org>
+  +files/squidguard-1.3-gentoo.patch, +squidguard-1.3.ebuild:
+  Version bump (#208855).
 
   02 Nov 2007; Alin Năstac <mrness@gentoo.org>
   -files/squidguard-1.2.0-db4.patch, -squidguard-1.2.0-r1.ebuild:
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index 1a8c07cb67ca..f46897c0540f 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -1,10 +1,62 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX blockedsites 8 RMD160 69ecf774374ab43c8e3950977ac155bd475d1336 SHA1 d36a84e9d9f9d0296b0e8199ad27154ac6726395 SHA256 20169b61056128def8ac7b7eb393f7933362392b8d583b610b21bd3ce5c2015f
+MD5 127270fbe0d0bfbc141ffaf56313f3e6 files/blockedsites 8
+RMD160 69ecf774374ab43c8e3950977ac155bd475d1336 files/blockedsites 8
+SHA256 20169b61056128def8ac7b7eb393f7933362392b8d583b610b21bd3ce5c2015f files/blockedsites 8
 AUX squidGuard.conf.blocksites 192 RMD160 7831192143b0db590872d6dd41a9504ef49b5bad SHA1 a328f9b6eb6d5c27816fde8317f6b821d49d93bd SHA256 6fab8600cbc8945f94260c68a5c4743244dd35ce195edaf3da453e284c4f8f3a
+MD5 3e17e52277c56640bb3a9a24da57dae9 files/squidGuard.conf.blocksites 192
+RMD160 7831192143b0db590872d6dd41a9504ef49b5bad files/squidGuard.conf.blocksites 192
+SHA256 6fab8600cbc8945f94260c68a5c4743244dd35ce195edaf3da453e284c4f8f3a files/squidGuard.conf.blocksites 192
 AUX squidGuard.conf.minimal 61 RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b SHA1 ed963e093429e9fdf9c1fa06716781dd161d9448 SHA256 7070372be0dca55ade0a1beea8ac8d0461c38a8f5ef9d0a71ab47a9678f8f5df
+MD5 0c3ba4835c98256ad8ee4bf3336eb277 files/squidGuard.conf.minimal 61
+RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b files/squidGuard.conf.minimal 61
+SHA256 7070372be0dca55ade0a1beea8ac8d0461c38a8f5ef9d0a71ab47a9678f8f5df files/squidGuard.conf.minimal 61
 AUX squidguard-1.2.1-gentoo.patch 4137 RMD160 48bc8c0990ca0e165af0f1dc756da939f2df2f80 SHA1 727e2f15144fedeb68e52acdbd5871d31704940a SHA256 8ea7540586a974cba4afb3a9149c3436e8d3d59355f3e532de2cbfbbdc08344b
+MD5 2213fd1eaf683ff05edbed2bb8ba5ea0 files/squidguard-1.2.1-gentoo.patch 4137
+RMD160 48bc8c0990ca0e165af0f1dc756da939f2df2f80 files/squidguard-1.2.1-gentoo.patch 4137
+SHA256 8ea7540586a974cba4afb3a9149c3436e8d3d59355f3e532de2cbfbbdc08344b files/squidguard-1.2.1-gentoo.patch 4137
 AUX squidguard-1.2.1-regexp.patch 994 RMD160 551f0e9b1f403e891f2a61d3c631c8de0dc81078 SHA1 2c9dc96abf05612b86215ad31fdd2feb2867074e SHA256 a264bf2272f17e570dbdfe833a40d48f36e09b2295f1845658ada4226bb098ad
+MD5 972e72b5264bdab22106f85fc5c2debe files/squidguard-1.2.1-regexp.patch 994
+RMD160 551f0e9b1f403e891f2a61d3c631c8de0dc81078 files/squidguard-1.2.1-regexp.patch 994
+SHA256 a264bf2272f17e570dbdfe833a40d48f36e09b2295f1845658ada4226bb098ad files/squidguard-1.2.1-regexp.patch 994
 AUX squidguard-1.2.1-tests.patch 3188 RMD160 7af54751b7e39b5cd01afe60c6c0901e0a34a7dd SHA1 808ec368163c050cc36dd7cb4bc300b225e16029 SHA256 15cf16bb5cbb0066a9e3087bd512a3c8582301178df15ed2f8be5080f841d4fc
+MD5 d8f1ff0e64ff0c8c68c5c87059a0c20e files/squidguard-1.2.1-tests.patch 3188
+RMD160 7af54751b7e39b5cd01afe60c6c0901e0a34a7dd files/squidguard-1.2.1-tests.patch 3188
+SHA256 15cf16bb5cbb0066a9e3087bd512a3c8582301178df15ed2f8be5080f841d4fc files/squidguard-1.2.1-tests.patch 3188
+AUX squidguard-1.3-gentoo.patch 4238 RMD160 a24e51a3170dec1595348d8e3c5e611eca279a25 SHA1 b062fcfedf3506f609046080501ee515cc0ecb73 SHA256 bedfd2445aeec584d4720cecdb88002697254a2ca7d5c25043010a2b62c8e8bc
+MD5 9a0fa0df458504b4daf1e4b5df0f1092 files/squidguard-1.3-gentoo.patch 4238
+RMD160 a24e51a3170dec1595348d8e3c5e611eca279a25 files/squidguard-1.3-gentoo.patch 4238
+SHA256 bedfd2445aeec584d4720cecdb88002697254a2ca7d5c25043010a2b62c8e8bc files/squidguard-1.3-gentoo.patch 4238
 DIST squidGuard-1.2.1.tar.gz 1947273 RMD160 0b998792a3612db28adb795c9fb0ea9b70118af3 SHA1 f8134ad0627ce61659f0d79a4a0bcf60e8b25796 SHA256 bc658e9bbadde5d5424caddc6a592c6fcd3346230269b0233092985e4b773592
+DIST squidGuard-1.3.tar.gz 1905252 RMD160 4a6a9b5cf36d9e1d0994b3ec410f741a7b7955d3 SHA1 4a1e359679f328cff5970e92e93cc94236ead6c7 SHA256 be3342be74dadbf5c27ce0396db675a989c4f919a19e5c8240ce72c6b3c361a4
 EBUILD squidguard-1.2.1-r2.ebuild 1770 RMD160 2a4fd5c47eef6b013194b35ec981ee4ed9b3ed92 SHA1 8614a391d3dc68b59cec4c7bb9b1eb03239fe064 SHA256 250a254dfaab12ee8e8f5a4eeec9192327fe0535e354b3b0181371ca61515ec8
-MISC ChangeLog 5018 RMD160 c79fec3f6308c8dd549e0398b978940e503c116d SHA1 cd0a2c98ceb74b716d45fac2af9df67dfad02b7c SHA256 b00fc3aaa61272aa396da545feee839eb18229908f1cb1aafde905b40a47fd99
+MD5 704f2bb723fc581c05556545da9b1c19 squidguard-1.2.1-r2.ebuild 1770
+RMD160 2a4fd5c47eef6b013194b35ec981ee4ed9b3ed92 squidguard-1.2.1-r2.ebuild 1770
+SHA256 250a254dfaab12ee8e8f5a4eeec9192327fe0535e354b3b0181371ca61515ec8 squidguard-1.2.1-r2.ebuild 1770
+EBUILD squidguard-1.3.ebuild 1736 RMD160 7a470b72aa5e655844f29215a391cb614d877f60 SHA1 496a11c64d3812a713f09fe02e0732b478a63da6 SHA256 ae82b9f515d7954838a56bffb638a419e8b99af6f9b3160ab1742793e7977a53
+MD5 54dee4c229a223a36309708e630c037a squidguard-1.3.ebuild 1736
+RMD160 7a470b72aa5e655844f29215a391cb614d877f60 squidguard-1.3.ebuild 1736
+SHA256 ae82b9f515d7954838a56bffb638a419e8b99af6f9b3160ab1742793e7977a53 squidguard-1.3.ebuild 1736
+MISC ChangeLog 5186 RMD160 ddc13d3d6b551670ba43105aa7b7c0a8ddd0f43b SHA1 7c3bc5ed349d2c8286e2eacfdc60c9f8b19ee9aa SHA256 68cd1080bee19d730007c0cdc935fbb49367bf9ef10ebfd17b8e470f19543969
+MD5 2f4df708f5d9d00f2bd6e36164b14418 ChangeLog 5186
+RMD160 ddc13d3d6b551670ba43105aa7b7c0a8ddd0f43b ChangeLog 5186
+SHA256 68cd1080bee19d730007c0cdc935fbb49367bf9ef10ebfd17b8e470f19543969 ChangeLog 5186
 MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057
+MD5 35bcd0f162808937c8e8dcfa3ffca0c4 metadata.xml 264
+RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 metadata.xml 264
+SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057 metadata.xml 264
+MD5 d5a56acb74ea2bd15e1e5a3158b4b6b2 files/digest-squidguard-1.2.1-r2 184
+RMD160 2770c5470373e2ee048b1dabdcbc4d69e8a208f0 files/digest-squidguard-1.2.1-r2 184
+SHA256 f3547f45029296c15dd41ace04632463c153431260b49904f1f00b3d80870230 files/digest-squidguard-1.2.1-r2 184
+MD5 7324824898796c8ad737f67e7f1df408 files/digest-squidguard-1.3 247
+RMD160 784482d2e9849c9319ec9a0d2cc944bb70335bb0 files/digest-squidguard-1.3 247
+SHA256 ceb927f4bb50d32193ac50c33fbc18edab2172c69490e5f39ff489bf8ef4d1db files/digest-squidguard-1.3 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAke36uUACgkQ+fWpoTWIA9GSGwCcD9mBpQWLtS5ZXghVSrkzNNxJ
+hWMAoIPBt0Mh9+v6j03elho6BBYC2Nvx
+=M+6y
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squidguard/files/digest-squidguard-1.2.1-r2 b/net-proxy/squidguard/files/digest-squidguard-1.2.1-r2
new file mode 100644
index 000000000000..472f632ee191
--- /dev/null
+++ b/net-proxy/squidguard/files/digest-squidguard-1.2.1-r2
@@ -0,0 +1,2 @@
+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/digest-squidguard-1.3 b/net-proxy/squidguard/files/digest-squidguard-1.3
new file mode 100644
index 000000000000..4fe30f6f8f0b
--- /dev/null
+++ b/net-proxy/squidguard/files/digest-squidguard-1.3
@@ -0,0 +1,3 @@
+MD5 d7c2c2e03a2835e4d1c3bef751ace76f squidGuard-1.3.tar.gz 1905252
+RMD160 4a6a9b5cf36d9e1d0994b3ec410f741a7b7955d3 squidGuard-1.3.tar.gz 1905252
+SHA256 be3342be74dadbf5c27ce0396db675a989c4f919a19e5c8240ce72c6b3c361a4 squidGuard-1.3.tar.gz 1905252
diff --git a/net-proxy/squidguard/files/squidguard-1.3-gentoo.patch b/net-proxy/squidguard/files/squidguard-1.3-gentoo.patch
new file mode 100644
index 000000000000..954dae601ae3
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.3-gentoo.patch
@@ -0,0 +1,143 @@
+diff -Nru squidGuard-1.3.orig/configure.in squidGuard-1.3/configure.in
+--- squidGuard-1.3.orig/configure.in	2007-05-10 18:39:44.000000000 +0300
++++ squidGuard-1.3/configure.in	2008-02-17 09:52:03.000000000 +0200
+@@ -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"
+@@ -110,13 +110,24 @@
+ dnl
+ 
+ dnl Check ldap
+-AC_CHECK_LIB(ldap,ldap_init,,[
+-               echo
+-               echo "LDAP library not found"
+-               echo
+-               exit 1
+-       ])
+-AC_RUN_IFELSE([
++AC_ARG_WITH(ldap,
++  AC_HELP_STRING([--with-ldap], [use ldap (default=yes)]))
++if test "$with_ldap" = "no" -o "$with_ldap" = "false"
++then
++  with_ldap=no
++else
++  AC_CHECK_LIB( ldap, ldap_init,
++	[
++	with_ldap=yes
++	LIBS="$LIBS -lldap"
++	],[
++	AC_MSG_WARN([Cannot find LDAP libraries. LDAP support disabled])
++	with_ldap=no
++	])
++fi
++if test "$with_ldap" = "yes"; then
++	AC_DEFINE(HAVE_LIBLDAP)
++	AC_RUN_IFELSE([
+        #include <ldap.h>
+        int main()
+        {
+@@ -130,6 +141,7 @@
+                echo
+                exit 1
+        ],)
++fi
+ 
+ dnl Check threads... ok if it fails
+ AC_CHECK_LIB(pthread,pthread_create,,[
+@@ -141,15 +153,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.3.orig/Makefile.in squidGuard-1.3/Makefile.in
+--- squidGuard-1.3.orig/Makefile.in	2007-07-01 18:37:14.000000000 +0300
++++ squidGuard-1.3/Makefile.in	2008-02-17 09:52:03.000000000 +0200
+@@ -43,7 +43,7 @@
+ # Dependencies for installing
+ #	
+ 
+-install:	install-build install-conf
++install:	install-build
+ 
+ install-conf:
+ 	@echo Installing configuration file  ;
+@@ -80,10 +80,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.3.orig/src/Makefile.in squidGuard-1.3/src/Makefile.in
+--- squidGuard-1.3.orig/src/Makefile.in	2007-05-10 18:39:44.000000000 +0300
++++ squidGuard-1.3/src/Makefile.in	2008-02-17 09:52:19.000000000 +0200
+@@ -91,6 +91,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
+ #
+@@ -103,8 +105,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.3.orig/src/sgDb.c squidGuard-1.3/src/sgDb.c
+--- squidGuard-1.3.orig/src/sgDb.c	2007-11-03 15:59:49.000000000 +0200
++++ squidGuard-1.3/src/sgDb.c	2008-02-17 09:52:03.000000000 +0200
+@@ -100,13 +100,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.3.ebuild b/net-proxy/squidguard/squidguard-1.3.ebuild
new file mode 100644
index 000000000000..a59688aa051e
--- /dev/null
+++ b/net-proxy/squidguard/squidguard-1.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.3.ebuild,v 1.1 2008/02/17 08:05:47 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="ldap"
+
+RDEPEND="net-proxy/squid
+	>=sys-libs/db-2
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/squidGuard-${PV}"
+
+RESTRICT="test" # tests are currently broken
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	eautoconf
+}
+
+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/"
+}