From bd7c352a2661f0b2d15536500db3216fa1b913ec Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 27 Apr 2023 23:26:32 -0700 Subject: [PATCH] v1.14.1 --- Makefile.am | 2 +- NEWS.md | 4 ++++ README.WINDOWS.md | 8 ++++---- README.md | 2 +- doc/man1/mkwinpeimg.1 | 2 +- doc/man1/wimapply.1 | 2 +- doc/man1/wimcapture.1 | 2 +- doc/man1/wimdelete.1 | 2 +- doc/man1/wimdir.1 | 2 +- doc/man1/wimexport.1 | 2 +- doc/man1/wimextract.1 | 2 +- doc/man1/wiminfo.1 | 2 +- doc/man1/wimjoin.1 | 2 +- doc/man1/wimlib-imagex.1 | 2 +- doc/man1/wimmount.1 | 2 +- doc/man1/wimoptimize.1 | 2 +- doc/man1/wimsplit.1 | 2 +- doc/man1/wimupdate.1 | 2 +- doc/man1/wimverify.1 | 2 +- include/wimlib.h | 4 ++-- tools/get-version-number.sh | 2 +- 21 files changed, 28 insertions(+), 24 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7eb51425..cb012fca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -201,7 +201,7 @@ libwim_la_CFLAGS = \ $(LIBNTFS_3G_CFLAGS) \ $(LIBFUSE_CFLAGS) -libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 37:0:22 +libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 38:0:23 libwim_la_LIBADD = \ $(PTHREAD_LIBS) \ diff --git a/NEWS.md b/NEWS.md index f6c7c9e8..8f5a250c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,9 @@ # wimlib release notes +## Version 1.14.1 + +- Fixed a bug introduced in v1.14.0 where wimlib would crash on older CPUs. + ## Version 1.14.0 - Removed libxml2 and libcrypto (OpenSSL) as dependencies of wimlib. Also diff --git a/README.WINDOWS.md b/README.WINDOWS.md index 54527e1e..9e3e0f96 100644 --- a/README.WINDOWS.md +++ b/README.WINDOWS.md @@ -107,9 +107,9 @@ After that, open any MSYS2 shell again and run the following commands: Note: By default the git repository will be on the `master` branch, which is the latest development snapshot. Optionally, you can check out a specific version, -e.g. `cd wimlib && git checkout v1.14.0`. For old versions, please refer to the +e.g. `cd wimlib && git checkout v1.14.1`. For old versions, please refer to the documentation for that version, as things may have changed. It is also possible -to use a release tarball (e.g. `wimlib-1.14.0.tar.gz`) instead of the git repo. +to use a release tarball (e.g. `wimlib-1.14.1.tar.gz`) instead of the git repo. Finally, to actually do a build, close the MSYS2 shell you have open, then open one of the following from the Start menu: @@ -127,7 +127,7 @@ one of the following from the Start menu: The script will automatically download and install the packages needed to build wimlib in the chosen MSYS2 environment, then build wimlib. The output will be -in a folder named similarly to `wimlib-1.14.0-windows-x86_64-bin`. Note that +in a folder named similarly to `wimlib-1.14.1-windows-x86_64-bin`. Note that your "home" folder within MSYS2 is `C:\msys64\home\%USERNAME%` by default. Therefore, the full path to the output folder will be similar to -`C:\msys64\home\%USERNAME%\wimlib\wimlib-1.14.0-windows-x86_64-bin`. +`C:\msys64\home\%USERNAME%\wimlib\wimlib-1.14.1-windows-x86_64-bin`. diff --git a/README.md b/README.md index 85476f22..57a8ddba 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Introduction -This is wimlib version 1.14.0 (April 2023). wimlib is a C library for +This is wimlib version 1.14.1 (April 2023). wimlib is a C library for creating, modifying, extracting, and mounting files in the Windows Imaging Format (WIM files). wimlib and its command-line frontend `wimlib-imagex` provide a free and cross-platform alternative to Microsoft's WIMGAPI, ImageX, diff --git a/doc/man1/mkwinpeimg.1 b/doc/man1/mkwinpeimg.1 index f57526ac..1a333ebd 100644 --- a/doc/man1/mkwinpeimg.1 +++ b/doc/man1/mkwinpeimg.1 @@ -1,4 +1,4 @@ -.TH MKWINPEIMG "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH MKWINPEIMG "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME mkwinpeimg \- Make a customized bootable image of Windows PE .SH SYNOPSIS diff --git a/doc/man1/wimapply.1 b/doc/man1/wimapply.1 index bbb32449..1489f5ca 100644 --- a/doc/man1/wimapply.1 +++ b/doc/man1/wimapply.1 @@ -1,4 +1,4 @@ -.TH WIMAPPLY "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMAPPLY "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimapply \- Apply a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimcapture.1 b/doc/man1/wimcapture.1 index e3fbcdb4..4dc19da7 100644 --- a/doc/man1/wimcapture.1 +++ b/doc/man1/wimcapture.1 @@ -1,4 +1,4 @@ -.TH WIMCAPTURE "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMCAPTURE "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimcapture, wimappend \- Capture or append a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimdelete.1 b/doc/man1/wimdelete.1 index 9b375a79..95fd2d4b 100644 --- a/doc/man1/wimdelete.1 +++ b/doc/man1/wimdelete.1 @@ -1,4 +1,4 @@ -.TH WIMDELETE "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMDELETE "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimdelete \- Delete an image from a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimdir.1 b/doc/man1/wimdir.1 index 4f50f662..9c25d236 100644 --- a/doc/man1/wimdir.1 +++ b/doc/man1/wimdir.1 @@ -1,4 +1,4 @@ -.TH WIMDIR "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMDIR "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimdir \- List the files contained in a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimexport.1 b/doc/man1/wimexport.1 index 8e754c29..87fd9e2a 100644 --- a/doc/man1/wimexport.1 +++ b/doc/man1/wimexport.1 @@ -1,4 +1,4 @@ -.TH WIMEXPORT "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMEXPORT "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimexport \- Export image(s) from a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimextract.1 b/doc/man1/wimextract.1 index 875f4d8c..d2c361b7 100644 --- a/doc/man1/wimextract.1 +++ b/doc/man1/wimextract.1 @@ -1,4 +1,4 @@ -.TH WIMEXTRACT "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMEXTRACT "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimextract \- Extract files from a WIM image .SH SYNOPSIS diff --git a/doc/man1/wiminfo.1 b/doc/man1/wiminfo.1 index 65c33174..a20ed5db 100644 --- a/doc/man1/wiminfo.1 +++ b/doc/man1/wiminfo.1 @@ -1,4 +1,4 @@ -.TH WIMINFO "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMINFO "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wiminfo \- Display or change information about a WIM file or image .SH SYNOPSIS diff --git a/doc/man1/wimjoin.1 b/doc/man1/wimjoin.1 index f0ee577e..2de21418 100644 --- a/doc/man1/wimjoin.1 +++ b/doc/man1/wimjoin.1 @@ -1,4 +1,4 @@ -.TH WIMJOIN "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMJOIN "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimjoin\- Join a split WIM into a standalone WIM .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex.1 b/doc/man1/wimlib-imagex.1 index 8ebcd4f6..0a08d916 100644 --- a/doc/man1/wimlib-imagex.1 +++ b/doc/man1/wimlib-imagex.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX 1 "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMLIB-IMAGEX 1 "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimlib-imagex \- Extract, create, modify, or mount a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimmount.1 b/doc/man1/wimmount.1 index 2bf731d2..51a89bf8 100644 --- a/doc/man1/wimmount.1 +++ b/doc/man1/wimmount.1 @@ -1,4 +1,4 @@ -.TH WIMMOUNT "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMMOUNT "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimmount, wimmountrw, wimunmount \- Mount or unmount a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimoptimize.1 b/doc/man1/wimoptimize.1 index 8b7242ce..d439d76d 100644 --- a/doc/man1/wimoptimize.1 +++ b/doc/man1/wimoptimize.1 @@ -1,4 +1,4 @@ -.TH WIMOPTIMIZE "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMOPTIMIZE "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimoptimize \- Optimize a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimsplit.1 b/doc/man1/wimsplit.1 index d47e9ea2..05e161c8 100644 --- a/doc/man1/wimsplit.1 +++ b/doc/man1/wimsplit.1 @@ -1,4 +1,4 @@ -.TH WIMSPLIT "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMSPLIT "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimsplit \- Split a WIM archive into multiple parts .SH SYNOPSIS diff --git a/doc/man1/wimupdate.1 b/doc/man1/wimupdate.1 index 203a1361..40f5268b 100644 --- a/doc/man1/wimupdate.1 +++ b/doc/man1/wimupdate.1 @@ -1,4 +1,4 @@ -.TH WIMUPDATE "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMUPDATE "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimupdate \- Update a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimverify.1 b/doc/man1/wimverify.1 index 6867cd21..c5ac3ae7 100644 --- a/doc/man1/wimverify.1 +++ b/doc/man1/wimverify.1 @@ -1,4 +1,4 @@ -.TH WIMVERIFY "1" "April 2023" "wimlib 1.14.0" "User Commands" +.TH WIMVERIFY "1" "April 2023" "wimlib 1.14.1" "User Commands" .SH NAME wimverify \- Verify a WIM archive .SH SYNOPSIS diff --git a/include/wimlib.h b/include/wimlib.h index 9035ba4d..6c68865f 100644 --- a/include/wimlib.h +++ b/include/wimlib.h @@ -11,7 +11,7 @@ /** * @mainpage * - * This is the documentation for the library interface of wimlib 1.14.0, a C + * This is the documentation for the library interface of wimlib 1.14.1, a C * library for creating, modifying, extracting, and mounting files in the * Windows Imaging (WIM) format. This documentation is intended for developers * only. If you have installed wimlib and want to know how to use the @b @@ -420,7 +420,7 @@ #define WIMLIB_MINOR_VERSION 14 /** Patch version of the library (for example, the 5 in 1.2.5). */ -#define WIMLIB_PATCH_VERSION 0 +#define WIMLIB_PATCH_VERSION 1 #ifdef __cplusplus extern "C" { diff --git a/tools/get-version-number.sh b/tools/get-version-number.sh index b8aa2f58..c0328c0a 100755 --- a/tools/get-version-number.sh +++ b/tools/get-version-number.sh @@ -7,6 +7,6 @@ vers=$(git describe --abbrev=8 --dirty --always 2>/dev/null | \ sed 's/^v//') if [ -z "$vers" ]; then # Fallback for people who use autoreconf on tarball releases - vers="1.14.0" + vers="1.14.1" fi echo "$vers" -- 2.43.0