Bug#864075: unblock: icoutils/0.31.2-1.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi Release Team,
Please consider unblocking package icoutils:
This upload fixes an important bug which caused icoutils' wrestool utility to
break completely, due to a regression in version 0.31.2. wrestool is a program
used to extract icons from Windows programs, and its breakage caused dependant
packages (e.g. kde-runtime, gnome-exe-thumbnailer, gextractwinicons) to fail at
icon extraction entirely.
The full debdiff is attached.
unblock icoutils/0.31.2-1.1
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (700, 'testing'), (500, 'unstable-debug'), (500, 'testing-
debug'), (500, 'unstable'), (101, 'experimental'), (1, 'experimental-debug')
Architecture: amd64
(x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_CA.utf8, LC_CTYPE=en_CA.utf8 (charmap=UTF-8)
diff -Nru icoutils-0.31.2/debian/changelog icoutils-0.31.2/debian/changelog
--- icoutils-0.31.2/debian/changelog 2017-03-07 14:18:53.000000000 -0800
+++ icoutils-0.31.2/debian/changelog 2017-05-30 23:12:09.000000000 -0700
@@ -1,3 +1,13 @@
+icoutils (0.31.2-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Add patch fix-wrestool.patch from upstream commit
+ http://git.savannah.nongnu.org/cgit/icoutils.git/commit/?id=3c990fcc754c81a02ab5981d59b01025f1596b2c
+ to fix wrestool not extracting icons - this is a regression from 0.31.2.
+ Closes: #860220
+
+ -- James Lu <bitflip3@gmail.com> Tue, 30 May 2017 23:12:09 -0700
+
icoutils (0.31.2-1) unstable; urgency=high
* New upstream release.
diff -Nru icoutils-0.31.2/debian/.git-dpm icoutils-0.31.2/debian/.git-dpm
--- icoutils-0.31.2/debian/.git-dpm 2017-03-07 09:30:30.000000000 -0800
+++ icoutils-0.31.2/debian/.git-dpm 2017-05-30 23:12:09.000000000 -0700
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-c50ee01e3bbbc846f7b17e7de1d7c092e7b950c9
-c50ee01e3bbbc846f7b17e7de1d7c092e7b950c9
+f06d6e83d1b3256a5b6a0d42b8fc5293e6005bab
+f06d6e83d1b3256a5b6a0d42b8fc5293e6005bab
c50ee01e3bbbc846f7b17e7de1d7c092e7b950c9
c50ee01e3bbbc846f7b17e7de1d7c092e7b950c9
icoutils_0.31.2.orig.tar.bz2
diff -Nru icoutils-0.31.2/debian/patches/fix-wrestool.patch icoutils-0.31.2/debian/patches/fix-wrestool.patch
--- icoutils-0.31.2/debian/patches/fix-wrestool.patch 1969-12-31 16:00:00.000000000 -0800
+++ icoutils-0.31.2/debian/patches/fix-wrestool.patch 2017-05-30 23:12:09.000000000 -0700
@@ -0,0 +1,37 @@
+From f06d6e83d1b3256a5b6a0d42b8fc5293e6005bab Mon Sep 17 00:00:00 2001
+From: Frank Richter <frank.richter@gmail.com>
+Date: Sat, 11 Mar 2017 14:10:50 +0100
+Subject: Revert "Add additional sanity checks to do_resource(). Found by Jerzy
+ Kramarz <op7ica@gmail.com>."
+
+That "sanity check" rather broke everything.
+Also, I couldn't reproduce the issue it this change was intended to catch from the files I have
+any more, so it's probably not needed anyway.
+
+Origin: upstream, http://git.savannah.nongnu.org/cgit/icoutils.git/commit/?id=3c990fcc754c81a02ab5981d59b01025f1596b2c
+Bug-Debian: https://bugs.debian.org/860220
+Last-Update: 2017-05-30
+
+Patch-Name: fix-wrestool.patch
+---
+ wrestool/restable.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/wrestool/restable.c b/wrestool/restable.c
+index c60806f..f568434 100644
+--- a/wrestool/restable.c
++++ b/wrestool/restable.c
+@@ -87,13 +87,9 @@ do_resources_recurs (WinLibrary *fi, WinResource *base, WinResource *type_wr,
+ wr = list_resources (fi, base, &rescnt);
+ if (wr == NULL)
+ return;
+- if (!check_offset(fi->memory, fi->total_size, fi->name, &wr[0], sizeof(WinResource)))
+- return;
+
+ /* process each resource listed */
+ for (c = 0 ; c < rescnt ; c++) {
+- if (!check_offset(fi->memory, fi->total_size, fi->name, &wr[c], sizeof(WinResource)))
+- break;
+ /* (over)write the corresponding WinResource holder with the current */
+ memcpy(WINRESOURCE_BY_LEVEL(wr[c].level), wr+c, sizeof(WinResource));
+
diff -Nru icoutils-0.31.2/debian/patches/series icoutils-0.31.2/debian/patches/series
--- icoutils-0.31.2/debian/patches/series 1969-12-31 16:00:00.000000000 -0800
+++ icoutils-0.31.2/debian/patches/series 2017-05-30 23:12:09.000000000 -0700
@@ -0,0 +1 @@
+fix-wrestool.patch
Reply to: