From nobody Thu Jun 9 03:52:18 2022 X-Original-To: dev-commits-ports-branches@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 27DB3844C8D; Thu, 9 Jun 2022 03:52:19 +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 4LJVXf5vbNz3NPk; Thu, 9 Jun 2022 03:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654746738; 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=xRSwJf+BNOFLI9ssW+F5dHQAHg0bCZ5YgcGiTqThYvE=; b=AdMjG46qKA1BuT//0yhbyCyLBd8IgQrzL3cWsaI7Ln+iru1YbB//PtFqXiGxEeHNUDaLrT TPLlu4ByqEKu3/w7gpU1tNrInwsyw9ZAc/NZuzn4NDmoRGahmdze7QDkaUhcXDwq8UmBBj /1EZAlQI076WK/B8jV3PCK34XbJhJ1oveKHZmoFXAFB5z0paiUhtSu7OJCG9p1C3a5fNBr y5uU2VnM9ReOOxmlIQAFrdSK5sy6IqPj9fyN6YGeHBh1K2+EPxagfuYODdnNyl+f44+Hvo 33Z+Gt/o0xFPqtLx2tnOXITIBx0wJ7HTNq3gV6FO6TllB9QNdoFk6Lwccd9TZA== 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 AB3B31CD9E; Thu, 9 Jun 2022 03:52:18 +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 2593qIi3068109; Thu, 9 Jun 2022 03:52:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2593qIDr068108; Thu, 9 Jun 2022 03:52:18 GMT (envelope-from git) Date: Thu, 9 Jun 2022 03:52:18 GMT Message-Id: <202206090352.2593qIDr068108@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bryan Drewery Subject: git: f02f777b7719 - 2022Q2 - sysutils/fusefs-encfs: Unbreak build with llvm13 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: f02f777b7719e91eff58b3397cf495c56195cac8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654746738; 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=xRSwJf+BNOFLI9ssW+F5dHQAHg0bCZ5YgcGiTqThYvE=; b=RqRrg02jWlc2pvH3pbweIYgCWokDJ2g+xhPsbZMz2p3E/8U6/PucSBavGuAydB5/BIxb5W AQQmNE8uahT0NGu+CK51JjOJLEfbVd0DZY2PuvX7lgczXOcokBSy48B3y9bJLey8/ioybH SuiTN6HuRmppwzZ1jtorLLGvKUNn8fx/5cUA0tpmF1lc/AeebLSZ2/UvoczNGuHKOhl6XJ DR9SFElxZr0wUOK7mNu3gC91AL3eukN408MR5hMe2PpFy7vO3NhB3msH/aTB+1DsQ443xd NBTvGjLOORfndfZXVwyq9/UhOvL2qyKDQjrXHi0hlGp7GKavI3qS+CFmb+AfDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654746738; a=rsa-sha256; cv=none; b=i0Wd4clB87fDec3GkzFxLEet2mdkCfX005AEhqr7dEjGjdrrZ483OeuP/7IEJSBACiIJbA 1lzrsT43mYOwwCuZ90fOrK6PKNmDy1jIDqMbZaoNmxGdjalYaUG15NHPcy7Lnc+jNs4sHo iGVPi+u5LXSD+rb9IebikhjSGr+5eJz4s2qWnp5OnpJqh0B2oq+5A3d8WT85qAltAj3pKb C04rUW5Nru5rriNCW6RpwiCSorEKXjFXjnPEI6PkBQbqLNb1ci8/3BR3lkWp4P8DS+n3ag 9d8poW5pHZbP6Nz+toAL869ZrBp/4awSQm+ecNNsImtYkafCgPPMB2OesQSPrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=f02f777b7719e91eff58b3397cf495c56195cac8 commit f02f777b7719e91eff58b3397cf495c56195cac8 Author: Dmitri Goutnik AuthorDate: 2022-05-14 16:10:33 +0000 Commit: Bryan Drewery CommitDate: 2022-06-09 03:52:05 +0000 sysutils/fusefs-encfs: Unbreak build with llvm13 /wrkdirs/usr/ports/sysutils/fusefs-encfs/work/encfs-1.9.5/encfs/NullCipher.cpp:81:36: error: no matching constructor for initialization of 'std::shared_ptr' std::shared_ptr gNullKey(new NullKey(), NullDestructor()); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Solution was taken from eacf34a1cf4b6b81e54d4fe74ad931ee93d1d8ef (cherry picked from commit 7508209535a01298ef91e7f6d4e1b33a5e5ffd97) --- sysutils/fusefs-encfs/files/patch-encfs_NullCipher.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sysutils/fusefs-encfs/files/patch-encfs_NullCipher.cpp b/sysutils/fusefs-encfs/files/patch-encfs_NullCipher.cpp new file mode 100644 index 000000000000..08e4db20abe8 --- /dev/null +++ b/sysutils/fusefs-encfs/files/patch-encfs_NullCipher.cpp @@ -0,0 +1,11 @@ +--- encfs/NullCipher.cpp.orig 2022-05-14 16:04:54 UTC ++++ encfs/NullCipher.cpp +@@ -76,7 +76,7 @@ class NullDestructor { + NullDestructor &operator=(const NullDestructor &) = delete; // copy assignment + NullDestructor& operator=(NullDestructor&& other) = delete; // move assignment + +- void operator()(NullKey *&) {} ++ void operator()(NullKey *) {} + }; + std::shared_ptr gNullKey(new NullKey(), NullDestructor()); +