From 9cfd3b10dbb781523269a2a4cf0dc6adf4008d92 Mon Sep 17 00:00:00 2001 From: caodongxia <315816521@qq.com> Date: Fri, 3 Feb 2023 18:15:07 +0800 Subject: [PATCH] Fix ewfoutput to compile with openssl-3.x --- libewf-ewfoutput-openssl3.patch | 19 +++++++++++++++++++ libewf.spec | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 libewf-ewfoutput-openssl3.patch diff --git a/libewf-ewfoutput-openssl3.patch b/libewf-ewfoutput-openssl3.patch new file mode 100644 index 0000000..f7541a0 --- /dev/null +++ b/libewf-ewfoutput-openssl3.patch @@ -0,0 +1,19 @@ +diff --git a/ewftools/ewfoutput.c b/ewftools/ewfoutput.c +index 80ae16a..1d2c97f 100644 +--- a/ewftools/ewfoutput.c ++++ b/ewftools/ewfoutput.c +@@ -197,9 +197,13 @@ void ewfoutput_version_detailed_fprint( + fprintf( + stream, + " (libcrypto %s)", ++#if defined ( OPENSSL_FULL_VERSION_STR ) ++ OPENSSL_FULL_VERSION_STR ); ++#else + SHLIB_VERSION_NUMBER ); + #endif + #endif ++#endif + + #if defined( HAVE_LIBODRAW ) || defined( HAVE_LOCAL_LIBODRAW ) + fprintf( + \ No newline at end of file diff --git a/libewf.spec b/libewf.spec index 3c321d1..bb3a476 100644 --- a/libewf.spec +++ b/libewf.spec @@ -1,10 +1,11 @@ Name: libewf Version: 20140608 -Release: 15 +Release: 16 Summary: Library to access the Expert Witness Compression Format (EWF) License: LGPLv3+ URL: http://sourceforge.net/projects/libewf/ Source0: https://github.com/ArchAssault-Project/libewf/archive/v.20140608.tar.gz +Patch0: libewf-ewfoutput-openssl3.patch BuildRequires: gcc-c++ fuse-devel libuuid-devel openssl-devel zlib-devel %description @@ -78,6 +79,9 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool %{_mandir}/man3/*.gz %changelog +* Fri Feb 3 2023 caodongxia - 20140608-16 +- Fix ewfoutput to compile with openssl-3.x + * Mon Oct 26 2020 leiju - 20140608-15 - Remove BuildRequires python2-devel and Requires python2-fuse