summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2021-03-11 11:57:33 +0000
committertb <>2021-03-11 11:57:33 +0000
commit9718c009ebd714a8cb224839233e9267bf1471d8 (patch)
tree937d68306422ae04ac4fb5fa16d531c18f3efdb3
parentd3e2243d370320c3e45682872b38893d842062a3 (diff)
downloadopenbsd-9718c009ebd714a8cb224839233e9267bf1471d8.tar.gz
openbsd-9718c009ebd714a8cb224839233e9267bf1471d8.tar.bz2
openbsd-9718c009ebd714a8cb224839233e9267bf1471d8.zip
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
-rw-r--r--src/regress/usr.bin/openssl/x509/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/regress/usr.bin/openssl/x509/Makefile b/src/regress/usr.bin/openssl/x509/Makefile
index 1974c00439..d038d4bd0f 100644
--- a/src/regress/usr.bin/openssl/x509/Makefile
+++ b/src/regress/usr.bin/openssl/x509/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.2 2021/02/18 00:34:14 tb Exp $ 1# $OpenBSD: Makefile,v 1.3 2021/03/11 11:57:33 tb Exp $
2 2
3# Copyright (c) 2021 Jan Klemkow <j.klemkow@wemelug.de> 3# Copyright (c) 2021 Jan Klemkow <j.klemkow@wemelug.de>
4# 4#
@@ -23,11 +23,12 @@
23PERL = perl 23PERL = perl
24OPENSSL ?= openssl 24OPENSSL ?= openssl
25 25
26PKG_REQUIRE != pkg_info -e 'p5-IO-Socket-SSL-*' 26.if !(make(clean) || make(cleandir) || make(obj))
27.if empty (PKG_REQUIRE) 27. if !exists(/usr/local/libdata/perl5/site_perl/IO/Socket/SSL.pm)
28regress: 28regress:
29 @echo "missing package p5-IO-Socket-SSL" 29 @echo "missing package p5-IO-Socket-SSL"
30 @echo SKIPPED 30 @echo SKIPPED
31. endif
31.endif 32.endif
32 33
33REGRESS_TARGETS += test-inlabel-wildcard-cert-no-CA-client 34REGRESS_TARGETS += test-inlabel-wildcard-cert-no-CA-client