CVS commit: pkgsrc/security/p5-Crypt-OpenSSL-Guess

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jun 19 10:58:03 UTC 2024

Modified Files:
        pkgsrc/security/p5-Crypt-OpenSSL-Guess: Makefile distinfo
Added Files:
        pkgsrc/security/p5-Crypt-OpenSSL-Guess/patches:
            patch-lib_Crypt_OpenSSL_Guess.pm

Log Message:
p5-Crypt-OpenSSL-Guess: Use the pkgsrc-defined prefix.

Previously this would try to execute "brew", look in random directories, etc,
and return the wrong prefix.  Fixes build of e.g. p5-Crypt-OpenSSL-AES.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/p5-Crypt-OpenSSL-Guess/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/p5-Crypt-OpenSSL-Guess/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/p5-Crypt-OpenSSL-Guess/patches/patch-lib_Crypt_OpenSSL_Guess.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/p5-Crypt-OpenSSL-Guess/Makefile
diff -u pkgsrc/security/p5-Crypt-OpenSSL-Guess/Makefile:1.11 pkgsrc/security/p5-Crypt-OpenSSL-Guess/Makefile:1.12
--- pkgsrc/security/p5-Crypt-OpenSSL-Guess/Makefile:1.11        Tue Oct 24 22:10:54 2023
+++ pkgsrc/security/p5-Crypt-OpenSSL-Guess/Makefile     Wed Jun 19 10:58:03 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2023/10/24 22:10:54 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2024/06/19 10:58:03 jperkin Exp $
 #
 
 DISTNAME=              Crypt-OpenSSL-Guess-0.15
 PKGNAME=               p5-${DISTNAME}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            security perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Crypt/}
 
@@ -14,6 +14,11 @@ LICENSE=             ${PERL5_LICENSE}
 
 PERL5_PACKLIST=                auto/Crypt/OpenSSL/Guess/.packlist
 
+SUBST_CLASSES+=                vars
+SUBST_STAGE.vars=      pre-configure
+SUBST_FILES.vars=      lib/Crypt/OpenSSL/Guess.pm
+SUBST_VARS.vars=       BUILDLINK_PREFIX.openssl
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/p5-Crypt-OpenSSL-Guess/distinfo
diff -u pkgsrc/security/p5-Crypt-OpenSSL-Guess/distinfo:1.5 pkgsrc/security/p5-Crypt-OpenSSL-Guess/distinfo:1.6
--- pkgsrc/security/p5-Crypt-OpenSSL-Guess/distinfo:1.5 Sun Mar 20 01:48:58 2022
+++ pkgsrc/security/p5-Crypt-OpenSSL-Guess/distinfo     Wed Jun 19 10:58:03 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2022/03/20 01:48:58 wen Exp $
+$NetBSD: distinfo,v 1.6 2024/06/19 10:58:03 jperkin Exp $
 
 BLAKE2s (Crypt-OpenSSL-Guess-0.15.tar.gz) = 76121f19f61fbe333cd3c7f973cf99baffe2fcf8ffcc25d19db36a9865ff73b4
 SHA512 (Crypt-OpenSSL-Guess-0.15.tar.gz) = d7527be1f07847fbafc10b30c00c43e7fdcd4db27535b16cac98c5b6507d138c14cebcdb3c4ef07dc3016a93fea95155548cc7d83a0309fbc13b7d3b9607bf5d
 Size (Crypt-OpenSSL-Guess-0.15.tar.gz) = 11952 bytes
+SHA1 (patch-lib_Crypt_OpenSSL_Guess.pm) = dd604ee5388840a30ae40b14237e7227cf9a88b8

Added files:

Index: pkgsrc/security/p5-Crypt-OpenSSL-Guess/patches/patch-lib_Crypt_OpenSSL_Guess.pm
diff -u /dev/null pkgsrc/security/p5-Crypt-OpenSSL-Guess/patches/patch-lib_Crypt_OpenSSL_Guess.pm:1.1
--- /dev/null   Wed Jun 19 10:58:04 2024
+++ pkgsrc/security/p5-Crypt-OpenSSL-Guess/patches/patch-lib_Crypt_OpenSSL_Guess.pm     Wed Jun 19 10:58:03 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_Crypt_OpenSSL_Guess.pm,v 1.1 2024/06/19 10:58:03 jperkin Exp $
+
+Unless OPENSSL_PREFIX is set, return the OpenSSL prefix as configured by pkgsrc.
+
+--- lib/Crypt/OpenSSL/Guess.pm.orig    2024-06-19 10:40:10.000000000 +0000
++++ lib/Crypt/OpenSSL/Guess.pm
+@@ -118,6 +118,9 @@ sub find_openssl_prefix {
+         return $ENV{OPENSSL_PREFIX};
+     }
+ 
++    # Return the OpenSSL this was built with rather than searching.
++    return "@BUILDLINK_PREFIX.openssl@";
++
+     # Homebrew (macOS) or LinuxBrew
+     if ($^O ne 'MSWin32' and my $prefix = `brew --prefix --installed openssl 2>@{[File::Spec->devnull]}`) {
+         chomp $prefix;