rpms/ocaml-ocamlnet
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New upstream version 4.1.6.

Browse Source 
- Remove upstream patch.
This commit is contained in:
Richard W.M. Jones 2018-05-15 14:31:44 +01:00
parent 904d534b7d
commit d7d4c5f084
4 changed files with 8 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored
View File

@ -1,13 +1 @@
ocamlnet-2.2.9.tar.gz
/ocamlnet-3.4.tar.gz
/ocamlnet-3.4.1.tar.gz
/ocamlnet-3.5.1.tar.gz
/ocamlnet-3.7.3.tar.gz
/ocamlnet-3.7.4.tar.gz
/ocamlnet-4.0.1.tar.gz
/ocamlnet-4.0.3.tar.gz
/ocamlnet-4.0.4.tar.gz
/ocamlnet-4.1.2.tar.gz
/ocamlnet-4.1.3.tar.gz
/ocamlnet-4.1.4.tar.gz
/ocamlnet-4.1.5.tar.gz
/ocamlnet-*.tar.gz

13
ocaml-ocamlnet.spec
View File

@ -8,18 +8,14 @@
%global __strip /bin/true
Name: ocaml-ocamlnet
Version: 4.1.5
Release: 2%{?dist}
Version: 4.1.6
Release: 1%{?dist}
Summary: Network protocols for OCaml
License: BSD
URL: http://projects.camlcity.org/projects/ocamlnet.html
Source0: http://download.camlcity.org/download/ocamlnet-%{version}.tar.gz
# Non-upstream patch to fix string immutability problems with OCaml 4.06.
# Sent upstream Nov 08, no response yet.
Patch1: ocamlnet-4.1.4-bytes-fixes.patch
BuildRequires: ocaml >= 3.12.1-3
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-camlp4-devel
@ -112,7 +108,6 @@ files for developing applications that use %{name}-nethttpd.
%prep
%setup -q -n ocamlnet-%{version}
%autopatch -p1
%build
@ -223,6 +218,10 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
%changelog
* Tue May 15 2018 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-1
- New upstream version 4.1.6.
- Remove upstream patch.
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

54
ocamlnet-4.1.4-bytes-fixes.patch
View File

@ -1,54 +0,0 @@
--- ocamlnet-4.1.4.old/src/netzip/netgzip.ml 2017-08-14 14:16:50.000000000 +0100
+++ ocamlnet-4.1.4/src/netzip/netgzip.ml 2017-11-08 16:24:22.162165338 +0000
@@ -7,7 +7,6 @@
val mutable closed = false
method input s p l =
- let s = Bytes.unsafe_to_string s in
let n = Gzip.input gzip_ch s p l in
if n = 0 then raise End_of_file;
n
@@ -27,7 +26,6 @@
class output_gzip_rec gzip_ch : Netchannels.rec_out_channel =
object(self)
method output s p l =
- let s = Bytes.unsafe_to_string s in
Gzip.output gzip_ch s p l;
l
method close_out() =
@@ -156,8 +154,6 @@
(fun out_buf out_pos out_len ->
let (finished, used_in, used_out) =
try
- let in_buf = Bytes.unsafe_to_string in_buf in
- let out_buf = Bytes.unsafe_to_string out_buf in
Zlib.inflate
stream
in_buf in_pos in_len out_buf out_pos out_len
@@ -170,8 +166,7 @@
st.in_size <-
Int32.add st.in_size (Int32.of_int used_out);
st.in_crc <-
- ( let out_buf = Bytes.unsafe_to_string out_buf in
- Zlib.update_crc st.in_crc out_buf out_pos used_out
+ ( Zlib.update_crc st.in_crc out_buf out_pos used_out
);
k := !k + used_in;
@@ -292,8 +287,6 @@
(fun out_buf out_pos out_len ->
let (finished, used_in, used_out) =
try
- let in_buf = Bytes.unsafe_to_string in_buf in
- let out_buf = Bytes.unsafe_to_string out_buf in
Zlib.deflate
stream in_buf 0 in_len out_buf out_pos out_len
(if at_eof then Zlib.Z_FINISH else Zlib.Z_NO_FLUSH)
@@ -305,7 +298,6 @@
st.out_size <- Int32.add st.out_size (Int32.of_int used_in);
st.out_crc <- (
- let in_buf = Bytes.unsafe_to_string in_buf in
Zlib.update_crc st.out_crc in_buf 0 used_in
);

2
sources
View File

@ -1 +1 @@
SHA512 (ocamlnet-4.1.5.tar.gz) = f22c24b3413ccf16fc2538d4390871e60c7c1abc6bd0f599057909d786e7ad852d47c3ba0315b0095c01b345ea58d6d7d9cfefc2f9f9c31fe7b8d5e5c874328c
SHA512 (ocamlnet-4.1.6.tar.gz) = 5bd6437f3ffea309c4382b79bbf87cc46c2fa88c5191df7b1d62294ce523aa25ba7fcf41c8c1cfade5396859db209d60b8b00062b103b1cab2761896443bf881