summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorSergey Matveychuk <sem@FreeBSD.org>2006-06-04 19:55:31 +0000
committerSergey Matveychuk <sem@FreeBSD.org>2006-06-04 19:55:31 +0000
commit2b17f205b05f43139ddc02ab3aa57648dea69fcb (patch)
treeafac67091bbce19558720d7214d1907d9ddce223 /www
parentrxvt-unicode assume wchar_t is Unicode, but it's not true for FreeBSD. (diff)
- Integrate a vendor patch published on
<http://www.squid-cache.org/Versions/v2/2.5/bugs/> to fix an "assertion failed: HttpReply.c:105: rep" error (squid bug #1606). - Update the customlog patchset accordingly. - Bump PORTREVISION. PR: ports/97066 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=164356
Diffstat (limited to 'www')
-rw-r--r--www/squid/Makefile3
-rw-r--r--www/squid/distinfo3
-rw-r--r--www/squid/files/customlog-2.5.patch18
-rw-r--r--www/squid25/Makefile3
-rw-r--r--www/squid25/distinfo3
-rw-r--r--www/squid25/files/customlog-2.5.patch18
-rw-r--r--www/squid26/Makefile3
-rw-r--r--www/squid26/distinfo3
-rw-r--r--www/squid26/files/customlog-2.5.patch18
-rw-r--r--www/squid27/Makefile3
-rw-r--r--www/squid27/distinfo3
-rw-r--r--www/squid27/files/customlog-2.5.patch18
-rw-r--r--www/squid30/Makefile3
-rw-r--r--www/squid30/distinfo3
-rw-r--r--www/squid30/files/customlog-2.5.patch18
-rw-r--r--www/squid31/Makefile3
-rw-r--r--www/squid31/distinfo3
-rw-r--r--www/squid31/files/customlog-2.5.patch18
18 files changed, 30 insertions, 114 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 2945a6166379..3541d0c11994 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -73,6 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.14
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -85,7 +86,7 @@ DISTNAME= squid-2.5.STABLE14
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=
+PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
diff --git a/www/squid/distinfo b/www/squid/distinfo
index fd037f2c3274..dcf1244c991e 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,3 +1,6 @@
MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
+MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
+SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
+SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
diff --git a/www/squid/files/customlog-2.5.patch b/www/squid/files/customlog-2.5.patch
index 35f58e9d0f32..3e8c2a542204 100644
--- a/www/squid/files/customlog-2.5.patch
+++ b/www/squid/files/customlog-2.5.patch
@@ -1289,24 +1289,6 @@ diff -u src/client_side.c:1.47.2.76 src/client_side.c:1.47.2.31.2.15
safe_free(http->redirect.location);
stringClean(&http->range_iter.boundary);
if ((e = http->entry)) {
-@@ -2031,8 +2041,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
-@@ -2067,8 +2075,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
Index: src/icp_v2.c
diff -u src/icp_v2.c:1.5 src/icp_v2.c:1.5.60.1
--- src/icp_v2.c:1.5 Fri May 4 06:39:12 2001
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 2945a6166379..3541d0c11994 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -73,6 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.14
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -85,7 +86,7 @@ DISTNAME= squid-2.5.STABLE14
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=
+PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index fd037f2c3274..dcf1244c991e 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -1,3 +1,6 @@
MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
+MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
+SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
+SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
diff --git a/www/squid25/files/customlog-2.5.patch b/www/squid25/files/customlog-2.5.patch
index 35f58e9d0f32..3e8c2a542204 100644
--- a/www/squid25/files/customlog-2.5.patch
+++ b/www/squid25/files/customlog-2.5.patch
@@ -1289,24 +1289,6 @@ diff -u src/client_side.c:1.47.2.76 src/client_side.c:1.47.2.31.2.15
safe_free(http->redirect.location);
stringClean(&http->range_iter.boundary);
if ((e = http->entry)) {
-@@ -2031,8 +2041,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
-@@ -2067,8 +2075,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
Index: src/icp_v2.c
diff -u src/icp_v2.c:1.5 src/icp_v2.c:1.5.60.1
--- src/icp_v2.c:1.5 Fri May 4 06:39:12 2001
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 2945a6166379..3541d0c11994 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -73,6 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.14
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -85,7 +86,7 @@ DISTNAME= squid-2.5.STABLE14
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=
+PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index fd037f2c3274..dcf1244c991e 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -1,3 +1,6 @@
MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
+MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
+SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
+SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
diff --git a/www/squid26/files/customlog-2.5.patch b/www/squid26/files/customlog-2.5.patch
index 35f58e9d0f32..3e8c2a542204 100644
--- a/www/squid26/files/customlog-2.5.patch
+++ b/www/squid26/files/customlog-2.5.patch
@@ -1289,24 +1289,6 @@ diff -u src/client_side.c:1.47.2.76 src/client_side.c:1.47.2.31.2.15
safe_free(http->redirect.location);
stringClean(&http->range_iter.boundary);
if ((e = http->entry)) {
-@@ -2031,8 +2041,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
-@@ -2067,8 +2075,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
Index: src/icp_v2.c
diff -u src/icp_v2.c:1.5 src/icp_v2.c:1.5.60.1
--- src/icp_v2.c:1.5 Fri May 4 06:39:12 2001
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 2945a6166379..3541d0c11994 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -73,6 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.14
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -85,7 +86,7 @@ DISTNAME= squid-2.5.STABLE14
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=
+PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index fd037f2c3274..dcf1244c991e 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1,3 +1,6 @@
MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
+MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
+SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
+SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
diff --git a/www/squid27/files/customlog-2.5.patch b/www/squid27/files/customlog-2.5.patch
index 35f58e9d0f32..3e8c2a542204 100644
--- a/www/squid27/files/customlog-2.5.patch
+++ b/www/squid27/files/customlog-2.5.patch
@@ -1289,24 +1289,6 @@ diff -u src/client_side.c:1.47.2.76 src/client_side.c:1.47.2.31.2.15
safe_free(http->redirect.location);
stringClean(&http->range_iter.boundary);
if ((e = http->entry)) {
-@@ -2031,8 +2041,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
-@@ -2067,8 +2075,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
Index: src/icp_v2.c
diff -u src/icp_v2.c:1.5 src/icp_v2.c:1.5.60.1
--- src/icp_v2.c:1.5 Fri May 4 06:39:12 2001
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 2945a6166379..3541d0c11994 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -73,6 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.14
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -85,7 +86,7 @@ DISTNAME= squid-2.5.STABLE14
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=
+PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index fd037f2c3274..dcf1244c991e 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1,3 +1,6 @@
MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
+MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
+SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
+SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
diff --git a/www/squid30/files/customlog-2.5.patch b/www/squid30/files/customlog-2.5.patch
index 35f58e9d0f32..3e8c2a542204 100644
--- a/www/squid30/files/customlog-2.5.patch
+++ b/www/squid30/files/customlog-2.5.patch
@@ -1289,24 +1289,6 @@ diff -u src/client_side.c:1.47.2.76 src/client_side.c:1.47.2.31.2.15
safe_free(http->redirect.location);
stringClean(&http->range_iter.boundary);
if ((e = http->entry)) {
-@@ -2031,8 +2041,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
-@@ -2067,8 +2075,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
Index: src/icp_v2.c
diff -u src/icp_v2.c:1.5 src/icp_v2.c:1.5.60.1
--- src/icp_v2.c:1.5 Fri May 4 06:39:12 2001
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 2945a6166379..3541d0c11994 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -73,6 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.14
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -85,7 +86,7 @@ DISTNAME= squid-2.5.STABLE14
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=
+PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index fd037f2c3274..dcf1244c991e 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,3 +1,6 @@
MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
+MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
+SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
+SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
diff --git a/www/squid31/files/customlog-2.5.patch b/www/squid31/files/customlog-2.5.patch
index 35f58e9d0f32..3e8c2a542204 100644
--- a/www/squid31/files/customlog-2.5.patch
+++ b/www/squid31/files/customlog-2.5.patch
@@ -1289,24 +1289,6 @@ diff -u src/client_side.c:1.47.2.76 src/client_side.c:1.47.2.31.2.15
safe_free(http->redirect.location);
stringClean(&http->range_iter.boundary);
if ((e = http->entry)) {
-@@ -2031,8 +2041,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
-@@ -2067,8 +2075,6 @@
- http->entry = clientCreateStoreEntry(http, http->request->method,
- null_request_flags);
- errorAppendEntry(http->entry, err);
-- httpReplyDestroy(http->reply);
-- http->reply = NULL;
- memFree(buf, MEM_CLIENT_SOCK_BUF);
- return;
- }
Index: src/icp_v2.c
diff -u src/icp_v2.c:1.5 src/icp_v2.c:1.5.60.1
--- src/icp_v2.c:1.5 Fri May 4 06:39:12 2001
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 07:53:47 +0000