Bug 63030 - [Maintainer] www/squid: Integrate new vendor patches
Summary: [Maintainer] www/squid: Integrate new vendor patches
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-02-18 18:10 UTC by Thomas-Martin Seck
Modified: 2004-02-25 00:23 UTC (History)
0 users

See Also:

Attachments
file.diff (8.62 KB, patch)
2004-02-18 18:10 UTC, Thomas-Martin Seck 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas-Martin Seck 2004-02-18 18:10:10 UTC 
- Integrate a new set of vendor patches, see
  http://www.squid-cache.org/Versions/v2/2.5/bugs/ for details
- Remove two local patches in favour of the respective vendor patches
- Bump PORTREVISION

Committer info:
please cvs rm files/patch-src_acl.c and
files/patch-helpers_ntlm_auth_SMB_smbval

Fix: Here's the patch:

cvs rdiff: Diffing projekte/FreeBSD/ports/www/squid
Comment 1 Thomas-Martin Seck 2004-02-18 20:04:38 UTC 
Hrmpf. It seems the squid folks are once again in the middle of a patch
frenzy.

Please patch my original update patch with this one:

Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/projekte/FreeBSD/ports/www/squid/Makefile,v
retrieving revision 1.5.2.16
retrieving revision 1.5.2.17
diff -u -r1.5.2.16 -r1.5.2.17
--- Makefile	18 Feb 2004 17:41:39 -0000	1.5.2.16
+++ Makefile	18 Feb 2004 19:58:33 -0000	1.5.2.17
@@ -83,7 +83,9 @@
 		squid-2.5.STABLE4-squidclient_auth.patch \
 		squid-2.5.STABLE4-authfixes.patch \
 		squid-2.5.STABLE4-arp-FreeBSD.patch \
-		squid-2.5.STABLE4-deny_info_reply.patch
+		squid-2.5.STABLE4-deny_info_reply.patch \
+		squid-2.5.STABLE4-authfixes2.patch \
+		squid-2.5.STABLE4-reply_body_max_size.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
Index: distinfo
===================================================================
RCS file: /usr/local/cvsroot/projekte/FreeBSD/ports/www/squid/distinfo,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -u -r1.4.2.9 -r1.4.2.10
--- distinfo	18 Feb 2004 17:41:39 -0000	1.4.2.9
+++ distinfo	18 Feb 2004 19:58:33 -0000	1.4.2.10
@@ -90,9 +90,13 @@
 SIZE (squid2.5/squid-2.5.STABLE4-miss_access_internal.patch) = 837
 MD5 (squid2.5/squid-2.5.STABLE4-squidclient_auth.patch) = eff31cbd54adad086d50e0ae7dbe2c6e
 SIZE (squid2.5/squid-2.5.STABLE4-squidclient_auth.patch) = 1107
-MD5 (squid2.5/squid-2.5.STABLE4-authfixes.patch) = 98c4eff7b9c2fe44770ff33bef1d0d0b
-SIZE (squid2.5/squid-2.5.STABLE4-authfixes.patch) = 9277
+MD5 (squid2.5/squid-2.5.STABLE4-authfixes.patch) = 139ab240c01acf6eeed7ead27f0ce387
+SIZE (squid2.5/squid-2.5.STABLE4-authfixes.patch) = 9401
 MD5 (squid2.5/squid-2.5.STABLE4-arp-FreeBSD.patch) = bad7a9a59071faf569734f022b35b28f
 SIZE (squid2.5/squid-2.5.STABLE4-arp-FreeBSD.patch) = 3999
 MD5 (squid2.5/squid-2.5.STABLE4-deny_info_reply.patch) = 97a9af2a33ded35bcef989181318ac71
 SIZE (squid2.5/squid-2.5.STABLE4-deny_info_reply.patch) = 1951
+MD5 (squid2.5/squid-2.5.STABLE4-authfixes2.patch) = b1de702ac773133affa1393c48d04807
+SIZE (squid2.5/squid-2.5.STABLE4-authfixes2.patch) = 2222
+MD5 (squid2.5/squid-2.5.STABLE4-reply_body_max_size.patch) = 79beba0e5466279ffbdd4322a3579aeb
+SIZE (squid2.5/squid-2.5.STABLE4-reply_body_max_size.patch) = 524
Comment 2 Thomas-Martin Seck 2004-02-20 15:08:42 UTC 
Integrate the latest vendor patches as of Feb 20, 2004.

As usual, see http://www.squid-cache.org/Versions/v2/2.5/bugs for
details about what has been fixed.

(A cumulative patch can be made available upon request for easier
committing.)

Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/projekte/FreeBSD/ports/www/squid/Makefile,v
retrieving revision 1.5.2.17
diff -u -r1.5.2.17 Makefile
--- Makefile	18 Feb 2004 19:58:33 -0000	1.5.2.17
+++ Makefile	20 Feb 2004 14:33:19 -0000
@@ -85,7 +85,9 @@
 		squid-2.5.STABLE4-arp-FreeBSD.patch \
 		squid-2.5.STABLE4-deny_info_reply.patch \
 		squid-2.5.STABLE4-authfixes2.patch \
-		squid-2.5.STABLE4-reply_body_max_size.patch
+		squid-2.5.STABLE4-reply_body_max_size.patch \
+		squid-2.5.STABLE4-digest-abort.patch \
+		squid-2.5.STABLE4-ntlm_auth_user_hash_pointer-leak.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
Index: distinfo
===================================================================
RCS file: /usr/local/cvsroot/projekte/FreeBSD/ports/www/squid/distinfo,v
retrieving revision 1.4.2.10
diff -u -r1.4.2.10 distinfo
--- distinfo	18 Feb 2004 19:58:33 -0000	1.4.2.10
+++ distinfo	20 Feb 2004 14:34:09 -0000
@@ -100,3 +100,7 @@
 SIZE (squid2.5/squid-2.5.STABLE4-authfixes2.patch) = 2222
 MD5 (squid2.5/squid-2.5.STABLE4-reply_body_max_size.patch) = 79beba0e5466279ffbdd4322a3579aeb
 SIZE (squid2.5/squid-2.5.STABLE4-reply_body_max_size.patch) = 524
+MD5 (squid2.5/squid-2.5.STABLE4-digest-abort.patch) = a0cf9a5451b89bb6d8a8982a14791c15
+SIZE (squid2.5/squid-2.5.STABLE4-digest-abort.patch) = 946
+MD5 (squid2.5/squid-2.5.STABLE4-ntlm_auth_user_hash_pointer-leak.patch) = 8422d34ab797ae07727a5f2fdfe1a832
+SIZE (squid2.5/squid-2.5.STABLE4-ntlm_auth_user_hash_pointer-leak.patch) = 3277
Comment 3 Thomas-Martin Seck 2004-02-24 23:51:39 UTC 
This PR can be closed, the cumulative update has been committed by eik@
Comment 4 Mark Linimon freebsd_committer freebsd_triage 2004-02-25 00:23:02 UTC 
State Changed
From-To: open->closed

Submitter notes that the changes have already been committed.