Applied updates and code clean up

libyal · Feb 19, 2022 · f2f0493 · f2f0493
1 parent bbf178a
commit f2f0493
Show file tree

Hide file tree

Showing 17 changed files with 176 additions and 29 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -35,5 +35,5 @@ Additional credits go to:
   version of ewfacquirestream and proposing multiple write performance enhancements.
 - Several others for pointing out flaws within the product and its related
   documentation. Refer to the project website for more information:
-  http://code.google.com/p/libewf/
+  https://github.com/libyal/libewf-legacy/wiki
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -80,7 +80,7 @@ environment:
   - TARGET: python39-x64
     BUILD_ENVIRONMENT: python
     APPVEYOR_BUILD_WORKER_IMAGE: macos
-    PYTHON: "/usr/local/opt/python@3.9/bin/python3"
+    PYTHON: "/usr/local/opt/python@3.10/bin/python3"
     HOMEBREW_NO_INSTALL_CLEANUP: 1
     CFLAGS: "-I/usr/local/include"
     LDFLAGS: "-L/usr/local/lib"

diff --git a/ewf.net/ewf.net.rc.in b/ewf.net/ewf.net.rc.in
@@ -28,7 +28,7 @@ BEGIN
       VALUE "OriginalFilename",		"ewf.net.dll\0"
       VALUE "ProductName",		"ewf.net\0"
       VALUE "ProductVersion",		"@VERSION@" "\0"
-      VALUE "Comments",			"For more information visit http://code.google.com/p/libewf/\0"
+      VALUE "Comments",			"For more information visit https://github.com/libyal/libewf-legacy/\0"
     END
   END
   BLOCK "VarFileInfo"

diff --git a/ewftools/ewftools_output.c b/ewftools/ewftools_output.c
@@ -238,12 +238,22 @@ void ewftools_output_version_detailed_fprint(
 	 LIBHMAC_VERSION_STRING );
 
 #if defined( HAVE_LIBCRYPTO )
+#if defined( SHLIB_VERSION_NUMBER )
 	fprintf(
 	 stream,
 	 " (libcrypto %s)",
 	 SHLIB_VERSION_NUMBER );
-#endif
-#endif
+
+#elif defined( OPENSSL_VERSION_MAJOR ) && defined( OPENSSL_VERSION_MINOR )
+	fprintf(
+	 stream,
+	 " (libcrypto %d.%d)",
+	 OPENSSL_VERSION_MAJOR,
+	 OPENSSL_VERSION_MINOR );
+
+#endif /* defined( SHLIB_VERSION_NUMBER ) */
+#endif /* defined( HAVE_LIBCRYPTO ) */
+#endif /* defined( HAVE_LIBHMAC ) || defined( HAVE_LOCAL_LIBHMAC ) */
 
 #if defined( HAVE_LIBODRAW ) || defined( HAVE_LOCAL_LIBODRAW )
 	fprintf(

diff --git a/libewf/libewf.rc.in b/libewf/libewf.rc.in
@@ -28,7 +28,7 @@ BEGIN
       VALUE "OriginalFilename",		"libewf.dll\0"
       VALUE "ProductName",		"libewf\0"
       VALUE "ProductVersion",		"@VERSION@" "\0"
-      VALUE "Comments",			"For more information visit http://code.google.com/p/libewf/\0"
+      VALUE "Comments",			"For more information visit https://github.com/libyal/libewf-legacy/\0"
     END
   END
   BLOCK "VarFileInfo"

diff --git a/m4/libcdata.m4 b/m4/libcdata.m4
@@ -1,6 +1,6 @@
 dnl Checks for libcdata required headers and functions
 dnl
-dnl Version: 20210625
+dnl Version: 20220115
 
 dnl Function to detect if libcdata is available
 dnl ac_libcdata_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -26,7 +26,7 @@ AC_DEFUN([AX_LIBCDATA_CHECK_LIB],
         [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
         [PKG_CHECK_MODULES(
           [libcdata],
-          [libcdata >= 20190112],
+          [libcdata >= 20220115],
           [ac_cv_libcdata=yes],
           [ac_cv_libcdata=check])
         ])

diff --git a/m4/libfuse.m4 b/m4/libfuse.m4
@@ -1,6 +1,6 @@
-dnl Functions for libfuse
+dnl Checks for libfuse required headers and functions
 dnl
-dnl Version: 20180403
+dnl Version: 20220118
 
 dnl Function to detect if libfuse is available
 dnl ac_libfuse_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -40,10 +40,11 @@ AC_DEFUN([AX_LIBFUSE_CHECK_LIB],
         [ac_cv_header_fuse_h=no])
 
       dnl libfuse sometimes requires -D_FILE_OFFSET_BITS=64 to be set
+      dnl macFuse requires -DFUSE_USE_VERSION=26 to be set
       AS_IF(
         [test "x$ac_cv_header_fuse_h" = xno],
         [AS_UNSET([ac_cv_header_fuse_h])
-        CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+        CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=26"
         AC_CHECK_HEADERS([fuse.h])
       ])
 

diff --git a/manuals/ewfacquire.1 b/manuals/ewfacquire.1
@@ -258,8 +258,7 @@ Sessions:
 .Sh DIAGNOSTICS
 Errors, verbose and debug output are printed to stderr when verbose output \-v is enabled. Verbose and debug output are only printed when enabled at compilation.
 .Sh BUGS
-Please report bugs of any kind to <joachim.metz@gmail.com> or on the project website:
-http://code.google.com/p/libewf/
+Please report bugs of any kind on the project issue tracker: https://github.com/libyal/libewf-legacy/issues
 .Sh AUTHOR
 .Pp
 These man pages were written by Kees Mastwijk.

diff --git a/manuals/ewfacquirestream.1 b/manuals/ewfacquirestream.1
@@ -149,8 +149,7 @@ MD5 hash calculated over data:		ae1ce8f5ac079d3ee93f97fe3792bda3
 .Sh DIAGNOSTICS
 Errors, verbose and debug output are printed to stderr when verbose output \-v is enabled. Verbose and debug output are only printed when enabled at compilation.
 .Sh BUGS
-Please report bugs of any kind to <joachim.metz@gmail.com> or on the project website:
-http://code.google.com/p/libewf/
+Please report bugs of any kind on the project issue tracker: https://github.com/libyal/libewf-legacy/issues
 .Sh AUTHOR
 These man pages were written by Joachim Metz.
 .Sh COPYRIGHT

diff --git a/manuals/ewfexport.1 b/manuals/ewfexport.1
@@ -113,8 +113,7 @@ MD5 hash calculated over data:		ae1ce8f5ac079d3ee93f97fe3792bda3
 .Sh DIAGNOSTICS
 Errors, verbose and debug output are printed to stderr when verbose output \-v is enabled. Verbose and debug output are only printed when enabled at compilation.
 .Sh BUGS
-Please report bugs of any kind to <joachim.metz@gmail.com> or on the project website:
-http://code.google.com/p/libewf/
+Please report bugs of any kind on the project issue tracker: https://github.com/libyal/libewf-legacy/issues
 .Sh AUTHOR
 .Pp
 These man pages were written by Kees Mastwijk.

diff --git a/manuals/ewfinfo.1 b/manuals/ewfinfo.1
@@ -89,8 +89,7 @@ Digest hash information
 .Sh DIAGNOSTICS
 Errors, verbose and debug output are printed to stderr when verbose output \-v is enabled. Verbose and debug output are only printed when enabled at compilation.
 .Sh BUGS
-Please report bugs of any kind to <joachim.metz@gmail.com> or on the project website:
-http://code.google.com/p/libewf/
+Please report bugs of any kind on the project issue tracker: https://github.com/libyal/libewf-legacy/issues
 .Sh AUTHOR
 .Pp
 These man pages were written by Kees Mastwijk.

diff --git a/manuals/ewfmount.1 b/manuals/ewfmount.1
@@ -53,8 +53,7 @@ ewfmount 20110918
 .Sh DIAGNOSTICS
 Errors, verbose and debug output are printed to stderr when verbose output \-v is enabled. Verbose and debug output are only printed when enabled at compilation.
 .Sh BUGS
-Please report bugs of any kind to <joachim.metz@gmail.com> or on the project website:
-http://code.google.com/p/libewf/
+Please report bugs of any kind on the project issue tracker: https://github.com/libyal/libewf-legacy/issues
 .Sh AUTHOR
 .Pp
 These man pages were written by Joachim Metz.

diff --git a/manuals/ewfrecover.1 b/manuals/ewfrecover.1
@@ -78,8 +78,7 @@ EWF file(s) are not corrupted.
 .Sh DIAGNOSTICS
 Errors, verbose and debug output are printed to stderr when verbose output \-v is enabled. Verbose and debug output are only printed when enabled at compilation.
 .Sh BUGS
-Please report bugs of any kind to <joachim.metz@gmail.com> or on the project website:
-http://code.google.com/p/libewf/
+Please report bugs of any kind on the project issue tracker: https://github.com/libyal/libewf-legacy/issues
 .Sh AUTHOR
 .Pp
 These man pages were written by Joachim Metz.

diff --git a/manuals/ewfverify.1 b/manuals/ewfverify.1
@@ -106,8 +106,7 @@ ewfverify: SUCCESS
 .Sh DIAGNOSTICS
 Errors, verbose and debug output are printed to stderr when verbose output \-v is enabled. Verbose and debug output are only printed when enabled at compilation.
 .Sh BUGS
-Please report bugs of any kind to <joachim.metz@gmail.com> or on the project website:
-http://code.google.com/p/libewf/
+Please report bugs of any kind on the project issue tracker: https://github.com/libyal/libewf-legacy/issues
 .Sh AUTHOR
 .Pp
 These man pages were written by Kees Mastwijk.

diff --git a/manuals/libewf.3 b/manuals/libewf.3
@@ -547,8 +547,7 @@ To have other code to determine if libewf was compiled with libbfio support it d
  in libewf/features.h.
 .sp
 .Sh BUGS
-Please report bugs of any kind to <joachim.metz@gmail.com> or on the project website:
-http://code.google.com/p/libewf/
+Please report bugs of any kind on the project issue tracker: https://github.com/libyal/libewf-legacy/issues
 .Sh AUTHOR
 These man pages were written by Joachim Metz.
 .Sh COPYRIGHT

diff --git a/msvscpp/libuna/libuna.vcproj b/msvscpp/libuna/libuna.vcproj
@@ -226,6 +226,78 @@
 				RelativePath="..\..\libuna\libuna_codepage_koi8_u.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_arabic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_celtic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_centraleurroman.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_croatian.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_cyrillic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_dingbats.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_farsi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_gaelic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_greek.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_icelandic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_inuit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_roman.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_romanian.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_russian.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_symbol.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_thai.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_turkish.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_ukrainian.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libuna\libuna_codepage_windows_1250.c"
 				>
@@ -412,6 +484,78 @@
 				RelativePath="..\..\libuna\libuna_codepage_koi8_u.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_arabic.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_celtic.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_centraleurroman.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_croatian.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_cyrillic.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_dingbats.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_farsi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_gaelic.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_greek.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_icelandic.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_inuit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_roman.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_romanian.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_russian.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_symbol.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_thai.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_turkish.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\libuna\libuna_codepage_mac_ukrainian.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libuna\libuna_codepage_windows_1250.h"
 				>

diff --git a/runtests.ps1 b/runtests.ps1
@@ -1,6 +1,6 @@
 # Script that runs the tests
 #
-# Version: 20200414
+# Version: 20220103
 
 $ExitSuccess = 0
 $ExitFailure = 1
@@ -42,7 +42,7 @@ Foreach (${Line} in ${Lines})
 		}
 		Catch
 		{
-			$LastExitCode = {ExitIgnore}
+			$LastExitCode = ${ExitIgnore}
 		}
 		If (${LastExitCode} -eq ${ExitFailure})
 		{