rpms/apr-util
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Related: RHEL-33728 - drop ENGINE support from apr_crypto

Browse Source
This commit is contained in:
Luboš Uhliarik 2024-07-29 15:20:59 +02:00
parent 52c379c5b3
commit f8d9414046
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apr-util-1.6.3-drop-engine-headers.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/crypto/apr_crypto_openssl.c b/crypto/apr_crypto_openssl.c
index 34d0559..4069cf9 100644
--- a/crypto/apr_crypto_openssl.c
+++ b/crypto/apr_crypto_openssl.c
@@ -37,7 +37,6 @@
#include <openssl/evp.h>
#include <openssl/rand.h>
-#include <openssl/engine.h>
#include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER >= 0x30000000
#include <openssl/macros.h>
@@ -92,6 +91,10 @@
#define APR_USE_OPENSSL_ENGINE_API 0
#endif
+#if APR_USE_OPENSSL_ENGINE_API
+#include <openssl/engine.h>
+#endif
+
#define LOG_PREFIX "apr_crypto_openssl: "
struct apr_crypto_t {

2
apr-util.spec
View File

@ -56,6 +56,7 @@ Patch5: apr-util-1.6.3-lmdb-support.patch
Patch6: apr-util-1.6.3-r1908584.patch
Patch7: apr-util-1.6.3-r1908585.patch
Patch8: apr-util-1.6.3-r1908586.patch
Patch9: apr-util-1.6.3-drop-engine-headers.patch
BuildRequires: gcc
BuildRequires: autoconf, apr-devel >= 1.3.0
BuildRequires: %{dbdep}, expat-devel, libuuid-devel
@ -284,6 +285,7 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver}
%changelog
* Mon Jul 29 2024 Luboš Uhliarik <luhliari@redhat.com> - 1.6.3-19
- Resolves: RHEL-50386 - drop unnecessary apr-util-devel dependencies
- Related: RHEL-33728 - drop ENGINE support from apr_crypto
* Tue Jun 25 2024 Joe Orton <jorton@redhat.com> - 1.6.3-18
- drop ENGINE support from apr_crypto (RHEL-33728)