回退 'Pull Request !4 : Add gperf for imlib2 package build failed'

This commit is contained in:
严志华 2020-03-23 15:06:26 +08:00 committed by Gitee
parent e19862c33c
commit 79d5126d9d
2 changed files with 2 additions and 33 deletions

View File

@ -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 *);

View File

@ -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<daiqianwen@huawei.com> - 0.15.1b-21
- Add gperf for imlib2 package build failed.
* Fri Mar 20 2020 lingsheng<lingsheng@huawei.com> - 0.15.1b-20
- Type:cves
- ID:CVE-2017-11550