From nobody Fri Feb 04 16:05:59 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 77C38198FC5D; Fri, 4 Feb 2022 16:05:59 +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 4Jr0kv2P0xz3PQ5; Fri, 4 Feb 2022 16:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643990759; 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=oCnZOumuoG9kDjy5iyd1AjZ8PNxjURNnqrqbo1P4ax4=; b=r+gGt86vrvkSR6Ay8nZAXsalctEPZTahcqRQPdAli0C49hvOcjNxYqt0iEEmQ8EPjG98Z6 wKY+iMmHzr7GA9nXQiO0USo6bSwdH8fveMmRh9jTmqrST9mGuauNGw7nkdz6UDuIiPE9fj LS4DiHwSO4nczMqJH+hp14qMBxAYqQq6SCs+GLwOLcNM2PIFnUmeCz9m0C1n6kVzC5OA6v zmgOGZrBBO7Ad+DI1Lj5ckkN4kxm5+fFejy4r/UxqeVXpxK7xax7ge14Um9P6VUSvtxiLT Fink+XV5xw+I6f4ktlVW0rFD7GLHFzjj3iOO8XO5Xhr4kKvkPa6669+YaPcYew== 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 31B4969BF; Fri, 4 Feb 2022 16:05: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 214G5xri085179; Fri, 4 Feb 2022 16:05:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 214G5xLH085178; Fri, 4 Feb 2022 16:05:59 GMT (envelope-from git) Date: Fri, 4 Feb 2022 16:05:59 GMT Message-Id: <202202041605.214G5xLH085178@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: 0c9022ff6b73 - main - devel/ocaml-xstr: unbreak the build against safe strings in OCaml 4.06+ 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: 0c9022ff6b73ee9e48aec7a545d9db31e16a11f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643990759; 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=oCnZOumuoG9kDjy5iyd1AjZ8PNxjURNnqrqbo1P4ax4=; b=KhgZFVeB3BcXAVHaAqaC6KMqGhTg3lWqzApwbtPp68Ty53OFO7GhRFWuPYZtBb9PAxuWW+ WhYVQPqAfCOD5MROq0PAJEnUPiXNMvO0ynn4JoBGmg+g+usl+QBbtAHBhL9wFzRLKt4f2k isMoURny2oyNm7sMbho+xZo1432qvgXxbWKf+ogF40zpCCY0KRgMJEyMW6kHTVh24kFlqU gNpoH9e9lHv0biIs1v5T8qrObhl2fX6bp7stcb02USRWFgeBxTloB5nzsnooky8vYpXNPx YRzeh26OW+sRtO9YMpyqRRGxEVdQlUweoqA28NeqR04L6vi/f1qkOgb3ZktitQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643990759; a=rsa-sha256; cv=none; b=pTEReX3XcBANK+uqHCLlAV8REB7MnkNOjaI+7qnD0ZXGpSzyB2byml1Uuf6Mryca1Ds2q1 VD+kAoK8dbfSX+NFzlFRX8eX5mZ8sjhrWrfAz4gawzcJcxnHpzfXnT5usl9660Xjz4KCHZ HRN5ww61e1/XBlw81JjwxtSXUh6n/Psv3qGYBTNVvHni3EZ5vxQbBfR5WBF7wTgAxaDveA IaVh7ZUXR1GZr4qrlTfsR8wjPdVzbgZVyrrdX0suPRcenl63zVl//Z+jisFoZtpUaa7G0b jRAvZRZRjJVJYPDOHSWm2/7nfR9HdjbcSvugQc7Z44EqsWRN3dBkk9CzU0IrKA== 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=0c9022ff6b73ee9e48aec7a545d9db31e16a11f4 commit 0c9022ff6b73ee9e48aec7a545d9db31e16a11f4 Author: Alexey Dokuchaev AuthorDate: 2022-02-04 16:05:04 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-02-04 16:05:04 +0000 devel/ocaml-xstr: unbreak the build against safe strings in OCaml 4.06+ Obtained from: Debian --- devel/ocaml-xstr/files/patch-xstr__match.ml | 26 ++++++++++++++++++++++++++ devel/ocaml-xstr/files/patch-xstr__search.ml | 11 +++++++++++ 2 files changed, 37 insertions(+) diff --git a/devel/ocaml-xstr/files/patch-xstr__match.ml b/devel/ocaml-xstr/files/patch-xstr__match.ml new file mode 100644 index 000000000000..1af5534357d2 --- /dev/null +++ b/devel/ocaml-xstr/files/patch-xstr__match.ml @@ -0,0 +1,26 @@ +--- xstr_match.ml.orig 2002-07-07 11:27:16 UTC ++++ xstr_match.ml +@@ -137,12 +137,12 @@ let noword_set() = + + + let set_as_string set = +- let s = String.make 32 ' ' in ++ let s = Bytes.make 32 ' ' in + for i = 0 to 15 do + s.[i+i] <- Char.chr (set.(i) land 0xff); + s.[i+i+1] <- Char.chr (set.(i) lsr 8); + done; +- s ++ Bytes.to_string s + ;; + + +@@ -592,7 +592,7 @@ let replace_matched_substrings ml rl fl s = + let length = total_length 0 transformer in + let target = String.create length in + form_replacement_ltor target transformer length; +- target, !n_repl ++ Bytes.to_string target, !n_repl + ;; + + diff --git a/devel/ocaml-xstr/files/patch-xstr__search.ml b/devel/ocaml-xstr/files/patch-xstr__search.ml new file mode 100644 index 000000000000..00ccee7fe661 --- /dev/null +++ b/devel/ocaml-xstr/files/patch-xstr__search.ml @@ -0,0 +1,11 @@ +--- xstr_search.ml.orig 1999-06-27 23:03:38 UTC ++++ xstr_search.ml +@@ -119,7 +119,7 @@ let rev_concat sep sl = + in + + fill_in len sl; +- t ++ Bytes.to_string t + ;; + +