[packages/libewf] - updated to 20230212
qboosh
qboosh at pld-linux.org
Sun Jun 18 11:05:37 CEST 2023
commit 76e0a3ecf21236a193365dea0b5a5e2fcc75e49f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jun 18 09:59:28 2023 +0200
- updated to 20230212
libewf-libcpath.patch | 231 --------------------------------------------------
libewf.spec | 36 ++++----
2 files changed, 19 insertions(+), 248 deletions(-)
---
diff --git a/libewf.spec b/libewf.spec
index 441deab..d62674b 100644
--- a/libewf.spec
+++ b/libewf.spec
@@ -9,42 +9,42 @@
%undefine with_python3
%endif
# see m4/${libname}.m4 />= for required version of particular library
-%define libbfio_ver 20160108
-%define libcaes_ver 20161025
-%define libcdata_ver 20160108
+%define libbfio_ver 20201125
+%define libcaes_ver 20220529
+%define libcdata_ver 20230108
%define libcdatetime_ver 20141018
%define libcerror_ver 20120425
%define libcfile_ver 20160409
%define libclocale_ver 20120425
%define libcnotify_ver 20120425
-%define libcpath_ver 20120701
+%define libcpath_ver 20180716
%define libcsplit_ver 20120701
%define libcthreads_ver 20160404
-%define libfcache_ver 20140912
-%define libfdata_ver 20160325
+%define libfcache_ver 20191109
+%define libfdata_ver 20201129
+%define libfdatetime_ver 20180910
%define libfguid_ver 20120426
-%define libfvalue_ver 20160131
-%define libhmac_ver 20160802
+%define libfvalue_ver 20200711
+%define libhmac_ver 20200104
%define libodraw_ver 20120630
%define libsmdev_ver 20140406
%define libsmraw_ver 20120630
-%define libuna_ver 20120425
+%define libuna_ver 20210801
Summary: Library to support the Expert Witness Compression Format
Summary(pl.UTF-8): Biblioteka obsługująca format Expert Witness Compression Format
Name: libewf
-Version: 20171104
-Release: 6
+Version: 20230212
+Release: 1
License: LGPL v3+
Group: Libraries
#Source0Download: https://github.com/libyal/libewf/releases
Source0: https://github.com/libyal/libewf/releases/download/%{version}/%{name}-experimental-%{version}.tar.gz
-# Source0-md5: 1d64ca734b4dd07d0b793a855db5c31f
-Patch0: %{name}-libcpath.patch
+# Source0-md5: a3f85c4cefc0b760858ea357093b63a2
URL: https://github.com/libyal/libewf/
-BuildRequires: autoconf >= 2.59
+BuildRequires: autoconf >= 2.71
BuildRequires: automake >= 1.6
BuildRequires: bzip2-devel >= 1.0
-BuildRequires: gettext-tools >= 0.18.1
+BuildRequires: gettext-tools >= 0.21
BuildRequires: libbfio-devel >= %{libbfio_ver}
BuildRequires: libcaes-devel >= %{libcaes_ver}
BuildRequires: libcdata-devel >= %{libcdata_ver}
@@ -58,6 +58,7 @@ BuildRequires: libcsplit-devel >= %{libcsplit_ver}
BuildRequires: libcthreads-devel >= %{libcthreads_ver}
BuildRequires: libfcache-devel >= %{libfcache_ver}
BuildRequires: libfdata-devel >= %{libfdata_ver}
+BuildRequires: libfdatetime-devel >= %{libfdatetime_ver}
BuildRequires: libfguid-devel >= %{libfguid_ver}
BuildRequires: libfuse-devel >= 2.6
BuildRequires: libfvalue-devel >= %{libfvalue_ver}
@@ -66,7 +67,7 @@ BuildRequires: libodraw-devel >= %{libodraw_ver}
BuildRequires: libsmdev-devel >= %{libsmdev_ver}
BuildRequires: libsmraw-devel >= %{libsmraw_ver}
BuildRequires: libuna-devel >= %{libuna_ver}
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
BuildRequires: libuuid-devel >= 2.20
BuildRequires: openssl-devel >= 1.0
%{?with_python2:BuildRequires: python-devel >= 1:2.5}
@@ -85,6 +86,7 @@ Requires: libcsplit >= %{libcsplit_ver}
Requires: libcthreads >= %{libcthreads_ver}
Requires: libfcache >= %{libfcache_ver}
Requires: libfdata >= %{libfdata_ver}
+Requires: libfdatetime >= %{libfdatetime_ver}
Requires: libfguid >= %{libfguid_ver}
Requires: libfvalue >= %{libfvalue_ver}
Requires: libhmac >= %{libhmac_ver}
@@ -122,6 +124,7 @@ Requires: libcsplit-devel >= %{libcsplit_ver}
Requires: libcthreads-devel >= %{libcthreads_ver}
Requires: libfcache-devel >= %{libfcache_ver}
Requires: libfdata-devel >= %{libfdata_ver}
+Requires: libfdatetime-devel >= %{libfdatetime_ver}
Requires: libfguid-devel >= %{libfguid_ver}
Requires: libfvalue-devel >= %{libfvalue_ver}
Requires: libhmac-devel >= %{libhmac_ver}
@@ -191,7 +194,6 @@ Wiązania Pythona 3 do biblioteki libewf.
%prep
%setup -q
-%patch0 -p1
%build
%{__gettextize}
diff --git a/libewf-libcpath.patch b/libewf-libcpath.patch
deleted file mode 100644
index 4a10c9c..0000000
--- a/libewf-libcpath.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From cc617ecd58c766245888089079913c68bbc11109 Mon Sep 17 00:00:00 2001
-From: Joachim Metz <joachim.metz at gmail.com>
-Date: Mon, 16 Jul 2018 15:05:05 +0200
-Subject: [PATCH] Changes to file name sanitation in export handle
-
----
- ewftools/export_handle.c | 104 +++++++++++++++++++++++++--------------
- 1 file changed, 68 insertions(+), 36 deletions(-)
-
-diff --git a/ewftools/export_handle.c b/ewftools/export_handle.c
-index 22f3d7c0..89aea2ec 100644
---- a/ewftools/export_handle.c
-+++ b/ewftools/export_handle.c
-@@ -5890,11 +5890,13 @@ int export_handle_export_single_files(
- log_handle_t *log_handle,
- libcerror_error_t **error )
- {
-- libewf_file_entry_t *file_entry = NULL;
-- static char *function = "export_handle_export_single_files";
-- size_t export_path_size = 0;
-- int result = 0;
-- int status = PROCESS_STATUS_COMPLETED;
-+ libewf_file_entry_t *file_entry = NULL;
-+ system_character_t *sanitized_name = NULL;
-+ static char *function = "export_handle_export_single_files";
-+ size_t export_path_length = 0;
-+ size_t sanitized_name_size = 0;
-+ int result = 0;
-+ int status = PROCESS_STATUS_COMPLETED;
-
- if( export_handle == NULL )
- {
-@@ -5918,18 +5920,22 @@ int export_handle_export_single_files(
-
- return( -1 );
- }
-- export_path_size = 1 + system_string_length(
-- export_handle->target_path );
-+ export_path_length = system_string_length(
-+ export_handle->target_path );
-
- #if defined( HAVE_WIDE_SYSTEM_CHARACTER )
-- if( libcpath_path_sanitize_wide(
-+ if( libcpath_path_get_sanitized_path_wide(
- export_handle->target_path,
-- &export_path_size,
-+ export_path_length,
-+ &sanitized_name,
-+ &sanitized_name_size,
- error ) != 1 )
- #else
-- if( libcpath_path_sanitize(
-+ if( libcpath_path_get_sanitized_path(
- export_handle->target_path,
-- &export_path_size,
-+ export_path_length,
-+ &sanitized_name,
-+ &sanitized_name_size,
- error ) != 1 )
- #endif
- {
-@@ -5991,11 +5997,11 @@ int export_handle_export_single_files(
- }
- #if defined( HAVE_WIDE_SYSTEM_CHARACTER )
- if( libcpath_path_make_directory_wide(
-- export_handle->target_path,
-+ sanitized_name,
- error ) != 1 )
- #else
- if( libcpath_path_make_directory(
-- export_handle->target_path,
-+ sanitized_name,
- error ) != 1 )
- #endif
- {
-@@ -6005,21 +6011,21 @@ int export_handle_export_single_files(
- LIBCERROR_IO_ERROR_WRITE_FAILED,
- "%s: unable to create directory: %" PRIs_SYSTEM "",
- function,
-- export_handle->target_path );
-+ sanitized_name );
-
- goto on_error;
- }
- log_handle_printf(
- log_handle,
- "Created directory: %" PRIs_SYSTEM ".\n",
-- export_handle->target_path );
-+ sanitized_name );
-
- result = export_handle_export_file_entry(
- export_handle,
- file_entry,
-- export_handle->target_path,
-- export_path_size,
-- export_path_size - 1,
-+ sanitized_name,
-+ sanitized_name_size,
-+ sanitized_name_size - 1,
- log_handle,
- error );
-
-@@ -6034,6 +6040,11 @@ int export_handle_export_single_files(
-
- goto on_error;
- }
-+ memory_free(
-+ sanitized_name );
-+
-+ sanitized_name = NULL;
-+
- if( export_handle->abort != 0 )
- {
- status = PROCESS_STATUS_ABORTED;
-@@ -6099,6 +6110,11 @@ int export_handle_export_single_files(
- &file_entry,
- NULL );
- }
-+ if( sanitized_name != NULL )
-+ {
-+ memory_free(
-+ sanitized_name );
-+ }
- return( -1 );
- }
-
-@@ -6114,14 +6130,16 @@ int export_handle_export_file_entry(
- log_handle_t *log_handle,
- libcerror_error_t **error )
- {
-- system_character_t *name = NULL;
-- system_character_t *target_path = NULL;
-- static char *function = "export_handle_export_file_entry";
-- size_t name_size = 0;
-- size_t target_path_size = 0;
-- uint8_t file_entry_type = 0;
-- int result = 0;
-- int return_value = 0;
-+ system_character_t *name = NULL;
-+ system_character_t *sanitized_name = NULL;
-+ system_character_t *target_path = NULL;
-+ static char *function = "export_handle_export_file_entry";
-+ size_t name_size = 0;
-+ size_t sanitized_name_size = 0;
-+ size_t target_path_size = 0;
-+ uint8_t file_entry_type = 0;
-+ int result = 0;
-+ int return_value = 0;
-
- if( export_handle == NULL )
- {
-@@ -6222,14 +6240,18 @@ int export_handle_export_file_entry(
- goto on_error;
- }
- #if defined( HAVE_WIDE_SYSTEM_CHARACTER )
-- if( libcpath_path_sanitize_filename_wide(
-+ if( libcpath_path_get_sanitized_filename_wide(
- name,
-- &name_size,
-+ name_size - 1,
-+ &sanitized_name,
-+ &sanitized_name_size,
- error ) != 1 )
- #else
-- if( libcpath_path_sanitize_filename(
-+ if( libcpath_path_get_sanitized_filename(
- name,
-- &name_size,
-+ name_size - 1,
-+ &sanitized_name,
-+ &sanitized_name_size,
- error ) != 1 )
- #endif
- {
-@@ -6242,14 +6264,19 @@ int export_handle_export_file_entry(
-
- goto on_error;
- }
-+ memory_free(
-+ name );
-+
-+ name = NULL;
-+
- #if defined( HAVE_WIDE_SYSTEM_CHARACTER )
- if( libcpath_path_join_wide(
- &target_path,
- &target_path_size,
- export_path,
- export_path_size - 1,
-- name,
-- name_size - 1,
-+ sanitized_name,
-+ sanitized_name_size - 1,
- error ) != 1 )
- #else
- if( libcpath_path_join(
-@@ -6257,8 +6284,8 @@ int export_handle_export_file_entry(
- &target_path_size,
- export_path,
- export_path_size - 1,
-- name,
-- name_size - 1,
-+ sanitized_name,
-+ sanitized_name_size - 1,
- error ) != 1 )
- #endif
- {
-@@ -6272,9 +6299,9 @@ int export_handle_export_file_entry(
- goto on_error;
- }
- memory_free(
-- name );
-+ sanitized_name );
-
-- name = NULL;
-+ sanitized_name = NULL;
-
- if( target_path == NULL )
- {
-@@ -6443,6 +6470,11 @@ int export_handle_export_file_entry(
- memory_free(
- target_path );
- }
-+ if( sanitized_name != NULL )
-+ {
-+ memory_free(
-+ sanitized_name );
-+ }
- if( name != NULL )
- {
- memory_free(
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libewf.git/commitdiff/76e0a3ecf21236a193365dea0b5a5e2fcc75e49f
More information about the pld-cvs-commit
mailing list