CVS commit: pkgsrc/security/sks

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Tue Sep 12 06:55:42 UTC 2017

Modified Files:
        pkgsrc/security/sks: distinfo
Added Files:
        pkgsrc/security/sks/patches: patch-eventloop.ml patch-reconComm.ml
            patch-script.ml patch-sks__do.ml patch-tester.ml

Log Message:
Fix build with ocaml 4.05.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/sks/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/sks/patches/patch-eventloop.ml \
    pkgsrc/security/sks/patches/patch-reconComm.ml \
    pkgsrc/security/sks/patches/patch-script.ml \
    pkgsrc/security/sks/patches/patch-sks__do.ml \
    pkgsrc/security/sks/patches/patch-tester.ml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/sks/distinfo
diff -u pkgsrc/security/sks/distinfo:1.6 pkgsrc/security/sks/distinfo:1.7
--- pkgsrc/security/sks/distinfo:1.6    Fri Dec 16 00:01:31 2016
+++ pkgsrc/security/sks/distinfo        Tue Sep 12 06:55:42 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2016/12/16 00:01:31 joerg Exp $
+$NetBSD: distinfo,v 1.7 2017/09/12 06:55:42 dholland Exp $
 
 SHA1 (sks-1.1.5.tgz) = a353426e99de3fb02bf93b953f574335a9f2a590
 RMD160 (sks-1.1.5.tgz) = f47543870313f6bd0868e702849eb717aa045d67
@@ -9,3 +9,8 @@ SHA1 (patch-ab) = 919846f9c31a89f2343008
 SHA1 (patch-ac) = 0fbe22e67681970521ae66ca1903e9e95eda52ad
 SHA1 (patch-ad) = f96b913bc7ad6b5bd11a51569fc28ee042b1667c
 SHA1 (patch-cryptokit-1.7-sks.patch) = 5d50af8d169df2b96a850d7ffdb67f9d51e3e955
+SHA1 (patch-eventloop.ml) = 755c33c8add74d4e93828ccfc46774ee92d55c26
+SHA1 (patch-reconComm.ml) = 1a01ab79fe9ae0727f492529d37e21e6f90b2f49
+SHA1 (patch-script.ml) = fe229100a2214484a89e20f482b4f3198818e42c
+SHA1 (patch-sks__do.ml) = 078b7b49251e95ef2975172bf619db41563d6e52
+SHA1 (patch-tester.ml) = dde2d4382054de8c2e0a187b0fb8961ce530e5d1

Added files:

Index: pkgsrc/security/sks/patches/patch-eventloop.ml
diff -u /dev/null pkgsrc/security/sks/patches/patch-eventloop.ml:1.1
--- /dev/null   Tue Sep 12 06:55:42 2017
+++ pkgsrc/security/sks/patches/patch-eventloop.ml      Tue Sep 12 06:55:42 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-eventloop.ml,v 1.1 2017/09/12 06:55:42 dholland Exp $
+
+Fix build with ocaml 4.05.
+
+--- eventloop.ml~      2014-02-02 12:03:02.000000000 +0000
++++ eventloop.ml
+@@ -129,7 +129,7 @@ let create_sock addr =
+     let domain =
+       Unix.domain_of_sockaddr addr in
+     let sock =
+-      socket ~domain ~kind:SOCK_STREAM ~protocol:0 in
++      socket ~domain ~kind:SOCK_STREAM ~protocol:0 ~cloexec:false in
+     setsockopt sock SO_REUSEADDR true;
+     if domain = PF_INET6 then
+       setsockopt sock IPV6_ONLY true;
Index: pkgsrc/security/sks/patches/patch-reconComm.ml
diff -u /dev/null pkgsrc/security/sks/patches/patch-reconComm.ml:1.1
--- /dev/null   Tue Sep 12 06:55:42 2017
+++ pkgsrc/security/sks/patches/patch-reconComm.ml      Tue Sep 12 06:55:42 2017
@@ -0,0 +1,36 @@
+$NetBSD: patch-reconComm.ml,v 1.1 2017/09/12 06:55:42 dholland Exp $
+
+Fix build with ocaml 4.05.
+
+--- reconComm.ml~      2014-02-02 12:03:02.000000000 +0000
++++ reconComm.ml
+@@ -40,7 +40,8 @@ let send_dbmsg msg =
+   let s = Unix.socket
+             ~domain:(Unix.domain_of_sockaddr db_command_addr)
+             ~kind:Unix.SOCK_STREAM
+-            ~protocol:0 in
++            ~protocol:0
++            ~cloexec:false in
+   protect ~f:(fun () ->
+                 Unix.connect s ~addr:db_command_addr;
+                 let cin = Channel.sys_in_from_fd s in
+@@ -57,7 +58,8 @@ let send_dbmsg_noreply msg =
+   let s = Unix.socket
+             ~domain:(Unix.domain_of_sockaddr db_command_addr)
+             ~kind:Unix.SOCK_STREAM
+-            ~protocol:0 in
++            ~protocol:0
++            ~cloexec:false in
+   protect ~f:(fun () ->
+                 Unix.connect s ~addr:db_command_addr;
+                 let cout = Channel.sys_out_from_fd s in
+@@ -78,7 +80,8 @@ let get_keystrings_via_http addr hashes 
+   let s = Unix.socket
+             ~domain:(Unix.domain_of_sockaddr addr)
+             ~kind:Unix.SOCK_STREAM
+-            ~protocol:0  in
++            ~protocol:0
++            ~cloexec:false in
+   protect ~f:(fun () ->
+                 Unix.bind s ~addr:(match_client_recon_addr addr);
+                 Unix.connect s ~addr;
Index: pkgsrc/security/sks/patches/patch-script.ml
diff -u /dev/null pkgsrc/security/sks/patches/patch-script.ml:1.1
--- /dev/null   Tue Sep 12 06:55:42 2017
+++ pkgsrc/security/sks/patches/patch-script.ml Tue Sep 12 06:55:42 2017
@@ -0,0 +1,26 @@
+$NetBSD: patch-script.ml,v 1.1 2017/09/12 06:55:42 dholland Exp $
+
+Fix build with ocaml 4.05.
+
+--- script.ml~ 2014-02-02 12:03:02.000000000 +0000
++++ script.ml
+@@ -66,7 +66,8 @@ let get_keystrings_via_http addr hashes 
+   let s = Unix.socket
+             ~domain:(Unix.domain_of_sockaddr addr)
+             ~kind:Unix.SOCK_STREAM
+-            ~protocol:0  in
++            ~protocol:0
++            ~cloexec:false in
+   let () = Unix.connect s ~addr in
+   let cin = Channel.sys_in_from_fd s
+   and cout = Channel.sys_out_from_fd s in
+@@ -94,7 +95,8 @@ let test addr hashes =
+   let s = Unix.socket
+             ~domain:(Unix.domain_of_sockaddr addr)
+             ~kind:Unix.SOCK_STREAM
+-            ~protocol:0  in
++            ~protocol:0
++            ~cloexec:false in
+   let () = Unix.connect s ~addr in
+   let cin = Channel.sys_in_from_fd s
+   and cout = Channel.sys_out_from_fd s in
Index: pkgsrc/security/sks/patches/patch-sks__do.ml
diff -u /dev/null pkgsrc/security/sks/patches/patch-sks__do.ml:1.1
--- /dev/null   Tue Sep 12 06:55:42 2017
+++ pkgsrc/security/sks/patches/patch-sks__do.ml        Tue Sep 12 06:55:42 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-sks__do.ml,v 1.1 2017/09/12 06:55:42 dholland Exp $
+
+Fix build with ocaml 4.05.
+
+--- sks_do.ml~ 2014-02-02 12:03:02.000000000 +0000
++++ sks_do.ml
+@@ -40,7 +40,8 @@ let send_dbmsg msg =
+   let s = Unix.socket
+             ~domain:(Unix.domain_of_sockaddr db_command_addr)
+             ~kind:Unix.SOCK_STREAM
+-            ~protocol:0 in
++            ~protocol:0
++            ~cloexec:false in
+   protect ~f:(fun () ->
+                 Unix.connect s ~addr:db_command_addr;
+                 let cin = Channel.sys_in_from_fd s in
Index: pkgsrc/security/sks/patches/patch-tester.ml
diff -u /dev/null pkgsrc/security/sks/patches/patch-tester.ml:1.1
--- /dev/null   Tue Sep 12 06:55:42 2017
+++ pkgsrc/security/sks/patches/patch-tester.ml Tue Sep 12 06:55:42 2017
@@ -0,0 +1,26 @@
+$NetBSD: patch-tester.ml,v 1.1 2017/09/12 06:55:42 dholland Exp $
+
+Fix build with ocaml 4.05.
+
+--- tester.ml~ 2014-02-02 12:03:02.000000000 +0000
++++ tester.ml
+@@ -49,7 +49,8 @@ let send_msg addr msg =
+   let s = Unix.socket
+             ~domain:(Unix.domain_of_sockaddr addr)
+             ~kind:Unix.SOCK_STREAM
+-            ~protocol:0 in
++            ~protocol:0
++            ~cloexec:false in
+   protect ~f:( fun () ->
+                  Unix.connect s ~addr:addr;
+                  let cin = Channel.sys_in_from_fd s
+@@ -66,7 +66,8 @@ let send_msg_noreply addr msg =
+   let s = Unix.socket
+             ~domain:(Unix.domain_of_sockaddr addr)
+             ~kind:Unix.SOCK_STREAM
+-            ~protocol:0 in
++            ~protocol:0
++            ~cloexec:false in
+   protect ~f:(fun () ->
+                 Unix.connect s ~addr:addr;
+                 let cout = Channel.sys_out_from_fd s in