From nobody Sat Feb 05 08:02:06 2022 X-Original-To: dev-commits-ports-main@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 2775219A632E; Sat, 5 Feb 2022 08:02:07 +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 4JrPy70fRHz4pcc; Sat, 5 Feb 2022 08:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644048127; 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=4jaUTLuEGuALsru6C+lJSGNyqoOrNhXeaxbO/LYB39U=; b=aqeC+MOsLgWPcXtWUnhuwdR29tXlbLXsTL4U5CCyFBZQkbOdYjpzHaJdg/2yXorF9TGqrP VZpJJjoQQGdr5ydFu0h2TetUkO0KkwCsZKqvEaQNi8mQYRsoQHVN1rcd252kI1349uqFYZ 11PEBH6sxnj8Z2Ppen6Pf/KWIH3tRgKhfLcSZrMjEt7DGDwBSIPiGZYpllT3sKhOKyJakj 4N+17f74BaybqHprRhzvPZFNIR64Dgr6FekxP8OM9TThDGffXchK1j39Gkz3Ri/ZbtW1lP bOkxWf5u4F/6gTBIGWJlk3ELj7ASx7YUESuw9zHqLPwh0cteOxW/AJ4gvUGobw== 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 EA8A71BD12; Sat, 5 Feb 2022 08:02:06 +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 2158268U067941; Sat, 5 Feb 2022 08:02:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 215826Z8067940; Sat, 5 Feb 2022 08:02:06 GMT (envelope-from git) Date: Sat, 5 Feb 2022 08:02:06 GMT Message-Id: <202202050802.215826Z8067940@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: d319d1eb50ab - main - graphics/ocaml-images: force unsafe strings to unbreak against new OCaml List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d319d1eb50ab1f756d7061a8a6e4ae60d3f8b6ad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644048127; 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=4jaUTLuEGuALsru6C+lJSGNyqoOrNhXeaxbO/LYB39U=; b=mwN+eTTyr7e6RsJiqhddKhfMFbeuPcj+cWLAmpESpnE9wc+Iom+QvVei6W5qonxKD1nzGo QS9nCfPwG4vry2uQdBO5/okXbq/7RFgTeFvdGxrNmLw/2C/q1fPYOvoaIC3mncd00FZaMb buh8w+NUFF8EXCv+7sZaVyFeWOUgl8GmKEeJSCiqm2+Ew20Z2vSyiikZj72TG7KNpDPOcL ENoxJQTAJ0nZuQr0mVV6HbpZ8WOwg4nE3LEbcGO1FTkfz44yL+/0BZTgK+BFLcThUyausA YNjvTBCkUbR9iQZN/gfcalYDDl1IyrXOkP+E3h9/heUdse+5b3t6J7UOCHjceQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644048127; a=rsa-sha256; cv=none; b=ZM4C2yjgmofJVhoObopPeCVP1IFP9or+nW7HGJtW4/FFb1bbgru6uV65W/1SPaoyYSNJoQ P5eZ0CErhhBHmB/krzZ0ArylLXF4b5WSkgT/2NRSsWT3sMkYAq3l7OKHCiTpI1gQuf15Qq WHzJvEyD/Z41rZ9rwBbaE62AyDezhKAOdMuuwF+LaK29KevwYdeozuJ6DcV5ejp1Vd+w7m JLYdwE9iYOt6e0voEVFme6D9SLUY117ExNbI4aq6ZPHU7T9tTndtaT74g5VBcyAhtRdibu 2ytJYPprZzzsXcEfcA8L+yyKsfoMpTcZ28/gh2bbmbQVaK58kyBeErI1vlxn/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=d319d1eb50ab1f756d7061a8a6e4ae60d3f8b6ad commit d319d1eb50ab1f756d7061a8a6e4ae60d3f8b6ad Author: Alexey Dokuchaev AuthorDate: 2022-02-05 08:01:48 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-02-05 08:01:48 +0000 graphics/ocaml-images: force unsafe strings to unbreak against new OCaml This code is old and convoluted enough to make patching unfeasible; once we modernize our stack, the port should be updated as appropriate. --- graphics/ocaml-images/files/patch-OMakefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/graphics/ocaml-images/files/patch-OMakefile b/graphics/ocaml-images/files/patch-OMakefile index 3fe0f16e9845..8f6675f254fc 100644 --- a/graphics/ocaml-images/files/patch-OMakefile +++ b/graphics/ocaml-images/files/patch-OMakefile @@ -18,7 +18,16 @@ # Specify directories where X's rgb.txt can be found PATH_RGB_TXT[]= -@@ -175,13 +175,13 @@ print_configured() = +@@ -95,6 +95,8 @@ print_configured() = + exit 1 + + CFLAGS = $(addprefix -I , $(INCLUDES)) ++ OCAMLCFLAGS = -unsafe-string ++ OCAMLOPTFLAGS = -unsafe-string + + WORD_SIZE = $(Word_size) + +@@ -175,13 +177,13 @@ print_configured() = OCAMLPACKS+=graphics export