From 0af5872673114415c605034eb38a0906f4707893 Mon Sep 17 00:00:00 2001 From: Martin Gieseking Date: Mar 12 2018 13:12:26 +0000 Subject: update to version 0.32.3 --- diff --git a/.gitignore b/.gitignore index c10ebcf..f94f512 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ icoutils-0.29.1.tar.bz2 /icoutils-0.31.3.tar.bz2 /icoutils-0.32.0.tar.bz2 /icoutils-0.32.2.tar.bz2 +/icoutils-0.32.3.tar.bz2 diff --git a/icoutils-nullptr.patch b/icoutils-nullptr.patch deleted file mode 100644 index 31baa04..0000000 --- a/icoutils-nullptr.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/wrestool/extract.c b/wrestool/extract.c -index 0044ce0..84239d7 100644 ---- a/wrestool/extract.c -+++ b/wrestool/extract.c -@@ -275,6 +275,8 @@ extract_bitmap_resource(WinLibrary *fi, WinResource *wr, size_t *ressize) - size_t size; - - resentry=(uint8_t *)(get_resource_entry(fi,wr,&size)); -+ if (!resentry) -+ return NULL; - - /* Bitmap file consists of: - * 1) File header (14 bytes) diff --git a/icoutils.spec b/icoutils.spec index af5fd65..6cdd8da 100644 --- a/icoutils.spec +++ b/icoutils.spec @@ -1,15 +1,12 @@ Name: icoutils -Version: 0.32.2 -Release: 3%{?dist} +Version: 0.32.3 +Release: 1%{?dist} Summary: Utility for extracting and converting Microsoft icon and cursor files License: GPLv3+ URL: http://www.nongnu.org/icoutils/ Source0: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.bz2 -# fixes segfault in wrestool (https://savannah.nongnu.org/bugs/?52319) -Patch0: %{name}-nullptr.patch - BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc @@ -27,7 +24,6 @@ libraries. %prep %setup -q -%patch0 -p1 autoreconf -i @@ -57,6 +53,10 @@ make install DESTDIR=%{buildroot} %changelog +* Mon Mar 12 2018 Martin Gieseking - 0.32.3-1 +- Updated to version 0.32.3. +- Dropped patch to fix https://savannah.nongnu.org/bugs/?52319 (applied upstream) + * Mon Feb 19 2018 Martin Gieseking - 0.32.2-3 - Added BR: gcc according to new packaging guidelines diff --git a/sources b/sources index d422445..1f15615 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (icoutils-0.32.2.tar.bz2) = 9d1ec7f8de2de35ca502ece953d288dad44143af185706855e8911c5e579153ce515208891783981c04406afc66db1e2a3f246515e888a2b1ccc6aea4b1056b8 +SHA512 (icoutils-0.32.3.tar.bz2) = 982a051a5dc4a63bb2a9f23e78e5a88e481e5c7a9c25789253e1c396e40d4c093e5a9b399966d660e4f2da21ce15d539cb9d20bfd8126b1138f148b86baa6726