Date: Sun, 9 Dec 2018 00:18:40 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487000 - in head/www/squid: . files Message-ID: <201812090018.wB90IewN063892@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sun Dec 9 00:18:40 2018 New Revision: 487000 URL: https://svnweb.freebsd.org/changeset/ports/487000 Log: www/squid: Update to 4.4 While here, pet portlint PR: 233845 Submitted by: takefu@airport.fm Approved by: timp87@gmail.com (maintainer) Deleted: head/www/squid/files/patch-src_ssl_bio.cc Modified: head/www/squid/Makefile (contents, props changed) head/www/squid/distinfo (contents, props changed) head/www/squid/files/patch-src_comm_TcpAcceptor.cc (contents, props changed) Modified: head/www/squid/Makefile ============================================================================== --- head/www/squid/Makefile Sat Dec 8 23:35:27 2018 (r486999) +++ head/www/squid/Makefile Sun Dec 9 00:18:40 2018 (r487000) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 4.3 -PORTREVISION= 1 +PORTVERSION= 4.4 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \ http://www2.us.squid-cache.org/Versions/v4/ \ @@ -18,6 +17,8 @@ PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://master.squid-cache.org/~amosjeffries/patches/:nosid PATCH_SITE_SUBDIR= Versions/v4/changesets +PATCHFILES= squid-4-bc54d7a6f7ec510a25966f2f800d3ea874657546.patch:-p1\ + squid-4-0022167d80725513d95b38aaebc90086fc0b6938.patch:-p1 MAINTAINER= timp87@gmail.com COMMENT= HTTP Caching Proxy @@ -27,9 +28,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_powerpc64= fails to link: ext_time_quota_acl.cc: undefined reference to std::ctype -CONFLICTS= squid*-3.* - USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz + +CONFLICTS= squid*-3.* CPE_VENDOR= squid-cache SHEBANG_FILES= scripts/*.pl contrib/*.pl tools/*.pl GNU_CONFIGURE= yes @@ -296,12 +297,12 @@ post-patch: @(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample) post-patch-IPV6-off: - @${REINPLACE_CMD} -e's/ ::1//' -e's/ fc00::\/7//' \ - -e's/ fe80::\/10//' -e's/ 2001:DB8::2//' \ - -e's/ 2001:DB8::a:0\/64//' \ - -e'/tcp_outgoing_address 2001:db8::c001 good_service_net/d' \ - -e'/tcp_outgoing_address 2001:db8::beef normal_service_net/d' \ - -e'/tcp_outgoing_address 2001:db8::1/d' \ + @${REINPLACE_CMD} -e's| ::1||' -e's|^.*fc00::\/7.*||' \ + -e's|^.*fe80::\/10.*||' -e's| 2001:DB8::2||' \ + -e's| 2001:DB8::a:0\/64||' \ + -e's|tcp_outgoing_address 2001:db8::c001 good_service_net||' \ + -e's|tcp_outgoing_address 2001:db8::beef normal_service_net||' \ + -e's|tcp_outgoing_address 2001:db8::1||' \ ${WRKSRC}/src/cf.data.pre post-install: Modified: head/www/squid/distinfo ============================================================================== --- head/www/squid/distinfo Sat Dec 8 23:35:27 2018 (r486999) +++ head/www/squid/distinfo Sun Dec 9 00:18:40 2018 (r487000) @@ -1,3 +1,7 @@ -TIMESTAMP = 1537243691 -SHA256 (squid4/squid-4.3.tar.xz) = 322612ef0544828f6c673a25124b32364fb41ef5e2847e21c89480b5546a4c7c -SIZE (squid4/squid-4.3.tar.xz) = 2435880 +TIMESTAMP = 1544169299 +SHA256 (squid4/squid-4.4.tar.xz) = 4905e6da7f5574d2583ba36f398bb062a12d51e70d67035078b6e85b09e9ee82 +SIZE (squid4/squid-4.4.tar.xz) = 2436468 +SHA256 (squid4/squid-4-bc54d7a6f7ec510a25966f2f800d3ea874657546.patch) = f1aa17763465a8c02b188e1b4c312452ce0382f1631b8dc6816e4ceb45dff166 +SIZE (squid4/squid-4-bc54d7a6f7ec510a25966f2f800d3ea874657546.patch) = 4237 +SHA256 (squid4/squid-4-0022167d80725513d95b38aaebc90086fc0b6938.patch) = 579310bf48d87635e97cb3ff6c3f0ea223ec9bcbdba562ac770d5d177f3316da +SIZE (squid4/squid-4-0022167d80725513d95b38aaebc90086fc0b6938.patch) = 5538 Modified: head/www/squid/files/patch-src_comm_TcpAcceptor.cc ============================================================================== --- head/www/squid/files/patch-src_comm_TcpAcceptor.cc Sat Dec 8 23:35:27 2018 (r486999) +++ head/www/squid/files/patch-src_comm_TcpAcceptor.cc Sun Dec 9 00:18:40 2018 (r487000) @@ -1,19 +1,6 @@ -Bug 4889: No connections are accepted after ECONNABORTED - -Ignore ECONNABORTED errors when accepting connections. These "client -decided not to wait for accept(2)" errors do not indicate a problem with -the listening socket and should not lead to listening socket closure. - -Also polished errno checking code for non-ignored errors. - -Also documented a bug that prevents TcpAcceptor::acceptOne() from -stopping to listen on non-ignored accept errors. - -Also documented ENFILE and EMFILE mishandling. - ---- src/comm/TcpAcceptor.cc.orig 2018-09-30 20:57:54.000000000 +0200 -+++ src/comm/TcpAcceptor.cc 2018-10-10 18:10:05.897616000 +0200 -@@ -297,6 +297,7 @@ +--- src/comm/TcpAcceptor.cc.orig 2018-10-27 20:44:55 UTC ++++ src/comm/TcpAcceptor.cc +@@ -297,6 +297,7 @@ Comm::TcpAcceptor::acceptOne() if (intendedForUserConnections()) logAcceptError(newConnDetails); notify(flag, newConnDetails); @@ -21,7 +8,7 @@ Also documented ENFILE and EMFILE mishandling. mustStop("Listener socket closed"); return; } -@@ -366,11 +367,12 @@ +@@ -366,11 +367,12 @@ Comm::TcpAcceptor::oldAccept(Comm::Conne PROF_stop(comm_accept);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812090018.wB90IewN063892>