diff --git a/libid3tag-0.15.1b-gperf-size_t.patch b/libid3tag-0.15.1b-gperf-size_t.patch deleted file mode 100644 index 588bde9c3d41c04c7ea1101decc0417b2cbad9be..0000000000000000000000000000000000000000 --- a/libid3tag-0.15.1b-gperf-size_t.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: libid3tag-0.15.1b/frametype.h -=================================================================== ---- libid3tag-0.15.1b.orig/frametype.h -+++ libid3tag-0.15.1b/frametype.h -@@ -37,6 +37,6 @@ extern struct id3_frametype const id3_fr - extern struct id3_frametype const id3_frametype_obsolete; - - struct id3_frametype const *id3_frametype_lookup(register char const *, -- register unsigned int); -+ register size_t); - - # endif -Index: libid3tag-0.15.1b/compat.h -=================================================================== ---- libid3tag-0.15.1b.orig/compat.h -+++ libid3tag-0.15.1b/compat.h -@@ -34,7 +34,7 @@ struct id3_compat { - }; - - struct id3_compat const *id3_compat_lookup(register char const *, -- register unsigned int); -+ register size_t); - - int id3_compat_fixup(struct id3_tag *); - diff --git a/libid3tag.spec b/libid3tag.spec index 6b4130c8905817ce9d011b05ccbf67c5388d3b41..30b9a3dd5988a87d7dd76ee65cf747c6939fad3d 100644 --- a/libid3tag.spec +++ b/libid3tag.spec @@ -1,15 +1,14 @@ Name: libid3tag Version: 0.15.1b -Release: 21 +Release: 20 Summary: ID3 tag manipulation library License: GPLv2+ URL: http://www.underbit.com/products/mad/ Source0: http://downloads.sourceforge.net/mad/%{name}-%{version}.tar.gz Patch0: libid3tag-0.15.1b-fix_overflow.patch -Patch1: libid3tag-0.15.1b-gperf-size_t.patch Patch6000: CVE-2004-2779.patch Patch6001: CVE-2017-11550.patch -BuildRequires: zlib-devel >= 1.1.4 libtool gperf +BuildRequires: zlib-devel >= 1.1.4 libtool %description libid3tag is a library for reading and (eventually) writing ID3 tags, @@ -25,11 +24,9 @@ ID3 tag library development files. %prep %setup -q %patch0 -p0 -b .CVE-2008-2109 -%patch1 -p1 %patch6000 -p1 %patch6001 -p1 touch NEWS AUTHORS ChangeLog -rm compat.c frametype.c autoreconf -i -f # *.pc originally from the Debian package. @@ -74,9 +71,6 @@ install -Dpm 644 %{name}.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/id3tag.pc %changelog -* Mon Mar 23 2020 daiqianwen - 0.15.1b-21 -- Add gperf for imlib2 package build failed. - * Fri Mar 20 2020 lingsheng - 0.15.1b-20 - Type:cves - ID:CVE-2017-11550