631079e45e
remove unused patch skip-tests-for-C-if-there-is-no-openssl-on-local-pat.patch Signed-off-by: bitianyuan <bitianyuan@huawei.com>
79 lines
2.3 KiB
Diff
79 lines
2.3 KiB
Diff
From 3c80942727444934fef8e06b2fd6ae51f1025d6d Mon Sep 17 00:00:00 2001
|
|
From: bitianyuan <bitianyuan@huawei.com>
|
|
Date: Thu, 5 Dec 2024 04:41:40 +0000
|
|
Subject: [PATCH] backport-upstream-Set-OPENSSL_BIN-from-OpenSSL-directory
|
|
|
|
---
|
|
Makefile.in | 1 +
|
|
configure.ac | 6 ++++++
|
|
regress/test-exec.sh | 3 ++-
|
|
3 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 01895a7..b26e3a2 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -736,6 +736,7 @@ tests: file-tests t-exec interop-tests unit
|
|
unit: regress-unit-binaries
|
|
BUILDDIR=`pwd`; \
|
|
cd $(srcdir)/regress || exit $$?; \
|
|
+ OPENSSL_BIN='@OPENSSL_BIN' \
|
|
$(MAKE) \
|
|
.OBJDIR="$${BUILDDIR}/regress" \
|
|
.CURDIR="`pwd`" \
|
|
diff --git a/configure.ac b/configure.ac
|
|
index d5a156c..0b36b5e 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -119,10 +119,12 @@ AC_CHECK_DECL([PR_SET_NO_NEW_PRIVS], [have_linux_no_new_privs=1], , [
|
|
])
|
|
|
|
openssl=yes
|
|
+openssl_bin=openssl
|
|
AC_ARG_WITH([openssl],
|
|
[ --without-openssl Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** ],
|
|
[ if test "x$withval" = "xno" ; then
|
|
openssl=no
|
|
+ openssl_bin=""
|
|
fi
|
|
]
|
|
)
|
|
@@ -2674,6 +2676,7 @@ AC_CHECK_FUNCS([getpgrp],[
|
|
# Search for OpenSSL
|
|
saved_CPPFLAGS="$CPPFLAGS"
|
|
saved_LDFLAGS="$LDFLAGS"
|
|
+openssl_bin_PATH="$PATH"
|
|
AC_ARG_WITH([ssl-dir],
|
|
[ --with-ssl-dir=PATH Specify path to OpenSSL installation ],
|
|
[
|
|
@@ -2709,9 +2712,12 @@ AC_ARG_WITH([ssl-dir],
|
|
else
|
|
CPPFLAGS="-I${withval} ${CPPFLAGS}"
|
|
fi
|
|
+ openssl_bin_PATH="${PATH}${PATH_SEPARATOR}${withval}/bin${PATH_SEPARATOR}${withval}/apps"
|
|
fi
|
|
]
|
|
)
|
|
+AC_PATH_PROGS([openssl_bin], openssl, [], [$openssl_bin_PATH])
|
|
+AC_SUBST(OPENSSL_BIN, [${openssl_bin}])
|
|
|
|
AC_ARG_WITH([openssl-header-check],
|
|
[ --without-openssl-header-check Disable OpenSSL version consistency check],
|
|
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
|
|
index 3e3b20e..44cf725 100644
|
|
--- a/regress/test-exec.sh
|
|
+++ b/regress/test-exec.sh
|
|
@@ -102,7 +102,8 @@ CONCH=conch
|
|
|
|
# Tools used by multiple tests
|
|
NC=$OBJ/netcat
|
|
-OPENSSL_BIN="${OPENSSL_BIN:-openssl}"
|
|
+# Always use the one configure tells us to, even if that's empty.
|
|
+#OPENSSL_BIN="${OPENSSL_BIN:-openssl}"
|
|
|
|
if [ "x$TEST_SSH_SSH" != "x" ]; then
|
|
SSH="${TEST_SSH_SSH}"
|
|
--
|
|
2.33.0
|
|
|