Compare commits

...

11 Commits

Author SHA1 Message Date
openeuler-ci-bot
7293c0702c
!10 Fix ewfoutput to compile with openssl-3.x
From: @caodongxia 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2023-02-04 00:53:38 +00:00
caodongxia
9cfd3b10db Fix ewfoutput to compile with openssl-3.x 2023-02-03 18:15:07 +08:00
openeuler-ci-bot
0f3c45d30b !9 Remove BuildRequires python2-devel and Requires python2-fuse
From: @lei_ju
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2020-10-30 11:49:02 +08:00
lei_ju
90478ca741 Remove BuildRequires python2-devel and Requires python2-fuse 2020-10-30 09:34:48 +08:00
openeuler-ci-bot
02defb1839 !6 modify Source0 Url
Merge pull request !6 from zhangtao2020/master
2020-09-03 09:21:31 +08:00
zhangtao2020
1958ebd506 modify source0 url 2020-09-02 16:12:37 +08:00
zhangtao2020
fc312e7aee modify Source0 Url 2020-09-02 15:45:49 +08:00
openeuler-ci-bot
c50fbf58c9 !5 modify tags in yaml
Merge pull request !5 from huanghaitao/master
2020-07-17 16:00:47 +08:00
hht8
771bd6b553 modify tags in yaml 2020-07-17 15:28:50 +08:00
openeuler-ci-bot
c0e2cae730 !4 modify yaml
Merge pull request !4 from huanghaitao/master
2020-06-30 14:27:28 +08:00
hht8
73aa0eb2a8 modify yaml 2020-06-29 19:26:35 +08:00
4 changed files with 37 additions and 9 deletions

View File

@ -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(

View File

@ -1,12 +1,12 @@
Name: libewf Name: libewf
Version: 20140608 Version: 20140608
Release: 13 Release: 16
Summary: Library to access the Expert Witness Compression Format (EWF) Summary: Library to access the Expert Witness Compression Format (EWF)
License: LGPLv3+ License: LGPLv3+
URL: http://sourceforge.net/projects/libewf/ URL: http://sourceforge.net/projects/libewf/
#Source0 url: https://github.com/ArchAssault-Project/libewf/archive/v.20140608.tar.gz Source0: https://github.com/ArchAssault-Project/libewf/archive/v.20140608.tar.gz
Source0: %{name}-%{version}.tar.gz Patch0: libewf-ewfoutput-openssl3.patch
BuildRequires: gcc-c++ fuse-devel libuuid-devel openssl-devel zlib-devel python2-devel BuildRequires: gcc-c++ fuse-devel libuuid-devel openssl-devel zlib-devel
%description %description
Libewf is a library for support of the Expert Witness Compression Format (EWF), Libewf is a library for support of the Expert Witness Compression Format (EWF),
@ -16,7 +16,7 @@ libewf allows to read files created by EnCase 1 to 6, linen and FTK Imager.
%package -n ewftools %package -n ewftools
Summary: Tools for the Expert Witness Compression Format (EWF) Summary: Tools for the Expert Witness Compression Format (EWF)
Requires: libewf = %{version}-%{release} python2-fuse >= 0.2 Requires: libewf = %{version}-%{release}
Provides: libewf-tools = %{version}-%{release} Provides: libewf-tools = %{version}-%{release}
Obsoletes: libewf-tools <= %{version}-%{release} Obsoletes: libewf-tools <= %{version}-%{release}
@ -43,7 +43,7 @@ This package contains man manual for help.
%autosetup -n libewf-v.20140608 -p1 %autosetup -n libewf-v.20140608 -p1
%build %build
%configure --disable-static --enable-wide-character-type --enable-python \ %configure --disable-static --enable-wide-character-type \
CFLAGS="${RPM_OPT_FLAGS} -std=gnu89" CFLAGS="${RPM_OPT_FLAGS} -std=gnu89"
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -68,7 +68,6 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
%files -n ewftools %files -n ewftools
%{_bindir}/ewf* %{_bindir}/ewf*
%{python2_sitearch}/pyewf.so
%files devel %files devel
%{_includedir}/{libewf.h,libewf/} %{_includedir}/{libewf.h,libewf/}
@ -80,5 +79,14 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
%{_mandir}/man3/*.gz %{_mandir}/man3/*.gz
%changelog %changelog
* Fri Feb 3 2023 caodongxia <caodongxia@h-partners.com> - 20140608-16
- Fix ewfoutput to compile with openssl-3.x
* Mon Oct 26 2020 leiju <leiju4@huawei.com> - 20140608-15
- Remove BuildRequires python2-devel and Requires python2-fuse
* Wed Sep 2 2020 zhangtao <zhangtao221@huawei.com> - 20140608-14
- Modify the Source0 Url
* Tue Feb 25 2020 Tianfei <tianfei16@huawei.com> - 20140608-13 * Tue Feb 25 2020 Tianfei <tianfei16@huawei.com> - 20140608-13
- Package init - Package init

View File

@ -1,4 +1,5 @@
git_url: https://github.com/ArchAssault-Project/libewf.git
version_control: github version_control: github
src_repo: ArchAssault-Project/libewf src_repo: ArchAssault-Project/libewf
tag_pattern: ^v tag_prefix: "v."
seperator: . seperator: "."