CVS commit: pkgsrc/security/openssl

["Sijmen J. Mulder" <sjmulder%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sjmulder
Date:           Wed Jul 22 20:41:30 UTC 2020

Modified Files:
        pkgsrc/security/openssl: Makefile distinfo
Added Files:
        pkgsrc/security/openssl/patches: patch-Configurations_10-main.conf

Log Message:
security/openssl: Make compatible with Apple Silicon


To generate a diff of this commit:
cvs rdiff -u -r1.261 -r1.262 pkgsrc/security/openssl/Makefile
cvs rdiff -u -r1.143 -r1.144 pkgsrc/security/openssl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/openssl/patches/patch-Configurations_10-main.conf

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.261 pkgsrc/security/openssl/Makefile:1.262
--- pkgsrc/security/openssl/Makefile:1.261      Mon Jul 13 11:35:54 2020
+++ pkgsrc/security/openssl/Makefile    Wed Jul 22 20:41:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.261 2020/07/13 11:35:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.262 2020/07/22 20:41:30 sjmulder Exp $
 
 DISTNAME=      openssl-1.1.1g
 PKGREVISION=   2
@@ -39,6 +39,7 @@ CONFIGURE_ENV+=               PERL=${PERL5:Q}
 # specify it manually and call the Configure script directly.
 OPENSSL_HOST.SunOS-i386=       solaris-x86-gcc
 OPENSSL_HOST.SunOS-x86_64=     solaris64-x86_64-gcc
+OPENSSL_HOST.Darwin-aarch64=   darwin64-arm64-cc
 
 .if defined(OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH})
 CONFIG_SHELL=          ${PERL5}

Index: pkgsrc/security/openssl/distinfo
diff -u pkgsrc/security/openssl/distinfo:1.143 pkgsrc/security/openssl/distinfo:1.144
--- pkgsrc/security/openssl/distinfo:1.143      Fri Jul 10 10:04:54 2020
+++ pkgsrc/security/openssl/distinfo    Wed Jul 22 20:41:30 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.143 2020/07/10 10:04:54 hauke Exp $
+$NetBSD: distinfo,v 1.144 2020/07/22 20:41:30 sjmulder Exp $
 
 SHA1 (openssl-1.1.1g.tar.gz) = b213a293f2127ec3e323fb3cfc0c9807664fd997
 RMD160 (openssl-1.1.1g.tar.gz) = 427b7b12c06715ad1c95d3ff5e38055c6bb66c1d
 SHA512 (openssl-1.1.1g.tar.gz) = 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
 Size (openssl-1.1.1g.tar.gz) = 9801502 bytes
+SHA1 (patch-Configurations_10-main.conf) = d27643187e0b71041f47a9a7c7eec811f7539085
 SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = d58376dfc8cbb4c7d98ca64093759f173eac73da
 SHA1 (patch-Configure) = 479f1bc826f7721f6b44d6b5a6cf460432924bf2

Added files:

Index: pkgsrc/security/openssl/patches/patch-Configurations_10-main.conf
diff -u /dev/null pkgsrc/security/openssl/patches/patch-Configurations_10-main.conf:1.1
--- /dev/null   Wed Jul 22 20:41:30 2020
+++ pkgsrc/security/openssl/patches/patch-Configurations_10-main.conf   Wed Jul 22 20:41:30 2020
@@ -0,0 +1,22 @@
+$NetBSD: patch-Configurations_10-main.conf,v 1.1 2020/07/22 20:41:30 sjmulder Exp $
+
+Add support for Apple Silicon. Imported from open pull request:
+https://github.com/openssl/openssl/pull/12369
+
+--- Configurations/10-main.conf.orig   2020-04-21 12:22:39.000000000 +0000
++++ Configurations/10-main.conf
+@@ -1557,6 +1557,14 @@ my %targets = (
+         bn_ops           => "SIXTY_FOUR_BIT_LONG",
+         perlasm_scheme   => "macosx",
+     },
++    "darwin64-arm64-cc" => {
++        inherit_from     => [ "darwin-common", asm("aarch64_asm") ],
++        CFLAGS           => add("-Wall"),
++        cflags           => add("-arch arm64"),
++        lib_cppflags     => add("-DL_ENDIAN"),
++        bn_ops           => "SIXTY_FOUR_BIT_LONG",
++        perlasm_scheme   => "ios64",
++    },
+ 
+ ##### GNU Hurd
+     "hurd-x86" => {