CVS commit: pkgsrc/security/openssl

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Aug 25 15:22:05 UTC 2021

Modified Files:
        pkgsrc/security/openssl: Makefile distinfo
Added Files:
        pkgsrc/security/openssl/patches: patch-crypto_rand_rand__unix.c

Log Message:
openssl: fix building on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.275 -r1.276 pkgsrc/security/openssl/Makefile
cvs rdiff -u -r1.151 -r1.152 pkgsrc/security/openssl/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/security/openssl/patches/patch-crypto_rand_rand__unix.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/openssl/Makefile
diff -u pkgsrc/security/openssl/Makefile:1.275 pkgsrc/security/openssl/Makefile:1.276
--- pkgsrc/security/openssl/Makefile:1.275      Wed Aug 25 11:25:25 2021
+++ pkgsrc/security/openssl/Makefile    Wed Aug 25 15:22:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.275 2021/08/25 11:25:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.276 2021/08/25 15:22:05 adam Exp $
 
 # Remember to upload-distfiles when updating OpenSSL -- otherwise it
 # is not possible for users who have bootstrapped without OpenSSL
@@ -14,7 +14,7 @@ LICENSE=      openssl
 
 USE_GCC_RUNTIME=       yes
 
-USE_TOOLS+=            fgrep gmake makedepend perl
+USE_TOOLS+=            fgrep gmake perl
 USE_TOOLS.SunOS+=      gm4
 BUILD_TARGET=          depend all
 TEST_TARGET=           tests

Index: pkgsrc/security/openssl/distinfo
diff -u pkgsrc/security/openssl/distinfo:1.151 pkgsrc/security/openssl/distinfo:1.152
--- pkgsrc/security/openssl/distinfo:1.151      Wed Aug 25 11:25:25 2021
+++ pkgsrc/security/openssl/distinfo    Wed Aug 25 15:22:05 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.151 2021/08/25 11:25:25 jperkin Exp $
+$NetBSD: distinfo,v 1.152 2021/08/25 15:22:05 adam Exp $
 
 SHA1 (openssl-1.1.1l.tar.gz) = f8819dd31642eebea6cc1fa5c256fc9a4f40809b
 RMD160 (openssl-1.1.1l.tar.gz) = aa470eea95b127e7ea389c39610a7568579d6b86
@@ -7,3 +7,4 @@ Size (openssl-1.1.1l.tar.gz) = 9834044 b
 SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = cf6b46c6e10e84100beb468bbe6f85c5e62cbe7a
 SHA1 (patch-Configure) = 479f1bc826f7721f6b44d6b5a6cf460432924bf2
+SHA1 (patch-crypto_rand_rand__unix.c) = 758489083f8698cb725e4c2b93a21cfa650c715c

Added files:

Index: pkgsrc/security/openssl/patches/patch-crypto_rand_rand__unix.c
diff -u /dev/null pkgsrc/security/openssl/patches/patch-crypto_rand_rand__unix.c:1.3
--- /dev/null   Wed Aug 25 15:22:05 2021
+++ pkgsrc/security/openssl/patches/patch-crypto_rand_rand__unix.c      Wed Aug 25 15:22:05 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-crypto_rand_rand__unix.c,v 1.3 2021/08/25 15:22:05 adam Exp $
+
+Fix building on older Darwin.
+
+--- crypto/rand/rand_unix.c.orig       2021-08-25 15:07:06.000000000 +0000
++++ crypto/rand/rand_unix.c
+@@ -35,6 +35,7 @@
+ # include <sys/param.h>
+ #endif
+ #if defined(__APPLE__)
++# include <CommonCrypto/CommonCryptoError.h>
+ # include <CommonCrypto/CommonRandom.h>
+ #endif
+