v1.13.5

diff --git a/Makefile.am b/Makefile.am
index d3e782352d626d2036f9a93453c92d01c63ee76b..84420a3255742c2f176849f86d06e18d4b30f597 100644 (file)
--- 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 0c83a08a84cb0ec6ac0110dc1581cfa057b75c12..4ea589f3c7094605e56db6bee060eac9c5413aba 100644 (file)
--- 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 6715a1f669d9b1223e8fa69327ab0652bef76bae..8ee586f6704f8e798155f24559e6bab04a7073b9 100644 (file)
--- 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 ad03e1650bd7a8fdd642d1cf08324a43c009d392..f6e6612184f9b0b20b45ee7e26b3c486965912f2 100644 (file)
--- 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 c357bc1e925f5bf6d680c3848eed00d3ef6418dc..896a3a5e8ed35f8e9d30c0980a34b7005b8d67bd 100644 (file)
--- 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 397eb9c4d88f6dac4d1c133c367e998683319200..e7543a634073686b0ffc68f8240f6749a2445db0 100644 (file)
--- 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 8271b7e6d211262d891c814c61a3d553337703a6..20acbc2a76a0709f656dfddacccd3c4073783d69 100644 (file)
--- 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 0508f610b7ce2a1bf020e5c587395e979ccc48b1..c670d7cc40749e9fd3c65f2490da095cd88b0589 100644 (file)
--- 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 bd0da24b187cac12c48ed0d71e3b4e009aaf8cad..31b4181bda987e3c6e4eb67220e83f31036794aa 100644 (file)
--- 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 fbe378cc0872909a6f9f683db7af22b409c0d2d5..2a176c0d6e00c4e438526053ba3ef0675de53e4a 100644 (file)
--- 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 05aa08037359ad41b0425158b7a4e3b224cc751f..89dce64121c919e44b4fdf26ca40e94fc2766c14 100644 (file)
--- 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 a4aa17d5b9b9bed20b04d3915b8947b0325f2a4c..eb5451f44d729807dab4a5c0f83a064e9e22abc9 100644 (file)
--- 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 1035d4ac709004562fc5c5a7b6b5eb36b8445b67..8a7a30fbeaac44b6c74503e5f1dd77a0b1df40d9 100644 (file)
--- 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 de64f6bf138a11be6272350beddca47e58e0a853..d16eec80cfa10d6538d4881dd4b2a98f976c0c29 100644 (file)
--- 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 d0c1f6b9fa01292d91636a4224b19c6b42777eb4..ef9234e46cffa348a9ca3dc64b017bad27cd3b5f 100644 (file)
--- 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 dabf6b88daedf72eb25191b3f8a1053931e0cb3f..e52f433a60b8f5b9e06da1e8df4b5f113f72cc6b 100644 (file)
--- 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 450be81a81a29af2566576705faafd3b6f4fdd26..6d140da7ae197e8a6403da28e03184a7b0848f63 100644 (file)
--- 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 f1cfb4a1edc92c9b8187f4529e535a87f08bcd0b..d32ca8f9c10554f2d754eb90c3d64eb43680ee04 100644 (file)
--- 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 41d08b887a45378c0502f092a000dfdee715da42..83a4784ab77cd201867097468c51d9edb28f7212 100644 (file)
--- 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 b5cc66fad5940ad4ae77dddacaf2508a0bbf1780..c032429d6e9d1863fd72f2273f7bcee55b5f0e86 100644 (file)
--- 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 15f256cc103abc1f4a5ae4496929d12a1fd2bd55..c6b3cac95548f59cc30a7a0c306f6a508476dd5f 100755 (executable)
--- 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 7898219631008c53ea72180597ec9d147c44de4a..e8281f557207ba8d0938582d64056a04adde45fd 100755 (executable)
--- 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'/' \