Import patch for CVE-2009-3826 (#290623).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 107 insertions, 7 deletions

diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index 2727c575de92..faffaeb23bfb 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squidguard
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.35 2009/04/26 12:47:15 mrness Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.36 2009/11/28 08:45:27 mrness Exp $
+
+*squidguard-1.4-r4 (28 Nov 2009)
+
+  28 Nov 2009; Alin Năstac <mrness@gentoo.org> +squidguard-1.4-r4.ebuild,
+  +files/squidguard-1.4-upstream-fixes.patch:
+  Import patch for CVE-2009-3826 (#290623).
 
 *squidguard-1.4-r3 (26 Apr 2009)
 
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index 25a485bd6bc8..3620b74f369a 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -7,16 +7,18 @@ AUX squidGuard.conf.minimal 61 RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b S
 AUX squidguard-1.4-autoheader.patch 1782 RMD160 48279027a0b7daeb39ce5e0782f00edd9fcf6c4c SHA1 539ee1ca0e769af7519f925f7fc6231c33d39916 SHA256 4b49dfb34973fcfed40efc426657c8a5fd6513b239fc28bbd9dd94d04b19a476
 AUX squidguard-1.4-cross-compile.patch 1409 RMD160 18b4f41c6cac858ffb76e82c8fc622f6a5c45540 SHA1 448e4a709a61f10577f91e70b837f245f450445c SHA256 609f13039d0cff196a7c44a16cc5a4338b4fe9d2fd735f687b8de485e8e0e85f
 AUX squidguard-1.4-gentoo.patch 2492 RMD160 c38896fb9b99a5d178280d0add599b96e84501f3 SHA1 1c65168136321fb27b3c434ec392aeac6d619274 SHA256 01d0270a2f8d0b7f4dcce096b4eccb3d65c4397fbc9a0208d6b16b31ae3e855d
+AUX squidguard-1.4-upstream-fixes.patch 839 RMD160 b04dc3bb4931e1be30013b2cd037d352f18ff0ce SHA1 c909a6ab5cfac9c9befc05c067d826a064986048 SHA256 a9c65ac0e473b3ae05413cd895a2605bb59d0c7eee070b1138b9ea62e548fc66
 AUX squidguard-1.4-vsnprintf.patch 1816 RMD160 33a945d767919397f579230a5e39956b99c542b1 SHA1 14c1ed0075df2a46a0bed0ba895a4d30a7a721af SHA256 6cb56f910d660978e29eefff1c5916f9897eb2922417ff6bde89e23131becc39
 DIST squidGuard-1.4.tar.gz 1968492 RMD160 c44880ddbfd7d1ad63fcda1c6ed777f24feedbba SHA1 0508ccb7db5c656b9952eacbcff2c956c01677d3 SHA256 0711ce60b8e2bbba107b980fed446a88df35e1584b39f079c0cae54a172c5141
 EBUILD squidguard-1.4-r1.ebuild 1781 RMD160 753ebace958a2394ed4e89d59c6899107b77bdbe SHA1 7d5fc4e4e8d0762bd161c03c5dff1349d20aeaf3 SHA256 4aa83971fdf3c5ad71fb05fb4f516d8dbbb403718273d5ac9866b9098007da6d
 EBUILD squidguard-1.4-r3.ebuild 1786 RMD160 76e9cd6d6ea4d75e8eb6d31ad487f6e2274a07c6 SHA1 58c7a33132721f4822b3eb64f33acc7b141a517b SHA256 f0aad7de6f7a4bd349d8677938edcc83e25d97d3140a09e91174d19c4f7efeba
-MISC ChangeLog 8473 RMD160 dc61d9aa56f2087f174c1739ff8082a5d3e10738 SHA1 afa0a25c985a47513fd06ff2132c7e8b3923c423 SHA256 09554cd510089fd32a90396f174dfa81df91c1ed6e06e80e4a971257e9b9c398
+EBUILD squidguard-1.4-r4.ebuild 1834 RMD160 fdd85d6779c68f38d69062788c1e317341b315e1 SHA1 2431d813eabc6aca72a3c3aba8d586feb65f5ed8 SHA256 b1996264948444e6c982bff3627fb4d9e4f72a64b953df9431ea8ad2daa82880
+MISC ChangeLog 8673 RMD160 41b815b7a2d698712e22ddd921a3b0ceb3ea01a6 SHA1 4de91dfd4e36aba9849fb5a2457f72c82327078d SHA256 f3c0e055a860c1363926768f3a64e2a0962fcc3e40be198b6d3dd13ff294924e
 MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkn0V98ACgkQts85UDFmaOX2GACeKZrNTiwKBV/SzA9rCg3AZsy4
-m60Ani0IUUJetpwGfXLRwlA3ZHArOx8E
-=YSKM
+iEYEARECAAYFAksQ40sACgkQ9A5kJBGSrsv92gCbBy/aI9CaVmrtTA370Gz+rjwv
+EbwAn2r4VR31s+T3V6qmbAhdBnezHn63
+=JKPT
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squidguard/files/squidguard-1.4-upstream-fixes.patch b/net-proxy/squidguard/files/squidguard-1.4-upstream-fixes.patch
new file mode 100644
index 000000000000..007e6b4c36fb
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.4-upstream-fixes.patch
@@ -0,0 +1,24 @@
+diff -Nru squidGuard-1.4.orig/src/sgDiv.c.in squidGuard-1.4/src/sgDiv.c.in
+--- squidGuard-1.4.orig/src/sgDiv.c.in	2008-07-14 18:02:43.000000000 +0200
++++ squidGuard-1.4/src/sgDiv.c.in	2009-11-28 09:33:05.000000000 +0100
+@@ -745,7 +745,7 @@
+       p++;
+       break;
+     case 'u': /* Requested URL */
+-      strcat(buf, req->orig);
++      strncat(buf, req->orig, 2048);
+       p++;
+       break;
+     default:
+diff -Nru squidGuard-1.4.orig/src/sg.h.in squidGuard-1.4/src/sg.h.in
+--- squidGuard-1.4.orig/src/sg.h.in	2007-11-16 17:58:32.000000000 +0100
++++ squidGuard-1.4/src/sg.h.in	2009-11-28 09:33:37.000000000 +0100
+@@ -73,7 +73,7 @@
+ #define REQUEST_TYPE_REDIRECT   2
+ #define REQUEST_TYPE_PASS       3
+ 
+-#define MAX_BUF 4096
++#define MAX_BUF 12288
+ 
+ #define DEFAULT_LOGFILE "squidGuard.log"
+ #define WARNING_LOGFILE "squidGuard.log"
diff --git a/net-proxy/squidguard/squidguard-1.4-r4.ebuild b/net-proxy/squidguard/squidguard-1.4-r4.ebuild
new file mode 100644
index 000000000000..c18a879f755a
--- /dev/null
+++ b/net-proxy/squidguard/squidguard-1.4-r4.ebuild
@@ -0,0 +1,68 @@
+# 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-r4.ebuild,v 1.1 2009/11/28 08:45:27 mrness Exp $
+
+WANT_AUTOMAKE=none
+EAPI="2"
+
+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_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-autoheader.patch"
+	epatch "${FILESDIR}/${P}-vsnprintf.patch"
+	epatch "${FILESDIR}/${P}-cross-compile.patch"
+	epatch "${FILESDIR}/${P}-upstream-fixes.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ldap) \
+		--with-sg-config=/etc/squidGuard/squidGuard.conf \
+		--with-sg-logdir=/var/log/squidGuard \
+		|| die "configure 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/"
+}