CVS commit: pkgsrc/security/openssl

["Aleksey Cheusov" <cheusov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cheusov
Date:           Fri May 31 16:22:21 UTC 2024

Modified Files:
        pkgsrc/security/openssl: distinfo
        pkgsrc/security/openssl/patches: patch-util_perl_OpenSSL_config.pm

Log Message:
Fix build on 64-bit big-endian Linux/PowerPC (32-bit vs. 64-bit)


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 pkgsrc/security/openssl/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/security/openssl/patches/patch-util_perl_OpenSSL_config.pm

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/distinfo
diff -u pkgsrc/security/openssl/distinfo:1.173 pkgsrc/security/openssl/distinfo:1.174
--- pkgsrc/security/openssl/distinfo:1.173      Tue Apr  9 17:16:45 2024
+++ pkgsrc/security/openssl/distinfo    Fri May 31 16:22:21 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.173 2024/04/09 17:16:45 wiz Exp $
+$NetBSD: distinfo,v 1.174 2024/05/31 16:22:21 cheusov Exp $
 
 BLAKE2s (openssl-3.3.0.tar.gz) = 5d0678ee0fdaa49b3ae775a97a9b356e8493599655dcaaf01d82203f6aa354dc
 SHA512 (openssl-3.3.0.tar.gz) = 1f9daeee6542e1b831c65f1f87befaef98ccedc3abc958c9d17f064ef771924c30849e3ff880f94eed4aaa9d81ea105e3bc8815e6d2e4d6b60b5e890f14fc5da
 Size (openssl-3.3.0.tar.gz) = 18038030 bytes
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = ea9b0a0c8de810362813d84a4f85c5ebdedf9fc6
-SHA1 (patch-util_perl_OpenSSL_config.pm) = 3d5b52a397265e91544a24c2a6c81029dff27b77
+SHA1 (patch-util_perl_OpenSSL_config.pm) = 3ba3c23046bf69c7d348b4c1c8c8269d83cfa2b4

Index: pkgsrc/security/openssl/patches/patch-util_perl_OpenSSL_config.pm
diff -u pkgsrc/security/openssl/patches/patch-util_perl_OpenSSL_config.pm:1.2 pkgsrc/security/openssl/patches/patch-util_perl_OpenSSL_config.pm:1.3
--- pkgsrc/security/openssl/patches/patch-util_perl_OpenSSL_config.pm:1.2       Tue Apr  9 17:16:45 2024
+++ pkgsrc/security/openssl/patches/patch-util_perl_OpenSSL_config.pm   Fri May 31 16:22:21 2024
@@ -1,7 +1,9 @@
-$NetBSD: patch-util_perl_OpenSSL_config.pm,v 1.2 2024/04/09 17:16:45 wiz Exp $
+$NetBSD: patch-util_perl_OpenSSL_config.pm,v 1.3 2024/05/31 16:22:21 cheusov Exp $
 
 a strategic chomp makes openssl on NetBSD/i386 configure
 
+fix default platform id (linux-ppc64) for big-endian PowerPC-based Linux
+
 --- util/perl/OpenSSL/config.pm.orig   2024-04-09 12:12:22.000000000 +0000
 +++ util/perl/OpenSSL/config.pm
 @@ -130,6 +130,7 @@ my $guess_patterns = [
@@ -12,3 +14,34 @@ a strategic chomp makes openssl on NetBS
            return "${hw}-whatever-netbsd";
        }
      ],
+@@ -579,29 +580,7 @@ EOF
+                      %config };
+         }
+       ],
+-      [ 'ppc64-.*-linux2',
+-        sub {
+-            my $KERNEL_BITS = $ENV{KERNEL_BITS} // '';
+-            if ( $KERNEL_BITS eq '' ) {
+-                print <<EOF;
+-WARNING! To build 64-bit package, do this:
+-         $WHERE/Configure linux-ppc64
+-EOF
+-                maybe_abort();
+-            }
+-            return { target => "linux-ppc64" } if $KERNEL_BITS eq '64';
+-
+-            my %config = ();
+-            if (!okrun('echo __LP64__',
+-                       'gcc -E -x c - 2>/dev/null',
+-                       'grep "^__LP64__" 2>&1 >/dev/null') ) {
+-                %config = ( cflags => [ '-m32' ],
+-                            cxxflags =>  [ '-m32' ] );
+-            }
+-            return { target => "linux-ppc",
+-                     %config };
+-        }
+-      ],
++      [ 'ppc64-.*-linux2',        { target => "linux-ppc64" } ],
+       [ 'ppc64le-.*-linux2',      { target => "linux-ppc64le" } ],
+       [ 'ppc-.*-linux2',          { target => "linux-ppc" } ],
+       [ 'mips64.*-*-linux2',