CVS commit: pkgsrc/security/sks

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Dec 16 00:01:32 UTC 2016

Modified Files:
        pkgsrc/security/sks: distinfo
Added Files:
        pkgsrc/security/sks/patches: patch-cryptokit-1.7-sks.patch

Log Message:
Newer Ocaml no longer defines uint32, so use standard types.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/sks/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/sks/patches/patch-cryptokit-1.7-sks.patch

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.5 pkgsrc/security/sks/distinfo:1.6
--- pkgsrc/security/sks/distinfo:1.5    Wed Nov  4 01:18:09 2015
+++ pkgsrc/security/sks/distinfo        Fri Dec 16 00:01:31 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 01:18:09 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/12/16 00:01:31 joerg Exp $
 
 SHA1 (sks-1.1.5.tgz) = a353426e99de3fb02bf93b953f574335a9f2a590
 RMD160 (sks-1.1.5.tgz) = f47543870313f6bd0868e702849eb717aa045d67
@@ -8,3 +8,4 @@ SHA1 (patch-aa) = 04f74c6f141d71e3b0cd45
 SHA1 (patch-ab) = 919846f9c31a89f23430081dbad853d088dcb7e5
 SHA1 (patch-ac) = 0fbe22e67681970521ae66ca1903e9e95eda52ad
 SHA1 (patch-ad) = f96b913bc7ad6b5bd11a51569fc28ee042b1667c
+SHA1 (patch-cryptokit-1.7-sks.patch) = 5d50af8d169df2b96a850d7ffdb67f9d51e3e955

Added files:

Index: pkgsrc/security/sks/patches/patch-cryptokit-1.7-sks.patch
diff -u /dev/null pkgsrc/security/sks/patches/patch-cryptokit-1.7-sks.patch:1.1
--- /dev/null   Fri Dec 16 00:01:32 2016
+++ pkgsrc/security/sks/patches/patch-cryptokit-1.7-sks.patch   Fri Dec 16 00:01:31 2016
@@ -0,0 +1,22 @@
+$NetBSD: patch-cryptokit-1.7-sks.patch,v 1.1 2016/12/16 00:01:31 joerg Exp $
+
+--- cryptokit-1.7-sks.patch.orig       2016-12-15 16:51:50.031027323 +0000
++++ cryptokit-1.7-sks.patch
+@@ -143,3 +143,17 @@ diff -urN cryptokit-1.7-orig/src/cryptok
+          let num_equals =
+            match ipos with 1 -> 2 | 2 -> 1 | _ -> 0 in
+          self#ensure_capacity num_equals;
++diff -urN cryptokit-1.7-orig/src/stubs-md5.c cryptokit-1.7/src/stubs-md5.c
++--- cryptokit-1.7-orig/src/stubs-md5.c        2016-12-15 16:48:54.901368026 +0000
+++++ cryptokit-1.7/src/stubs-md5.c     2016-12-15 16:48:54.901368026 +0000
++@@ -18,8 +18,8 @@
++ #include <caml/alloc.h>
++ 
++ struct MD5Context {
++-        uint32 buf[4];
++-        uint32 bits[2];
+++        uint32_t buf[4];
+++        uint32_t bits[2];
++         unsigned char in[64];
++ };
++