New upstream version 4.3.0.
Remove patches from git which were unused and unapplied.
This commit is contained in:
Richard W.M. Jones
parent
5c307f837d
commit
2a1fb44447
|
|
@ -8,3 +8,4 @@ lwt-2.0.0+rc1.tar.gz
|
|||
/lwt-2.5.0.tar.gz
|
||||
/lwt-4.1.0.tar.gz
|
||||
/lwt-4.2.1.tar.gz
|
||||
/lwt-4.3.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
diff -ur lwt-2.5.0.old/myocamlbuild.ml lwt-2.5.0/myocamlbuild.ml
|
||||
--- lwt-2.5.0.old/myocamlbuild.ml 2015-07-03 13:39:30.000000000 +0100
|
||||
+++ lwt-2.5.0/myocamlbuild.ml 2017-08-08 19:13:04.789273169 +0100
|
||||
@@ -538,7 +538,7 @@
|
||||
| nm, [], intf_modules ->
|
||||
ocaml_lib nm;
|
||||
let cmis =
|
||||
- List.map (fun m -> (String.uncapitalize m) ^ ".cmi")
|
||||
+ List.map (fun m -> (String.uncapitalize_ascii m) ^ ".cmi")
|
||||
intf_modules in
|
||||
dep ["ocaml"; "link"; "library"; "file:"^nm^".cma"] cmis
|
||||
| nm, dir :: tl, intf_modules ->
|
||||
@@ -551,7 +551,7 @@
|
||||
["compile"; "infer_interface"; "doc"])
|
||||
tl;
|
||||
let cmis =
|
||||
- List.map (fun m -> dir^"/"^(String.uncapitalize m)^".cmi")
|
||||
+ List.map (fun m -> dir^"/"^(String.uncapitalize_ascii m)^".cmi")
|
||||
intf_modules in
|
||||
dep ["ocaml"; "link"; "library"; "file:"^dir^"/"^nm^".cma"]
|
||||
cmis)
|
||||
diff -ur lwt-2.5.0.old/src/unix/lwt_unix.ml lwt-2.5.0/src/unix/lwt_unix.ml
|
||||
--- lwt-2.5.0.old/src/unix/lwt_unix.ml 2015-07-03 13:39:30.000000000 +0100
|
||||
+++ lwt-2.5.0/src/unix/lwt_unix.ml 2017-08-08 19:14:31.957333383 +0100
|
||||
@@ -588,6 +588,7 @@
|
||||
| O_RSYNC
|
||||
| O_SHARE_DELETE
|
||||
| O_CLOEXEC
|
||||
+ | O_KEEPEXEC
|
||||
|
||||
external open_job : string -> Unix.open_flag list -> int -> (Unix.file_descr * bool) job = "lwt_unix_open_job"
|
||||
|
||||
@@ -1326,7 +1327,7 @@
|
||||
check_descriptor ch;
|
||||
Unix.shutdown ch.fd shutdown_command
|
||||
|
||||
-external stub_socketpair : socket_domain -> socket_type -> int -> Unix.file_descr * Unix.file_descr = "lwt_unix_socketpair_stub"
|
||||
+external stub_socketpair : ?cloexec:bool -> socket_domain -> socket_type -> int -> Unix.file_descr * Unix.file_descr = "lwt_unix_socketpair_stub"
|
||||
|
||||
let socketpair dom typ proto =
|
||||
let do_socketpair = if Sys.win32 then stub_socketpair else Unix.socketpair in
|
||||
Only in lwt-2.5.0/src/unix: lwt_unix.ml~
|
||||
diff -ur lwt-2.5.0.old/src/unix/lwt_unix.mli lwt-2.5.0/src/unix/lwt_unix.mli
|
||||
--- lwt-2.5.0.old/src/unix/lwt_unix.mli 2015-07-03 13:39:30.000000000 +0100
|
||||
+++ lwt-2.5.0/src/unix/lwt_unix.mli 2017-08-08 19:13:04.790273170 +0100
|
||||
@@ -314,6 +314,7 @@
|
||||
| O_RSYNC
|
||||
| O_SHARE_DELETE
|
||||
| O_CLOEXEC
|
||||
+ | O_KEEPEXEC
|
||||
|
||||
val openfile : string -> open_flag list -> file_perm -> file_descr Lwt.t
|
||||
(** Wrapper for [Unix.openfile]. *)
|
||||
diff -ur lwt-2.5.0.old/src/unix/lwt_unix_stubs.c lwt-2.5.0/src/unix/lwt_unix_stubs.c
|
||||
--- lwt-2.5.0.old/src/unix/lwt_unix_stubs.c 2015-07-03 13:39:30.000000000 +0100
|
||||
+++ lwt-2.5.0/src/unix/lwt_unix_stubs.c 2017-08-08 19:15:07.469357918 +0100
|
||||
@@ -453,9 +453,9 @@
|
||||
SOCK_STREAM, SOCK_DGRAM, SOCK_RAW, SOCK_SEQPACKET
|
||||
};
|
||||
|
||||
-CAMLprim value lwt_unix_socketpair_stub(value domain, value type, value protocol)
|
||||
+CAMLprim value lwt_unix_socketpair_stub(value cloexec, value domain, value type, value protocol)
|
||||
{
|
||||
- CAMLparam3(domain, type, protocol);
|
||||
+ CAMLparam4(cloexec, domain, type, protocol);
|
||||
CAMLlocal1(result);
|
||||
SOCKET sockets[2];
|
||||
lwt_unix_socketpair(socket_domain_table[Int_val(domain)],
|
||||
Only in lwt-2.5.0/src/unix: lwt_unix_stubs.c~
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From d3226b70359cb8618d95d1105c908aa591f1b144 Mon Sep 17 00:00:00 2001
|
||||
From: Jeremie Dimino <jdimino@janestreet.com>
|
||||
Date: Thu, 17 Apr 2014 10:55:43 +0100
|
||||
Subject: [PATCH] Fix ocaml/camlp4#19
|
||||
|
||||
---
|
||||
syntax/pa_optcomp.ml | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/syntax/pa_optcomp.ml b/syntax/pa_optcomp.ml
|
||||
index 583248f..4b112d2 100644
|
||||
--- a/syntax/pa_optcomp.ml
|
||||
+++ b/syntax/pa_optcomp.ml
|
||||
@@ -334,13 +334,19 @@ let parse_ident stream =
|
||||
let parse_expr stream =
|
||||
(* Lists of opened brackets *)
|
||||
let opened_brackets = ref [] in
|
||||
+ let eoi = ref None in
|
||||
|
||||
(* Return the next token of [stream] until all opened parentheses
|
||||
have been closed and a newline is reached *)
|
||||
let rec next_token _ =
|
||||
- Some(match Stream.next stream, !opened_brackets with
|
||||
+ match !eoi with
|
||||
+ | Some _ as x -> x
|
||||
+ | None ->
|
||||
+ Some(match Stream.next stream, !opened_brackets with
|
||||
| (NEWLINE, loc), [] ->
|
||||
- EOI, loc
|
||||
+ let x = EOI, loc in
|
||||
+ eoi := Some x;
|
||||
+ x
|
||||
|
||||
| (KEYWORD("(" | "[" | "{" as b), _) as x, l ->
|
||||
opened_brackets := b :: l;
|
||||
--
|
||||
1.9.3
|
||||
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff -ur lwt-2.5.0.old/src/ssl/lwt_ssl.mli lwt-2.5.0/src/ssl/lwt_ssl.mli
|
||||
--- lwt-2.5.0.old/src/ssl/lwt_ssl.mli 2015-07-03 13:39:30.000000000 +0100
|
||||
+++ lwt-2.5.0/src/ssl/lwt_ssl.mli 2017-11-17 16:07:20.829197330 +0000
|
||||
@@ -56,8 +56,8 @@
|
||||
val ssl_accept_handshake : uninitialized_socket -> socket Lwt.t
|
||||
(** Await a SSL/TLS handshake on the specified socket (used by servers). *)
|
||||
|
||||
-val read : socket -> string -> int -> int -> int Lwt.t
|
||||
-val write : socket -> string -> int -> int -> int Lwt.t
|
||||
+val read : socket -> bytes -> int -> int -> int Lwt.t
|
||||
+val write : socket -> bytes -> int -> int -> int Lwt.t
|
||||
|
||||
val read_bytes : socket -> Lwt_bytes.t -> int -> int -> int Lwt.t
|
||||
val write_bytes : socket -> Lwt_bytes.t -> int -> int -> int Lwt.t
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
Name: ocaml-lwt
|
||||
Version: 4.2.1
|
||||
Release: 6%{?dist}
|
||||
Version: 4.3.0
|
||||
Release: 1%{?dist}
|
||||
Summary: OCaml lightweight thread library
|
||||
|
||||
# The openssl linking exception is granted.
|
||||
|
|
@ -22,7 +22,7 @@ BuildRequires: ocaml-react-devel
|
|||
|
||||
# lwt_ppx dependencies.
|
||||
BuildRequires: ocaml-migrate-parsetree-devel
|
||||
BuildRequires: ocaml-ppx-tools-versioned-devel
|
||||
BuildRequires: ocaml-ppx-tools-versioned-devel >= 5.2.3
|
||||
BuildRequires: ocaml-ppx-derivers-devel
|
||||
|
||||
#BuildRequires: chrpath
|
||||
|
|
@ -136,7 +136,7 @@ rm -rf %{buildroot}/%{_prefix}/doc
|
|||
%{_libdir}/ocaml/lwt/*.cmx
|
||||
%endif
|
||||
%{_libdir}/ocaml/lwt/*.mli
|
||||
%{_libdir}/ocaml/stublibs/*.so
|
||||
#%{_libdir}/ocaml/stublibs/*.so
|
||||
|
||||
%files react
|
||||
%doc CHANGES README.md
|
||||
|
|
@ -178,6 +178,10 @@ rm -rf %{buildroot}/%{_prefix}/doc
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 21 2019 Richard W.M. Jones <rjones@redhat.com> - 4.3.0-1
|
||||
- New upstream version 4.3.0.
|
||||
- Remove patches from git which were unused and unapplied.
|
||||
|
||||
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.1-6
|
||||
- Fix previous commit.
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (lwt-4.2.1.tar.gz) = 4289568e9ca0ffc8625caddc0b5c7d79737800106289931927133eeeb79e3c638aad4399b075bf46b339e91a739589983ce546f4dad07f492fd31ce5be5c216d
|
||||
SHA512 (lwt-4.3.0.tar.gz) = 8e66f5b2443b2cc2889cd3f425db6e7261165603f1c31f8800540900d944dc6ae99b5cf02a29244cfd40fa4b077f238a7a788ba970734faa47deec98b55ac252
|
||||
|
|
|
|||
Loading…
Reference in New Issue