From: tb <tb@openbsd.org>
Date: Thu, 11 Mar 2021 11:57:33 +0000 (+0000)
Subject: Check for the existence of p5-IO-Socket-SSL by checking for its SSL.pm
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=cff080bfccbff339b268d3b2998b79d6ee3f5fc5;p=openbsd

Check for the existence of p5-IO-Socket-SSL by checking for its SSL.pm
instead of running pkg_add which may block due to its locking mechanism.

Precise file to check for suggested by sthen
ok kn deraadt on previous version
---

diff --git a/regress/usr.bin/openssl/x509/Makefile b/regress/usr.bin/openssl/x509/Makefile
index 1974c004396..d038d4bd0f0 100644
--- a/regress/usr.bin/openssl/x509/Makefile
+++ b/regress/usr.bin/openssl/x509/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2021/02/18 00:34:14 tb Exp $
+# $OpenBSD: Makefile,v 1.3 2021/03/11 11:57:33 tb Exp $
 
 # Copyright (c) 2021 Jan Klemkow <j.klemkow@wemelug.de>
 #
@@ -23,11 +23,12 @@
 PERL =		perl
 OPENSSL ?=	openssl
 
-PKG_REQUIRE != pkg_info -e 'p5-IO-Socket-SSL-*'
-.if empty (PKG_REQUIRE)
+.if !(make(clean) || make(cleandir) || make(obj))
+. if !exists(/usr/local/libdata/perl5/site_perl/IO/Socket/SSL.pm)
 regress:
 	@echo "missing package p5-IO-Socket-SSL"
 	@echo SKIPPED
+. endif
 .endif
 
 REGRESS_TARGETS +=	test-inlabel-wildcard-cert-no-CA-client