Merge pull request #6976 from kit-ty-kate/ocaml-tar-3.5.0

Upgrade to ocaml-tar 3.5.0

Author: kit-ty-kate

.github/workflows/ci.ml

@@ -552,10 +552,9 @@ let main oc : unit =
     ("OPAMBSVERSION", "2.1.0");
     ("OPAMBSROOT", "~/.cache/.opam.cached");
     ("OPAM12CACHE", "~/.cache/opam1.2/cache");
-    (* These should be identical to the values in appveyor.yml *)
     ("OPAM_REPO", "https://github.com/ocaml/opam-repository.git");
-    ("OPAM_TEST_REPO_SHA", "ea549f9f2496d9b1454d1cb4817bba7be9013985");
-    ("OPAM_REPO_SHA", "38a1469dbbc69c770e534e26f79c97256a442b71");
+    ("OPAM_TEST_REPO_SHA", "ceed23f9d33677f323a62325ad42599d14f46b98");
+    ("OPAM_REPO_SHA", "ceed23f9d33677f323a62325ad42599d14f46b98");
     ("SOLVER", "");
     (* Cygwin configuration *)
     ("CYGWIN_MIRROR", "http://mirrors.kernel.org/sourceware/cygwin/");

.github/workflows/depexts.yml

@@ -20,7 +20,7 @@ defaults:
 env:
   OPAMVERSION: 2.5.1
   OPAM_REPO: https://github.com/ocaml/opam-repository.git
-  OPAM_REPO_SHA: ea549f9f2496d9b1454d1cb4817bba7be9013985
+  OPAM_REPO_SHA: ceed23f9d33677f323a62325ad42599d14f46b98
 
 jobs:
   opam-cache:

.github/workflows/main.yml

@@ -27,8 +27,8 @@ env:
   OPAMBSROOT: ~/.cache/.opam.cached
   OPAM12CACHE: ~/.cache/opam1.2/cache
   OPAM_REPO: https://github.com/ocaml/opam-repository.git
-  OPAM_TEST_REPO_SHA: ea549f9f2496d9b1454d1cb4817bba7be9013985
-  OPAM_REPO_SHA: 38a1469dbbc69c770e534e26f79c97256a442b71
+  OPAM_TEST_REPO_SHA: ceed23f9d33677f323a62325ad42599d14f46b98
+  OPAM_REPO_SHA: ceed23f9d33677f323a62325ad42599d14f46b98
   SOLVER:
   CYGWIN_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
   CYGWIN_ROOT: D:\cygwin

master_changes.md

@@ -101,6 +101,7 @@ users)
   * Add lower-bounds constraints to the dependencies that have none (`ocamlgraph` >= 1.8.8, `jsonm` >= 1.0.2, `swhid_core` >= 0.1, `uutf` >= 1.0.3) [#6878 @kit-ty-kate]
   * Require `spdx_licenses` >= 1.4.0 to ensure compatibility with SPDX v3 syntax [#6878 @kit-ty-kate]
   * Remove support for building opam with OCaml 4.08, 4.09 and 4.10 [#6879 @kit-ty-kate]
+  * Upgrade to ocaml-tar.3.5.0 [#6976 @kit-ty-kate]
 
 ## Infrastructure
 
@@ -198,6 +199,8 @@ users)
   * Install `micro_httpd` in test scripts [#6939 @rjbou]
   * Fix ubuntu depext job: remove install of no longer available system packages  'ocaml-compiler-libs' [#6960 @rjbou]
   * Fix opensuse depexts job : force resolution in case of conflict (ocaml/ncurses) [#6960 @rjbou]
+  * Bump the opam-repository commits sha [#6976 @kit-ty-kate]
+  * Fix the archlinux depexts run [#6976 @kit-ty-kate]
 
 ## Doc
   * Add spacing between two words in `--locked` man section [#6806 @yosefAlsuhaibani]

opam-repository.opam

@@ -32,7 +32,7 @@ depends: [
   "dune" {>= "2.8.0"}
   "opam-format" {= version}
   "patch" {>= "3.0.0"}
-  "tar" {>= "3.3.0"}
+  "tar" {>= "3.5.0"}
   "checkseum" {>= "0.5.2"}
   "decompress" {>= "1.5.1"}
 ]

src/repository/opamTar.ml

@@ -30,6 +30,7 @@ let run archive =
   let raise_error fmt = raise_error archive fmt in
   let rec run : type a. Unix.file_descr -> (a, _, _) Tar.t -> a = fun fd -> function
     | Tar.Read len ->
+      let len = Int64.to_int len in
       let b = Bytes.create len in
       let read = safe_read fd b 0 len in
       if read = 0 then
@@ -47,6 +48,7 @@ let run archive =
           else
             loop fd buf (offset + n) len
       in
+      let len = Int64.to_int len in
       let buf = Bytes.create len in
       loop fd buf 0 len;
       Bytes.unsafe_to_string buf
@@ -65,7 +67,7 @@ let fold_reg_files_aux archive f acc fd =
   let go ?global:_ hdr acc =
     match hdr.Tar.Header.link_indicator with
     | Normal ->
-      let* content = Tar.really_read (Int64.to_int hdr.file_size) in
+      let* content = Tar.really_read hdr.file_size in
       let acc = f acc (OpamFilename.Unix.of_string hdr.file_name) content in
       Tar.return (Ok acc)
     | Directory -> Tar.return (Ok acc)

src_ext/Makefile.sources

@@ -66,5 +66,5 @@ MD5_optint = 46cc1b8bd00872529ac01407f908d389
 URL_decompress = https://github.com/mirage/decompress/releases/download/v1.5.3/decompress-1.5.3.tbz
 MD5_decompress = 6c22cdd6368a6c66fbcae2944578fdd7
 
-URL_tar = https://github.com/mirage/ocaml-tar/releases/download/v3.3.0/tar-3.3.0.tbz
-MD5_tar = ee524f7b7049342eaf2bcad0ef40d331
+URL_tar = https://github.com/mirage/ocaml-tar/releases/download/v3.5.0/tar-3.5.0.tbz
+MD5_tar = 06026fdb95a4a6c85a19177887351175