CVS commit: pkgsrc/security/nacl

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jan  4 20:53:20 UTC 2022

Modified Files:
        pkgsrc/security/nacl: Makefile PLIST distinfo
Added Files:
        pkgsrc/security/nacl/patches: patch-curvecp_socket__udp.c

Log Message:
Fix building the curvecp programs on at least FreeBSD and macOS. Install
them. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/nacl/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/nacl/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/nacl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/nacl/patches/patch-curvecp_socket__udp.c

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

Modified files:

Index: pkgsrc/security/nacl/Makefile
diff -u pkgsrc/security/nacl/Makefile:1.4 pkgsrc/security/nacl/Makefile:1.5
--- pkgsrc/security/nacl/Makefile:1.4   Sat Jan  5 06:16:14 2019
+++ pkgsrc/security/nacl/Makefile       Tue Jan  4 20:53:20 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2019/01/05 06:16:14 schmonz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:20 schmonz Exp $
 
 DISTNAME=      nacl-20110221
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  https://hyperelliptic.org/nacl/
 EXTRACT_SUFX=  .tar.bz2
@@ -21,10 +21,17 @@ do-build:
        ${AR} -r build/*/lib/*/libnacl.a build/*/lib/*/randombytes.o
 
 do-install:
-       cd ${WRKSRC}/build/* && \
-       ${INSTALL_PROGRAM} bin/nacl-sha256 ${DESTDIR}${PREFIX}/bin &&   \
-       ${INSTALL_PROGRAM} bin/nacl-sha512 ${DESTDIR}${PREFIX}/bin &&   \
-       ${INSTALL_LIB} lib/*/* ${DESTDIR}${PREFIX}/lib &&               \
-       ${INSTALL_DATA} include/*/* ${DESTDIR}${PREFIX}/include
+       cd ${WRKSRC}/build/* &&                                         \
+       for i in nacl-sha256 nacl-sha512                                \
+               curvecpclient curvecpserver                             \
+               curvecpmakekey curvecpprintkey curvecpmessage; do       \
+               ${INSTALL_PROGRAM} bin/$${i} ${DESTDIR}${PREFIX}/bin;   \
+       done &&                                                         \
+       for i in lib/*/*; do                                            \
+               ${INSTALL_LIB} $${i} ${DESTDIR}${PREFIX}/lib;           \
+       done &&                                                         \
+       for i in include/*/*; do                                        \
+               ${INSTALL_DATA} $${i} ${DESTDIR}${PREFIX}/include;      \
+       done
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/nacl/PLIST
diff -u pkgsrc/security/nacl/PLIST:1.1 pkgsrc/security/nacl/PLIST:1.2
--- pkgsrc/security/nacl/PLIST:1.1      Tue Aug 12 05:00:34 2014
+++ pkgsrc/security/nacl/PLIST  Tue Jan  4 20:53:20 2022
@@ -1,4 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2014/08/12 05:00:34 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/01/04 20:53:20 schmonz Exp $
+bin/curvecpclient
+bin/curvecpmakekey
+bin/curvecpmessage
+bin/curvecpprintkey
+bin/curvecpserver
 bin/nacl-sha256
 bin/nacl-sha512
 include/cpucycles.h

Index: pkgsrc/security/nacl/distinfo
diff -u pkgsrc/security/nacl/distinfo:1.5 pkgsrc/security/nacl/distinfo:1.6
--- pkgsrc/security/nacl/distinfo:1.5   Tue Oct 26 11:17:20 2021
+++ pkgsrc/security/nacl/distinfo       Tue Jan  4 20:53:20 2022
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:17:20 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/01/04 20:53:20 schmonz Exp $
 
 BLAKE2s (nacl-20110221.tar.bz2) = d8fccb5036297da7fe4f4d357cd326f10094ba709b9422ccd1571b13e3981f4d
 SHA512 (nacl-20110221.tar.bz2) = 4c031ceffe6a28dc74b46ac003d485531f78de467c802df73c8b22ca53644dabb7d2e3080b7bdd6583f0d07ad76b6d95bc0ffdce319ca2f80ee041e6fe618656
 Size (nacl-20110221.tar.bz2) = 163415 bytes
+SHA1 (patch-curvecp_socket__udp.c) = 77e98768d015cb16af1ffa8b57464a12620d8110
 SHA1 (patch-do) = 590961a4b2daf5693a477b06d35c8ea92f8e3173
 SHA1 (patch-okcompilers_c) = bdbc229671428738e0115551ef1c123f3224d3cf
 SHA1 (patch-okcompilers_cpp) = bf5468ce0d0881cbf124cc5590746f685a2c74f5

Added files:

Index: pkgsrc/security/nacl/patches/patch-curvecp_socket__udp.c
diff -u /dev/null pkgsrc/security/nacl/patches/patch-curvecp_socket__udp.c:1.1
--- /dev/null   Tue Jan  4 20:53:20 2022
+++ pkgsrc/security/nacl/patches/patch-curvecp_socket__udp.c    Tue Jan  4 20:53:20 2022
@@ -0,0 +1,17 @@
+$NetBSD: patch-curvecp_socket__udp.c,v 1.1 2022/01/04 20:53:20 schmonz Exp $
+
+Borrow patch from FreeBSD ports that also fixes macOS build.
+
+--- curvecp/socket_udp.c.orig  2011-02-21 01:49:34.000000000 +0000
++++ curvecp/socket_udp.c
+@@ -6,6 +6,10 @@
+ #include "socket.h"
+ #include "blocking.h"
+ 
++#ifndef SOL_IP
++#define SOL_IP IPPROTO_IP  /* FreeBSD requires protocol number */
++#endif
++
+ static void enable_bsd_fragmentation(int fd)
+ {
+ #ifdef IP_DONTFRAG