Attachment #199924 for bug #233845

View | Details | Raw Unified | Return to bug 233845
Collapse All | Expand All

Lines 1-3 Link Here

(-)./distinfo (-3 / +7 lines)
1	TIMESTAMP = 1537243691	1	TIMESTAMP = 1544169299
2	SHA256 (squid4/squid-4.3.tar.xz) = 322612ef0544828f6c673a25124b32364fb41ef5e2847e21c89480b5546a4c7c	2	SHA256 (squid4/squid-4.4.tar.xz) = 4905e6da7f5574d2583ba36f398bb062a12d51e70d67035078b6e85b09e9ee82
3	SIZE (squid4/squid-4.3.tar.xz) = 2435880	3	SIZE (squid4/squid-4.4.tar.xz) = 2436468
		4	SHA256 (squid4/squid-4-bc54d7a6f7ec510a25966f2f800d3ea874657546.patch) = f1aa17763465a8c02b188e1b4c312452ce0382f1631b8dc6816e4ceb45dff166
		5	SIZE (squid4/squid-4-bc54d7a6f7ec510a25966f2f800d3ea874657546.patch) = 4237
		6	SHA256 (squid4/squid-4-0022167d80725513d95b38aaebc90086fc0b6938.patch) = 579310bf48d87635e97cb3ff6c3f0ea223ec9bcbdba562ac770d5d177f3316da
		7	SIZE (squid4/squid-4-0022167d80725513d95b38aaebc90086fc0b6938.patch) = 5538




--- src/comm/TcpAcceptor.cc.orig	2018-10-27 20:44:55 UTC
+++ src/comm/TcpAcceptor.cc
@@ -297,6 +297,7 @@ Comm::TcpAcceptor::acceptOne()
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 @@
         if (intendedForUserConnections())
             logAcceptError(newConnDetails);
         notify(flag, newConnDetails);

         mustStop("Listener socket closed");
         return;
     }
@@ -366,11 +367,12 @@ Comm::TcpAcceptor::oldAccept(Comm::Conne
 
         PROF_stop(comm_accept);
 




--- 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

Lines 1-8 Link Here

(-)./Makefile (-10 / +11 lines)
1	# $FreeBSD: head/www/squid/Makefile 481788 2018-10-11 07:14:16Z pi $	1	# $FreeBSD: head/www/squid/Makefile 481788 2018-10-11 07:14:16Z pi $
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 4.3	4	PORTVERSION= 4.4
5	PORTREVISION= 1
6	CATEGORIES= www ipv6	5	CATEGORIES= www ipv6
7	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \	6	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \
8	http://www2.us.squid-cache.org/Versions/v4/ \	7	http://www2.us.squid-cache.org/Versions/v4/ \
Lines 18-23 PATCH_SITES= http://www.squid-cache.org/ Link Here
18	http://www1.jp.squid-cache.org/%SUBDIR%/ \	17	http://www1.jp.squid-cache.org/%SUBDIR%/ \
19	http://master.squid-cache.org/~amosjeffries/patches/:nosid	18	http://master.squid-cache.org/~amosjeffries/patches/:nosid
20	PATCH_SITE_SUBDIR= Versions/v4/changesets	19	PATCH_SITE_SUBDIR= Versions/v4/changesets
		20	PATCHFILES= squid-4-bc54d7a6f7ec510a25966f2f800d3ea874657546.patch:-p1\
		21	squid-4-0022167d80725513d95b38aaebc90086fc0b6938.patch:-p1
21		22
22	MAINTAINER= timp87@gmail.com	23	MAINTAINER= timp87@gmail.com
23	COMMENT= HTTP Caching Proxy	24	COMMENT= HTTP Caching Proxy
Lines 27-35 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
27		28
28	BROKEN_powerpc64= fails to link: ext_time_quota_acl.cc: undefined reference to std::ctype	29	BROKEN_powerpc64= fails to link: ext_time_quota_acl.cc: undefined reference to std::ctype
29		30
30	CONFLICTS= squid-3.
31
32	USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz	31	USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz
		32
		33	CONFLICTS= squid-3.
33	CPE_VENDOR= squid-cache	34	CPE_VENDOR= squid-cache
34	SHEBANG_FILES= scripts/.pl contrib/.pl tools/*.pl	35	SHEBANG_FILES= scripts/.pl contrib/.pl tools/*.pl
35	GNU_CONFIGURE= yes	36	GNU_CONFIGURE= yes
Lines 296-307 post-patch: Link Here
296	@(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample)	297	@(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample)
297		298
298	post-patch-IPV6-off:	299	post-patch-IPV6-off:
299	@${REINPLACE_CMD} -e's/ ::1//' -e's/ fc00::\/7//' \	300	@${REINPLACE_CMD} -e's\| ::1\|\|' -e's\|^.fc00::\/7.\|\|' \
300	-e's/ fe80::\/10//' -e's/ 2001:DB8::2//' \	301	-e's\|^.fe80::\/10.\|\|' -e's\| 2001:DB8::2\|\|' \
301	-e's/ 2001:DB8::a:0\/64//' \	302	-e's\| 2001:DB8::a:0\/64\|\|' \
302	-e'/tcp_outgoing_address 2001:db8::c001 good_service_net/d' \	303	-e's\|tcp_outgoing_address 2001:db8::c001 good_service_net\|\|' \
303	-e'/tcp_outgoing_address 2001:db8::beef normal_service_net/d' \	304	-e's\|tcp_outgoing_address 2001:db8::beef normal_service_net\|\|' \
304	-e'/tcp_outgoing_address 2001:db8::1/d' \	305	-e's\|tcp_outgoing_address 2001:db8::1\|\|' \
305	${WRKSRC}/src/cf.data.pre	306	${WRKSRC}/src/cf.data.pre
306		307
307	post-install:	308	post-install:

Return to bug 233845

Lines 1-19 Link Here

(-)./files/patch-src_comm_TcpAcceptor.cc (-17 / +4 lines)
1	Bug 4889: No connections are accepted after ECONNABORTED	1	--- src/comm/TcpAcceptor.cc.orig 2018-10-27 20:44:55 UTC
2		2	+++ src/comm/TcpAcceptor.cc
3	Ignore ECONNABORTED errors when accepting connections. These "client	3	@@ -297,6 +297,7 @@ Comm::TcpAcceptor::acceptOne()
4	decided not to wait for accept(2)" errors do not indicate a problem with
5	the listening socket and should not lead to listening socket closure.
6
7	Also polished errno checking code for non-ignored errors.
8
9	Also documented a bug that prevents TcpAcceptor::acceptOne() from
10	stopping to listen on non-ignored accept errors.
11
12	Also documented ENFILE and EMFILE mishandling.
13
14	--- src/comm/TcpAcceptor.cc.orig 2018-09-30 20:57:54.000000000 +0200
15	+++ src/comm/TcpAcceptor.cc 2018-10-10 18:10:05.897616000 +0200
16	@@ -297,6 +297,7 @@
17	if (intendedForUserConnections())	4	if (intendedForUserConnections())
18	logAcceptError(newConnDetails);	5	logAcceptError(newConnDetails);
19	notify(flag, newConnDetails);	6	notify(flag, newConnDetails);
Lines 21-27 Also documented ENFILE and EMFILE mishan Link Here
21	mustStop("Listener socket closed");	8	mustStop("Listener socket closed");
22	return;	9	return;
23	}	10	}
24	@@ -366,11 +367,12 @@	11	@@ -366,11 +367,12 @@ Comm::TcpAcceptor::oldAccept(Comm::Conne
25		12
26	PROF_stop(comm_accept);	13	PROF_stop(comm_accept);
27		14

Lines 1-14 Link Here

(-)./files/patch-src_ssl_bio.cc (-14 lines)
1	--- src/ssl/bio.cc.orig 2018-06-21 15:26:17 UTC
2	+++ src/ssl/bio.cc
3	@@ -76,7 +76,11 @@ Ssl::Bio::Create(const int fd, Security:
4	BIO_meth_set_create(SquidMethods, squid_bio_create);
5	BIO_meth_set_destroy(SquidMethods, squid_bio_destroy);
6	}
7	+#if defined(LIBRESSL_VERSION_NUMBER)
8	+ BIO_METHOD *useMethod = SquidMethods;
9	+#elif !defined(LIBRESSL_VERSION_NUMBER)
10	const BIO_METHOD *useMethod = SquidMethods;
11	+#endif
12	#else
13	BIO_METHOD *useMethod = &SquidMethods;
14	#endif