[pkgsrc/trunk]: pkgsrc/security/libcurvecpr sodium no longer provides crypto_...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fcf84bff7173
branches:  trunk
changeset: 419609:fcf84bff7173
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Dec 22 22:28:54 2019 +0000

description:
sodium no longer provides crypto_uint*, so provide ones local.

diffstat:

 security/libcurvecpr/distinfo                                                                       |  10 ++++-
 security/libcurvecpr/patches/patch-libcurvecpr-glib_include_curvecpr__glib_client__messager__glib.h |  18 +++++++++
 security/libcurvecpr/patches/patch-libcurvecpr-glib_include_curvecpr__glib_messager__glib.h         |  18 +++++++++
 security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_block.h                             |  15 +++++++
 security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_bytes.h                             |  19 ++++++++++
 security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_messager.h                          |  19 ++++++++++
 security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_session.h                           |  13 ++++++
 security/libcurvecpr/patches/patch-libcurvecpr_lib_bytes.c                                          |  15 +++++++
 security/libcurvecpr/patches/patch-libcurvecpr_lib_messager.c                                       |  15 +++++++
 9 files changed, 141 insertions(+), 1 deletions(-)

diffs (184 lines):

diff -r 29f86660e4d2 -r fcf84bff7173 security/libcurvecpr/distinfo
--- a/security/libcurvecpr/distinfo     Sun Dec 22 22:28:15 2019 +0000
+++ b/security/libcurvecpr/distinfo     Sun Dec 22 22:28:54 2019 +0000
@@ -1,7 +1,15 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:17:48 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/12/22 22:28:54 joerg Exp $
 
 SHA1 (libcurvecpr-20130806/master.zip) = 4083d5edaec792f68bfd91414ce5d4aedab8a688
 RMD160 (libcurvecpr-20130806/master.zip) = ae87ec907de18324c38e147b30c8cc7103380a48
 SHA512 (libcurvecpr-20130806/master.zip) = c26cfd8444eb8124be804e26935ba60b430454dcfe84b3c707f88e1b87c2b0fdb09197c38345d1b7f9efeb86402afe50767144c48cf25d368b16cc7af853c6c3
 Size (libcurvecpr-20130806/master.zip) = 110182 bytes
 SHA1 (patch-configure.ac) = ae60603706decaf38ad0b4b70aa98da6fee2a983
+SHA1 (patch-libcurvecpr-glib_include_curvecpr__glib_client__messager__glib.h) = a4397c537e0dd403f0637ea7e24b3e775bbb869a
+SHA1 (patch-libcurvecpr-glib_include_curvecpr__glib_messager__glib.h) = ff17155ae34f90a3e9645da1725d56b1af7c1b5c
+SHA1 (patch-libcurvecpr_include_curvecpr_block.h) = 7c965ec47344bfd3d90f848fe1e2ce9a5c32ec76
+SHA1 (patch-libcurvecpr_include_curvecpr_bytes.h) = bd2a94c3b0e036b868fb6bae4f8f60da0ead87e6
+SHA1 (patch-libcurvecpr_include_curvecpr_messager.h) = f16c137b8cef90efb9315a10a81b6b08b308b156
+SHA1 (patch-libcurvecpr_include_curvecpr_session.h) = 31c4e1fe6e052f3881f88bd315305fe4c3c2e1d5
+SHA1 (patch-libcurvecpr_lib_bytes.c) = 24387243c172526c872eddb676125a32d0c015a6
+SHA1 (patch-libcurvecpr_lib_messager.c) = e30f3ee305acd102209b70a1aff4f99b7dbaa703
diff -r 29f86660e4d2 -r fcf84bff7173 security/libcurvecpr/patches/patch-libcurvecpr-glib_include_curvecpr__glib_client__messager__glib.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libcurvecpr/patches/patch-libcurvecpr-glib_include_curvecpr__glib_client__messager__glib.h       Sun Dec 22 22:28:54 2019 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-libcurvecpr-glib_include_curvecpr__glib_client__messager__glib.h,v 1.1 2019/12/22 22:28:54 joerg Exp $
+
+--- libcurvecpr-glib/include/curvecpr_glib/client_messager_glib.h.orig 2019-12-22 17:54:41.079631695 +0000
++++ libcurvecpr-glib/include/curvecpr_glib/client_messager_glib.h
+@@ -4,12 +4,11 @@
+ #include "messager_glib.h"
+ 
+ #include <curvecpr/block.h>
++#include <curvecpr/bytes.h>
+ #include <curvecpr/client.h>
+ 
+ #include <string.h>
+ 
+-#include <sodium/crypto_uint64.h>
+-
+ struct curvecpr_client_messager_glib;
+ 
+ struct curvecpr_client_messager_glib_ops {
diff -r 29f86660e4d2 -r fcf84bff7173 security/libcurvecpr/patches/patch-libcurvecpr-glib_include_curvecpr__glib_messager__glib.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libcurvecpr/patches/patch-libcurvecpr-glib_include_curvecpr__glib_messager__glib.h       Sun Dec 22 22:28:54 2019 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-libcurvecpr-glib_include_curvecpr__glib_messager__glib.h,v 1.1 2019/12/22 22:28:54 joerg Exp $
+
+--- libcurvecpr-glib/include/curvecpr_glib/messager_glib.h.orig        2019-12-22 17:54:31.023786330 +0000
++++ libcurvecpr-glib/include/curvecpr_glib/messager_glib.h
+@@ -2,12 +2,11 @@
+ #define __CURVECPR_GLIB_MESSAGER_GLIB_H
+ 
+ #include <curvecpr/block.h>
++#include <curvecpr/bytes.h>
+ #include <curvecpr/messager.h>
+ 
+ #include <string.h>
+ 
+-#include <sodium/crypto_uint64.h>
+-
+ #include <glib.h>
+ 
+ struct curvecpr_messager_glib;
diff -r 29f86660e4d2 -r fcf84bff7173 security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_block.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_block.h   Sun Dec 22 22:28:54 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-libcurvecpr_include_curvecpr_block.h,v 1.1 2019/12/22 22:28:54 joerg Exp $
+
+--- libcurvecpr/include/curvecpr/block.h.orig  2019-12-22 17:54:24.664262284 +0000
++++ libcurvecpr/include/curvecpr/block.h
+@@ -2,9 +2,7 @@
+ #define __CURVECPR_BLOCK_H
+ 
+ #include <string.h>
+-
+-#include <sodium/crypto_uint32.h>
+-#include <sodium/crypto_uint64.h>
++#include <curvecpr/bytes.h>
+ 
+ enum curvecpr_block_eofflag {
+     CURVECPR_BLOCK_STREAM,
diff -r 29f86660e4d2 -r fcf84bff7173 security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_bytes.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_bytes.h   Sun Dec 22 22:28:54 2019 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-libcurvecpr_include_curvecpr_bytes.h,v 1.1 2019/12/22 22:28:54 joerg Exp $
+
+--- libcurvecpr/include/curvecpr/bytes.h.orig  2019-12-22 17:51:15.224837301 +0000
++++ libcurvecpr/include/curvecpr/bytes.h
+@@ -2,10 +2,11 @@
+ #define __LIBCURVECPR_BYTES_H
+ 
+ #include <string.h>
++#include <inttypes.h>
+ 
+-#include <sodium/crypto_uint16.h>
+-#include <sodium/crypto_uint32.h>
+-#include <sodium/crypto_uint64.h>
++typedef uint16_t crypto_uint16;
++typedef uint32_t crypto_uint32;
++typedef uint64_t crypto_uint64;
+ 
+ void curvecpr_bytes_copy (void *destination, const void *source, size_t num);
+ void curvecpr_bytes_zero (void *destination, size_t num);
diff -r 29f86660e4d2 -r fcf84bff7173 security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_messager.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_messager.h        Sun Dec 22 22:28:54 2019 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-libcurvecpr_include_curvecpr_messager.h,v 1.1 2019/12/22 22:28:54 joerg Exp $
+
+--- libcurvecpr/include/curvecpr/messager.h.orig       2019-12-22 17:55:13.590078135 +0000
++++ libcurvecpr/include/curvecpr/messager.h
+@@ -1,13 +1,12 @@
+ #ifndef __CURVECPR_MESSAGER_H
+ #define __CURVECPR_MESSAGER_H
+ 
++#include "bytes.h"
+ #include "block.h"
+ #include "chicago.h"
+ 
+ #include <string.h>
+ 
+-#include <sodium/crypto_uint32.h>
+-
+ struct curvecpr_messager;
+ 
+ struct curvecpr_messager_ops {
diff -r 29f86660e4d2 -r fcf84bff7173 security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_session.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libcurvecpr/patches/patch-libcurvecpr_include_curvecpr_session.h Sun Dec 22 22:28:54 2019 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-libcurvecpr_include_curvecpr_session.h,v 1.1 2019/12/22 22:28:54 joerg Exp $
+
+--- libcurvecpr/include/curvecpr/session.h.orig        2019-12-22 17:53:48.570243631 +0000
++++ libcurvecpr/include/curvecpr/session.h
+@@ -1,7 +1,7 @@
+ #ifndef __CURVECPR_SESSION_H
+ #define __CURVECPR_SESSION_H
+ 
+-#include <sodium/crypto_uint64.h>
++#include <curvecpr/bytes.h>
+ 
+ struct curvecpr_session {
+     /* Any extensions. */
diff -r 29f86660e4d2 -r fcf84bff7173 security/libcurvecpr/patches/patch-libcurvecpr_lib_bytes.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libcurvecpr/patches/patch-libcurvecpr_lib_bytes.c        Sun Dec 22 22:28:54 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-libcurvecpr_lib_bytes.c,v 1.1 2019/12/22 22:28:54 joerg Exp $
+
+--- libcurvecpr/lib/bytes.c.orig       2019-12-22 17:53:50.601852676 +0000
++++ libcurvecpr/lib/bytes.c
+@@ -4,10 +4,6 @@
+ 
+ #include <string.h>
+ 
+-#include <sodium/crypto_uint16.h>
+-#include <sodium/crypto_uint32.h>
+-#include <sodium/crypto_uint64.h>
+-
+ void curvecpr_bytes_copy (void *destination, const void *source, size_t num)
+ {
+     char *destination_copier = destination;
diff -r 29f86660e4d2 -r fcf84bff7173 security/libcurvecpr/patches/patch-libcurvecpr_lib_messager.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libcurvecpr/patches/patch-libcurvecpr_lib_messager.c     Sun Dec 22 22:28:54 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-libcurvecpr_lib_messager.c,v 1.1 2019/12/22 22:28:54 joerg Exp $
+
+--- libcurvecpr/lib/messager.c.orig    2019-12-22 17:53:53.626250749 +0000
++++ libcurvecpr/lib/messager.c
+@@ -10,10 +10,6 @@
+ #include <stdint.h>
+ #include <string.h>
+ 
+-#include <sodium/crypto_uint16.h>
+-#include <sodium/crypto_uint32.h>
+-#include <sodium/crypto_uint64.h>
+-
+ #define _STOP_SUCCESS 2048
+ #define _STOP_FAILURE 4096
+