summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authortaca <taca>2010-02-02 14:43:57 +0000
committertaca <taca>2010-02-02 14:43:57 +0000
commit809e99e4d44988f46523459c918d9eef9675a964 (patch)
treeffc78df0aee1e753b43cc032b8c78d9fa23c3398 /www
parent7c4b16e61c257e704f2c55a56b70eb42b85c64af (diff)
downloadpkgsrc-809e99e4d44988f46523459c918d9eef9675a964.tar.gz
Add security patch noted as
http://www.squid-cache.org/Advisories/SQUID-2010_1.txt. Bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r--www/squid27/Makefile4
-rw-r--r--www/squid27/distinfo3
-rw-r--r--www/squid27/patches/patch-an24
3 files changed, 28 insertions, 3 deletions
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 543eb6743e7..e0d66f26b77 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/11/02 15:45:01 taca Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/02 14:43:57 taca Exp $
DISTNAME= squid-2.7.STABLE7
PKGNAME= ${DISTNAME:S/STABLE//}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= ${SQUID_MASTER_SITES} \
http://www.squid-cache.org/Versions/v2/2.7/
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 91aa6a55bbd..925e523de3e 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2009/09/18 02:01:35 taca Exp $
+$NetBSD: distinfo,v 1.7 2010/02/02 14:43:57 taca Exp $
SHA1 (squid-2.7.STABLE7.tar.bz2) = 0729116f309093e4f141e000136cdec39290628a
RMD160 (squid-2.7.STABLE7.tar.bz2) = a13df321fb0831de963c77f6e33e3f374634d353
@@ -15,3 +15,4 @@ SHA1 (patch-ai) = a227e6fc622f1bda3fa49406b4d588c1f1f78430
SHA1 (patch-aj) = c5c7cd10a63a5066eee63988775f71758ed5463e
SHA1 (patch-ak) = 6863cac0fe9100f4b8c3c05cb321324a4abf0a4c
SHA1 (patch-al) = a9e957a90dc6956e59668c297dd8566642baecff
+SHA1 (patch-an) = 9170bdd57f5428e7b64b4db2e1ffdee3c032643e
diff --git a/www/squid27/patches/patch-an b/www/squid27/patches/patch-an
new file mode 100644
index 00000000000..63ab9b6562a
--- /dev/null
+++ b/www/squid27/patches/patch-an
@@ -0,0 +1,24 @@
+$NetBSD: patch-an,v 1.1 2010/02/02 14:43:57 taca Exp $
+
+This is fix for security problem:
+
+http://www.squid-cache.org/Advisories/SQUID-2010_1.txt
+
+Since the announced patch contains RCS style revision string, it never
+applied to clearly.
+
+http://www.squid-cache.org/Versions/v2/HEAD/changesets/12597.patch.
+
+--- lib/rfc1035.c.orig 2008-06-19 01:11:44.000000000 +0000
++++ lib/rfc1035.c
+@@ -286,7 +286,9 @@ rfc1035NameUnpack(const char *buf, size_
+ size_t len;
+ assert(ns > 0);
+ do {
+- assert((*off) < sz);
++ if ((*off) >= sz) {
++ return 1;
++ }
+ c = *(buf + (*off));
+ if (c > 191) {
+ /* blasted compression */