CVS commit: pkgsrc/security/openssl

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Jul 10 10:04:55 UTC 2020

Modified Files:
        pkgsrc/security/openssl: Makefile distinfo
Added Files:
        pkgsrc/security/openssl/patches: patch-Configure

Log Message:
Unbreak security/openssl build on pre-v9 Darwin.

(1) There is no {get,make,set}context support before Darwin 9

(2) Instead of failing the build on makedepend(8) malfunction, have
make(1) ignore its return value - which used to be the default for
previous OpenSSL versions.


To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 pkgsrc/security/openssl/Makefile
cvs rdiff -u -r1.142 -r1.143 pkgsrc/security/openssl/distinfo
cvs rdiff -u -r0 -r1.10 pkgsrc/security/openssl/patches/patch-Configure

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.259 pkgsrc/security/openssl/Makefile:1.260
--- pkgsrc/security/openssl/Makefile:1.259      Thu May 21 10:41:36 2020
+++ pkgsrc/security/openssl/Makefile    Fri Jul 10 10:04:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.259 2020/05/21 10:41:36 nia Exp $
+# $NetBSD: Makefile,v 1.260 2020/07/10 10:04:54 hauke Exp $
 
 DISTNAME=      openssl-1.1.1g
 PKGREVISION=   1
@@ -23,6 +23,13 @@ CONFIGURE_ARGS+=     --libdir=${PREFIX}/lib
 CONFIGURE_ARGS+=       --openssldir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       shared
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-powerpc)
+# No {get,make,set}context support before Darwin 9
+CONFIGURE_ARGS+=       no-async
+.endif
+
 .include "options.mk"
 
 CONFIGURE_ARGS+=       ${CFLAGS} ${LDFLAGS}

Index: pkgsrc/security/openssl/distinfo
diff -u pkgsrc/security/openssl/distinfo:1.142 pkgsrc/security/openssl/distinfo:1.143
--- pkgsrc/security/openssl/distinfo:1.142      Sat May 23 10:32:06 2020
+++ pkgsrc/security/openssl/distinfo    Fri Jul 10 10:04:54 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.142 2020/05/23 10:32:06 jperkin Exp $
+$NetBSD: distinfo,v 1.143 2020/07/10 10:04:54 hauke Exp $
 
 SHA1 (openssl-1.1.1g.tar.gz) = b213a293f2127ec3e323fb3cfc0c9807664fd997
 RMD160 (openssl-1.1.1g.tar.gz) = 427b7b12c06715ad1c95d3ff5e38055c6bb66c1d
@@ -6,4 +6,5 @@ SHA512 (openssl-1.1.1g.tar.gz) = 01e3d0b
 Size (openssl-1.1.1g.tar.gz) = 9801502 bytes
 SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = d58376dfc8cbb4c7d98ca64093759f173eac73da
+SHA1 (patch-Configure) = 479f1bc826f7721f6b44d6b5a6cf460432924bf2
 SHA1 (patch-crypto_rand_rand__unix.c) = 9aa1ff0b0ff1db3fcadacf8707596a7db852f956

Added files:

Index: pkgsrc/security/openssl/patches/patch-Configure
diff -u /dev/null pkgsrc/security/openssl/patches/patch-Configure:1.10
--- /dev/null   Fri Jul 10 10:04:55 2020
+++ pkgsrc/security/openssl/patches/patch-Configure     Fri Jul 10 10:04:54 2020
@@ -0,0 +1,23 @@
+$NetBSD: patch-Configure,v 1.10 2020/07/10 10:04:54 hauke Exp $
+
+OpenSSL mandates that you need to re-create dependencies for
+unorthodox combinations of build options. These days, the compiler
+will create dependency information. On older platforms (e.g. pre-v9
+Darwin) Configure will fall back to makedepend(8), which hasn't kept up
+well with compilers' options.
+
+Instead of failing the build on makedepend(8) malfunction, have
+make(1) ignore its return value - which used to be the default for
+previous OpenSSL versions.
+
+--- Configure.orig     2020-04-21 12:22:39.000000000 +0000
++++ Configure
+@@ -1419,7 +1419,7 @@ if (!$disabled{makedepend}) {
+     } else {
+         # In all other cases, we look for 'makedepend', and disable the
+         # capability if not found.
+-        $config{makedepprog} = which('makedepend');
++        $config{makedepprog} = '-' . which('makedepend');
+         disable('unavailable', 'makedepend') unless $config{makedepprog};
+     }
+ }