From 88b6a72e1b62000ea239c30c774762db2d375202 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 21 Jan 2021 20:21:45 +0000
Subject: [PATCH 1/4] Enable use of ocaml-base64 to provide Base64 functions.

This module is no longer included in the minimal extlib:
https://github.com/ygrek/ocaml-extlib/issues/53
---
 _tags.in        | 8 ++++----
 npm/packages.ml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_tags.in b/_tags.in
index 23ed855..68c4d4e 100644
--- a/_tags.in
+++ b/_tags.in
@@ -9,9 +9,9 @@ true: -traverse
 <applications/*.ml> or <experimental/*/*.ml> or <experimental/*.ml>: pp(cppo @CPPOFLAGS@ @CONFIG_PARMAP@ @CONFIG_OCAMLGRAPH@ @CONFIG_MCCS@)
 
 <*/*.ml{i,}>: pp(cppo)
-<*/*.ml{i,}>: package(extlib), @PKG_CUDF@, package(re.pcre)
+<*/*.ml{i,}>: package(extlib), package(base64), @PKG_CUDF@, package(re.pcre)
 
-<*/tests.*>: package(oUnit), package(extlib), @PKG_CUDF@, package(re.pcre), package(zip), package(bz2), package(ocamlgraph)
+<*/tests.*>: package(oUnit), package(extlib), package(base64), @PKG_CUDF@, package(re.pcre), package(zip), package(bz2), package(ocamlgraph)
 
 <common/tests.*>: use_common
 <algo/tests.*>: use_common
@@ -54,7 +54,7 @@ true: -traverse
 <doseparseNoRpm/*.cmx> and not <doseparseNoRpm/doseparse*.cmx>: for-pack(DoseparseNoRpm)
 
 <{applications,experimental}/*>: use_common, use_versioning, use_debian, use_opam, use_npm, use_pef, use_csw
-<{applications,experimental}/*>: package(extlib), package(re.pcre), package(unix), package(re.str), package(ocamlgraph)
+<{applications,experimental}/*>: package(extlib), package(base64), package(re.pcre), package(unix), package(re.str), package(ocamlgraph)
 <{applications,experimental}/*>: @PKG_CUDF@, @PKG_ZIP@, @PKG_BZ2@
 
 <applications/apt-cudf.*>: use_doseparseNoRpm, use_algo, @PKG_MCCS@
@@ -85,5 +85,5 @@ true: -traverse
 <experimental/cnftocudf.*>: use_doseparseNoRpm
 <experimental/example.*>: use_doseparse
 
-<experimental/dudftocudf/*>: use_common, use_debian, use_pef, use_csw, package(extlib), package(re.pcre), package(unix), @PKG_CUDF@, @PKG_ZIP@, @PKG_BZ2@, @PKG_CURL@, @PKG_XML@, use_doseparseNoRpm
+<experimental/dudftocudf/*>: use_common, use_debian, use_pef, use_csw, package(extlib), package(base64), package(re.pcre), package(unix), @PKG_CUDF@, @PKG_ZIP@, @PKG_BZ2@, @PKG_CURL@, @PKG_XML@, use_doseparseNoRpm
 true: safe_string
diff --git a/npm/packages.ml b/npm/packages.ml
index 0511950..1f36322 100644
--- a/npm/packages.ml
+++ b/npm/packages.ml
@@ -30,7 +30,7 @@ let lexbuf_wrapper type_parser v =
     match v with
     | (_, (_, package)) -> 
       let splited = Pcre.split (Pcre.regexp " : ") package in
-      let base64 = Bytes.to_string (Base64.str_encode (List.nth splited 1)) in
+      let base64 = Base64.encode_string (List.nth splited 1) in
       [[("", None), Some ("=", base64)]]
 
 let parse_dependlist v = lexbuf_wrapper Npm_parser.dependlist_top v ;;
-- 
2.29.2