Update version: v1.7.0-BETA

There are too many changes to call the next release 1.6.3.

diff --git a/NEWS b/NEWS
index b6125877f73233847ce313abab49c809bb06f037..f4074bd36e6d9bae2160cf747da522e7f18ad1c5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 Only the most important changes more recent than version 0.6 are noted here.
 
-Version 1.6.3-BETA:
+Version 1.7.0-BETA:
        Improved compatibility with version 3584 WIM / ESD files.
 
        Performance improvements, including for extraction.

diff --git a/README b/README
index 9a0dd07346bbf3ab7712d674c4e15a428ab30eea..3a0ef00b5ab202b16871b91ff77d2567450e2504 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                                   INTRODUCTION
 
-This is wimlib version 1.6.3 (May 2014).  wimlib is a C library for
+This is wimlib version 1.7.0-BETA (May 2014).  wimlib is a C library for
 creating, modifying, extracting, and mounting files in the Windows Imaging
 Format (WIM files).  These files are normally created using the ImageX
 (imagex.exe) or Dism (Dism.exe) utilities on Windows, but wimlib is distributed

diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 8bb988df4ce5f5a6f16d0896e907d2ca74ed4f58..28458460a511c04fa0092108f86b234042f81c91 100644 (file)
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Eric Biggers <ebiggers3 at gmail dot com>
 
 pkgname=wimlib
-pkgver=1.6.3
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="A library and program to extract, create, and modify WIM files"
 arch=("i686" "x86_64")

diff --git a/configure.ac b/configure.ac
index b182ae70087572511e8b83d1ff93bde86337c7f6..ac5bee1ef6ae1bc18ea860feaad585f948e73328 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.6.3-BETA], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.7.0-BETA], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/debian/changelog b/debian/changelog
index 29c3535973473d4450c883bcf8f6da2e8c849491..0f40e9c3553e1888002e5852a68f9c00e44fb483 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-wimlib (1.6.3-1) unstable; urgency=low
+wimlib (1.7.0-1) unstable; urgency=low
 
-  * Update to v1.6.3
+  * Update to v1.7.0
 
- -- Eric Biggers <ebiggers3@gmail.com>  Thu, 08 May 2014 22:22:31 -0500
+ -- Eric Biggers <ebiggers3@gmail.com>  Fri, 23 May 2014 00:05:54 -0500
 
 wimlib (1.6.2-1) unstable; urgency=low
 

diff --git a/doc/man1/imagex-apply.1.in b/doc/man1/imagex-apply.1.in
index 53557ca8805f828c5d2574be98790ea153a2159f..5aec9b3fb30cc7b9450d782fea7a32c3531db99f 100644 (file)
--- a/doc/man1/imagex-apply.1.in
+++ b/doc/man1/imagex-apply.1.in
@@ -124,7 +124,7 @@ mode:
 .IP \[bu] 4
 Encrypted files will not be extracted.
 .IP \[bu]
-wimlib v1.6.3 and later:  Sparse file attributes will not be extracted (same
+wimlib v1.7.0 and later:  Sparse file attributes will not be extracted (same
 behavior as ImageX/DISM/WIMGAPI).  wimlib v1.6.2 and earlier:  Although sparse
 file attributes will be applied, the full data will be extracted to each sparse
 file, so extracted "sparse" files may not actually contain any sparse regions.

diff --git a/doc/man1/imagex-capture.1.in b/doc/man1/imagex-capture.1.in
index 073e1cab000c5ce2616d25e3cc85de723e204c08..b1f726752ea1794db6911f697d46a5c2074a316b 100644 (file)
--- a/doc/man1/imagex-capture.1.in
+++ b/doc/man1/imagex-capture.1.in
@@ -343,11 +343,10 @@ that may be present on the filesystem.
 .TP
 \fB--unix-data\fR
 (UNIX-like systems only) Store the UNIX owner, group, and mode of all captured
-files.  This is done by adding a special alternate data stream to each directory
-entry that contains this information.  Please note that this flag is for
-convenience only, in case you want to use \fB@IMAGEX_PROGNAME@\fR to archive
-files on UNIX.  Microsoft's software will not understand this special
-information.
+files.  This is done by adding a special tagged metadata item to each directory
+entry that contains this information.  This information should be ignored by the
+Microsoft implementation.  (Note: the way that UNIX data is stored was changed
+in wimlib v1.7.0 and is not backwards or forward compatible.)
 .TP
 \fB--no-acls\fR
 Do not capture files' security descriptors.
@@ -578,11 +577,6 @@ such names and quit extracting the image partway through.  (It perhaps is worth
 pointing out that Windows' own default filesystem, NTFS, supports these
 characters, although Windows does not!)
 .IP \[bu]
-WIMs captured with \fB--unix-data\fR should be assumed to be incompatible with
-Microsoft's software.  However, the UNIX data format used in wimlib v1.6.3 and
-later uses reserved fields in the WIM dentries which seem to be ignored by the
-Microsoft implementation as of Windows 8.1.
-.IP \[bu]
 Pipable WIMs are incompatible with Microsoft's software.  Pipable WIMs are
 created only if \fIWIMFILE\fR was specified as "-" (standard output) or if
 the \fB--pipable\fR flag was specified.

diff --git a/doc/man1/imagex.1.in b/doc/man1/imagex.1.in
index 53a4b786900387f0d9401ee25354230430ed02ea..561c52b47132074929ee3f7ec5dc04702e3991a9 100644 (file)
--- a/doc/man1/imagex.1.in
+++ b/doc/man1/imagex.1.in
@@ -153,6 +153,10 @@ to standard output or read from standard input.  This can be used to pipe images
 to or from a server over the network to implement fast filesystem imaging and
 restore.
 .IP \[bu]
+On UNIX-like systems, support for saving and restoring UNIX uids (user IDs),
+gids (group IDs), and modes to/from WIM images.  This is a wimlib extension, but
+the Microsoft implementation ignores this extra metadata.
+.IP \[bu]
 Multithreaded compression.  By default, data compression is multithreaded and
 will use all available processors.  In most cases, this can be changed by the
 \fB--threads\fR option.
@@ -163,8 +167,8 @@ can do better than the equivalent Microsoft implementations.
 .IP \[bu]
 "ESD file" support.  As mentioned in \fBBACKGROUND INFORMATION\fR, "ESD files"
 use a new WIM format that features solid blocks and LZMS compression.  This
-support was first present in wimlib v1.6.0, but later v1.6 releases have
-improved compatibility.
+support was first present in wimlib v1.6.0, but v1.7.0 and later have improved
+compatibility.
 .IP \[bu]
 Mounting WIM images.  This relies on FUSE (Filesystem in UserSpacE) and is only
 supported on compatible UNIX-like systems, in particular Linux.  FreeBSD may

diff --git a/include/wimlib.h b/include/wimlib.h
index 110b0fa5ad8d8c3fb7b4849cf2aecb2c03ae8080..f28e971fc26c9df26ec890c4d6b78b91b8f1a692 100644 (file)
--- a/include/wimlib.h
+++ b/include/wimlib.h
@@ -33,7 +33,7 @@
  *
  * @section sec_intro Introduction
  *
- * This is the documentation for the library interface of wimlib 1.6.3, a C
+ * This is the documentation for the library interface of wimlib 1.7.0, a C
  * library for creating, modifying, extracting, and mounting files in the
  * Windows Imaging Format.  This documentation is intended for developers only.
  * If you have installed wimlib and want to know how to use the @b wimlib-imagex
@@ -301,9 +301,9 @@
  * such as wimlib_join(), also take the progress function directly using an
  * extended version of the function, such as wimlib_join_with_progress().
  *
- * In wimlib v1.6.3 and later, progress functions are no longer just
+ * In wimlib v1.7.0 and later, progress functions are no longer just
  * unidirectional.  You can now return ::WIMLIB_PROGRESS_STATUS_ABORT to cause
- * the current operation to be aborted.  wimlib v1.6.3 also added the third
+ * the current operation to be aborted.  wimlib v1.7.0 also added the third
  * argument to ::wimlib_progress_func_t, which is a user-supplied context.
  */
 
@@ -353,10 +353,10 @@
 #define WIMLIB_MAJOR_VERSION 1
 
 /** Minor version of the library (for example, the 2 in 1.2.5). */
-#define WIMLIB_MINOR_VERSION 6
+#define WIMLIB_MINOR_VERSION 7
 
 /** Patch version of the library (for example, the 5 in 1.2.5). */
-#define WIMLIB_PATCH_VERSION 3
+#define WIMLIB_PATCH_VERSION 0
 
 #ifdef __cplusplus
 extern "C" {
@@ -932,7 +932,7 @@ union wimlib_progress_info {
                /** Name of the split WIM part that is about to be started
                 * (::WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART) or has just been
                 * finished (::WIMLIB_PROGRESS_MSG_SPLIT_END_PART).
-                * As of wimlib v1.6.3, the library user may change this when
+                * As of wimlib v1.7.0, the library user may change this when
                 * receiving ::WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART in order to
                 * cause the next split WIM part to be written to a different
                 * location.  */

diff --git a/rpm/wimtools.spec b/rpm/wimtools.spec
index 2eecf1b8bff1a0894264e7655f38db0603aa1c23..a0df471cad2051bd006f755e6257e03477bc48e5 100644 (file)
--- a/rpm/wimtools.spec
+++ b/rpm/wimtools.spec
@@ -1,6 +1,6 @@
 Name:      wimtools
 Summary:   Tools to create, extract, modify, and mount WIM files
-Version:   1.6.3
+Version:   1.7.0
 Release:   1
 License:   GPLv3+
 URL:       http://sourceforge.net/projects/wimlib

diff --git a/src/write.c b/src/write.c
index 2b8347da973a1f20bd05dc15eed472f0dff374c3..27463d90d059879426f9df0f17121df8e08f4fea 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -1569,7 +1569,7 @@ wim_write_stream_list(WIMStruct *wim,
 
        write_resource_flags = write_flags_to_resource_flags(write_flags);
 
-       /* wimlib v1.6.3: pack streams by default if the WIM version has been
+       /* wimlib v1.7.0: pack streams by default if the WIM version has been
         * set to WIM_VERSION_PACKED_STREAMS and at least one stream in the
         * WIM's lookup table is located in a packed resource (may be the same
         * WIM, or a different one in the case of export).  */

diff --git a/update-version b/update-version
index b864be46515ada807ce5496b8b2a9feade45710c..ee16c53c123e7d9a40ea0b05a2095aee1538442a 100755 (executable)
--- a/update-version
+++ b/update-version
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-oldver='1\.6\.2'
-oldmonth=March
+oldver='1\.6\.3'
+oldmonth=May
 oldyear=2014
 
 newmajor=1
-newminor=6
-newpatch=3
+newminor=7
+newpatch=0
 newmonth=May
 newyear=2014