CVS commit: pkgsrc/security/nacl

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Jan  5 06:16:14 UTC 2019

Modified Files:
        pkgsrc/security/nacl: Makefile distinfo
Added Files:
        pkgsrc/security/nacl: buildlink3.mk
        pkgsrc/security/nacl/patches: patch-do patch-okcompilers_c
            patch-okcompilers_cpp

Log Message:
Avoid detecting anything other than the native ABI. Bump PKGREVISION.
Add buildlink3.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/nacl/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/nacl/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/nacl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/nacl/patches/patch-do \
    pkgsrc/security/nacl/patches/patch-okcompilers_c \
    pkgsrc/security/nacl/patches/patch-okcompilers_cpp

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.3 pkgsrc/security/nacl/Makefile:1.4
--- pkgsrc/security/nacl/Makefile:1.3   Wed Aug  8 08:10:24 2018
+++ pkgsrc/security/nacl/Makefile       Sat Jan  5 06:16:14 2019
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2018/08/08 08:10:24 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2019/01/05 06:16:14 schmonz Exp $
 
 DISTNAME=      nacl-20110221
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  https://hyperelliptic.org/nacl/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://nacl.cr.yp.to
+HOMEPAGE=      https://nacl.cr.yp.to/
 COMMENT=       Secure, usable, fast networking and cryptography library
 LICENSE=       public-domain
 

Index: pkgsrc/security/nacl/distinfo
diff -u pkgsrc/security/nacl/distinfo:1.2 pkgsrc/security/nacl/distinfo:1.3
--- pkgsrc/security/nacl/distinfo:1.2   Wed Nov  4 01:17:51 2015
+++ pkgsrc/security/nacl/distinfo       Sat Jan  5 06:16:14 2019
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:17:51 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/01/05 06:16:14 schmonz Exp $
 
 SHA1 (nacl-20110221.tar.bz2) = 6007a6aee249f5a534ec53fddfc364601fba9629
 RMD160 (nacl-20110221.tar.bz2) = 2b1d6046ff633cb4d98fa548060de1a96930ed3c
 SHA512 (nacl-20110221.tar.bz2) = 4c031ceffe6a28dc74b46ac003d485531f78de467c802df73c8b22ca53644dabb7d2e3080b7bdd6583f0d07ad76b6d95bc0ffdce319ca2f80ee041e6fe618656
 Size (nacl-20110221.tar.bz2) = 163415 bytes
+SHA1 (patch-do) = 590961a4b2daf5693a477b06d35c8ea92f8e3173
+SHA1 (patch-okcompilers_c) = bdbc229671428738e0115551ef1c123f3224d3cf
+SHA1 (patch-okcompilers_cpp) = bf5468ce0d0881cbf124cc5590746f685a2c74f5

Added files:

Index: pkgsrc/security/nacl/buildlink3.mk
diff -u /dev/null pkgsrc/security/nacl/buildlink3.mk:1.1
--- /dev/null   Sat Jan  5 06:16:14 2019
+++ pkgsrc/security/nacl/buildlink3.mk  Sat Jan  5 06:16:14 2019
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2019/01/05 06:16:14 schmonz Exp $
+
+BUILDLINK_TREE+=       nacl
+
+.if !defined(NACL_BUILDLINK3_MK)
+NACL_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.nacl+=   nacl>=20110221
+BUILDLINK_PKGSRCDIR.nacl?=     ../../security/nacl
+BUILDLINK_DEPMETHOD.nacl?=     build
+.endif # NACL_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -nacl

Index: pkgsrc/security/nacl/patches/patch-do
diff -u /dev/null pkgsrc/security/nacl/patches/patch-do:1.1
--- /dev/null   Sat Jan  5 06:16:14 2019
+++ pkgsrc/security/nacl/patches/patch-do       Sat Jan  5 06:16:14 2019
@@ -0,0 +1,25 @@
+$NetBSD: patch-do,v 1.1 2019/01/05 06:16:14 schmonz Exp $
+
+Don't bake build host into anything.
+Show build output.
+
+--- do.orig    2011-02-21 01:49:34.000000000 +0000
++++ do
+@@ -6,7 +6,7 @@
+ 
+ version=`cat version`
+ project=nacl
+-shorthostname=`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'`
++shorthostname='pkgsrchostname'
+ 
+ top="`pwd`/build/$shorthostname"
+ bin="$top/bin"
+@@ -38,7 +38,7 @@ mkdir -p "$bin"
+ mkdir -p "$lib"
+ mkdir -p "$include"
+ 
+-exec >"$top/log"
++exec | tee "$top/log"
+ exec 2>&1
+ exec 5>"$top/data"
+ exec </dev/null
Index: pkgsrc/security/nacl/patches/patch-okcompilers_c
diff -u /dev/null pkgsrc/security/nacl/patches/patch-okcompilers_c:1.1
--- /dev/null   Sat Jan  5 06:16:14 2019
+++ pkgsrc/security/nacl/patches/patch-okcompilers_c    Sat Jan  5 06:16:14 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-okcompilers_c,v 1.1 2019/01/05 06:16:14 schmonz Exp $
+
+Don't override the system's usual ABI.
+
+--- okcompilers/c.orig 2011-02-21 01:49:34.000000000 +0000
++++ okcompilers/c
+@@ -1,8 +1,5 @@
+-gcc -m64 -O3 -fomit-frame-pointer -funroll-loops
+-gcc -m64 -O -fomit-frame-pointer
+-gcc -m64 -fomit-frame-pointer
+-gcc -m32 -O3 -fomit-frame-pointer -funroll-loops
+-gcc -m32 -O -fomit-frame-pointer
+-gcc -m32 -fomit-frame-pointer
++gcc -O3 -fomit-frame-pointer -funroll-loops
++gcc -O -fomit-frame-pointer
++gcc -fomit-frame-pointer
+ spu-gcc -mstdmain -march=cell -O3 -funroll-loops -fomit-frame-pointer -Drandom=rand -Dsrandom=srand
+ spu-gcc -mstdmain -march=cell -O -fomit-frame-pointer -Drandom=rand -Dsrandom=srand
Index: pkgsrc/security/nacl/patches/patch-okcompilers_cpp
diff -u /dev/null pkgsrc/security/nacl/patches/patch-okcompilers_cpp:1.1
--- /dev/null   Sat Jan  5 06:16:14 2019
+++ pkgsrc/security/nacl/patches/patch-okcompilers_cpp  Sat Jan  5 06:16:14 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-okcompilers_cpp,v 1.1 2019/01/05 06:16:14 schmonz Exp $
+
+Don't override the system's usual ABI.
+
+--- okcompilers/cpp.orig       2011-02-21 01:49:34.000000000 +0000
++++ okcompilers/cpp
+@@ -1,8 +1,5 @@
+-g++ -m64 -O3 -fomit-frame-pointer -funroll-loops
+-g++ -m64 -O -fomit-frame-pointer
+-g++ -m64 -fomit-frame-pointer
+-g++ -m32 -O3 -fomit-frame-pointer -funroll-loops
+-g++ -m32 -O -fomit-frame-pointer
+-g++ -m32 -fomit-frame-pointer
++g++ -O3 -fomit-frame-pointer -funroll-loops
++g++ -O -fomit-frame-pointer
++g++ -fomit-frame-pointer
+ spu-g++ -mstdmain -march=cell -O3 -funroll-loops -fomit-frame-pointer -Drandom=rand -Dsrandom=srand
+ spu-g++ -mstdmain -march=cell -O -fomit-frame-pointer -Drandom=rand -Dsrandom=srand