Hello community, here is the log from the commit of package wimlib for openSUSE:Factory checked in at 2020-08-17 12:04:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wimlib (Old) and /work/SRC/openSUSE:Factory/.wimlib.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wimlib" Mon Aug 17 12:04:11 2020 rev:3 rq:827013 version:1.13.2 Changes: -------- --- /work/SRC/openSUSE:Factory/wimlib/wimlib.changes 2019-07-18 15:23:26.980111620 +0200 +++ /work/SRC/openSUSE:Factory/.wimlib.new.3399/wimlib.changes 2020-08-17 12:04:53.578677966 +0200 @@ -1,0 +2,11 @@ +Sun Aug 16 11:43:24 UTC 2020 - Dirk Mueller <dmuel...@suse.com> + +- update to 1.13.2: + Prevented miscompilation with gcc 10 at -O3 + Avoided some compiler warnings with gcc 9 and later. + The 'mkwinpeimg' script now also looks for syslinux modules in + /usr/share/syslinux, to handle where openSUSE installs them. + Removed obsolete packaging files from the source tree. +- remove mkwinpeimg-syslinux-modules-may-be-in-usr-share-sysl.patch (upstream) + +------------------------------------------------------------------- Old: ---- mkwinpeimg-syslinux-modules-may-be-in-usr-share-sysl.patch wimlib-1.13.1.tar.gz New: ---- wimlib-1.13.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wimlib.spec ++++++ --- /var/tmp/diff_new_pack.8IqllK/_old 2020-08-17 12:04:54.466678461 +0200 +++ /var/tmp/diff_new_pack.8IqllK/_new 2020-08-17 12:04:54.470678464 +0200 @@ -1,7 +1,7 @@ # # spec file for package wimlib # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +18,13 @@ %define so_version 15 Name: wimlib -Version: 1.13.1 +Version: 1.13.2 Release: 0 Summary: Library to extract, create, modify, and mount WIM files License: GPL-3.0-or-later AND LGPL-3.0-or-later AND CC0-1.0 Group: Development/Libraries/C and C++ URL: https://wimlib.net Source: https://wimlib.net/downloads/wimlib-%{version}.tar.gz -Patch0: mkwinpeimg-syslinux-modules-may-be-in-usr-share-sysl.patch BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(fuse) @@ -71,7 +70,6 @@ %prep %setup -q -%autopatch -p1 %build %configure --disable-static \ ++++++ wimlib-1.13.1.tar.gz -> wimlib-1.13.2.tar.gz ++++++ ++++ 5191 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/Makefile.am new/wimlib-1.13.2/Makefile.am --- old/wimlib-1.13.1/Makefile.am 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/Makefile.am 2020-05-24 20:22:36.000000000 +0200 @@ -19,8 +19,7 @@ EXTRA_DIST = README README.WINDOWS \ COPYING COPYING.GPLv3 COPYING.LGPLv3 COPYING.CC0 \ - examples \ - debian rpm + examples ############################################################################## # Library # @@ -201,7 +200,7 @@ $(LIBFUSE_CFLAGS) \ $(LIBCRYPTO_CFLAGS) -libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 31:0:16 +libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 32:0:17 libwim_la_LIBADD = \ $(PTHREAD_LIBS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/NEWS new/wimlib-1.13.2/NEWS --- old/wimlib-1.13.1/NEWS 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/NEWS 2020-05-24 20:22:36.000000000 +0200 @@ -1,3 +1,14 @@ +Version 1.13.2: + Prevented miscompilation with gcc 10 at -O3 + (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94994). + + Avoided some compiler warnings with gcc 9 and later. + + The 'mkwinpeimg' script now also looks for syslinux modules in + /usr/share/syslinux, to handle where openSUSE installs them. + + Removed obsolete packaging files from the source tree. + Version 1.13.1: Fixed a crash or incorrect output during LZMS compression with a compression level greater than 50 and a chunk size greater than 64 MiB. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/README new/wimlib-1.13.2/README --- old/wimlib-1.13.1/README 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/README 2020-05-24 20:22:36.000000000 +0200 @@ -1,6 +1,6 @@ INTRODUCTION -This is wimlib version 1.13.1 (May 2019). wimlib is a C library for +This is wimlib version 1.13.2 (May 2020). 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, @@ -10,8 +10,7 @@ To install wimlib and wimlib-imagex on UNIX-like systems, you can compile from source (e.g. './configure && make && sudo make install'). Alternatively, check -if a package has already been prepared for your operating system. Example files -for Debian and RPM packaging are in the debian/ and rpm/ directories. +if a package has already been prepared for your operating system. To install wimlib and wimlib-imagex on Windows, just download and extract the ZIP file containing the latest binaries. See README.WINDOWS for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/build-aux/ar-lib new/wimlib-1.13.2/build-aux/ar-lib --- old/wimlib-1.13.1/build-aux/ar-lib 2019-02-09 23:32:31.000000000 +0100 +++ new/wimlib-1.13.2/build-aux/ar-lib 2020-05-24 19:47:43.000000000 +0200 @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-03-01.08; # UTC +scriptversion=2019-07-04.01; # UTC -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2020 Free Software Foundation, Inc. # Written by Peter Rosin <p...@lysator.liu.se>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -65,7 +65,7 @@ mingw) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin) + cygwin | msys) file=`cygpath -m "$file" || echo "$file"` ;; wine) @@ -224,10 +224,11 @@ esac done else - $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member - do - $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? - done + $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \ + | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done fi elif test -n "$quick$replace"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/build-aux/compile new/wimlib-1.13.2/build-aux/compile --- old/wimlib-1.13.1/build-aux/compile 2019-02-09 23:32:31.000000000 +0100 +++ new/wimlib-1.13.2/build-aux/compile 2020-05-24 19:47:43.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/build-aux/missing new/wimlib-1.13.2/build-aux/missing --- old/wimlib-1.13.1/build-aux/missing 2019-02-09 23:32:31.000000000 +0100 +++ new/wimlib-1.13.2/build-aux/missing 2020-05-24 19:47:43.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/build-aux/test-driver new/wimlib-1.13.2/build-aux/test-driver --- old/wimlib-1.13.1/build-aux/test-driver 2019-02-09 23:32:31.000000000 +0100 +++ new/wimlib-1.13.2/build-aux/test-driver 2020-05-24 19:47:43.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/configure.ac new/wimlib-1.13.2/configure.ac --- old/wimlib-1.13.1/configure.ac 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/configure.ac 2020-05-24 20:22:36.000000000 +0200 @@ -1,6 +1,6 @@ ############################################################################### -AC_INIT([wimlib], [1.13.1], [ebigge...@gmail.com]) +AC_INIT([wimlib], [1.13.2], [ebigge...@gmail.com]) AC_CONFIG_SRCDIR([src/wim.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -225,7 +225,7 @@ AC_MSG_CHECKING([whether to include error messages]) AC_ARG_ENABLE([error_messages], - AS_HELP_STRING([--disable-error-messages], [do not compile in error messsages]), + AS_HELP_STRING([--disable-error-messages], [do not compile in error messages]), [ENABLE_ERROR_MESSAGES=$enableval], [ENABLE_ERROR_MESSAGES=yes]) AC_MSG_RESULT([$ENABLE_ERROR_MESSAGES]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/changelog new/wimlib-1.13.2/debian/changelog --- old/wimlib-1.13.1/debian/changelog 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/debian/changelog 1970-01-01 01:00:00.000000000 +0100 @@ -1,246 +0,0 @@ -wimlib (1.13.1-1) unstable; urgency=low - - * Update to v1.13.1 - - -- Eric Biggers <ebigge...@gmail.com> Mon, 06 May 2019 19:23:40 -0700 - -wimlib (1.13.0-1) unstable; urgency=low - - * Update to v1.13.0 - - -- Eric Biggers <ebigge...@gmail.com> Thu, 22 Nov 2018 17:04:35 -0800 - -wimlib (1.12.0-1) unstable; urgency=low - - * Update to v1.12.0 - - -- Eric Biggers <ebigge...@gmail.com> Sat, 29 Jul 2017 12:01:11 -0700 - -wimlib (1.11.0-1) unstable; urgency=low - - * Update to v1.11.0 - - -- Eric Biggers <ebigge...@gmail.com> Tue, 17 Jan 2017 19:41:32 -0800 - -wimlib (1.10.0-1) unstable; urgency=low - - * Update to v1.10.0 - - -- Eric Biggers <ebigge...@gmail.com> Fri, 19 Aug 2016 20:12:30 -0700 - -wimlib (1.9.2-1) unstable; urgency=low - - * Update to v1.9.2 - - -- Eric Biggers <ebigge...@gmail.com> Tue, 31 May 2016 20:40:27 -0500 - -wimlib (1.9.1-1) unstable; urgency=low - - * Update to v1.9.1 - - -- Eric Biggers <ebigge...@gmail.com> Fri, 11 Mar 2016 21:54:00 -0600 - -wimlib (1.9.0-1) unstable; urgency=low - - * Update to v1.9.0 - - -- Eric Biggers <ebigge...@gmail.com> Sat, 30 Jan 2016 23:58:54 -0600 - -wimlib (1.8.3-1) unstable; urgency=low - - * Update to v1.8.3 - - -- Eric Biggers <ebigge...@gmail.com> Sat, 14 Nov 2015 13:29:29 -0600 - -wimlib (1.8.2-1) unstable; urgency=low - - * Update to v1.8.2 - - -- Eric Biggers <ebigge...@gmail.com> Sat, 22 Aug 2015 09:19:10 -0500 - -wimlib (1.8.1-1) unstable; urgency=low - - * Update to v1.8.1 - - -- Eric Biggers <ebigge...@gmail.com> Sat, 16 May 2015 12:35:15 -0500 - -wimlib (1.8.0-1) unstable; urgency=low - - * Update to v1.8.0 - - -- Eric Biggers <ebigge...@gmail.com> Tue, 24 Feb 2015 22:54:49 -0600 - -wimlib (1.7.4-1) unstable; urgency=low - - * Update to v1.7.4 - - -- Eric Biggers <ebigge...@gmail.com> Fri, 02 Jan 2015 20:01:28 -0600 - -wimlib (1.7.3-1) unstable; urgency=low - - * Update to v1.7.3 - - -- Eric Biggers <ebigge...@gmail.com> Thu, 13 Nov 2014 18:11:27 -0600 - -wimlib (1.7.2-1) unstable; urgency=low - - * Update to v1.7.2 - - -- Eric Biggers <ebigge...@gmail.com> Thu, 02 Oct 2014 20:24:27 -0500 - -wimlib (1.7.1-1) unstable; urgency=low - - * Update to v1.7.1 - - -- Eric Biggers <ebigge...@gmail.com> Wed, 06 Aug 2014 22:34:49 -0500 - -wimlib (1.7.0-1) unstable; urgency=low - - * Update to v1.7.0 - - -- Eric Biggers <ebigge...@gmail.com> Sat, 07 Jun 2014 21:34:56 -0500 - -wimlib (1.6.2-1) unstable; urgency=low - - * Update to v1.6.2 - - -- Eric Biggers <ebigge...@gmail.com> Fri, 14 Mar 2014 15:59:59 -0500 - -wimlib (1.6.1-1) unstable; urgency=low - - * Update to v1.6.1 - - -- Eric Biggers <ebigge...@gmail.com> Sun, 12 Jan 2014 23:13:44 -0600 - -wimlib (1.6.0-1) unstable; urgency=low - - * Update to v1.6.0 - - -- Eric Biggers <ebigge...@gmail.com> Sat, 28 Dec 2013 11:13:54 -0600 - -wimlib (1.5.3-1) unstable; urgency=low - - * Update to v1.5.3 - - -- Eric Biggers <ebigge...@gmail.com> Sun, 08 Dec 2013 00:34:21 -0600 - -wimlib (1.5.2-1) unstable; urgency=low - - * Update to v1.5.2 - - -- Eric Biggers <ebigge...@gmail.com> Sun, 17 Nov 2013 17:10:43 -0600 - -wimlib (1.5.1-1) unstable; urgency=low - - * Update to v1.5.1 - - -- Eric Biggers <ebigge...@gmail.com> Fri, 11 Oct 2013 09:34:20 -0500 - -wimlib (1.5.0-1) unstable; urgency=low - - * Update to v1.5.0 - - -- Eric Biggers <ebigge...@gmail.com> Fri, 16 Aug 2013 20:51:08 -0500 - -wimlib (1.4.2-1) unstable; urgency=low - - * Update to v1.4.2 - - -- Eric Biggers <ebigge...@gmail.com> Tue, 11 Jun 2013 19:46:09 -0500 - -wimlib (1.4.1-1) precise; urgency=low - - * Update to v1.4.1 - - -- Eric Biggers <ebigge...@gmail.com> Mon, 20 May 2013 14:01:44 -0500 - -wimlib (1.4.0-1) unstable; urgency=low - - * Update to v1.4.0; moved wimlib-imagex and mkwinpeimg to "wimtools" - package. - - -- Eric Biggers <ebigge...@gmail.com> Sun, 12 May 2013 22:59:55 -0500 - -wimlib (1.3.3-1) unstable; urgency=low - - * Update to v1.3.3 - - -- Eric Biggers <ebigge...@gmail.com> Mon, 08 Apr 2013 00:16:50 -0500 - -wimlib (1.3.2-1) unstable; urgency=low - - * Update to v1.3.2 - - -- Eric Biggers <ebigge...@gmail.com> Sat, 23 Mar 2013 20:00:14 -0500 - -wimlib (1.3.1-1) unstable; urgency=low - - * Update to v1.3.1 - - -- Eric Biggers <ebigge...@gmail.com> Fri, 22 Mar 2013 01:05:27 -0500 - -wimlib (1.3.0-1) unstable; urgency=low - - * Update to v1.3.0 - - -- Eric Biggers <ebigge...@gmail.com> Sun, 10 Mar 2013 18:46:29 -0700 - -wimlib (1.2.6-1) unstable; urgency=low - - * Update to v1.2.6 - - -- Eric Biggers <ebigge...@gmail.com> Tue, 05 Mar 2013 14:26:59 -0600 - -wimlib (1.2.5-1) unstable; urgency=low - - * Update to v1.2.5 - - -- Eric Biggers <ebigge...@gmail.com> Tue, 05 Feb 2013 20:26:47 -0600 - -wimlib (1.2.4-1) unstable; urgency=low - - * Update to v1.2.4 - - -- Eric Biggers <ebigge...@gmail.com> Tue, 29 Jan 2013 20:19:29 -0600 - -wimlib (1.2.3-1) unstable; urgency=low - - * Update to v1.2.3 - - -- Eric Biggers <ebigge...@gmail.com> Mon, 31 Dec 2012 14:33:36 -0600 - -wimlib (1.2.2-1) unstable; urgency=low - - * Update to v1.2.2 - - -- Eric Biggers <ebigge...@gmail.com> Fri, 21 Dec 2012 12:39:22 -0600 - -wimlib (1.2.1-1) unstable; urgency=low - - * Update to v1.2.1 - - -- Eric Biggers <ebigge...@gmail.com> Tue, 18 Dec 2012 11:25:02 -0600 - -wimlib (1.2.0-1) unstable; urgency=low - - * Update to v1.2.0 - - -- Eric Biggers <ebigge...@gmail.com> Thu, 22 Nov 2012 14:35:33 -0600 - -wimlib (1.1.0-1) unstable; urgency=low - - * Update to v1.1.0 - - -- Eric Biggers <ebigge...@gmail.com> Sun, 18 Nov 2012 13:49:54 -0600 - -wimlib (1.0.4-1) unstable; urgency=low - - * Update to v1.0.4 - - -- Eric Biggers <ebigge...@gmail.com> Mon, 29 Oct 2012 03:57:13 +0000 - -wimlib (0.6.3-1) unstable; urgency=low - - * Initial release of Debian package - - -- Eric Biggers <ebigge...@gmail.com> Tue, 01 May 2012 23:48:40 -0500 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/compat new/wimlib-1.13.2/debian/compat --- old/wimlib-1.13.1/debian/compat 2014-01-01 09:00:00.000000000 +0100 +++ new/wimlib-1.13.2/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/control new/wimlib-1.13.2/debian/control --- old/wimlib-1.13.1/debian/control 2017-09-20 04:55:16.000000000 +0200 +++ new/wimlib-1.13.2/debian/control 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -Source: wimlib -Priority: optional -Maintainer: Eric Biggers <ebigge...@gmail.com> -Build-Depends: debhelper (>= 8.9.7), autotools-dev, pkg-config, - libfuse-dev, libxml2-dev, libssl-dev, - ntfs-3g-dev (>= 2011.4.12), attr -Build-Depends-Indep: doxygen -Standards-Version: 3.9.3 -Section: libs -Homepage: https://wimlib.net -Vcs-Git: git://wimlib.net/wimlib - -Package: wimlib15 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: wimtools -Description: Library to extract, create, modify, and mount WIM files - wimlib is a C library for extracting, creating, modifying, and mounting WIM - (Windows Imaging) files. WIM is an archive format designed primarily for - archiving Windows filesystems. It features single-instancing and LZ77-based - compression, and is used by Microsoft to distribute and deploy Windows Vista and - later. wimlib is an independent implementation of an API for handling WIM - files, available on both UNIX-like systems and Windows, that provides features - similar to Microsoft's WIMGAPI, as well as additional features such as support - for pipable WIM files and programatically making changes to WIM images without - mounting them. - - -Package: wimtools -Section: utils -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: genisoimage, mtools, syslinux, cabextract -Description: Tools to extract, create, modify, and mount WIM files - Tools to extract, create, modify, and mount WIM (Windows Imaging) files. WIM is - an archive format designed primarily for archiving Windows filesystems. It - features single-instancing and LZ77-based compression and is used by Microsoft - to distribute and deploy Windows Vista and later. WIM files are normally - created by using the `imagex.exe' utility on Windows, but this package contains - a free implementation of ImageX called "wimlib-imagex" that is designed to work - on both UNIX-like systems and Windows. - . - In addition to the usual extract/create/update support, wimlib-imagex allows you - to mount WIM images readonly or read-write, and it even allows you to extract or - create a WIM image directly to/from an unmounted NTFS volume. This makes it - possible to, from Linux, back up or deploy a Windows OS directly to or from a - WIM file, such as the install.wim distributed on the Windows installation media. - . - This package also contains a script to make a customized Windows PE image based - on the capabilities provided by wimlib-imagex. - -Package: wimlib-dev -Section: libdevel -Architecture: any -Depends: wimlib15 (= ${binary:Version}), ${misc:Depends} -Suggests: wimlib-doc -Description: wimlib - development files - Development files for wimlib - -Package: wimlib-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Description: wimlib - API documentation - API documentation for wimlib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/copyright new/wimlib-1.13.2/debian/copyright --- old/wimlib-1.13.1/debian/copyright 2017-09-20 04:55:16.000000000 +0200 +++ new/wimlib-1.13.2/debian/copyright 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -Format: http://dep.debian.net/deps/dep5 -Upstream-Name: wimlib -Source: https://wimlib.net - -Files: * -Copyright: 2012-2016 Eric Biggers <ebigge...@gmail.com> -License: GPLv3+ with exception - Unless otherwise specified, wimlib and its associated programs, scripts, - documentation, and other files may be redistributed and/or modified under the - terms of the GNU General Public License; either version 3 of the License, or (at - your option) any later version. There is NO WARRANTY, to the extent permitted - by law. See the file COPYING.GPLv3 for more details. - . - Alternatively, when not prohibited by conflict with a third-party software - license, the library portion of wimlib may be redistributed and/or modified - under the terms of the GNU Lesser General Public License; either version 3 of - the License, or (at your option) any later version. There is NO WARRANTY, to - the extent permitted by law. See the file COPYING.LGPLv3 for more details. - -Files: debian/* -License: Public domain - The Debian packaging scripts are free to be redistributed and/or modified with - no restrictions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/rules new/wimlib-1.13.2/debian/rules --- old/wimlib-1.13.1/debian/rules 2014-01-01 09:00:00.000000000 +0100 +++ new/wimlib-1.13.2/debian/rules 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 - -%: - dh $@ - -override_dh_auto_build-indep: - set -e; if type doxygen >/dev/null 2>/dev/null; \ - then \ - cd doc && doxygen; \ - fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/source/format new/wimlib-1.13.2/debian/source/format --- old/wimlib-1.13.1/debian/source/format 2014-01-01 09:00:00.000000000 +0100 +++ new/wimlib-1.13.2/debian/source/format 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.0 (native) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/watch new/wimlib-1.13.2/debian/watch --- old/wimlib-1.13.1/debian/watch 2017-09-20 04:55:16.000000000 +0200 +++ new/wimlib-1.13.2/debian/watch 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -https://wimlib.net/downloads/wimlib-(.*)\.tar\.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/wimlib-dev.install new/wimlib-1.13.2/debian/wimlib-dev.install --- old/wimlib-1.13.1/debian/wimlib-dev.install 2014-01-01 09:00:00.000000000 +0100 +++ new/wimlib-1.13.2/debian/wimlib-dev.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -usr/include/wimlib.h -usr/lib/libwim.a -usr/lib/libwim.so -usr/lib/pkgconfig/wimlib.pc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/wimlib-doc.docs new/wimlib-1.13.2/debian/wimlib-doc.docs --- old/wimlib-1.13.1/debian/wimlib-doc.docs 2016-11-27 10:30:38.000000000 +0100 +++ new/wimlib-1.13.2/debian/wimlib-doc.docs 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -doc/html -NEWS -README diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/wimlib-doc.examples new/wimlib-1.13.2/debian/wimlib-doc.examples --- old/wimlib-1.13.1/debian/wimlib-doc.examples 2014-01-01 09:00:00.000000000 +0100 +++ new/wimlib-1.13.2/debian/wimlib-doc.examples 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -examples/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/wimlib15.install new/wimlib-1.13.2/debian/wimlib15.install --- old/wimlib-1.13.1/debian/wimlib15.install 2016-11-27 10:30:38.000000000 +0100 +++ new/wimlib-1.13.2/debian/wimlib15.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/libwim.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/wimtools.docs new/wimlib-1.13.2/debian/wimtools.docs --- old/wimlib-1.13.1/debian/wimtools.docs 2016-11-27 10:30:38.000000000 +0100 +++ new/wimlib-1.13.2/debian/wimtools.docs 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -NEWS -README diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/debian/wimtools.install new/wimlib-1.13.2/debian/wimtools.install --- old/wimlib-1.13.1/debian/wimtools.install 2014-01-01 09:00:00.000000000 +0100 +++ new/wimlib-1.13.2/debian/wimtools.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/bin/* -usr/share/man/man1/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/mkwinpeimg.1 new/wimlib-1.13.2/doc/man1/mkwinpeimg.1 --- old/wimlib-1.13.1/doc/man1/mkwinpeimg.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/mkwinpeimg.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MKWINPEIMG "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH MKWINPEIMG "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME mkwinpeimg \- Make a customized bootable image of Windows PE .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimapply.1 new/wimlib-1.13.2/doc/man1/wimapply.1 --- old/wimlib-1.13.1/doc/man1/wimapply.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimapply.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMAPPLY "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMAPPLY "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimapply \- Apply a WIM image .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimcapture.1 new/wimlib-1.13.2/doc/man1/wimcapture.1 --- old/wimlib-1.13.1/doc/man1/wimcapture.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimcapture.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMCAPTURE "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMCAPTURE "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimcapture, wimappend \- Capture or append a WIM image .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimdelete.1 new/wimlib-1.13.2/doc/man1/wimdelete.1 --- old/wimlib-1.13.1/doc/man1/wimdelete.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimdelete.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMDELETE "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMDELETE "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimdelete \- Delete an image from a WIM archive .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimdir.1 new/wimlib-1.13.2/doc/man1/wimdir.1 --- old/wimlib-1.13.1/doc/man1/wimdir.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimdir.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMDIR "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMDIR "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimdir \- List the files contained in a WIM image .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimexport.1 new/wimlib-1.13.2/doc/man1/wimexport.1 --- old/wimlib-1.13.1/doc/man1/wimexport.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimexport.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMEXPORT "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMEXPORT "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimexport \- Export image(s) from a WIM archive .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimextract.1 new/wimlib-1.13.2/doc/man1/wimextract.1 --- old/wimlib-1.13.1/doc/man1/wimextract.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimextract.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMEXTRACT "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMEXTRACT "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimextract \- Extract files from a WIM image .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wiminfo.1 new/wimlib-1.13.2/doc/man1/wiminfo.1 --- old/wimlib-1.13.1/doc/man1/wiminfo.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wiminfo.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMINFO "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMINFO "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wiminfo \- Display or change information about a WIM file or image .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimjoin.1 new/wimlib-1.13.2/doc/man1/wimjoin.1 --- old/wimlib-1.13.1/doc/man1/wimjoin.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimjoin.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMJOIN "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMJOIN "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimjoin\- Join a split WIM into a standalone WIM .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimlib-imagex.1 new/wimlib-1.13.2/doc/man1/wimlib-imagex.1 --- old/wimlib-1.13.1/doc/man1/wimlib-imagex.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimlib-imagex.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX 1 "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMLIB-IMAGEX 1 "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimlib-imagex \- Extract, create, modify, or mount a WIM archive .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimmount.1 new/wimlib-1.13.2/doc/man1/wimmount.1 --- old/wimlib-1.13.1/doc/man1/wimmount.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimmount.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMMOUNT "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMMOUNT "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimmount, wimmountrw, wimunmount \- Mount or unmount a WIM image .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimoptimize.1 new/wimlib-1.13.2/doc/man1/wimoptimize.1 --- old/wimlib-1.13.1/doc/man1/wimoptimize.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimoptimize.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMOPTIMIZE "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMOPTIMIZE "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimoptimize \- Optimize a WIM archive .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimsplit.1 new/wimlib-1.13.2/doc/man1/wimsplit.1 --- old/wimlib-1.13.1/doc/man1/wimsplit.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimsplit.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMSPLIT "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMSPLIT "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimsplit \- Split a WIM archive into multiple parts .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimupdate.1 new/wimlib-1.13.2/doc/man1/wimupdate.1 --- old/wimlib-1.13.1/doc/man1/wimupdate.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimupdate.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMUPDATE "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMUPDATE "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimupdate \- Update a WIM image .SH SYNOPSIS @@ -220,7 +220,7 @@ .PP Add some files and directories to a WIM image. Note that the first path of each \fBadd\fR command specifies the files to add, while the second path of each -\fBadd\fR command specify the locations at which to to add them inside the WIM +\fBadd\fR command specify the locations at which to add them inside the WIM image: .PP .RS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/doc/man1/wimverify.1 new/wimlib-1.13.2/doc/man1/wimverify.1 --- old/wimlib-1.13.1/doc/man1/wimverify.1 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/doc/man1/wimverify.1 2020-05-24 20:22:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WIMVERIFY "1" "May 2019" "wimlib 1.13.1" "User Commands" +.TH WIMVERIFY "1" "May 2020" "wimlib 1.13.2" "User Commands" .SH NAME wimverify \- Verify a WIM archive .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/include/wimlib/blob_table.h new/wimlib-1.13.2/include/wimlib/blob_table.h --- old/wimlib-1.13.1/include/wimlib/blob_table.h 2017-09-20 04:55:16.000000000 +0200 +++ new/wimlib-1.13.2/include/wimlib/blob_table.h 2020-02-21 05:14:39.000000000 +0100 @@ -102,7 +102,7 @@ struct wim_inode *back_inode; u32 back_stream_id; }; - } _packed_attribute; /* union is SHA1_HASH_SIZE bytes */ + }; /* Number of times this blob is referenced by file streams in WIM * images. See blob_decrement_refcnt() for information about the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/include/wimlib/inode.h new/wimlib-1.13.2/include/wimlib/inode.h --- old/wimlib-1.13.1/include/wimlib/inode.h 2018-11-23 04:23:32.000000000 +0100 +++ new/wimlib-1.13.2/include/wimlib/inode.h 2020-02-21 05:14:39.000000000 +0100 @@ -71,7 +71,7 @@ union { u8 _stream_hash[SHA1_HASH_SIZE]; struct blob_descriptor *_stream_blob; - } _packed_attribute; /* union is SHA1_HASH_SIZE bytes */ + }; /* 'stream_resolved' determines whether 'stream_hash' or 'stream_blob' * is valid as described above. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/include/wimlib/unaligned.h new/wimlib-1.13.2/include/wimlib/unaligned.h --- old/wimlib-1.13.1/include/wimlib/unaligned.h 2018-05-02 05:38:31.000000000 +0200 +++ new/wimlib-1.13.2/include/wimlib/unaligned.h 2020-05-22 07:52:37.000000000 +0200 @@ -21,25 +21,25 @@ #ifndef _WIMLIB_UNALIGNED_H #define _WIMLIB_UNALIGNED_H +#include <string.h> + #include "wimlib/compiler.h" #include "wimlib/endianness.h" #include "wimlib/types.h" #define DEFINE_UNALIGNED_TYPE(type) \ -struct type##_unaligned { \ - type v; \ -} _packed_attribute _may_alias_attribute; \ - \ static forceinline type \ load_##type##_unaligned(const void *p) \ { \ - return ((const struct type##_unaligned *)p)->v; \ + type v; \ + memcpy(&v, p, sizeof(v)); \ + return v; \ } \ \ static forceinline void \ -store_##type##_unaligned(type val, void *p) \ +store_##type##_unaligned(type v, void *p) \ { \ - ((struct type##_unaligned *)p)->v = val; \ + memcpy(p, &v, sizeof(v)); \ } DEFINE_UNALIGNED_TYPE(u16); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/include/wimlib.h new/wimlib-1.13.2/include/wimlib.h --- old/wimlib-1.13.1/include/wimlib.h 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/include/wimlib.h 2020-05-24 20:22:36.000000000 +0200 @@ -11,7 +11,7 @@ /** * @mainpage * - * This is the documentation for the library interface of wimlib 1.13.1, a C + * This is the documentation for the library interface of wimlib 1.13.2, 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 1 +#define WIMLIB_PATCH_VERSION 2 #ifdef __cplusplus extern "C" { @@ -2738,7 +2738,7 @@ * @param wim_ret * On success, a pointer to the new ::WIMStruct is written to the memory * location pointed to by this parameter. This ::WIMStruct must be freed - * using using wimlib_free() when finished with it. + * using wimlib_free() when finished with it. * * @return 0 on success; a ::wimlib_error_code value on failure. * @@ -3623,8 +3623,8 @@ * @param wim_ret * On success, a pointer to a new ::WIMStruct backed by the specified * on-disk WIM file is written to the memory location pointed to by this - * parameter. This ::WIMStruct must be freed using using wimlib_free() - * when finished with it. + * parameter. This ::WIMStruct must be freed using wimlib_free() when + * finished with it. * * @return 0 on success; a ::wimlib_error_code value on failure. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/m4/libtool.m4 new/wimlib-1.13.2/m4/libtool.m4 --- old/wimlib-1.13.1/m4/libtool.m4 2019-02-09 23:32:28.000000000 +0100 +++ new/wimlib-1.13.2/m4/libtool.m4 2020-05-24 19:47:40.000000000 +0200 @@ -728,7 +728,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/m4/ltversion.m4 new/wimlib-1.13.2/m4/ltversion.m4 --- old/wimlib-1.13.1/m4/ltversion.m4 2019-02-09 23:32:28.000000000 +0100 +++ new/wimlib-1.13.2/m4/ltversion.m4 2020-05-24 19:47:40.000000000 +0200 @@ -12,11 +12,11 @@ # serial 4221 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6.42-b88ce]) +m4_define([LT_PACKAGE_VERSION], [2.4.6.42-b88ce-dirty]) m4_define([LT_PACKAGE_REVISION], [2.4.6.42]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6.42-b88ce' +[macro_version='2.4.6.42-b88ce-dirty' macro_revision='2.4.6.42' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/programs/mkwinpeimg new/wimlib-1.13.2/programs/mkwinpeimg --- old/wimlib-1.13.1/programs/mkwinpeimg 2019-05-07 04:29:46.000000000 +0200 +++ new/wimlib-1.13.2/programs/mkwinpeimg 2020-05-24 21:13:11.000000000 +0200 @@ -20,7 +20,7 @@ script_name="$(basename "$0")" PREFIX_REG="::" -WIMLIB_VERSION=1.13.1 +WIMLIB_VERSION=1.13.2 calc_columns () { STAT_COL=80 @@ -488,7 +488,8 @@ for biosdir in \ /usr/lib/syslinux/modules/bios \ /usr/lib/syslinux/bios \ - /usr/lib/syslinux + /usr/lib/syslinux \ + /usr/share/syslinux do if [ -e "$biosdir/chain.c32" ]; then break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/programs/mkwinpeimg.in new/wimlib-1.13.2/programs/mkwinpeimg.in --- old/wimlib-1.13.1/programs/mkwinpeimg.in 2018-05-02 05:38:31.000000000 +0200 +++ new/wimlib-1.13.2/programs/mkwinpeimg.in 2019-12-07 04:01:24.000000000 +0100 @@ -488,7 +488,8 @@ for biosdir in \ /usr/lib/syslinux/modules/bios \ /usr/lib/syslinux/bios \ - /usr/lib/syslinux + /usr/lib/syslinux \ + /usr/share/syslinux do if [ -e "$biosdir/chain.c32" ]; then break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/rpm/wimtools.spec new/wimlib-1.13.2/rpm/wimtools.spec --- old/wimlib-1.13.1/rpm/wimtools.spec 2019-05-07 04:25:17.000000000 +0200 +++ new/wimlib-1.13.2/rpm/wimtools.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,92 +0,0 @@ -Name: wimtools -Summary: Tools to create, extract, modify, and mount WIM files -Version: 1.13.1 -Release: 1 -License: GPLv3+ -URL: https://wimlib.net -Packager: Eric Biggers <ebigge...@gmail.com> -Source: https://wimlib.net/downloads/wimlib-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - - -Group: Applications/System -Requires: libwim15 -%description -Tools to extract, create, modify, and mount WIM (Windows Imaging) files. WIM is -an archive format designed primarily for archiving Windows filesystems. It -features single-instancing and LZ77-based compression and is used by Microsoft -to distribute and deploy Windows Vista and later. WIM files are normally -created by using the `imagex.exe' utility on Windows, but this package contains -a free implementation of ImageX called "wimlib-imagex" that is designed to work -on both UNIX-like systems and Windows. - -In addition to the usual extract/create/update support, wimlib-imagex allows you -to mount WIM images readonly or read-write, and it even allows you to extract or -create a WIM image directly to/from an unmounted NTFS volume. This makes it -possible to, from Linux, back up or deploy a Windows OS directly to or from a -WIM file, such as the install.wim distributed on the Windows installation media. - -This package also contains a script to make a customized Windows PE image based -on the capabilities provided by wimlib-imagex. - -%package -n libwim15-devel -Summary: Development files for wimlib -Group: Development/Libraries -%description -n libwim15-devel -Development files for wimlib - -%package -n libwim15 -Summary: Library to extract, create, modify, and mount WIM files -Group: System Environment/Libraries -Requires: fuse -BuildRequires: libxml2-devel, fuse, fuse-devel, openssl-devel, attr -BuildRequires: ntfs-3g-devel, ntfsprogs, libtool, pkgconfig -%description -n libwim15 -wimlib is a C library for extracting, creating, modifying, and mounting WIM -(Windows Imaging) files. WIM is an archive format designed primarily for -archiving Windows filesystems. It features single-instancing and LZ77-based -compression, and is used by Microsoft to distribute and deploy Windows Vista and -later. wimlib is an independent implementation of an API for handling WIM -files, available on both UNIX-like systems and Windows, that provides features -similar to Microsoft's WIMGAPI, as well as additional features such as support -for pipable WIM files and programatically making changes to WIM images without -mounting them. -%post -n libwim15 -p /sbin/ldconfig -%postun -n libwim15 -p /sbin/ldconfig - -%prep -%setup -q -n wimlib-%{version} - -%build -%configure --prefix=/usr \ - --disable-rpath \ - --with-libcrypto \ - --with-ntfs-3g \ - --with-fuse -make %{?_smp_mflags} - -%install -rm -rf %{buildroot} -make DESTDIR=%{buildroot} install - -%clean -rm -rf %{buildroot} - -%files -%defattr(-, root, root) -%{_bindir}/* -%doc %{_mandir}/man1/*.1.gz -%doc README COPYING COPYING.GPLv3 - -%files -n libwim15-devel -%defattr(-, root, root) -%{_libdir}/libwim.a -%{_libdir}/libwim.so -%exclude %{_libdir}/libwim.la -%{_includedir}/wimlib.h -%{_libdir}/pkgconfig/wimlib.pc - -%files -n libwim15 -%defattr(-, root, root) -%{_libdir}/libwim.so.* -%doc COPYING COPYING.GPLv3 COPYING.LGPLv3 COPYING.CC0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/src/blob_table.c new/wimlib-1.13.2/src/blob_table.c --- old/wimlib-1.13.1/src/blob_table.c 2017-09-20 04:55:16.000000000 +0200 +++ new/wimlib-1.13.2/src/blob_table.c 2019-12-07 04:01:24.000000000 +0100 @@ -900,7 +900,7 @@ if (!table) goto oom; - /* Allocate and initalize blob descriptors from the raw blob table + /* Allocate and initialize blob descriptors from the raw blob table * buffer. */ for (size_t i = 0; i < num_entries; i++) { const struct blob_descriptor_disk *disk_entry = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/src/compress_common.c new/wimlib-1.13.2/src/compress_common.c --- old/wimlib-1.13.1/src/compress_common.c 2017-09-20 04:55:16.000000000 +0200 +++ new/wimlib-1.13.2/src/compress_common.c 2019-12-07 04:01:24.000000000 +0100 @@ -544,18 +544,17 @@ * shortening the longest codeword that is generated. * * There also is the issue of how codewords longer than @max_codeword_len - * are dealt with. Fortunately, for LZMS this is irrelevant because - * because for the LZMS alphabets no codeword can ever exceed - * LZMS_MAX_CODEWORD_LEN (= 15). Since the LZMS algorithm regularly - * halves all frequencies, the frequencies cannot become high enough for - * a length 16 codeword to be generated. Specifically, I think that if - * ties are broken in favor of non-leaves (as we do), the lowest total - * frequency that would give a length-16 codeword would be the sum of the - * frequencies 1 1 1 3 4 7 11 18 29 47 76 123 199 322 521 843 1364, which - * is 3570. And in LZMS we can't get a frequency that high based on the - * alphabet sizes, rebuild frequencies, and scaling factors. This - * worst-case scenario is based on the following degenerate case (only - * the bottom of the tree shown): + * are dealt with. Fortunately, for LZMS this is irrelevant because for + * the LZMS alphabets no codeword can ever exceed LZMS_MAX_CODEWORD_LEN + * (= 15). Since the LZMS algorithm regularly halves all frequencies, + * the frequencies cannot become high enough for a length 16 codeword to + * be generated. Specifically, I think that if ties are broken in favor + * of non-leaves (as we do), the lowest total frequency that would give a + * length-16 codeword would be the sum of the frequencies 1 1 1 3 4 7 11 + * 18 29 47 76 123 199 322 521 843 1364, which is 3570. And in LZMS we + * can't get a frequency that high based on the alphabet sizes, rebuild + * frequencies, and scaling factors. This worst-case scenario is based + * on the following degenerate case (only the bottom of the tree shown): * * ... * 17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/src/lzx_compress.c new/wimlib-1.13.2/src/lzx_compress.c --- old/wimlib-1.13.1/src/lzx_compress.c 2019-02-21 08:30:40.000000000 +0100 +++ new/wimlib-1.13.2/src/lzx_compress.c 2019-12-07 04:01:24.000000000 +0100 @@ -1227,7 +1227,7 @@ * but rather we combine many symbols into a single "observation type". For * literals we only look at the high bits and low bits, and for matches we only * look at whether the match is long or not. The assumption is that for typical - * "real" data, places that are good block boundaries will tend to be noticable + * "real" data, places that are good block boundaries will tend to be noticeable * based only on changes in these aggregate frequencies, without looking for * subtle differences in individual symbols. For example, a change from ASCII * bytes to non-ASCII bytes, or from few matches (generally less compressible) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/src/registry.c new/wimlib-1.13.2/src/registry.c --- old/wimlib-1.13.1/src/registry.c 2017-09-20 04:55:17.000000000 +0200 +++ new/wimlib-1.13.2/src/registry.c 2020-02-21 05:14:39.000000000 +0100 @@ -243,7 +243,7 @@ unsigned num_offsets; size_t extra_size; unsigned increment; - const le32 *p; + size_t i = 0; enum hive_status status; if (stats->levels_remaining == 0 || stats->subkey_lists_remaining == 0) @@ -270,8 +270,6 @@ sizeof(struct subkey_list) + extra_size)) return HIVE_CORRUPT; - p = list->elements; - switch (list->base.magic) { case LF_MAGIC: case LH_MAGIC: @@ -283,18 +281,20 @@ while (num_offsets--) { const struct nk *sub_nk; - sub_nk = get_cell_pointer(regf, *p, sizeof(struct nk)); + sub_nk = get_cell_pointer(regf, list->elements[i], + sizeof(struct nk)); if (!sub_nk || sub_nk->base.magic != NK_MAGIC) return HIVE_CORRUPT; - if (!revalidate_cell(regf, *p, sizeof(struct nk) + + if (!revalidate_cell(regf, list->elements[i], + sizeof(struct nk) + le16_to_cpu(sub_nk->name_size))) return HIVE_CORRUPT; status = (*cb)(sub_nk, cb_ctx); if (status != HIVE_OK) return status; - p += increment; + i += increment; } return HIVE_OK; case RI_MAGIC: @@ -302,8 +302,9 @@ status = HIVE_OK; stats->levels_remaining--; while (num_offsets--) { - status = iterate_subkeys_recursive(regf, *p++, - cb, cb_ctx, stats); + status = iterate_subkeys_recursive(regf, + list->elements[i++], + cb, cb_ctx, stats); if (status != HIVE_OK) break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/src/update_image.c new/wimlib-1.13.2/src/update_image.c --- old/wimlib-1.13.1/src/update_image.c 2018-11-23 23:55:33.000000000 +0100 +++ new/wimlib-1.13.2/src/update_image.c 2019-12-07 04:01:24.000000000 +0100 @@ -742,9 +742,12 @@ size_t len = tstrlen(fs_source_path) + tstrlen(wimboot_cfgfile); - tmp_config_file = MALLOC((len + 1) * sizeof(tchar)); struct stat st; + tmp_config_file = MALLOC((len + 1) * sizeof(tchar)); + if (!tmp_config_file) + return WIMLIB_ERR_NOMEM; + tsprintf(tmp_config_file, T("%"TS"%"TS), fs_source_path, wimboot_cfgfile); if (!tstat(tmp_config_file, &st)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/src/wimboot.c new/wimlib-1.13.2/src/wimboot.c --- old/wimlib-1.13.1/src/wimboot.c 2017-09-20 04:55:17.000000000 +0200 +++ new/wimlib-1.13.2/src/wimboot.c 2020-05-24 20:22:36.000000000 +0200 @@ -511,6 +511,21 @@ return 0; } +static bool +valid_wim_filename(const struct WimOverlay_dat_entry_2 *entry, size_t name_len) +{ + size_t i; + + if (name_len % sizeof(wchar_t)) + return false; + name_len /= sizeof(wchar_t); + if (name_len < 2) + return false; + for (i = 0; i < name_len && entry->wim_file_name[i] != 0; i++) + ; + return i == name_len - 1; +} + /* * Reads and validates a WimOverlay.dat file. * @@ -686,13 +701,7 @@ wim_file_name_length = entry_1->entry_2_length - sizeof(struct WimOverlay_dat_entry_2); - if ((wim_file_name_length < 2 * sizeof(wchar_t)) || - (wim_file_name_length % sizeof(wchar_t) != 0) || - (wmemchr(entry_2->wim_file_name, L'\0', - wim_file_name_length / sizeof(wchar_t)) - != &entry_2->wim_file_name[wim_file_name_length / - sizeof(wchar_t) - 1])) - { + if (!valid_wim_filename(entry_2, wim_file_name_length)) { ERROR("\"%ls\": entry %"PRIu32" (2) " "(data source ID 0x%016"PRIx64") " "has invalid WIM file name", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/src/win32_apply.c new/wimlib-1.13.2/src/win32_apply.c --- old/wimlib-1.13.1/src/win32_apply.c 2018-12-05 04:23:02.000000000 +0100 +++ new/wimlib-1.13.2/src/win32_apply.c 2019-12-07 04:01:24.000000000 +0100 @@ -1094,7 +1094,7 @@ path_max = compute_path_max(dentry_list); /* Add some extra for building Win32 paths for the file encryption APIs, - * and ensure we have at least enough to potentially use a 8.3 name for + * and ensure we have at least enough to potentially use an 8.3 name for * the last component. */ path_max += max(2 + (ctx->target_ntpath.Length / sizeof(wchar_t)), 8 + 1 + 3); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wimlib-1.13.1/tests/test-imagex-mount new/wimlib-1.13.2/tests/test-imagex-mount --- old/wimlib-1.13.1/tests/test-imagex-mount 2017-09-20 04:55:17.000000000 +0200 +++ new/wimlib-1.13.2/tests/test-imagex-mount 2019-12-07 04:01:24.000000000 +0100 @@ -128,7 +128,7 @@ error "Failed to re-mount test WIM read-write" fi if ! imagex_unmount tmp.mnt --commit --check; then - error "Failed to unmount read-write mounted WIM with changes commited (no changes made)" + error "Failed to unmount read-write mounted WIM with changes committed (no changes made)" fi echo "Testing removing file from mounted WIM" if ! wimmountrw dir.wim dir tmp.mnt; then
