Skip to content

Commit f6723dd

Browse files
djs55djs55
authored
Merge pull request #641 from LaurentGoderre/pin-deps
Add version to package file and pin dependencies to fix build
2 parents dc331cb + 2bf6b06 commit f6723dd

File tree

3 files changed

+31
-30
lines changed

3 files changed

+31
-30
lines changed

‎scripts/licenses.ml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ limitations under the License.
447447
|}
448448

449449
let licenses = function
450-
| "angstrom.0.15.0" -> {
450+
| "angstrom.0.15.0" | "angstrom.0.16.0" -> {
451451
link = "https://github.com/inhabitedtype/angstrom/blob/21333c8629ade0b99732a7c34c9513096d7efa05/LICENSE";
452452
text = {|
453453
Copyright (c) 2016, Inhabited Type LLC
@@ -481,7 +481,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
481481
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
482482
POSSIBILITY OF SUCH DAMAGE.|}
483483
}
484-
| "arp.3.0.0" -> {
484+
| "arp.3.0.0" | "arp.3.1.1" -> {
485485
link = "https://github.com/mirage/arp/blob/7222488873ae6d54233480322cb2f92a8df312ba/LICENSE.md";
486486
text = {|
487487
Copyright (c) 2016 Hannes Mehnert [email protected]
@@ -513,7 +513,7 @@ src/arp_packet.ml mirage/arpv4.mli mirage/arpv4.ml
513513
Copyright (c) 2015 Leo White <[email protected]>
514514
|} ^ isc
515515
}
516-
| "luv_unix.0.5.0" | "luv.0.5.11" -> {
516+
| "luv_unix.0.5.0" | "luv.0.5.11" | "luv.0.5.13" | "luv_unix.0.5.1" -> {
517517
link = "https://raw.githubusercontent.com/aantron/luv/master/LICENSE.md";
518518
text = {|
519519
Copyright (c) 2018-2021 Anton Bachin
@@ -525,7 +525,7 @@ src/arp_packet.ml mirage/arpv4.mli mirage/arpv4.ml
525525
Copyright (c) 2013-2016 Jeremy Yallop
526526
|} ^ mit
527527
}
528-
| "ctypes.0.20.1" -> {
528+
| "ctypes.0.20.1" | "ctypes.0.22.0" -> {
529529
link = "https://raw.githubusercontent.com/ocamllabs/ocaml-ctypes/master/LICENSE";
530530
text = {|
531531
Copyright (c) 2013 Jeremy Yallop
@@ -563,7 +563,7 @@ src/arp_packet.ml mirage/arpv4.mli mirage/arpv4.ml
563563
Copyright (c) 2016--2020 Jane Street Group, LLC [email protected]
564564
|} ^ mit
565565
}
566-
| "base64.3.5.0" -> {
566+
| "base64.3.5.0" | "base64.3.5.1" -> {
567567
link = "https://github.com/mirage/ocaml-base64/blob/3a5e259895acef979a0fab8bb59d396e1bccead0/LICENSE.md";
568568
text = {|
569569
Copyright (c) 2006-2009 Citrix Systems Inc.
@@ -577,7 +577,7 @@ Copyright (c) 2016--2020 Jane Street Group, LLC [email protected]
577577
578578
|} ^ isc
579579
}
580-
| "bigstringaf.0.8.0" | "bigstringaf.0.9.0" -> {
580+
| "bigstringaf.0.8.0" | "bigstringaf.0.9.0" | "bigstringaf.0.10.0" -> {
581581
link = "https://github.com/inhabitedtype/bigstringaf/blob/9c1e57375f3da15cf344c228e2cc14a36513923d/LICENSE";
582582
text = {|
583583
Copyright (c) 2018, Inhabited Type LLC
@@ -618,7 +618,7 @@ POSSIBILITY OF SUCH DAMAGE.
618618
Copyright (c) 2011 Daniel C. Bünzli
619619
|} ^ isc
620620
}
621-
| "cohttp.5.0.0" | "cohttp-lwt.5.0.0" -> {
621+
| "cohttp.5.0.0" | "cohttp.5.3.1" | "cohttp-lwt.5.0.0" | "cohttp-lwt.5.3.0" -> {
622622
link = "https://github.com/mirage/ocaml-cohttp/blob/5f9c0ae88a69e4280810fe73344367e90954dea5/LICENSE.md";
623623
text = {|
624624
ISC License
@@ -676,14 +676,14 @@ Copyright (c) 2009-2018 <the authors, see individual headers on files>
676676
Copyright (c) 2013 Thomas Gazagnaire [email protected] Copyright (C) 2012-2013 Citrix Inc Copyright (c) 2010-2012 Anil Madhavapeddy [email protected]
677677
|} ^ isc
678678
}
679-
| "ipaddr.5.2.0" | "ipaddr.5.3.0" | "ipaddr.5.3.1" | "ipaddr-sexp.5.2.0" | "ipaddr-sexp.5.3.0" | "ipaddr-sexp.5.3.1" | "macaddr.5.2.0" | "macaddr.5.3.0" | "macaddr.5.3.1" | "macaddr-cstruct.5.2.0" | "macaddr-cstruct.5.3.0" | "macaddr-cstruct.5.3.1" | "macaddr-sexp.5.2.0" | "macaddr-sexp.5.3.0" | "macaddr-sexp.5.3.1" -> {
679+
| "ipaddr.5.2.0" | "ipaddr.5.3.0" | "ipaddr.5.3.1" | "ipaddr.5.6.0" | "ipaddr-sexp.5.2.0" | "ipaddr-sexp.5.3.0" | "ipaddr-sexp.5.3.1" | "ipaddr-sexp.5.6.0"| "macaddr.5.2.0" | "macaddr.5.3.0" | "macaddr.5.3.1" | "macaddr.5.6.0" | "macaddr-cstruct.5.2.0" | "macaddr-cstruct.5.3.0" | "macaddr-cstruct.5.3.1" | "macaddr-cstruct.5.6.0" | "macaddr-sexp.5.2.0" | "macaddr-sexp.5.3.0" | "macaddr-sexp.5.3.1" | "macaddr-sexp.5.6.0" -> {
680680
link = "https://github.com/mirage/ocaml-ipaddr/blob/7745ea4be2c1c5a7ab95908b26a6ed81a0947ab5/LICENSE.md";
681681
text = {|
682682
Copyright (c) 2013-2015 David Sheets [email protected] Copyright (c) 2010-2011, 2014 Anil Madhavapeddy [email protected]
683683
684684
|} ^ isc
685685
}
686-
| "metrics.0.3.0" | "metrics.0.4.0" -> {
686+
| "metrics.0.3.0" | "metrics.0.4.0" | "metrics.0.4.1" -> {
687687
link = "https://github.com/mirage/metrics/blob/0f48d63c5e1c0e33d7043b2c6e053ba380516433/LICENSE.md";
688688
text = isc;
689689
}
@@ -762,7 +762,7 @@ Copyright (c) 2009-2018 <the authors, see individual headers on files>
762762
Copyright (c) 2015, MirageOS
763763
|} ^ isc
764764
}
765-
| "uri.4.2.0" | "uri-sexp.4.2.0" -> {
765+
| "uri.4.2.0" | "uri.4.4.0" | "uri-sexp.4.2.0" | "uri-sexp.4.4.0" -> {
766766
link = "https://github.com/mirage/ocaml-uri/blob/0ff3efbbc235bef5a7d67cc01bc1dadbe2e859b9/LICENSE.md";
767767
text = {|
768768
Copyright (c) <the authors, see individual headers on files>
@@ -799,7 +799,7 @@ All rights reserved.
799799
800800
|} ^ isc
801801
}
802-
| "re.1.10.3" | "re.1.10.4" -> {
802+
| "re.1.10.3" | "re.1.10.4" | "re.1.11.0" -> {
803803
link = "https://github.com/ocaml/ocaml-re/blob/c5d5df80e128c3d7646b7d8b1322012c5fcc35f3/LICENSE.md";
804804
text = {|
805805
This Software is distributed under the terms of the GNU Lesser
@@ -850,7 +850,7 @@ might be covered by the GNU Lesser General Public License.
850850
851851
|} ^ lgpl21
852852
}
853-
| "num.1.4" -> {
853+
| "num.1.4" | "num.1.5-1" -> {
854854
link = "https://github.com/ocaml/num/blob/814c159ea6cebff3b1f61b2055b893be87084ae3/LICENSE";
855855
text = {|
856856
The Num library is copyright Institut National de Recherche en
@@ -978,7 +978,7 @@ might be covered by the GNU Lesser General Public License.
978978
979979
|} ^ isc
980980
}
981-
| "jsonm.1.0.1" -> {
981+
| "jsonm.1.0.1" | "jsonm.1.0.2" -> {
982982
link = "https://github.com/dbuenzli/jsonm/blob/15ba785854b8b6e45958570d23238b603cd3f8d6/LICENSE.md";
983983
text = {|
984984
Copyright (c) 2012 Daniel C. Bünzli
@@ -1009,15 +1009,17 @@ might be covered by the GNU Lesser General Public License.
10091009
Copyright (c) 2016 David Kaloper Meršinjak
10101010
|} ^ isc
10111011
}
1012-
| "lwt.5.5.0" | "lwt.5.6.1" | "lwt-dllist.1.0.1" -> {
1012+
| "lwt.5.5.0" | "lwt.5.6.1" | "lwt.5.7.0" | "lwt-dllist.1.0.1" -> {
10131013
link = "https://github.com/ocsigen/lwt/blob/bab52d9744cb2d5cd3cfe86cda65ba73752998ee/LICENSE.md";
10141014
text = {|
10151015
Copyright (c) 1999-2020, the Authors of Lwt (docs/AUTHORS)
10161016
10171017
|} ^ mit
10181018
}
10191019
| "menhir.20211230" | "menhirLib.20211230" | "menhirSdk.20211230"
1020-
| "menhir.20220210" | "menhirLib.20220210" | "menhirSdk.20220210" -> {
1020+
| "menhir.20220210" | "menhirLib.20220210" | "menhirSdk.20220210"
1021+
| "menhirSdk.20240715" | "menhirLib.20240715" | "menhirCST.20240715" | "menhir.20240715"
1022+
-> {
10211023
link = "https://gitlab.inria.fr/fpottier/menhir/-/blob/20211230/LICENSE";
10221024
text = {|
10231025
@@ -1030,7 +1032,7 @@ Public License version 2 (included below).
10301032
link = "https://github.com/OCamlPro/ocplib-endian/blob/10292cd3ffa4d23d737e3f855ad04f22d3d95460/COPYING.txt";
10311033
text = lgpl21_with_ocaml_linking_exception;
10321034
}
1033-
| "ounit.2.2.4" | "ounit.2.2.6" | "ounit2.2.2.4" | "ounit2.2.2.6" -> {
1035+
| "ounit.2.2.4" | "ounit.2.2.6" | "ounit.2.2.7" | "ounit2.2.2.4" | "ounit2.2.2.6" | "ounit2.2.2.7" -> {
10341036
link = "https://github.com/gildor478/ounit/blob/faf4936b17507406c7592186dcaa3f25c6fc138a/LICENSE.txt";
10351037
text = {|
10361038
Copyright (c) 2002, 2003 by Maas-Maarten Zeeman
@@ -1059,7 +1061,7 @@ otherwise, arising from, out of or in connection with the Software or
10591061
the use or other dealings in the software.
10601062
|}
10611063
}
1062-
| "sha.1.15.1" | "sha.1.15.2" -> {
1064+
| "sha.1.15.1" | "sha.1.15.2" | "sha.1.15.4" -> {
10631065
link = "https://github.com/djs55/ocaml-sha/blob/af5c7b1c7d3b8f9492038b7b40ba9cad82fb4ee8/LICENSE.md";
10641066
text = isc;
10651067
}
@@ -1130,6 +1132,7 @@ Copyright (c) 2016-2017 Mindy Preston
11301132
let linked_into_executable = function
11311133
| "ocaml-config"
11321134
| "conf-which" -> false (* part of OCaml infra *)
1135+
| "conf-pkg-config"
11331136
| "ocamlbuild"
11341137
| "ocamlfind"
11351138
| "ppx_derivers"

‎src/hostnet_test/test_http.ml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -740,9 +740,8 @@ let test_http_connect_tunnel proxy () =
740740
failwith "test_proxy_get: EOF on HTTP GET"
741741
| `Invalid x ->
742742
failwith ("test_proxy_get: Invalid HTTP response: " ^ x)
743-
| `Ok res ->
744-
if res.Cohttp.Response.status <> `OK
745-
then failwith "test_proxy_get: HTTP GET failed unexpectedly";
743+
| `Ok _ ->
744+
(* any response is ok. We'll probably get a "301 Moved Permanently" *)
746745
Lwt.return_unit
747746
)
748747
end
@@ -971,9 +970,8 @@ let test_http_connect_tunnel proxy () =
971970
failwith "test_proxy_head: EOF on HTTP HEAD"
972971
| `Invalid x ->
973972
failwith ("test_proxy_head: Invalid HTTP response: " ^ x)
974-
| `Ok res ->
975-
if res.Cohttp.Response.status <> `OK
976-
then failwith "test_proxy_head: HTTP HEAD failed unexpectedly";
973+
| `Ok _ ->
974+
(* any valid HTTP response will do *)
977975
(* Now try another request to see if the channel still works *)
978976
let request = Cohttp.Request.make ~meth:`GET (Uri.make ~host ()) in
979977
Outgoing.Request.write ~flush:true (fun _writer -> Lwt.return_unit) request oc
@@ -985,9 +983,8 @@ let test_http_connect_tunnel proxy () =
985983
failwith "test_proxy_head: EOF on HTTP GET after HEAD"
986984
| `Invalid x ->
987985
failwith ("test_proxy_head: Invalid HTTP response: " ^ x)
988-
| `Ok res ->
989-
if res.Cohttp.Response.status <> `OK
990-
then failwith "test_proxy_head: HTTP GET after HEAD failed unexpectedly";
986+
| `Ok _ ->
987+
(* any HTTP response will do *)
991988
Lwt.return `Ok in
992989
Lwt.pick [
993990
(Host.Time.sleep_ns (Duration.of_sec 100) >|= fun () -> `Timeout);

‎vpnkit.opam

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
version: "0.5.0"
12
opam-version: "2.0"
23
maintainer: "David Scott <[email protected]>"
34
authors: [
@@ -23,7 +24,7 @@ build: [
2324

2425
depends: [
2526
"ocaml" {>="4.08.0"}
26-
"dune"
27+
"dune" {build & < "3.1.0" }
2728
"alcotest" {with-test}
2829
"ounit" {with-test}
2930
"tar" {>= "1.0.1"}
@@ -44,17 +45,17 @@ depends: [
4445
"logs"
4546
"fmt"
4647
"astring"
47-
"ethernet" {>= "3.0.0"}
48+
"ethernet" {>= "3.0.0" & < "3.1.0"}
4849
"arp" {>= "3.0.0"}
4950
"mirage-entropy" {>= "0.5.0"}
50-
"mirage-kv" {>= "4.0.0"}
51+
"mirage-kv" {>= "4.0.0" & < "6.0.0"}
5152
"mirage-net" {>= "4.0.0"}
5253
"mirage-time" {>= "3.0.0"}
5354
"mirage-channel" {>= "4.0.1"}
5455
"mirage-stack"
5556
"cohttp-lwt" {>= "0.99.0"}
5657
"protocol-9p" {>= "2.0.0"}
57-
"mirage-vnetif" {>= "0.5.0"}
58+
"mirage-vnetif" {>= "0.5.0" & < "0.6.0"}
5859
"io-page-unix"
5960
"uuidm"
6061
"ezjsonm" {>= "0.4.0"}

0 commit comments

Comments
 (0)