Fix regex support, thanks to Yar Odin <yarodin@gmail.com> (#230922).

Package-Manager: portage-2.1.4.4
RepoMan-Options: --force

4 files changed, 189 insertions, 2 deletions

diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index 847cbe9e3c5e..ce6f30704383 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2008/06/23 19:43:30 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.25 2008/07/08 21:16:23 mrness Exp $
+
+*squidguard-1.3-r2 (08 Jul 2008)
+
+  08 Jul 2008; Alin Năstac <mrness@gentoo.org>
+  +files/squidguard-1.3-bison.patch, +squidguard-1.3-r2.ebuild:
+  Fix regex support, thanks to Yar Odin <yarodin@gmail.com> (#230922).
 
   23 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   squidguard-1.3-r1.ebuild:
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index e84c8c7f97b8..9e63e0c3ba7e 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX blockedsites 8 RMD160 69ecf774374ab43c8e3950977ac155bd475d1336 SHA1 d36a84e9d9f9d0296b0e8199ad27154ac6726395 SHA256 20169b61056128def8ac7b7eb393f7933362392b8d583b610b21bd3ce5c2015f
 AUX squidGuard.conf.blocksites 192 RMD160 7831192143b0db590872d6dd41a9504ef49b5bad SHA1 a328f9b6eb6d5c27816fde8317f6b821d49d93bd SHA256 6fab8600cbc8945f94260c68a5c4743244dd35ce195edaf3da453e284c4f8f3a
 AUX squidGuard.conf.minimal 61 RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b SHA1 ed963e093429e9fdf9c1fa06716781dd161d9448 SHA256 7070372be0dca55ade0a1beea8ac8d0461c38a8f5ef9d0a71ab47a9678f8f5df
@@ -5,12 +8,21 @@ AUX squidguard-1.2.1-gentoo.patch 4137 RMD160 48bc8c0990ca0e165af0f1dc756da939f2
 AUX squidguard-1.2.1-regexp.patch 994 RMD160 551f0e9b1f403e891f2a61d3c631c8de0dc81078 SHA1 2c9dc96abf05612b86215ad31fdd2feb2867074e SHA256 a264bf2272f17e570dbdfe833a40d48f36e09b2295f1845658ada4226bb098ad
 AUX squidguard-1.2.1-tests.patch 3188 RMD160 7af54751b7e39b5cd01afe60c6c0901e0a34a7dd SHA1 808ec368163c050cc36dd7cb4bc300b225e16029 SHA256 15cf16bb5cbb0066a9e3087bd512a3c8582301178df15ed2f8be5080f841d4fc
 AUX squidguard-1.3-autoheader.patch 1517 RMD160 75caa54a404eb93713f7cc29a6c9144c3867f957 SHA1 9729db3a9134f61f011514176f1ad20d90800cbe SHA256 70783a9141f4507ef309de2066c8f250ff1ec90545ed8c099969e13f29232e2b
+AUX squidguard-1.3-bison.patch 3835 RMD160 74454f76e25e4fb946d39a889e54232a2f8f8f69 SHA1 b36cdd65e917049b5f759e8934adc33444bcc7eb SHA256 afd526a6ad7ca573dd5b044fe88ba19f552933000edd07f802e31b69b2c8a46e
 AUX squidguard-1.3-gentoo.patch 4238 RMD160 a24e51a3170dec1595348d8e3c5e611eca279a25 SHA1 b062fcfedf3506f609046080501ee515cc0ecb73 SHA256 bedfd2445aeec584d4720cecdb88002697254a2ca7d5c25043010a2b62c8e8bc
 DIST squidGuard-1.2.1.tar.gz 1947273 RMD160 0b998792a3612db28adb795c9fb0ea9b70118af3 SHA1 f8134ad0627ce61659f0d79a4a0bcf60e8b25796 SHA256 bc658e9bbadde5d5424caddc6a592c6fcd3346230269b0233092985e4b773592
 DIST squidGuard-1.3-patch-20080613.tar.gz 6779 RMD160 d59b96cf46495d37147939d489c26c0c65d4b48f SHA1 5ea46560b3563528a344f160e263ab57450eccc4 SHA256 a3f02df25eaeeaea247467bddaa204fc6824f5e2cb38e5217f4233894e66883f
 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
 EBUILD squidguard-1.3-r1.ebuild 1992 RMD160 c1515931630c52de9b02ecaeca758cd4f3a79cfa SHA1 75ca8db1892454fbc2aa212b88ae64ca1a4688e9 SHA256 d76ecce6aeab423b35b8cd5823284b340325dda773b6ce0eb48a7a66f1e8cc9d
+EBUILD squidguard-1.3-r2.ebuild 2027 RMD160 c2ac6aa8cef7e7e1e580f360231ba85e36737903 SHA1 647e3035c6928d5bd24b43e74c808c5e78651bc3 SHA256 50e58ea2ee2b9ebfecb2e0b3da38fdbd13f9927bc73d9038b1db850f7d6d3a42
 EBUILD squidguard-1.3.ebuild 1736 RMD160 7a470b72aa5e655844f29215a391cb614d877f60 SHA1 496a11c64d3812a713f09fe02e0732b478a63da6 SHA256 ae82b9f515d7954838a56bffb638a419e8b99af6f9b3160ab1742793e7977a53
-MISC ChangeLog 5958 RMD160 e4c1851ddeab3a616499801ea4146636d79ab8f0 SHA1 2b84962158e3dbef18d08e6cab78d27b1a947618 SHA256 74d62f2a378d094c08889906cb8a3ae321a25eb53dc0aa771f87f4ba94014bcb
+MISC ChangeLog 6172 RMD160 b555f936ffa31f52214023ef20cbf8bdd34782a6 SHA1 424b45d0a836c9889eca6fc52ee6608b8fdc0c36 SHA256 df69d114567adb1e9dacb6457ed13f858746619940c8acb2269565c7214d1104
 MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhz2TIACgkQPrHvTlXvhtvfjwCeLfI6sfGC0VMBxDIgAEU/Zqy4
+F94An2BmBqAj2i6M6Zqs4WnZYR8wSHyq
+=xDO0
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squidguard/files/squidguard-1.3-bison.patch b/net-proxy/squidguard/files/squidguard-1.3-bison.patch
new file mode 100644
index 000000000000..1c2fee88515f
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.3-bison.patch
@@ -0,0 +1,94 @@
+diff -Nru squidGuard-1.3.orig/configure.in squidGuard-1.3/configure.in
+--- squidGuard-1.3/configure.in 	2007-05-10 21:39:44.000000000 +0600
++++ squidGuard-1.3/configure.in         2008-07-06 14:11:01.000000000 +0600
+@@ -296,4 +296,4 @@
+ AC_SUBST(ROBOTEXCEPTIONS)
+ AC_SUBST(BLACKLISTS)
+ 
+-AC_OUTPUT(Makefile src/Makefile src/sg.h doc/Makefile test/Makefile test/test1.conf test/test2.conf samples/Makefile samples/sample.conf samples/squidGuard.cgi samples/squidGuard-simple.cgi contrib/Makefile contrib/squidGuardRobot/squidGuardRobot contrib/sgclean/sgclean contrib/hostbyname/hostbyname)
++AC_OUTPUT(Makefile src/Makefile src/sg.h src/sg.y doc/Makefile test/Makefile test/test1.conf test/test2.conf samples/Makefile samples/sample.conf samples/squidGuard.cgi samples/squidGuard-simple.cgi contrib/Makefile contrib/squidGuardRobot/squidGuardRobot contrib/sgclean/sgclean contrib/hostbyname/hostbyname)
+diff -Nru squidGuard-1.3.orig/src/sg.y.in squidGuard-1.3/src/sg.y.in
+--- squidGuard-1.3/src/sg.y.in          2007-11-03 18:59:49.000000000 +0500
++++ squidGuard-1.3/src/sg.y.in          2008-07-06 15:35:08.000000000 +0600
+@@ -185,7 +185,6 @@
+ source_content:     DOMAIN domain
+                     | USER user 
+                     | USERLIST WORD { sgSourceUserList($2); } 
+-@YACCLINE@
+                     | EXECUSERLIST EXECCMD { sgSourceExecUserList($2); }
+                     | USERQUOTA NUMBER NUMBER HOURLY { 
+ 		      sgSourceUserQuota($2,$3,"3600");} 
+@@ -667,7 +666,7 @@
+ */
+ 
+   if(!ldap_is_ldap_url(url)) {
+-    @NOLOG1@ sgLogError("%s: can't parse LDAP url %s",progname, url);  @NOLOG2@
++    sgLogError("%s: can't parse LDAP url %s",progname, url);
+     return;
+   }
+ 
+@@ -1832,7 +1831,7 @@
+     m = ((lastval - m) * 60) - lt->tm_sec;
+   if(m <= 0)
+     m = 30;
+-@NOLOG1@  sgLogError("Info: recalculating alarm in %d seconds", (unsigned int)m); @NOLOG2@
++  sgLogError("Info: recalculating alarm in %d seconds", (unsigned int)m);
+   alarm((unsigned int) m);
+   sgTimeCheck(lt,t);
+   sgTimeSetAcl();
+@@ -2275,16 +2274,12 @@
+       }
+     }
+   }
+-@NOLOG1@
+   else {
+       if( globalDebug == 1 ) { sgLogError("source not found"); }
+        }
+-@NOLOG2@
+   if(!found) {
+     acl = defaultAcl;
+-@NOLOG1@
+     if( globalDebug == 1 ) { sgLogError("no ACL matching source, using default"); }
+-@NOLOG2@
+   }
+   return acl;
+ }
+@@ -2516,7 +2511,7 @@
+ 
+                sgDbUpdate(src->userDb, ident, (char *) userinfo,
+                        sizeof(struct UserInfo));
+-               @NOLOG1@ sgLogError("Added LDAP source: %s", ident); @NOLOG2@
++               sgLogError("Added LDAP source: %s", ident);
+ 
+                if(found) {
+                        *rval = userinfo;
+@@ -2684,12 +2679,12 @@
+                if (strncmp(key, "bindname=", 9) == 0)
+                {
+                        binddn = data;
+-                       @NOLOG1@ sgLogError("Extracted binddn: %s", binddn); @NOLOG2@
++                       sgLogError("Extracted binddn: %s", binddn);
+                }
+                else if (strncmp(key, "x-bindpass=", 11) == 0)
+                {
+                        bindpass = data;
+-                       @NOLOG1@ sgLogError("Extracted x-bindpass: %s", bindpass); @NOLOG2@
++                       sgLogError("Extracted x-bindpass: %s", bindpass);
+                }
+        }
+ 
+@@ -2707,14 +2702,12 @@
+                lud->lud_attrs, 0, NULL, NULL, NULL, -1,
+                &ldapresult) != LDAP_SUCCESS) {
+ 
+-@NOLOG1@
+                sgLogError("%s: ldap_search_ext_s failed: %s "
+ 
+                        "(params: %s, %d, %s, %s)",
+                        progname, ldap_err2string(get_ldap_errno(ld)),
+                        lud->lud_dn, lud->lud_scope, lud->lud_filter,
+                        lud->lud_attrs[0]);
+-@NOLOG2@
+ 
+                ldap_unbind(ld);
+                ldap_free_urldesc(lud);
diff --git a/net-proxy/squidguard/squidguard-1.3-r2.ebuild b/net-proxy/squidguard/squidguard-1.3-r2.ebuild
new file mode 100644
index 000000000000..8742204571f3
--- /dev/null
+++ b/net-proxy/squidguard/squidguard-1.3-r2.ebuild
@@ -0,0 +1,75 @@
+# 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-r2.ebuild,v 1.1 2008/07/08 21:16:23 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
+	http://www.squidguard.org/Downloads/Patches/${PV}/squidGuard-${PV}-patch-20080613.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}"
+	cp ../squidGuard-${PV}-patch-20080613/src/sgDiv.c.in src/ || die "failed to replace sgDiv.c.in"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-autoheader.patch"
+	epatch "${FILESDIR}/${P}-bison.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/"
+}