From nobody Sat Sep 28 09:48:47 2024 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 4XG2bN3dYkz5X56N; Sat, 28 Sep 2024 09:48:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XG2bN0TnQz41Qf; Sat, 28 Sep 2024 09:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727516928; 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=EljKhU9p+aD2N2qbd5WndP/eObedym+Tu4gNdF2Db08=; b=q6C5YbqstNBLPEj4t4Eagas4GvBvcasdUBoU3KzKz17EEZyX/veMV2y0LTpAn0FrkG19gV Z8hfft+Ump4/3rvONFV1oMhc4MbQzd3PoGRXuuHRo0LaJwv8Sq3IG+YX2MLrN8ZT1oWeSG I1R1pmQHou0w48OzpY6Ntf9HyMFf4+0OI3ZFmWob6wyLw4kl0SpRezBsKHcwSolxFjGLN5 SKXsIBIhVQ4QvBZCEXukndJhifHkPHNAaxSuJbXjuJ+yq49DKP50It+wWsUgxkv509RELK 1aR3sJoj1S/b68D5LESUGF3UQd5SbD1ARlaBePHsaqN96Jecj7gSo5FORq8/yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727516928; 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=EljKhU9p+aD2N2qbd5WndP/eObedym+Tu4gNdF2Db08=; b=F2KPd1KgyvOIKDnjwBz2RwSvQ/BQj6c98wecX2DaYZDS1FmCqWU0TkZ13H0Ogwfvw6d5UG ky/r54zt0EuBc1leap0r858OPWpEzG9XIU7EGb22E3toavjY57ahyXoIgL/LdsEODngLiS HUyd9xru0kVcVfUxEKcK1c1hqGF3vc2vd626uMFgLfqu/baatwaeMWuZbftsILaiAVQrFE fcHWQMuUtS+8nUYRV+RUTHsTtQoUQPaNXP04nS4QUNwYcBmnSUO8dpPWa2znwVsQMuRAc5 4yJMBF+tP6J6bsRvVbERDsMmxCSvP6GvGRRMMP5/KZLM3gKSNRnRZwUXL48WKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727516928; a=rsa-sha256; cv=none; b=PCnyTSiFG4VvQZ9eVtejrRlLxkdRFRtMt0keE+87VB1H6+MPCumVjoEeLG5orLTe8M090B 8EyNI97Lb8/dn+Tbki1AxnuwrhbueEQfSuW8RH9GcrwGgkUPrTd/jO67UOC2ZPlbDcsRMD m4RFiVDd057jFI83EAU862Cyx5kQqgiSlf7HoEw4rjhUzbcYnvGNFXSWZILcBe0ERwMd+d 3tvFd+j7mb5CXZz3hGtqIf56H+eeGnvb7pNvnBh6frbSaa3gNh9c/03NtnIzHqpX6Xdx1P vv3IsPi8syJHPdCrA0zI55b3Jrlcxto+Qo4eaAy2eFMFY5Owe0FIxnCvZ65D5g== 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 4XG2bN04N7zK5C; Sat, 28 Sep 2024 09:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48S9mldw011655; Sat, 28 Sep 2024 09:48:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48S9mlWa011652; Sat, 28 Sep 2024 09:48:47 GMT (envelope-from git) Date: Sat, 28 Sep 2024 09:48:47 GMT Message-Id: <202409280948.48S9mlWa011652@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: ca0626f2f34c - 2024Q3 - security/olm: fix build with clang 19 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: ca0626f2f34caa27f3457418b1a694fc684705f5 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca0626f2f34caa27f3457418b1a694fc684705f5 commit ca0626f2f34caa27f3457418b1a694fc684705f5 Author: Dimitry Andric AuthorDate: 2024-09-14 11:33:09 +0000 Commit: Dimitry Andric CommitDate: 2024-09-28 09:48:24 +0000 security/olm: fix build with clang 19 Clang 19 has become more strict about assigning to const variables, resulting in an error similar to: /wrkdirs/usr/ports/security/olm/work/olm-6d767aaf29bdf15571c2ef4d3f8f9e953de03733/include/olm/list.hh:106:13: error: cannot assign to variable 'other_pos' with const-qualified type 'T *const' 106 | ++other_pos; | ^ ~~~~~~~~~ /wrkdirs/usr/ports/security/olm/work/olm-6d767aaf29bdf15571c2ef4d3f8f9e953de03733/include/olm/list.hh:102:19: note: variable 'other_pos' declared const here 102 | T * const other_pos = other._data; | ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ In this case, it looks like a typo: "T * const" means that the pointer itself is const, thus it cannot be incremented. Instead, this should be "T const *" (spelled alternatively as "const T *"), which means that the object pointed to is const, not the pointer itself. PR: 281496 Approved by: maintainer timeout (2 weeks) MFH: 2024Q3 (cherry picked from commit c42de78032ea24d6431412e2aec35383c3c66a34) --- security/olm/files/patch-include_olm_list.hh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/security/olm/files/patch-include_olm_list.hh b/security/olm/files/patch-include_olm_list.hh new file mode 100644 index 000000000000..055f0833a4bc --- /dev/null +++ b/security/olm/files/patch-include_olm_list.hh @@ -0,0 +1,11 @@ +--- include/olm/list.hh.orig 2022-10-07 15:00:05 UTC ++++ include/olm/list.hh +@@ -99,7 +99,7 @@ class List { (public) + return *this; + } + T * this_pos = _data; +- T * const other_pos = other._data; ++ T const * other_pos = other._data; + while (other_pos != other._end) { + *this_pos = *other; + ++this_pos;