From nobody Mon Jul 11 13:52:59 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6B4151D040E1; Mon, 11 Jul 2022 13:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LhQLz70FVz3mj1; Mon, 11 Jul 2022 13:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657547580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tVfCPKd6njErk00ffK9OSgQpZV8L1sHQZcZGYc7zdUA=; b=NbOrW0G1P6BuQP/CTkvJEewc9zwWew5SNJxA9wuZ2OLA5y4gh1CX45LSwgoLnAEA8AKfsb xcPQ16UMGAsIqJluCkwawOx530LW7u+fPCfDNJeJnnE18M0lz3S3uMLcNSVLWmhTUUlqBK hmMzkscz8mAYctsNgXalEeZXRMYNfImbcaDItGLOXESVB3GrudTOeYEY/Nicnz0BjhTkr7 CcJxgd6b9qGhl01F4cecv94NDhEtehPS1Nssi85mMbR57/hSP96kxruzXm8lxjdYB1ZwOO OktB1xN4j8lbAnBLfXoBEI/xsIESeArJuY0Rws+kvWvskqfk7QueLVy2svf+1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LhQLz62kfz15sM; Mon, 11 Jul 2022 13:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26BDqxlg012015; Mon, 11 Jul 2022 13:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26BDqxfB012014; Mon, 11 Jul 2022 13:52:59 GMT (envelope-from git) Date: Mon, 11 Jul 2022 13:52:59 GMT Message-Id: <202207111352.26BDqxfB012014@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: b37ebe5a89a3 - main - devel/libdap: Fix build with Clang 13+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b37ebe5a89a33125910ddcdce34c31f0d700b2b5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657547580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tVfCPKd6njErk00ffK9OSgQpZV8L1sHQZcZGYc7zdUA=; b=ZH3jIt38zRPbXUq+ybwXIc3tKSeeFFFNRz/7cGbJ5Apc/xScWld2d3s8BpJ1FDF9GCUGZo eEl2TxQXjZRmyjtkX2QrZb0Upm6/sE77JUU/bY505TGk21zDlYWW+WWPVL+EnGtVOBXtsq GnphHhb+iavRigdtIWPOQchb4cVcuBJzI4ug/2cfkRxFc/C3Q44QhrzLRCH1oRnl56m2TV kEcUseRT50sYLmR+/7So7otI7cvSZkwxMYexP3JIWgXx8W0VYvTiR+GcX+9OGryWt+8yfv 0iYCuwtlyRReZO29APDut1n4UHAG+oBONgOv+5qCGIhc7npq1J2n/Xr9s7ndmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657547580; a=rsa-sha256; cv=none; b=lpzPmYGhzIsJ5FTL+Gt+rJIGbmhdr8qkdUAHzjddGw2rM4dvAAqaw+ySVvtl7DmQai9W6Z 3wleaaXEMY6N608OoefqQEvuoRTk+i0N5pTvQZay6FUo5Zcyq15r8PsQHtmG3b2rKDJMO1 WVHa41F3hDRX1op58Rs9dYoGQYl+9MVbcV3Qa7Fbgsmka1lPY+FZeGVRII5aHDo6jrV3tF 6PdsyARda9mhIStT+tmX9+3FuDuvmwm/ct+we10UJtlXzkbgjmyZV6KIOBwA/QoDB4lh6G QQbJqJNjpuF1dF6xklLScwywRKDz7961XBz1Or7oWgNdjUrrFnYcOc7E9Laivg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b37ebe5a89a33125910ddcdce34c31f0d700b2b5 commit b37ebe5a89a33125910ddcdce34c31f0d700b2b5 Author: Po-Chuan Hsieh AuthorDate: 2022-07-11 13:49:19 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-07-11 13:49:19 +0000 devel/libdap: Fix build with Clang 13+ HTTPCache.cc:1034:14: error: no matching function for call to 'min' line[min(line_buf_len, strnlen(line, line_buf_len))-1] = '\0'; // erase newline ^~~ /usr/include/c++/v1/__algorithm/min.h:40:1: note: candidate template ignored: deduced conflicting types for parameter '_Tp' ('unsigned long' vs. 'size_t' (aka 'unsigned int')) min(const _Tp& __a, const _Tp& __b) ^ /usr/include/c++/v1/__algorithm/min.h:51:1: note: candidate template ignored: could not match 'initializer_list<_Tp>' against 'unsigned long' min(initializer_list<_Tp> __t, _Compare __comp) ^ /usr/include/c++/v1/__algorithm/min.h:61:1: note: candidate function template not viable: requires single argument '__t', but 2 arguments were provided min(initializer_list<_Tp> __t) ^ /usr/include/c++/v1/__algorithm/min.h:31:1: note: candidate function template not viable: requires 3 arguments, but 2 were provided min(const _Tp& __a, const _Tp& __b, _Compare __comp) ^ 1 error generated. Reported by: pkg-fallout --- devel/libdap/files/patch-HTTPCache.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/devel/libdap/files/patch-HTTPCache.cc b/devel/libdap/files/patch-HTTPCache.cc new file mode 100644 index 000000000000..25ab6db3b000 --- /dev/null +++ b/devel/libdap/files/patch-HTTPCache.cc @@ -0,0 +1,11 @@ +--- HTTPCache.cc.orig 2022-03-16 11:02:01 UTC ++++ HTTPCache.cc +@@ -1031,7 +1031,7 @@ HTTPCache::read_metadata(const string &cachename, vect + const unsigned long line_buf_len = 1024; + char line[line_buf_len]; + while (!feof(md) && fgets(line, line_buf_len, md)) { +- line[min(line_buf_len, strnlen(line, line_buf_len))-1] = '\0'; // erase newline ++ line[min(line_buf_len, strnlen(line, line_buf_len))-1] = '\0'; // erase newline + headers.push_back(string(line)); + } +