Attachment #190900 for bug #225447




# $FreeBSD$

PORTNAME=	squid
PORTVERSION=	4.0.23
PORTREVISION=	1
CATEGORIES=	www ipv6
MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
		http://www2.us.squid-cache.org/Versions/v4/ \

	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR})

.include <bsd.port.mk>

.if ${CHOSEN_COMPILER_TYPE} == clang
CXXFLAGS+=	-Wno-unknown-warning-option
CXXFLAGS+=	-Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)www/squid-devel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1499897995	1	TIMESTAMP = 1517146538
2	SHA256 (squid4.0/squid-4.0.22.tar.xz) = 51b852f17c21569d53bcd098d2c55a4e0c745e9cac392cff26d92681e911a5a2	2	SHA256 (squid4.0/squid-4.0.23.tar.xz) = 18b71a601f60f49ca0cfc7d1d212dc935112d61008ab8a689fceab3ef4070f29
3	SIZE (squid4.0/squid-4.0.22.tar.xz) = 2411692	3	SIZE (squid4.0/squid-4.0.23.tar.xz) = 2415132




# https://bugs.squid-cache.org/show_bug.cgi?id=4822
# https://patch-diff.githubusercontent.com/raw/squid-cache/squid/pull/158.patch

--- src/ipc/Kid.cc.orig	2018-02-22 18:34:42 UTC
+++ src/ipc/Kid.cc
@@ -90,7 +90,9 @@ Kid::reportStopped() const
     if (hopeless() && Config.hopelessKidRevivalDelay) {
         syslog(LOG_NOTICE, "Squid Parent: %s process %d will not be restarted for %ld "
                "seconds due to repeated, frequent failures",
-               theName.termedBuf(), pid, Config.hopelessKidRevivalDelay);
+               theName.termedBuf(),
+               pid,
+               static_cast<long int>(Config.hopelessKidRevivalDelay));
     }
 }
 

Return to bug 225447

Lines 1-8 Link Here

(-)www/squid-devel/Makefile (-10 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 4.0.22	4	PORTVERSION= 4.0.23
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 309-319 Link Here
309	@${MKDIR} ${STAGEDIR}${DOCSDIR}	308	@${MKDIR} ${STAGEDIR}${DOCSDIR}
310	(cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR})	309	(cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR})
311		310
312	.include <bsd.port.pre.mk>	311	.include <bsd.port.mk>
313
314	.if ${CHOSEN_COMPILER_TYPE} == clang
315	CXXFLAGS+= -Wno-unknown-warning-option
316	CXXFLAGS+= -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess
317	.endif
318
319	.include <bsd.port.post.mk>

Line 0 Link Here

(-)www/squid-devel/files/patch-src_ipc_Kid.cc (+16 lines)
	1	# https://bugs.squid-cache.org/show_bug.cgi?id=4822
	2	# https://patch-diff.githubusercontent.com/raw/squid-cache/squid/pull/158.patch
	3
	4	--- src/ipc/Kid.cc.orig 2018-02-22 18:34:42 UTC
	5	+++ src/ipc/Kid.cc
	6	@@ -90,7 +90,9 @@ Kid::reportStopped() const
	7	if (hopeless() && Config.hopelessKidRevivalDelay) {
	8	syslog(LOG_NOTICE, "Squid Parent: %s process %d will not be restarted for %ld "
	9	"seconds due to repeated, frequent failures",
	10	- theName.termedBuf(), pid, Config.hopelessKidRevivalDelay);
	11	+ theName.termedBuf(),
	12	+ pid,
	13	+ static_cast<long int>(Config.hopelessKidRevivalDelay));
	14	}
	15	}
	16