pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/ocamlnet
Module Name: pkgsrc
Committed By: jaapb
Date: Wed Jan 10 16:37:42 UTC 2018
Modified Files:
pkgsrc/net/ocamlnet: Makefile PLIST buildlink3.mk distinfo
Added Files:
pkgsrc/net/ocamlnet/patches: patch-src_netzip_netgzip.ml
Removed Files:
pkgsrc/net/ocamlnet/patches: patch-Makefile.rules
patch-src_netsys_Makefile
Log Message:
Updated package net/ocamlnet to version 4.1.5.
This version includes support for native plugins, and some more minor
fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/ocamlnet/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/ocamlnet/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/ocamlnet/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/ocamlnet/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/net/ocamlnet/patches/patch-Makefile.rules
cvs rdiff -u -r1.1 -r0 pkgsrc/net/ocamlnet/patches/patch-src_netsys_Makefile
cvs rdiff -u -r0 -r1.3 \
pkgsrc/net/ocamlnet/patches/patch-src_netzip_netgzip.ml
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/ocamlnet/Makefile
diff -u pkgsrc/net/ocamlnet/Makefile:1.45 pkgsrc/net/ocamlnet/Makefile:1.46
--- pkgsrc/net/ocamlnet/Makefile:1.45 Thu Nov 30 16:45:35 2017
+++ pkgsrc/net/ocamlnet/Makefile Wed Jan 10 16:37:41 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2017/11/30 16:45:35 adam Exp $
+# $NetBSD: Makefile,v 1.46 2018/01/10 16:37:41 jaapb Exp $
#
-DISTNAME= ocamlnet-4.1.4
-PKGREVISION= 5
+DISTNAME= ocamlnet-4.1.5
CATEGORIES= net
MASTER_SITES= http://download.camlcity.org/download/
Index: pkgsrc/net/ocamlnet/PLIST
diff -u pkgsrc/net/ocamlnet/PLIST:1.17 pkgsrc/net/ocamlnet/PLIST:1.18
--- pkgsrc/net/ocamlnet/PLIST:1.17 Mon Sep 4 18:17:47 2017
+++ pkgsrc/net/ocamlnet/PLIST Wed Jan 10 16:37:41 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2017/09/04 18:17:47 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.18 2018/01/10 16:37:41 jaapb Exp $
${OCAML_SITELIB}/equeue/META
${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.a
${OCAML_SITELIB}/equeue/equeue.cma
@@ -458,6 +458,7 @@ ${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_S
${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmi
${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmo
${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmxs
${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.mli
${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.o
${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.p.cmx
@@ -524,18 +525,22 @@ ${OCAML_SITELIB}/netunidata/META
${OCAML_SITELIB}/netunidata/netmappings_iso.cmi
${OCAML_SITELIB}/netunidata/netmappings_iso.cmo
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.cmxs
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.o
${OCAML_SITELIB}/netunidata/netmappings_jp.cmi
${OCAML_SITELIB}/netunidata/netmappings_jp.cmo
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.cmxs
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.o
${OCAML_SITELIB}/netunidata/netmappings_kr.cmi
${OCAML_SITELIB}/netunidata/netmappings_kr.cmo
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.cmxs
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.o
${OCAML_SITELIB}/netunidata/netmappings_other.cmi
${OCAML_SITELIB}/netunidata/netmappings_other.cmo
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.cmxs
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.o
${OCAML_SITELIB}/netunidata/netunichecksums.cmi
${OCAML_SITELIB}/netunidata/netuniconfig.cmi
@@ -551,6 +556,7 @@ ${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_S
${OCAML_SITELIB}/netunidata/netuniinit.cmi
${OCAML_SITELIB}/netunidata/netuniinit.cmo
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.cmxs
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.o
${OCAML_SITELIB}/netzip/META
${OCAML_SITELIB}/netzip/netgzip.cmi
Index: pkgsrc/net/ocamlnet/buildlink3.mk
diff -u pkgsrc/net/ocamlnet/buildlink3.mk:1.9 pkgsrc/net/ocamlnet/buildlink3.mk:1.10
--- pkgsrc/net/ocamlnet/buildlink3.mk:1.9 Sun Jan 7 13:04:27 2018
+++ pkgsrc/net/ocamlnet/buildlink3.mk Wed Jan 10 16:37:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:27 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/10 16:37:41 jaapb Exp $
BUILDLINK_TREE+= ocamlnet
@@ -6,8 +6,8 @@ BUILDLINK_TREE+= ocamlnet
OCAMLNET_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocamlnet+= ocamlnet>=4.1.2
-BUILDLINK_ABI_DEPENDS.ocamlnet+= ocamlnet>=4.1.4nb3
-BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet
+BUILDLINK_ABI_DEPENDS.ocamlnet+= ocamlnet>=4.1.5
+BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet
.endif # OCAMLNET_BUILDLINK3_MK
Index: pkgsrc/net/ocamlnet/distinfo
diff -u pkgsrc/net/ocamlnet/distinfo:1.25 pkgsrc/net/ocamlnet/distinfo:1.26
--- pkgsrc/net/ocamlnet/distinfo:1.25 Sun Jan 7 21:01:09 2018
+++ pkgsrc/net/ocamlnet/distinfo Wed Jan 10 16:37:41 2018
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.25 2018/01/07 21:01:09 joerg Exp $
+$NetBSD: distinfo,v 1.26 2018/01/10 16:37:41 jaapb Exp $
-SHA1 (ocamlnet-4.1.4.tar.gz) = f7bb6e98f2c35850fb8dce428c061ce316d55ce2
-RMD160 (ocamlnet-4.1.4.tar.gz) = a71a5c894db5c540e5b47df750ea4a1468ea7bf8
-SHA512 (ocamlnet-4.1.4.tar.gz) = ca502444f81898ccda27d61760a357aad59624cf3c4c025d49dd1c2e7bc3ef497c199634247ba7731e016c234e5cd92d2599d1ef9ecd55c3b6e7a64fc4773ee0
-Size (ocamlnet-4.1.4.tar.gz) = 4552969 bytes
-SHA1 (patch-Makefile.rules) = 124b787309e39334036681035e0687120da672c8
-SHA1 (patch-src_netsys_Makefile) = 9edbac14c5f5840933f3e93b27bb95750e946089
+SHA1 (ocamlnet-4.1.5.tar.gz) = 84e17713961536442c440745c4daa158d22d899a
+RMD160 (ocamlnet-4.1.5.tar.gz) = b4b276cd086a6d0901d8d0788b159c451db48ca4
+SHA512 (ocamlnet-4.1.5.tar.gz) = f22c24b3413ccf16fc2538d4390871e60c7c1abc6bd0f599057909d786e7ad852d47c3ba0315b0095c01b345ea58d6d7d9cfefc2f9f9c31fe7b8d5e5c874328c
+Size (ocamlnet-4.1.5.tar.gz) = 4588097 bytes
SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01
SHA1 (patch-src_nettls-nettle.c) = 75748ff2fd30ff6f54f15b9646a22b420d108f28
+SHA1 (patch-src_netzip_netgzip.ml) = ab46274a135c695c4c3776c2a6f00e73338d5c77
Added files:
Index: pkgsrc/net/ocamlnet/patches/patch-src_netzip_netgzip.ml
diff -u /dev/null pkgsrc/net/ocamlnet/patches/patch-src_netzip_netgzip.ml:1.3
--- /dev/null Wed Jan 10 16:37:42 2018
+++ pkgsrc/net/ocamlnet/patches/patch-src_netzip_netgzip.ml Wed Jan 10 16:37:41 2018
@@ -0,0 +1,97 @@
+$NetBSD: patch-src_netzip_netgzip.ml,v 1.3 2018/01/10 16:37:41 jaapb Exp $
+
+Compile with ocaml 4.06 (patch from upstream reported issue)
+--- src/netzip/netgzip.ml.orig 2017-12-06 20:20:53.000000000 +0000
++++ src/netzip/netgzip.ml
+@@ -6,8 +6,7 @@ class input_gzip_rec gzip_ch : Netchanne
+ object(self)
+ val mutable closed = false
+
+- method input s p l =
+- let s = Bytes.unsafe_to_string s in
++ method input s p l =
+ let n = Gzip.input gzip_ch s p l in
+ if n = 0 then raise End_of_file;
+ n
+@@ -27,7 +26,6 @@ class input_gzip gzip_ch =
+ 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,24 +154,20 @@ let inflating_conv st incoming at_eof ou
+ (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
++ Zlib.inflate
++ stream
++ in_buf in_pos in_len out_buf out_pos out_len
+ Zlib.Z_SYNC_FLUSH
+ with Zlib.Error(_, _) ->
+- dispose_in_ignore st;
++ dispose_in_ignore st;
+ gzip_error "error during decompression" in
+-
+-
++
++
+ 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;
+
+ if finished then (
+@@ -292,31 +286,27 @@ let deflating_conv st incoming at_eof ou
+ (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
++ 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)
+- with
++ with
+ | Zlib.Error(_, "buffer error") ->
+ (false, 0, 0)
+ |Zlib.Error(_, msg) ->
+ raise (Gzip.Error("error during compression")) in
+-
++
+ 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
+- );
+-
++ st.out_crc <-
++ Zlib.update_crc st.out_crc in_buf 0 used_in;
++
+ Netbuffer.delete incoming 0 used_in;
+-
++
+ if at_eof && finished then loop := false;
+ used_out
+ ) in
+ if not at_eof then loop := false
+ done;
+-
++
+ if at_eof then (
+ write_int32 outgoing st.out_crc;
+ write_int32 outgoing st.out_size;
Home |
Main Index |
Thread Index |
Old Index