From 8a135e86b937d1acb9112b37a906562c2099899f Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 19 Dec 2021 13:06:07 -0600 Subject: [PATCH] v1.13.5 --- Makefile.am | 2 +- NEWS | 7 +++++-- README | 2 +- README.WINDOWS | 12 ++++++------ 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 | 2 +- tools/update-version | 2 +- 22 files changed, 32 insertions(+), 29 deletions(-) diff --git a/Makefile.am b/Makefile.am index d3e78235..84420a32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -200,7 +200,7 @@ libwim_la_CFLAGS = \ $(LIBFUSE_CFLAGS) \ $(LIBCRYPTO_CFLAGS) -libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 34:0:19 +libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 35:0:20 libwim_la_LIBADD = \ $(PTHREAD_LIBS) \ diff --git a/NEWS b/NEWS index 0c83a08a..4ea589f3 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,12 @@ -version 1.13.5-BETA1: - Fixed build errors with the latest version of Mingw-w64. +version 1.13.5: + Exporting "all" images from a WIM file no longer fails if multiple + images in that WIM file have the same name. wimlib now warns rather than aborts if two files have the same SHA-1 hash but different sizes. + Fixed build errors with the latest version of Mingw-w64. + Version 1.13.4: wimsplit now prints progress messages regularly rather than just once per WIM part. diff --git a/README b/README index 6715a1f6..8ee586f6 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ INTRODUCTION -This is wimlib version 1.13.4 (April 2021). wimlib is a C library for +This is wimlib version 1.13.5 (December 2021). 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/README.WINDOWS b/README.WINDOWS index ad03e165..f6e66121 100644 --- a/README.WINDOWS +++ b/README.WINDOWS @@ -94,7 +94,7 @@ from source, potentially with customizations. Although wimlib's build system is designed for UNIX-like systems and is easiest to use on Linux, it's possible to build Windows binaries on Windows using Cygwin with MinGW. To do this, follow the instructions below. For the sake of example, I'll assume you are building a -64-bit version of wimlib v1.13.0. +64-bit version of wimlib v1.13.5. Run the Cygwin installer, available from https://www.cygwin.com/setup-x86.exe. When you get to the package selection screen, choose the following additional @@ -107,13 +107,13 @@ packages from category "Devel": - mingw64-x86_64-winpthreads - pkg-config -Download wimlib's source code from https://wimlib.net/downloads/wimlib-1.13.0.tar.gz. +Download wimlib's source code from https://wimlib.net/downloads/wimlib-1.13.5.tar.gz. Start a Cygwin terminal and run the following commands: cd /cygdrive/c/Users/example/Downloads # (or wherever you downloaded the source to) - tar xf wimlib-1.13.0.tar.gz - cd wimlib-1.13.0 + tar xf wimlib-1.13.5.tar.gz + cd wimlib-1.13.5 ./configure --host=x86_64-w64-mingw32 make @@ -162,12 +162,12 @@ bootstrap the repository, and run the Windows release script: git clone git://wimlib.net/wimlib cd wimlib - git checkout v1.13.0 # example only; omit if building the master branch + git checkout v1.13.5 # example only; omit if building the master branch ./bootstrap ./tools/make-windows-release x86_64 The release script will download and build libxml2 and winpthreads as static libraries, then build wimlib, then do some final tasks and bundle the resulting files up into a ZIP archive. If successful you'll end up with a file like -"wimlib-1.13.0-windows-x86_64-bin.zip", just like the official releases. For +"wimlib-1.13.5-windows-x86_64-bin.zip", just like the official releases. For 32-bit binaries just use "i686" instead of "x86_64". diff --git a/doc/man1/mkwinpeimg.1 b/doc/man1/mkwinpeimg.1 index c357bc1e..896a3a5e 100644 --- a/doc/man1/mkwinpeimg.1 +++ b/doc/man1/mkwinpeimg.1 @@ -1,4 +1,4 @@ -.TH MKWINPEIMG "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH MKWINPEIMG "1" "December 2021" "wimlib 1.13.5" "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 397eb9c4..e7543a63 100644 --- a/doc/man1/wimapply.1 +++ b/doc/man1/wimapply.1 @@ -1,4 +1,4 @@ -.TH WIMAPPLY "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMAPPLY "1" "December 2021" "wimlib 1.13.5" "User Commands" .SH NAME wimapply \- Apply a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimcapture.1 b/doc/man1/wimcapture.1 index 8271b7e6..20acbc2a 100644 --- a/doc/man1/wimcapture.1 +++ b/doc/man1/wimcapture.1 @@ -1,4 +1,4 @@ -.TH WIMCAPTURE "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMCAPTURE "1" "December 2021" "wimlib 1.13.5" "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 0508f610..c670d7cc 100644 --- a/doc/man1/wimdelete.1 +++ b/doc/man1/wimdelete.1 @@ -1,4 +1,4 @@ -.TH WIMDELETE "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMDELETE "1" "December 2021" "wimlib 1.13.5" "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 bd0da24b..31b4181b 100644 --- a/doc/man1/wimdir.1 +++ b/doc/man1/wimdir.1 @@ -1,4 +1,4 @@ -.TH WIMDIR "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMDIR "1" "December 2021" "wimlib 1.13.5" "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 fbe378cc..2a176c0d 100644 --- a/doc/man1/wimexport.1 +++ b/doc/man1/wimexport.1 @@ -1,4 +1,4 @@ -.TH WIMEXPORT "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMEXPORT "1" "December 2021" "wimlib 1.13.5" "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 05aa0803..89dce641 100644 --- a/doc/man1/wimextract.1 +++ b/doc/man1/wimextract.1 @@ -1,4 +1,4 @@ -.TH WIMEXTRACT "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMEXTRACT "1" "December 2021" "wimlib 1.13.5" "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 a4aa17d5..eb5451f4 100644 --- a/doc/man1/wiminfo.1 +++ b/doc/man1/wiminfo.1 @@ -1,4 +1,4 @@ -.TH WIMINFO "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMINFO "1" "December 2021" "wimlib 1.13.5" "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 1035d4ac..8a7a30fb 100644 --- a/doc/man1/wimjoin.1 +++ b/doc/man1/wimjoin.1 @@ -1,4 +1,4 @@ -.TH WIMJOIN "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMJOIN "1" "December 2021" "wimlib 1.13.5" "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 de64f6bf..d16eec80 100644 --- a/doc/man1/wimlib-imagex.1 +++ b/doc/man1/wimlib-imagex.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX 1 "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMLIB-IMAGEX 1 "December 2021" "wimlib 1.13.5" "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 d0c1f6b9..ef9234e4 100644 --- a/doc/man1/wimmount.1 +++ b/doc/man1/wimmount.1 @@ -1,4 +1,4 @@ -.TH WIMMOUNT "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMMOUNT "1" "December 2021" "wimlib 1.13.5" "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 dabf6b88..e52f433a 100644 --- a/doc/man1/wimoptimize.1 +++ b/doc/man1/wimoptimize.1 @@ -1,4 +1,4 @@ -.TH WIMOPTIMIZE "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMOPTIMIZE "1" "December 2021" "wimlib 1.13.5" "User Commands" .SH NAME wimoptimize \- Optimize a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimsplit.1 b/doc/man1/wimsplit.1 index 450be81a..6d140da7 100644 --- a/doc/man1/wimsplit.1 +++ b/doc/man1/wimsplit.1 @@ -1,4 +1,4 @@ -.TH WIMSPLIT "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMSPLIT "1" "December 2021" "wimlib 1.13.5" "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 f1cfb4a1..d32ca8f9 100644 --- a/doc/man1/wimupdate.1 +++ b/doc/man1/wimupdate.1 @@ -1,4 +1,4 @@ -.TH WIMUPDATE "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMUPDATE "1" "December 2021" "wimlib 1.13.5" "User Commands" .SH NAME wimupdate \- Update a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimverify.1 b/doc/man1/wimverify.1 index 41d08b88..83a4784a 100644 --- a/doc/man1/wimverify.1 +++ b/doc/man1/wimverify.1 @@ -1,4 +1,4 @@ -.TH WIMVERIFY "1" "April 2021" "wimlib 1.13.4" "User Commands" +.TH WIMVERIFY "1" "December 2021" "wimlib 1.13.5" "User Commands" .SH NAME wimverify \- Verify a WIM archive .SH SYNOPSIS diff --git a/include/wimlib.h b/include/wimlib.h index b5cc66fa..c032429d 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.13.4, a C + * This is the documentation for the library interface of wimlib 1.13.5, 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 @@ -411,7 +411,7 @@ #define WIMLIB_MINOR_VERSION 13 /** Patch version of the library (for example, the 5 in 1.2.5). */ -#define WIMLIB_PATCH_VERSION 4 +#define WIMLIB_PATCH_VERSION 5 #ifdef __cplusplus extern "C" { diff --git a/tools/get-version-number b/tools/get-version-number index 15f256cc..c6b3cac9 100755 --- a/tools/get-version-number +++ b/tools/get-version-number @@ -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.13.4" + vers="1.13.5" fi echo "$vers" diff --git a/tools/update-version b/tools/update-version index 78982196..e8281f55 100755 --- a/tools/update-version +++ b/tools/update-version @@ -23,7 +23,7 @@ newver="${newmajor}.${newminor}.${newpatch}" pat='This is wimlib version [^[:space:]]\+ ([^[:space:]]\+ [^[:space:]]\+)' sed -i "s/$pat/This is wimlib version $newver ($newmonth $newyear)/" README -sed -i "s/$oldver/$newver/" tools/get-version-number +sed -i "s/$oldver/$newver/" tools/get-version-number README.WINDOWS sed -i -e 's/\(#define WIMLIB_MAJOR_VERSION[[:space:]]\+\)[[:digit:]]\+/\1'$newmajor'/' \ -e 's/\(#define WIMLIB_MINOR_VERSION[[:space:]]\+\)[[:digit:]]\+/\1'$newminor'/' \ -- 2.43.0