From 4f078744b94b8f1565355c2a35538ae068e836cc Mon Sep 17 00:00:00 2001
From: Franziskus Kiefer <franziskuskiefer@gmail.com>
Date: Fri, 9 Sep 2022 16:34:19 +0200
Subject: [PATCH 1/2] update opam packages

---
 ocaml/META                     |  2 +-
 ocaml/Makefile                 | 11 ++++++-----
 ocaml/hacl-star-raw.opam       |  3 ++-
 ocaml/hacl-star/hacl-star.opam | 15 ++++++++++-----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ocaml/META b/ocaml/META
index f4a8651c..b7e1a9ef 100644
--- a/ocaml/META
+++ b/ocaml/META
@@ -1,5 +1,5 @@
 name="hacl-star-raw"
-version="0.4.5"
+version="0.4.6"
 description="EverCrypt with Ctypes bindings"
 requires="ctypes"
 archive(native)="ocamlevercrypt.cmxa"
diff --git a/ocaml/Makefile b/ocaml/Makefile
index 0fb2f296..a4d18dee 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -45,10 +45,10 @@ C_DYN_LIB?=lib$(DYNAMIC_C_LIB_NAME).$(SO)
 # of build-bindings because it will also write Makefile.config, which is needed
 # by build-bindings.
 build-c:
-	cmake -B build -G"Ninja Multi-Config"
-	ninja -f build-Release.ninja -C build
-	cp build/Release/$(C_LIB) .
-	cp build/Release/$(C_DYN_LIB) .
+	cmake -B build -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release
+	make -C build
+	cp build/$(C_LIB) .
+	cp build/$(C_DYN_LIB) .
 
 -include build/Makefile.include
 
@@ -147,7 +147,8 @@ clean:
 # Install hacl-star-raw locally.
 install: dllocamlevercrypt.$(OCAML_SO)
 # We need to remove all comments from config.h because ccpo can't handle them
-	sed -i 's/\(\/\/.*\)\|\(\/\*.*\*\/\)//g' build/config.h
+	sed 's/\(\/\/.*\)\|\(\/\*.*\*\/\)//g' build/config.h > build/config-new.h
+	mv build/config-new.h build/config.h
 	ocamlfind remove hacl-star-raw || true
 	ocamlfind install hacl-star-raw META
 	ocamlfind install -add hacl-star-raw $(CTYPES_ML)
diff --git a/ocaml/hacl-star-raw.opam b/ocaml/hacl-star-raw.opam
index e124afb1..1867efbf 100644
--- a/ocaml/hacl-star-raw.opam
+++ b/ocaml/hacl-star-raw.opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "hacl-star-raw"
-version: "0.4.5"
+version: "0.4.6"
 synopsis: "Auto-generated low-level OCaml bindings for EverCrypt/HACL*"
 description: """
 This package contains a snapshot of the EverCrypt crypto provider and
@@ -18,6 +18,7 @@ depends: [
   "ocamlfind" {build}
   "ctypes" { >= "0.18.0" }
   "conf-which" {build}
+  "conf-cmake" {build}
 ]
 available: [
   arch != "ppc64" & arch != "ppc32" &
diff --git a/ocaml/hacl-star/hacl-star.opam b/ocaml/hacl-star/hacl-star.opam
index 17105dca..b32eec6e 100644
--- a/ocaml/hacl-star/hacl-star.opam
+++ b/ocaml/hacl-star/hacl-star.opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "hacl-star"
-version: "0.4.5"
+version: "0.4.6"
 synopsis: "OCaml API for EverCrypt/HACL*"
 description: """
 Documentation for this library can be found
@@ -24,12 +24,17 @@ available: [
   os = "freebsd" | os-family != "bsd"
 ]
 build: [
+  ["dune" "subst"] {dev}
   [
-    "dune" "build" "-p" name "-j" jobs
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
     "@doc" {with-doc}
   ]
 ]
-run-test: [
-  ["dune" "runtest" "-p" name "-j" jobs]
-]
 dev-repo: "git+https://github.com/project-everest/hacl-star.git"

From ec22a3366dbb5d5ab75e5002976fa11685d12d5f Mon Sep 17 00:00:00 2001
From: Franziskus Kiefer <franziskuskiefer@gmail.com>
Date: Fri, 9 Sep 2022 16:50:59 +0200
Subject: [PATCH 2/2] bump to opam packages to 0.5.0 update changes.md

---
 ocaml/META                     | 2 +-
 ocaml/hacl-star-raw.opam       | 2 +-
 ocaml/hacl-star/CHANGES.md     | 5 +++++
 ocaml/hacl-star/hacl-star.opam | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ocaml/META b/ocaml/META
index b7e1a9ef..6e4cf992 100644
--- a/ocaml/META
+++ b/ocaml/META
@@ -1,5 +1,5 @@
 name="hacl-star-raw"
-version="0.4.6"
+version="0.5.0"
 description="EverCrypt with Ctypes bindings"
 requires="ctypes"
 archive(native)="ocamlevercrypt.cmxa"
diff --git a/ocaml/hacl-star-raw.opam b/ocaml/hacl-star-raw.opam
index 1867efbf..ee0b7d7c 100644
--- a/ocaml/hacl-star-raw.opam
+++ b/ocaml/hacl-star-raw.opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "hacl-star-raw"
-version: "0.4.6"
+version: "0.5.0"
 synopsis: "Auto-generated low-level OCaml bindings for EverCrypt/HACL*"
 description: """
 This package contains a snapshot of the EverCrypt crypto provider and
diff --git a/ocaml/hacl-star/CHANGES.md b/ocaml/hacl-star/CHANGES.md
index 5a754974..36086d80 100644
--- a/ocaml/hacl-star/CHANGES.md
+++ b/ocaml/hacl-star/CHANGES.md
@@ -1,3 +1,8 @@
+## 0.5.0
+- New build system
+- Faster blake2b
+- Agile incremental APIs for blake2
+
 ## 0.4.5
 - Faster fallback implementations for certain intrinsics, leading to improved
   performance, notably on ARMv8
diff --git a/ocaml/hacl-star/hacl-star.opam b/ocaml/hacl-star/hacl-star.opam
index b32eec6e..5123e7ca 100644
--- a/ocaml/hacl-star/hacl-star.opam
+++ b/ocaml/hacl-star/hacl-star.opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "hacl-star"
-version: "0.4.6"
+version: "0.5.0"
 synopsis: "OCaml API for EverCrypt/HACL*"
 description: """
 Documentation for this library can be found