Attachment 199924 Details for Bug 233845 – squid-4.4.patch

[patch] squid-4.4.patch

squid-4.4.patch (text/plain), 5.11 KB, created by takefu on 2018-12-07 08:40:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2018-12-07 08:40:27 UTC

Size: 5.11 KB

patch

obsolete

>diff -udprN /usr/ports/www/squid/distinfo ./distinfo
>--- /usr/ports/www/squid/distinfo	2018-10-01 18:31:40.000000000 +0000
>+++ ./distinfo	2018-12-07 07:54:59.814882000 +0000
>@@ -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
>diff -udprN /usr/ports/www/squid/files/patch-src_comm_TcpAcceptor.cc ./files/patch-src_comm_TcpAcceptor.cc
>--- /usr/ports/www/squid/files/patch-src_comm_TcpAcceptor.cc	2018-10-11 07:14:16.000000000 +0000
>+++ ./files/patch-src_comm_TcpAcceptor.cc	2018-12-07 08:01:53.837697000 +0000
>@@ -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 mishan
>          mustStop("Listener socket closed");
>          return;
>      }
>-@@ -366,11 +367,12 @@
>+@@ -366,11 +367,12 @@ Comm::TcpAcceptor::oldAccept(Comm::Conne
>  
>          PROF_stop(comm_accept);
>  
>diff -udprN /usr/ports/www/squid/files/patch-src_ssl_bio.cc ./files/patch-src_ssl_bio.cc
>--- /usr/ports/www/squid/files/patch-src_ssl_bio.cc	2018-10-01 18:31:40.000000000 +0000
>+++ ./files/patch-src_ssl_bio.cc	1970-01-01 00:00:00.000000000 +0000
>@@ -1,14 +0,0 @@
>---- src/ssl/bio.cc.orig	2018-06-21 15:26:17 UTC
>-+++ src/ssl/bio.cc
>-@@ -76,7 +76,11 @@ Ssl::Bio::Create(const int fd, Security:
>-         BIO_meth_set_create(SquidMethods, squid_bio_create);
>-         BIO_meth_set_destroy(SquidMethods, squid_bio_destroy);
>-     }
>-+#if defined(LIBRESSL_VERSION_NUMBER)
>-+    BIO_METHOD *useMethod = SquidMethods;
>-+#elif !defined(LIBRESSL_VERSION_NUMBER)
>-     const BIO_METHOD *useMethod = SquidMethods;
>-+#endif
>- #else
>-     BIO_METHOD *useMethod = &SquidMethods;
>- #endif
>diff -udprN /usr/ports/www/squid/Makefile ./Makefile
>--- /usr/ports/www/squid/Makefile	2018-10-11 07:14:16.000000000 +0000
>+++ ./Makefile	2018-12-07 08:20:21.260152000 +0000
>@@ -1,8 +1,7 @@
> # $FreeBSD: head/www/squid/Makefile 481788 2018-10-11 07:14:16Z pi $
> 
> 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/
> 		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:

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 233845: 199924