Date: Fri, 23 Feb 2018 19:51:28 +0000 (UTC) From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462737 - in branches/2018Q1/www/squid-devel: . files Message-ID: <201802231951.w1NJpSbj031616@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Fri Feb 23 19:51:27 2018 New Revision: 462737 URL: https://svnweb.freebsd.org/changeset/ports/462737 Log: MFH: r462698 www/squid-devel: Update to 4.0.23, Fixes security vulnerabilities - Add a patch from upstream that fixes a problem when building on i386 arch Kid.cc:93:42: error: format specifies type 'long' but the argument has type 'time_t' (aka 'int') [-Werror,-Wformat] theName.termedBuf(), pid, Config.hopelessKidRevivalDelay); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. - Remove CXXFLAGS with clang, not necessary anymore PR: 225447 Submitted by: timp87@gmail.com (maintainer) Security: d5b6d151-1887-11e8-94f7-9c5c8e75236a Approved by: ports-secteam (swills) Added: branches/2018Q1/www/squid-devel/files/patch-src_ipc_Kid.cc - copied unchanged from r462698, head/www/squid-devel/files/patch-src_ipc_Kid.cc Modified: branches/2018Q1/www/squid-devel/Makefile branches/2018Q1/www/squid-devel/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/squid-devel/Makefile ============================================================================== --- branches/2018Q1/www/squid-devel/Makefile Fri Feb 23 19:48:33 2018 (r462736) +++ branches/2018Q1/www/squid-devel/Makefile Fri Feb 23 19:51:27 2018 (r462737) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 4.0.22 -PORTREVISION= 1 +PORTVERSION= 4.0.23 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \ http://www2.us.squid-cache.org/Versions/v4/ \ @@ -309,11 +308,4 @@ post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}) -.include <bsd.port.pre.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> +.include <bsd.port.mk> Modified: branches/2018Q1/www/squid-devel/distinfo ============================================================================== --- branches/2018Q1/www/squid-devel/distinfo Fri Feb 23 19:48:33 2018 (r462736) +++ branches/2018Q1/www/squid-devel/distinfo Fri Feb 23 19:51:27 2018 (r462737) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499897995 -SHA256 (squid4.0/squid-4.0.22.tar.xz) = 51b852f17c21569d53bcd098d2c55a4e0c745e9cac392cff26d92681e911a5a2 -SIZE (squid4.0/squid-4.0.22.tar.xz) = 2411692 +TIMESTAMP = 1517146538 +SHA256 (squid4.0/squid-4.0.23.tar.xz) = 18b71a601f60f49ca0cfc7d1d212dc935112d61008ab8a689fceab3ef4070f29 +SIZE (squid4.0/squid-4.0.23.tar.xz) = 2415132 Copied: branches/2018Q1/www/squid-devel/files/patch-src_ipc_Kid.cc (from r462698, head/www/squid-devel/files/patch-src_ipc_Kid.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/squid-devel/files/patch-src_ipc_Kid.cc Fri Feb 23 19:51:27 2018 (r462737, copy of r462698, head/www/squid-devel/files/patch-src_ipc_Kid.cc) @@ -0,0 +1,16 @@ +# 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)); + } + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802231951.w1NJpSbj031616>