Applied updates

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: build
 on: [push, pull_request]
 jobs:
   build_ubuntu:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:
@@ -54,7 +54,7 @@ jobs:
       run: |
         tests/runtests.sh
   build_python_ubuntu:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:
@@ -91,18 +91,14 @@ jobs:
       run: |
         tests/runtests.sh
   build_setup_py_ubuntu:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:
         - architecture: 'x64'
           compiler: 'gcc'
           configure_options: ''
-          python-version: 2.7
-        - architecture: 'x64'
-          compiler: 'gcc'
-          configure_options: ''
-          python-version: 3.8
+          python-version: 3.9
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -123,7 +119,7 @@ jobs:
       run: |
         python setup.py build
   coverage_ubuntu:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:

.github/workflows/build_shared.yml

@@ -5,7 +5,7 @@ on:
     branches: [main]
 jobs:
   build_shared_ubuntu:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:

appveyor.yml

@@ -86,73 +86,76 @@ environment:
     LDFLAGS: "-L/usr/local/lib"
   - TARGET: cygwin-gcc
     BUILD_ENVIRONMENT: cygwin
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: ""
   - TARGET: cygwin-gcc-no-optimization
     BUILD_ENVIRONMENT: cygwin
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-shared=no"
     CFLAGS: "--coverage -O0"
     CPPFLAGS: "-DOPTIMIZATION_DISABLED"
     LDFLAGS: "--coverage"
   - TARGET: cygwin-gcc-python
     BUILD_ENVIRONMENT: cygwin
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-python"
   - TARGET: cygwin-gcc-python2
     BUILD_ENVIRONMENT: cygwin
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-python2"
     PYTHON_VERSION: 2
   - TARGET: cygwin-gcc-python3
     BUILD_ENVIRONMENT: cygwin
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-python3"
     PYTHON_VERSION: 3
   - TARGET: cygwin-gcc-static-executables
     BUILD_ENVIRONMENT: cygwin
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-static-executables"
   - TARGET: cygwin64-gcc
     BUILD_ENVIRONMENT: cygwin64
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: ""
   - TARGET: cygwin64-gcc-no-optimization
     BUILD_ENVIRONMENT: cygwin64
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-shared=no"
     CFLAGS: "--coverage -O0"
     CPPFLAGS: "-DOPTIMIZATION_DISABLED"
     LDFLAGS: "--coverage"
   - TARGET: cygwin64-gcc-python
     BUILD_ENVIRONMENT: cygwin64
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-python"
   - TARGET: cygwin64-gcc-python2
     BUILD_ENVIRONMENT: cygwin64
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-python2"
     PYTHON_VERSION: 2
   - TARGET: cygwin64-gcc-python3
     BUILD_ENVIRONMENT: cygwin64
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-python3"
     PYTHON_VERSION: 3
   - TARGET: cygwin64-gcc-static-executables
     BUILD_ENVIRONMENT: cygwin64
-    CONFIGURE_OPTIONS: "--enable-static-executables"
-  - TARGET: mingw-gcc
-    BUILD_ENVIRONMENT: mingw
-    CONFIGURE_OPTIONS: ""
-  - TARGET: mingw-gcc-no-optimization
-    BUILD_ENVIRONMENT: mingw
-    CONFIGURE_OPTIONS: "--enable-shared=no"
-    CFLAGS: "--coverage -O0"
-    CPPFLAGS: "-DOPTIMIZATION_DISABLED"
-    LDFLAGS: "--coverage"
-  - TARGET: mingw-gcc-static-executables
-    BUILD_ENVIRONMENT: mingw
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-static-executables"
   - TARGET: mingw-w64-gcc
     BUILD_ENVIRONMENT: mingw-w64
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: ""
   - TARGET: mingw-w64-gcc-no-optimization
     BUILD_ENVIRONMENT: mingw-w64
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-shared=no"
     CFLAGS: "--coverage -O0"
     CPPFLAGS: "-DOPTIMIZATION_DISABLED"
     LDFLAGS: "--coverage"
   - TARGET: mingw-w64-gcc-static-executables
     BUILD_ENVIRONMENT: mingw-w64
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-static-executables"
 
 install:
@@ -216,10 +219,8 @@ install:
     C:\cygwin\setup-x86.exe -qgnNdO -l C:\cygwin\var\cache\setup -R c:\cygwin -s http://cygwin.mirror.constant.com -P gettext-devel -P bison -P flex -P zlib-devel -P libssl-devel -P python2-devel -P python3-devel -P libuuid-devel )
 - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
     C:\cygwin64\setup-x86_64.exe -qgnNdO -l C:\cygwin64\var\cache\setup -R c:\cygwin64 -s http://cygwin.mirror.constant.com -P gettext-devel -P bison -P flex -P zlib-devel -P libssl-devel -P python2-devel -P python3-devel -P libuuid-devel )
-- cmd: if [%BUILD_ENVIRONMENT%]==[mingw] (
-    C:\MinGW\bin\mingw-get install libz-dev )
 - cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
-    C:\msys64\usr\bin\pacman -S --noconfirm --needed msys/bison msys/flex msys/zlib-devel )
+    C:\msys64\usr\bin\pacman -S --noconfirm --needed autoconf automake gcc gettext-devel libtool make msys/bison msys/flex msys/zlib-devel )
 
 build_script:
 - ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild" -or ($env:BUILD_ENVIRONMENT -eq "python" -and $isWindows)) {
@@ -254,9 +255,6 @@ build_script:
 - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
     xcopy /i /q /s C:\projects\libewf-legacy C:\cygwin64\home\appveyor\libewf-legacy &&
     C:\cygwin64\bin\bash -e -l -c "cd libewf-legacy && tests/build.sh ${CONFIGURE_OPTIONS}" )
-- cmd: if [%BUILD_ENVIRONMENT%]==[mingw] (
-    xcopy /i /q /s C:\projects\libewf-legacy C:\MinGW\msys\1.0\home\appveyor\libewf-legacy &&
-    C:\MinGW\msys\1.0\bin\bash -e -l -c "cd libewf-legacy && sed 's/@VERSION@/0.29/g' m4/pkg.m4.in > m4/pkg.m4 && tests/build.sh ${CONFIGURE_OPTIONS}" )
 - cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
     xcopy /i /q /s C:\projects\libewf-legacy C:\msys64\home\appveyor\libewf-legacy &&
     C:\msys64\usr\bin\bash -e -l -c "cd libewf-legacy && tests/build.sh ${CONFIGURE_OPTIONS}" )
@@ -271,15 +269,13 @@ test_script:
     C:\cygwin\bin\bash -l -c "cd libewf-legacy && tests/runtests.sh" )
 - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
     C:\cygwin64\bin\bash -l -c "cd libewf-legacy && tests/runtests.sh" )
-- cmd: if [%BUILD_ENVIRONMENT%]==[mingw] (
-    C:\MinGW\msys\1.0\bin\bash -l -c "cd libewf-legacy && tests/runtests.sh" )
 - cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
     C:\msys64\usr\bin\bash -l -c "cd libewf-legacy && tests/runtests.sh" )
 
 after_test:
-- cmd: if [%TARGET%]==[mingw-gcc-no-optimization] (
-    copy C:\projects\codecov-bash\codecov C:\MinGW\msys\1.0\home\appveyor\libewf-legacy\codecov.sh &&
-    C:\MinGW\msys\1.0\bin\bash -e -l -c "cd libewf-legacy && chmod a+x ./codecov.sh && ./codecov.sh -n ${TARGET}" )
+- cmd: if [%TARGET%]==[mingw-w64-gcc-no-optimization] (
+    copy C:\projects\codecov-bash\codecov C:\msys64\home\appveyor\libewf-legacy\codecov.sh &&
+    C:\msys64\usr\bin\bash -e -l -c "cd libewf-legacy && chmod a+x ./codecov.sh && ./codecov.sh -n ${TARGET}" )
 
 artifacts:
 - path: \*.nupkg

autogen.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Script to generate ./configure using the autotools
 #
-# Version: 20200425
+# Version: 20220709
 
 EXIT_SUCCESS=0;
 EXIT_FAILURE=1;
@@ -22,11 +22,6 @@ then
 	BINDIR="/opt/local/bin";
 fi
 if ! test -x "${BINDIR}/aclocal";
-then
-	# Default location of MSYS-MinGW installed binaries.
-	BINDIR="/mingw/bin";
-fi
-if ! test -x "${BINDIR}/aclocal";
 then
 	# Default location of 32-bit MSYS2-MinGW installed binaries.
 	BINDIR="/mingw32/bin";

configure.ac

@@ -1,8 +1,8 @@
-AC_PREREQ( 2.59 )
+AC_PREREQ([2.71])
 
 AC_INIT(
  [libewf],
- [20140813],
+ [20140814],
  [joachim.metz@gmail.com])
 
 AC_CONFIG_SRCDIR(
@@ -16,7 +16,7 @@ dnl Check for host type
 AC_CANONICAL_HOST
 
 dnl Check for libtool DLL support
-AC_LIBTOOL_WIN32_DLL
+LT_INIT([win32-dll])
 
 dnl Checks for programs
 AC_PROG_CC
@@ -30,15 +30,14 @@ AC_PROG_CXX
 AX_CXX_COMPILE_STDCXX_11(noext, optional)
 
 dnl Check for libtool
-AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
 dnl Check for pkg-config
 AC_PATH_PROG(PKGCONFIG,[pkg-config])
 
 dnl Support of internationalization (i18n)
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT_VERSION([0.21])
 
 dnl Check for compiler language support
 AC_C_CONST

dpkg/control

@@ -1,7 +1,7 @@
 Source: libewf
 Priority: extra
 Maintainer: Joachim Metz <joachim.metz@gmail.com>
-Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, zlib1g-dev, libssl-dev, python3-dev, python3-setuptools, libfuse-dev
+Build-Depends: debhelper (>= 9), dh-autoreconf, dh-python, pkg-config, zlib1g-dev, libssl-dev, python3-dev, python3-setuptools, libfuse-dev
 Standards-Version: 4.1.4
 Section: libs
 Homepage: https://github.com/libyal/libewf-legacy

libewf.nuspec

@@ -2,15 +2,15 @@
 <package >
   <metadata>
     <id>libewf</id>
-    <version>20140813</version>
+    <version>20140814</version>
     <authors>Joachim Metz</authors>
     <owners>joachimmetz</owners>
     <license type="expression">LGPL-3.0-or-later</license>
     <projectUrl>https://github.com/libyal/libewf</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <title>libewf</title>
     <description>Library to access the Expert Witness Compression Format (EWF) format</description>
-    <releaseNotes>Release of libewf 20220419</releaseNotes>
+    <releaseNotes>Release of libewf 20140814</releaseNotes>
     <copyright>Copyright (C) 2006-2022</copyright>
     <tags>native</tags>
   </metadata>

libewf.spec.in

@@ -84,7 +84,6 @@ rm -rf %{buildroot}
 %defattr(644,root,root,755)
 %license COPYING COPYING.LESSER
 %doc AUTHORS README
-%{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libewf.pc
 %{_includedir}/*
@@ -95,7 +94,6 @@ rm -rf %{buildroot}
 %license COPYING COPYING.LESSER
 %doc AUTHORS README
 %{_libdir}/python3*/site-packages/*.a
-%{_libdir}/python3*/site-packages/*.la
 %{_libdir}/python3*/site-packages/*.so
 
 %files -n libewf-tools

libewf/libewf_header_values.c

@@ -2698,7 +2698,7 @@ int libewf_header_values_convert_utf8_header_string_to_header(
 	if( *header != NULL )
 	{
 		memory_free(
-		 header );
+		 *header );
 
 		*header = NULL;
 	}
@@ -5321,7 +5321,7 @@ int libewf_header_values_generate_header2(
 	if( *header2 != NULL )
 	{
 		memory_free(
-		 header2 );
+		 *header2 );
 
 		*header2 = NULL;
 	}