From owner-dev-commits-ports-all@freebsd.org Sun Sep 5 17:35:07 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE99267EAB6; Sun, 5 Sep 2021 17:35: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 4H2dvv5Rjmz4nsh; Sun, 5 Sep 2021 17:35:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9ADE17A88; Sun, 5 Sep 2021 17:35:07 +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 185HZ7fv072823; Sun, 5 Sep 2021 17:35:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 185HZ7M8072822; Sun, 5 Sep 2021 17:35:07 GMT (envelope-from git) Date: Sun, 5 Sep 2021 17:35:07 GMT Message-Id: <202109051735.185HZ7M8072822@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: b717c5de9107 - main - security/sks: unbreak against safe-by-default strings in OCaml 4.06+. 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: b717c5de9107bb3b4b8ab131bc1018def14be5ef Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Sep 2021 17:35:07 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b717c5de9107bb3b4b8ab131bc1018def14be5ef commit b717c5de9107bb3b4b8ab131bc1018def14be5ef Author: Alexey Dokuchaev AuthorDate: 2021-09-05 17:34:18 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-09-05 17:34:22 +0000 security/sks: unbreak against safe-by-default strings in OCaml 4.06+. --- security/sks/Makefile | 2 ++ security/sks/files/patch-Makefile | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/security/sks/Makefile b/security/sks/Makefile index 93a60784edcb..823a8822b3e4 100644 --- a/security/sks/Makefile +++ b/security/sks/Makefile @@ -33,6 +33,8 @@ post-extract: post-patch: @${REINPLACE_CMD} -e '/^CC=/d; /^CFLAGS=/s/=/+=/' ${WRKSRC}/bdb/Makefile + @${REINPLACE_CMD} -E '/^\+OCAML(C|OPT)=/s,$$, -unsafe-string,' \ + ${WRKSRC}/cryptokit-1.7-sks.patch pre-build: @cd ${WRKSRC} && test -f .depend || ${MAKE_CMD} dep diff --git a/security/sks/files/patch-Makefile b/security/sks/files/patch-Makefile index 86d7c495fa7a..f7071a5b7447 100644 --- a/security/sks/files/patch-Makefile +++ b/security/sks/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2019-06-06 15:28:32 UTC +--- Makefile.orig 2021-09-05 17:11:36 UTC +++ Makefile -@@ -15,9 +15,8 @@ +@@ -15,16 +15,15 @@ # USA # CINCLUDES=-I`ocamlc -where` @@ -11,6 +11,14 @@ CXXFLAGS=-O3 $(CINCLUDES) -I . ifndef OCAMLC + OCAMLC=ocamlc + endif + ifndef OCAMLOPT +- OCAMLOPT=ocamlopt ++ OCAMLOPT=ocamlopt -unsafe-string + endif + ifndef CAMLP4O + CAMLP4O=camlp4o @@ -135,16 +134,16 @@ keyMerge.cmx: keyMerge.ml # Special targets