commit fd3387b82de8906a1956f6c2a369dc1be0ede3dd
Author: Jan Rękorajski <[email protected]>
Date: Fri Oct 29 15:10:16 2021 +0200
- ignore test failures for the unsupported ciphers
openvpn.spec | 2 ++
unsupported-ciphers.patch | 11 +++++++++++
2 files changed, 13 insertions(+)
---
diff --git a/openvpn.spec b/openvpn.spec
index 9e39fca..3e69850 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -21,6 +21,7 @@ Source5: %{name}.target
Source6: %{name}@.service
Source7: %{name}-update-resolv-conf
Patch0: %{name}-pam.patch
+Patch1: unsupported-ciphers.patch
Patch100: 0038-Deprecate-ecdh-curve-with-OpenSSL-3.0-and-adjust-mbe.patch
Patch101: 0039-Use-EVP_PKEY-based-API-for-loading-DH-keys.patch
Patch102: 0040-Remove-DES-check-with-OpenSSL-3.0.patch
@@ -156,6 +157,7 @@ Ten pakiet zawiera pliki nagłówkowe do tworzenia wtyczek
OpenVPN.
%patch106 -p1
%patch107 -p1
%patch0 -p1
+%patch1 -p1
sed -e 's,/''usr/lib/openvpn,%{_libdir}/%{name},' %{SOURCE7} >
contrib/update-resolv-conf
diff --git a/unsupported-ciphers.patch b/unsupported-ciphers.patch
new file mode 100644
index 0000000..ea25804
--- /dev/null
+++ b/unsupported-ciphers.patch
@@ -0,0 +1,11 @@
+--- openvpn-2.5.4/tests/t_lpback.sh~ 2021-10-05 07:56:26.000000000 +0200
++++ openvpn-2.5.4/tests/t_lpback.sh 2021-10-29 15:02:09.952131872 +0200
+@@ -46,7 +46,7 @@
+ do
+ printf "Testing cipher ${cipher}... "
+ ( "${top_builddir}/src/openvpn/openvpn" --test-crypto --secret key.$$
--cipher ${cipher} ) >log.$$ 2>&1
+- if [ $? != 0 ] ; then
++ if [ $? != 0 ] && ! grep "OpenSSL: error:0308010C:digital envelope
routines::unsupported" log.$$; then
+ echo "FAILED"
+ cat log.$$
+ e=1
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openvpn.git/commitdiff/fd3387b82de8906a1956f6c2a369dc1be0ede3dd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
