(security/monocypher) Updated 2.0.5 to 3.1.1

3.1.1
-----
2020/06/15

- Various documentation fixes.
- Fixed various compiler warnings.
- Fixed some integer overflows (16-bit platforms only).


3.1.0
-----
2020/04/03

- Added Elligator 2 mappings (hash to curve, curve to hash).
- Added OPRF support (with scalar inversion).
- Added Edwards25519 -> Curve25519 conversions


3.0.0
-----
2020/01/19

- Deprecated the incremental AEAD interface.
- Deprecated the incremental Chacha20, added a direct interface.
- Added IETF Chacha20 (96-bit nonce), as described in RFC 8439.
- Moved deprecated interfaces to a separate `src/deprecated` folder.
- Removed the `ED25519_SHA512` preprocessor flag.
- `crypto_x25519()` and `crypto_key_exchange()` now return `void`.
- Added a custom hash interface to EdDSA.  Several instances of EdDSA
  can share the same binary.
- Added optional support for HMAC SHA-512
- Moved all SHA-512 operations to `src/optional/monocypher-ed25519.(h|c)`
- Optional support for Ed25519 no longer requires a preprocessor flag.
  Add `src/optional/monocypher-ed25519.(h|c)` to your project instead.


2.0.6
-----
2019/10/21

- Added the `BLAKE2_NO_UNROLLING` preprocessor definition. Activating it
  makes the binary about 5KB smaller, and speeds up processing times on
  many embedded processors.
  - Reduced the stack usage of signature verification by about
    40%. Signature verification now fits in smaller machines.
  - Fixed many implicit casts warnings.
  - Fixed the manual here and there.
  - Lots of small nitpicks.

4 files changed, 24 insertions, 19 deletions

diff --git a/security/monocypher/Makefile b/security/monocypher/Makefile
index 0f0e2696fec..c92f11aa517 100644
--- a/security/monocypher/Makefile
+++ b/security/monocypher/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2019/03/16 09:17:09 maya Exp $
+# $NetBSD: Makefile,v 1.2 2020/10/19 12:30:30 mef Exp $
 
-DISTNAME=	monocypher-2.0.5
+DISTNAME=	monocypher-3.1.1
 CATEGORIES=	security
 MASTER_SITES=	https://monocypher.org/download/
 
@@ -11,7 +11,7 @@ LICENSE=	cc0-1.0-universal OR 2-clause-bsd
 
 USE_TOOLS+=	gmake
 MAKE_FILE=	makefile
-MAKE_ENV+=	MAN_DIR=${DESTDIR}/${PKGMANDIR}
+MAKE_ENV+=	MANDIR=${DESTDIR}/${PKGMANDIR}
 TEST_TARGET=	test
 
 # We default to binaries portable to more than one arch.
diff --git a/security/monocypher/PLIST b/security/monocypher/PLIST
index e1112f7145e..9a312478c5d 100644
--- a/security/monocypher/PLIST
+++ b/security/monocypher/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2019/03/16 09:17:09 maya Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/10/19 12:30:30 mef Exp $
 include/monocypher.h
 lib/libmonocypher.a
 lib/libmonocypher.so
-lib/libmonocypher.so.2
+lib/libmonocypher.so.3
 lib/pkgconfig/monocypher.pc
diff --git a/security/monocypher/distinfo b/security/monocypher/distinfo
index 0b4f56669ac..b243f64ea73 100644
--- a/security/monocypher/distinfo
+++ b/security/monocypher/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2019/03/16 09:17:09 maya Exp $
+$NetBSD: distinfo,v 1.2 2020/10/19 12:30:30 mef Exp $
 
-SHA1 (monocypher-2.0.5.tar.gz) = b409cc5a69c96d38d47c07affd550bd33d6861f2
-RMD160 (monocypher-2.0.5.tar.gz) = 755440680f64195cea6c969ca49cb9b0d794f3f4
-SHA512 (monocypher-2.0.5.tar.gz) = 634dfaa981decb48043161f733702f7b55c1057bbb4cd8c202c8d8c1dd6fadcfbce881328f5df95213931eeea160d74330d18992d83fd60c76390e53023078f9
-Size (monocypher-2.0.5.tar.gz) = 988921 bytes
-SHA1 (patch-makefile) = 756eaeb7d11a013c0ebc81a47e7a1cf00b7d4fb8
+SHA1 (monocypher-3.1.1.tar.gz) = 7476dbf0c404b9cd196f763aaa09fa2b7f4b70b0
+RMD160 (monocypher-3.1.1.tar.gz) = 71336114fab7068aeb63dc2ae12452d064c671d1
+SHA512 (monocypher-3.1.1.tar.gz) = 9c202ffe74eac1f2a7f21b8e195d981c21c5792b788315dea168cf40f1ee83cb787f3409c2d6135f517a58fee5f3e44c9ef521e132cee40c04e4b4868787f366
+Size (monocypher-3.1.1.tar.gz) = 1066382 bytes
+SHA1 (patch-makefile) = 788ffa96918136c9fe602e55d72f6036f196227a
diff --git a/security/monocypher/patches/patch-makefile b/security/monocypher/patches/patch-makefile
index c0fca6fb147..50c33cc9fde 100644
--- a/security/monocypher/patches/patch-makefile
+++ b/security/monocypher/patches/patch-makefile
@@ -1,11 +1,14 @@
-$NetBSD: patch-makefile,v 1.1 2019/03/16 09:17:09 maya Exp $
+$NetBSD: patch-makefile,v 1.2 2020/10/19 12:30:30 mef Exp $
 
 Allow overriding CC, DESTDIR and PREFIX
 Use the more standard MANDIR (that we override)
 
---- makefile.orig	2018-06-27 09:11:23.000000000 +0000
+--- makefile.orig	2020-04-22 00:00:00.000000000 +0000
 +++ makefile
-@@ -1,9 +1,9 @@
+@@ -49,14 +49,14 @@
+ # You should have received a copy of the CC0 Public Domain Dedication along
+ # with this software.  If not, see
+ # <https://creativecommons.org/publicdomain/zero/1.0/>
 -CC=gcc -std=gnu99 # speed tests don't work with -std=cxx, they need the POSIX extensions
 +CC?=gcc -std=gnu99 # speed tests don't work with -std=cxx, they need the POSIX extensions
  CFLAGS= -pedantic -Wall -Wextra -O3 -march=native
@@ -13,9 +16,11 @@ Use the more standard MANDIR (that we override)
 -PREFIX=usr/local
 +DESTDIR?=
 +PREFIX?=usr/local
- PKGCONFIG=$(DESTDIR)/$(PREFIX)/lib/pkgconfig
--MAN_DIR=$(DESTDIR)/$(PREFIX)/share/man/man3
-+MANDIR?=$(DESTDIR)/$(PREFIX)/share/man/man3
+ LIBDIR=$(PREFIX)/lib
+ INCLUDEDIR=$(PREFIX)/include
+ PKGCONFIGDIR=$(LIBDIR)/pkgconfig
+-MANDIR=$(PREFIX)/share/man/man3
++MANDIR?=$(PREFIX)/share/man/man3
+ SONAME=libmonocypher.so.3
  
- TARBALL_VERSION=$$(cat VERSION.md)
- TARBALL_DIR=.
+ VERSION=3.1.1