Attachment #104483 for bug #144668

View | Details | Raw Unified | Return to bug 144668
Collapse All | Expand All





PORTNAME=	squid
PORTVERSION=	2.7.${SQUID_STABLE_VER}
PORTREVISION=	4
CATEGORIES=	www
MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \

		http://www1.jp.squid-cache.org/%SUBDIR%/ \
		http://www2.tw.squid-cache.org/%SUBDIR%/
PATCH_SITE_SUBDIR=	Versions/v2/2.7/changesets
PATCHFILES=
PATCH_DIST_STRIP=	-p1

MAINTAINER=	tmseck@web.de
COMMENT=	HTTP Caching Proxy

SQUID_STABLE_VER=	8

CONFLICTS=	squid-2.[^7]* squid-3.* cacheboy-[0-9]* lusca-head-[0-9]*
GNU_CONFIGURE=	yes

# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
.if defined(WITH_SQUID_KERB_AUTH) && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
# XXX This currently only works with heimdal from the base system,
#     see files/patch-squid_kerb_auth:
CONFIGURE_ARGS+=	--enable-negotiate-auth-helpers="squid_kerb_auth"
libexec+=	squid_kerb_auth
.endif

Lines 1-6 Link Here

(-)distinfo (-6 / +3 lines)
1	MD5 (squid2.7/squid-2.7.STABLE7.tar.bz2) = c18b0371fca813d5e7c7e0baf87baa22	1	MD5 (squid2.7/squid-2.7.STABLE8.tar.bz2) = c061ba1c9ae39d0aaa8eca137f7dd18b
2	SHA256 (squid2.7/squid-2.7.STABLE7.tar.bz2) = 6c4e50708ff9ed2d2f43acf3300cbc826749d7fdc722465654415b285d6f7015	2	SHA256 (squid2.7/squid-2.7.STABLE8.tar.bz2) = 9409b02fc53518e334395df803a1ae30f4ed385b0f041fb310b4c75e2a49138c
3	SIZE (squid2.7/squid-2.7.STABLE7.tar.bz2) = 1341869	3	SIZE (squid2.7/squid-2.7.STABLE8.tar.bz2) = 1348473
4	MD5 (squid2.7/12600.patch) = 4bf7fb22ef3715b50650c89f679bc47d
5	SHA256 (squid2.7/12600.patch) = 828f386ba6468e3b810ec22691f9f920f57cf91548d2edb266c726b1e6b1b829
6	SIZE (squid2.7/12600.patch) = 1194




FreeBSD-Patch for Squid-Advisory 2010:1, prepared by Thomas-Martin Seck,
<tmseck@web.de>, 2010-02-01.

Removed one directory level and the first hunk with CVS meta-information
from the original patch. The original patch can be downloaded from:
http://www.squid-cache.org/Versions/v2/HEAD/changesets/12597.patch

---------------------
PatchSet 12597 
Date: 2010/01/15 11:40:30
Author: amosjeffries
Branch: HEAD
Tag: (none) 
Log:
Handle DNS header-only packets as invalid.

Members: 
	lib/rfc1035.c:1.30->1.31 

Index: lib/rfc1035.c
===================================================================
RCS file: /cvsroot/squid/squid/lib/rfc1035.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- lib/rfc1035.c	15 Jun 2008 03:49:55 -0000	1.30
+++ lib/rfc1035.c	15 Jan 2010 11:40:30 -0000	1.31
@@ -286,7 +286,9 @@
     size_t len;
     assert(ns > 0);
     do {
-	assert((*off) < sz);
+	if ((*off) >= sz) {
+	    return 1;
+	}
 	c = *(buf + (*off));
 	if (c > 191) {
 	    /* blasted compression */

Return to bug 144668

Lines 76-82 Link Here

(-)Makefile (-4 / +3 lines)
76		76
77	PORTNAME= squid	77	PORTNAME= squid
78	PORTVERSION= 2.7.${SQUID_STABLE_VER}	78	PORTVERSION= 2.7.${SQUID_STABLE_VER}
79	PORTREVISION= 4
80	CATEGORIES= www	79	CATEGORIES= www
81	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	80	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
82	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \	81	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
Lines 107-119 Link Here
107	http://www1.jp.squid-cache.org/%SUBDIR%/ \	106	http://www1.jp.squid-cache.org/%SUBDIR%/ \
108	http://www2.tw.squid-cache.org/%SUBDIR%/	107	http://www2.tw.squid-cache.org/%SUBDIR%/
109	PATCH_SITE_SUBDIR= Versions/v2/2.7/changesets	108	PATCH_SITE_SUBDIR= Versions/v2/2.7/changesets
110	PATCHFILES= 12600.patch	109	PATCHFILES=
111	PATCH_DIST_STRIP= -p1	110	PATCH_DIST_STRIP= -p1
112		111
113	MAINTAINER= tmseck@web.de	112	MAINTAINER= tmseck@web.de
114	COMMENT= HTTP Caching Proxy	113	COMMENT= HTTP Caching Proxy
115		114
116	SQUID_STABLE_VER= 7	115	SQUID_STABLE_VER= 8
117		116
118	CONFLICTS= squid-2.[^7]* squid-3.* cacheboy-[0-9]* lusca-head-[0-9]*	117	CONFLICTS= squid-2.[^7]* squid-3.* cacheboy-[0-9]* lusca-head-[0-9]*
119	GNU_CONFIGURE= yes	118	GNU_CONFIGURE= yes
Lines 248-254 Link Here
248	# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:	247	# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
249	.if defined(WITH_SQUID_KERB_AUTH) && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)	248	.if defined(WITH_SQUID_KERB_AUTH) && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
250	# XXX This currently only works with heimdal from the base system,	249	# XXX This currently only works with heimdal from the base system,
251	# see files/patch-helpers_negotiate_auth-squid_kerb_auth_*	250	# see files/patch-squid_kerb_auth:
252	CONFIGURE_ARGS+= --enable-negotiate-auth-helpers="squid_kerb_auth"	251	CONFIGURE_ARGS+= --enable-negotiate-auth-helpers="squid_kerb_auth"
253	libexec+= squid_kerb_auth	252	libexec+= squid_kerb_auth
254	.endif	253	.endif

Lines 1-38 Link Here

(-)files/patch-squid-advisory-2010:1 (-38 lines)
1	FreeBSD-Patch for Squid-Advisory 2010:1, prepared by Thomas-Martin Seck,
2	<tmseck@web.de>, 2010-02-01.
3
4	Removed one directory level and the first hunk with CVS meta-information
5	from the original patch. The original patch can be downloaded from:
6	http://www.squid-cache.org/Versions/v2/HEAD/changesets/12597.patch
7
8	---------------------
9	PatchSet 12597
10	Date: 2010/01/15 11:40:30
11	Author: amosjeffries
12	Branch: HEAD
13	Tag: (none)
14	Log:
15	Handle DNS header-only packets as invalid.
16
17	Members:
18	lib/rfc1035.c:1.30->1.31
19
20	Index: lib/rfc1035.c
21	===================================================================
22	RCS file: /cvsroot/squid/squid/lib/rfc1035.c,v
23	retrieving revision 1.30
24	retrieving revision 1.31
25	diff -u -r1.30 -r1.31
26	--- lib/rfc1035.c 15 Jun 2008 03:49:55 -0000 1.30
27	+++ lib/rfc1035.c 15 Jan 2010 11:40:30 -0000 1.31
28	@@ -286,7 +286,9 @@
29	size_t len;
30	assert(ns > 0);
31	do {
32	- assert((*off) < sz);
33	+ if ((*off) >= sz) {
34	+ return 1;
35	+ }
36	c = (buf + (off));
37	if (c > 191) {
38	/* blasted compression */