ports/122382: [Maintainer] www/squid30: update to 3.0.STABLE4
Thomas-Martin Seck
tmseck at web.de
Wed Apr 2 19:40:01 UTC 2008
>Number: 122382
>Category: ports
>Synopsis: [Maintainer] www/squid30: update to 3.0.STABLE4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 02 19:40:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 7.0-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of April 2, 2008.
>Description:
- Update to 3.0.STABLE4
- Remove two patches that are no longer needed
Removed files:
files/patch-bug-2206
files/patch-configure
>How-To-Repeat:
>Fix:
Apply this patch:
Index: Makefile
===================================================================
--- Makefile (.../www/squid30) (revision 1338)
+++ Makefile (.../local/squid30) (revision 1338)
@@ -62,8 +62,7 @@
# requests.
PORTNAME= squid
-PORTVERSION= 3.0.2
-PORTREVISION= 1
+PORTVERSION= 3.0.4
CATEGORIES= www
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
@@ -82,7 +81,7 @@
http://www1.jp.squid-cache.org/Versions/v3/3.0/ \
http://www2.tw.squid-cache.org/Versions/v3/3.0/
MASTER_SITE_SUBDIR= squid-3/STABLE
-DISTNAME= squid-3.0.STABLE2
+DISTNAME= squid-3.0.STABLE4
DIST_SUBDIR= squid3.0
PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
Index: distinfo
===================================================================
--- distinfo (.../www/squid30) (revision 1338)
+++ distinfo (.../local/squid30) (revision 1338)
@@ -1,3 +1,3 @@
-MD5 (squid3.0/squid-3.0.STABLE2.tar.bz2) = 33c89b22aaf27d12b818b5f120aa0322
-SHA256 (squid3.0/squid-3.0.STABLE2.tar.bz2) = eabace0fd4f61a49389d1dffb20705b4a22ba8d65e281e6c5fff47c1aeef2ed1
-SIZE (squid3.0/squid-3.0.STABLE2.tar.bz2) = 1822143
+MD5 (squid3.0/squid-3.0.STABLE4.tar.bz2) = 50ea09d59b8a37b34d0ea38acb1eef43
+SHA256 (squid3.0/squid-3.0.STABLE4.tar.bz2) = b838dd87a6a6c9c1fda24f29f991b84f16a0ee3a1cf18705c61dde405a09b7ca
+SIZE (squid3.0/squid-3.0.STABLE4.tar.bz2) = 1818054
Index: files/patch-bug-2206
===================================================================
--- files/patch-bug-2206 (.../www/squid30) (revision 1338)
+++ files/patch-bug-2206 (.../local/squid30) (revision 1338)
@@ -1,50 +0,0 @@
-Temporary patch for Squid bug 2206 ("no proxy Authenticate header in 407
-response") as fetched from Squid bugzilla 2008-03-26.
-
-See <http://www.squid-cache.org/bugs/show_bug_cgi?id=2206> for further
-information.
-=== modified file 'src/HttpHeader.cc'
---- src/HttpHeader.cc 2008-02-27 12:59:29 +0000
-+++ src/HttpHeader.cc 2008-03-12 20:53:15 +0000
-@@ -1806,5 +1806,7 @@
- }
- if (headers_deleted)
- refreshMask();
-+
-+ delById(HDR_CONNECTION);
- }
- }
-
-=== modified file 'src/HttpHeader.h'
---- src/HttpHeader.h 2008-02-27 12:59:29 +0000
-+++ src/HttpHeader.h 2008-03-12 20:53:56 +0000
-@@ -247,15 +247,13 @@
- int hasListMember(http_hdr_type id, const char *member, const char separator) const;
- int hasByNameListMember(const char *name, const char *member, const char separator) const;
- void removeHopByHopEntries();
-+ void removeConnectionHeaderEntries();
- /* protected, do not use these, use interface functions instead */
- Vector<HttpHeaderEntry *> entries; /* parsed fields in raw format */
- HttpHeaderMask mask; /* bit set <=> entry present */
- http_hdr_owner_type owner; /* request or reply */
- int len; /* length when packed, not counting terminating '\0' */
-
--protected:
-- void removeConnectionHeaderEntries();
--
- private:
- HttpHeaderEntry *findLastEntry(http_hdr_type id) const;
- // Make it non-copyable. Our destructor is a bit nasty...
-
-=== modified file 'src/client_side_reply.cc'
---- src/client_side_reply.cc 2008-02-27 12:59:29 +0000
-+++ src/client_side_reply.cc 2008-03-12 20:54:37 +0000
-@@ -1214,7 +1214,7 @@
- if (is_hit)
- hdr->delById(HDR_SET_COOKIE);
-
-- reply->header.removeHopByHopEntries();
-+ reply->header.removeConnectionHeaderEntries();
-
- // if (request->range)
- // clientBuildRangeHeader(http, reply);
Index: files/patch-configure
===================================================================
--- files/patch-configure (.../www/squid30) (revision 1338)
+++ files/patch-configure (.../local/squid30) (revision 1338)
@@ -1,21 +0,0 @@
-Patch for Squid bug #2203:
-
-LDFLAGS gets unset when --with-filedescriptors=n is added to
-SQUID_CONFIGURE_ARGS.
-
---- configure.orig 2008-03-26 21:16:54.000000000 +0100
-+++ configure 2008-03-26 21:18:40.000000000 +0100
-@@ -43819,12 +43819,12 @@
-
- { echo "$as_me:$LINENO: checking Maximum number of filedescriptors we can open" >&5
- echo $ECHO_N "checking Maximum number of filedescriptors we can open... $ECHO_C" >&6; }
-+TLDFLAGS="$LDFLAGS"
- if test -n "$squid_filedescriptors_num" ; then
- SQUID_MAXFD=$squid_filedescriptors_num
- { echo "$as_me:$LINENO: result: $SQUID_MAXFD (user-forced)" >&5
- echo "${ECHO_T}$SQUID_MAXFD (user-forced)" >&6; }
- else
-- TLDFLAGS="$LDFLAGS"
- case $host in
- i386-unknown-freebsd*)
- if echo "$LDFLAGS" | grep -q pthread; then
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list