Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F00DD84E97 for ; Wed, 27 Dec 2023 15:55:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id GX-SU0tgCj6x for ; Wed, 27 Dec 2023 15:55:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6D41684D4A for ; Wed, 27 Dec 2023 15:55:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 63D04FA42; Wed, 27 Dec 2023 15:55:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1703692558193090" MIME-Version: 1.0 Date: Wed, 27 Dec 2023 15:55:58 +0000 From: "S.P.Zeidler" Subject: CVS commit: pkgsrc/security/openssl To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: spz@netbsd.org X-Mailer: log_accum Message-Id: <20231227155558.63D04FA42@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1703692558193090 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: spz Date: Wed Dec 27 15:55:58 UTC 2023 Modified Files: pkgsrc/security/openssl: distinfo Added Files: pkgsrc/security/openssl/patches: patch-util_perl_OpenSSL_config.pm Log Message: openssl: fix configure for NetBSD/i386 To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 pkgsrc/security/openssl/distinfo cvs rdiff -u -r0 -r1.1 \ 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. --_----------=_1703692558193090 Content-Disposition: inline Content-Length: 1846 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/openssl/distinfo diff -u pkgsrc/security/openssl/distinfo:1.170 pkgsrc/security/openssl/distinfo:1.171 --- pkgsrc/security/openssl/distinfo:1.170 Fri Oct 27 18:30:12 2023 +++ pkgsrc/security/openssl/distinfo Wed Dec 27 15:55:58 2023 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.170 2023/10/27 18:30:12 jperkin Exp $ +$NetBSD: distinfo,v 1.171 2023/12/27 15:55:58 spz Exp $ BLAKE2s (openssl-3.1.4.tar.gz) = a2fb05a80f2e8587861edfa5304e995cf7595a262d729593655209de6b67745f SHA512 (openssl-3.1.4.tar.gz) = a69df4a018f57dee7d8a57c8003a6869eba11f1eaa394518976642a993780d0de3326019e92dea4c679c6c581fef568ea616ec541afc0792800359c606dffcd2 Size (openssl-3.1.4.tar.gz) = 15569450 bytes SHA1 (patch-Configurations_unix-Makefile.tmpl) = a482c9b1be14428efb99f3ef638eccbcaea506b7 +SHA1 (patch-util_perl_OpenSSL_config.pm) = 8f335441860597d0074245d49cc9e081b0f9fd4e Added files: Index: pkgsrc/security/openssl/patches/patch-util_perl_OpenSSL_config.pm diff -u /dev/null pkgsrc/security/openssl/patches/patch-util_perl_OpenSSL_config.pm:1.1 --- /dev/null Wed Dec 27 15:55:58 2023 +++ pkgsrc/security/openssl/patches/patch-util_perl_OpenSSL_config.pm Wed Dec 27 15:55:58 2023 @@ -0,0 +1,16 @@ +$NetBSD: patch-util_perl_OpenSSL_config.pm,v 1.1 2023/12/27 15:55:58 spz Exp $ + +a strategic chomp makes openssl on NetBSD/i386 configure + +--- ./util/perl/OpenSSL/config.pm.orig 2023-10-24 13:41:51.000000000 +0000 ++++ ./util/perl/OpenSSL/config.pm +@@ -127,8 +127,9 @@ my $guess_patterns = [ + # Order is important, this has to appear before 'NetBSD:.*' + [ 'NetBSD:.*?:.*?:.*386.*', + sub { + my $hw = `/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model`; + $hw =~ s@.*(.)86-class.*@i${1}86@; ++ chomp $hw; + return "${hw}-whatever-netbsd"; + } + ], --_----------=_1703692558193090--