From 4bb88eb622e1fab6d13d4343b71f35d385eaf913 Mon Sep 17 00:00:00 2001
From: Martin Gieseking <martin.gieseking@uos.de>
Date: Mon, 9 Jan 2017 13:44:57 +0100
Subject: [PATCH] update to version 0.31.1

---
 .gitignore                      |  1 +
 icoutils-wrestool-extract.patch | 22 ----------------------
 icoutils.spec                   | 13 ++++++-------
 sources                         |  2 +-
 4 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 icoutils-wrestool-extract.patch

diff --git a/.gitignore b/.gitignore
index 6cd8208..d1048b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 icoutils-0.29.1.tar.bz2
 /icoutils-0.30.0.tar.bz2
 /icoutils-0.31.0.tar.bz2
+/icoutils-0.31.1.tar.bz2
diff --git a/icoutils-wrestool-extract.patch b/icoutils-wrestool-extract.patch
deleted file mode 100644
index 53990b8..0000000
--- a/icoutils-wrestool-extract.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/wrestool/extract.c b/wrestool/extract.c
-index a203d04..8192a1f 100644
---- a/wrestool/extract.c
-+++ b/wrestool/extract.c
-@@ -237,13 +237,15 @@ extract_group_icon_cursor_resource(WinLibrary *fi, WinResource *wr, char *lang,
- 		fileicondir->entries[c-skipped].dib_offset = offset;
- 
- 		/* transfer resource into file memory */
-+		if (size > icondir->entries[c].bytes_in_res)
-+			size = icondir->entries[c].bytes_in_res;
- 		if (is_icon) {
--			memcpy(&memory[offset], data, icondir->entries[c].bytes_in_res);
-+			memcpy(&memory[offset], data, size);
- 		} else {
- 			fileicondir->entries[c-skipped].hotspot_x = ((uint16_t *) data)[0];
- 			fileicondir->entries[c-skipped].hotspot_y = ((uint16_t *) data)[1];
- 			memcpy(&memory[offset], data+sizeof(uint16_t)*2,
--				   icondir->entries[c].bytes_in_res-sizeof(uint16_t)*2);
-+				   size-sizeof(uint16_t)*2);
- 			offset -= sizeof(uint16_t)*2;
- 		}
- 
diff --git a/icoutils.spec b/icoutils.spec
index 9670351..1db29d2 100644
--- a/icoutils.spec
+++ b/icoutils.spec
@@ -1,6 +1,6 @@
 Name:           icoutils
-Version:        0.31.0
-Release:        9%{?dist}
+Version:        0.31.1
+Release:        1%{?dist}
 Summary:        Utility for extracting and converting Microsoft icon and cursor files
 
 Group:          Applications/Multimedia
@@ -8,10 +8,6 @@ License:        GPLv3+
 URL:            http://www.nongnu.org/icoutils/
 Source0:        http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.bz2
 
-# wrestool: ensure that reading the resource data doesn't exceed the
-# allocated memory block
-Patch0:         %{name}-wrestool-extract.patch
-
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gettext 
@@ -29,7 +25,6 @@ libraries.
 
 %prep
 %setup -q
-%patch0 -p1
 autoreconf -i
 
 for f in AUTHORS NEWS; do
@@ -58,6 +53,10 @@ make install DESTDIR=%{buildroot}
 
 
 %changelog
+* Mon Jan 09 2017 Martin Gieseking <martin.gieseking@uos.de> - 0.31.1-1
+- Updated to version 0.31.1.
+- Dropped wrestool patch because it has been applied upstream.
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 3a19e25..07d8c35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe12dcfb7796cb6cb4ac9bb0720ae362  icoutils-0.31.0.tar.bz2
+SHA512 (icoutils-0.31.1.tar.bz2) = 47fe41429cee73b6aff90e2b385b621314700dedfe09989318e439b19a484d806a9428652008be2db70598ba1337e860fba30b6d8104525f9e0bcbb4dc61dc56