Toshaan Bharvani
3 years ago
commit
28736fa486
6 changed files with 375 additions and 0 deletions
@ -0,0 +1,11 @@
@@ -0,0 +1,11 @@
|
||||
--- field.c.orig 2008-05-05 09:49:15.000000000 -0400 |
||||
+++ field.c 2008-05-05 09:49:25.000000000 -0400 |
||||
@@ -291,7 +291,7 @@ |
||||
|
||||
end = *ptr + length; |
||||
|
||||
- while (end - *ptr > 0) { |
||||
+ while (end - *ptr > 0 && **ptr != '\0') { |
||||
ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0); |
||||
if (ucs4 == 0) |
||||
goto fail; |
@ -0,0 +1,25 @@
@@ -0,0 +1,25 @@
|
||||
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 *); |
||||
|
@ -0,0 +1,37 @@
@@ -0,0 +1,37 @@
|
||||
#! /bin/sh /usr/share/dpatch/dpatch-run |
||||
## 11_unknown_encoding.dpatch by Andreas Henriksson <andreas@fatal.se> |
||||
## |
||||
## All lines beginning with `## DP:' are a description of the patch. |
||||
## DP: In case of an unknown/invalid encoding, id3_parse_string() will |
||||
## DP: return NULL, but the return value wasn't checked resulting |
||||
## DP: in segfault in id3_ucs4_length(). This is the only place |
||||
## DP: the return value wasn't checked. |
||||
|
||||
@DPATCH@ |
||||
diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf |
||||
--- libid3tag-0.15.1b~/compat.gperf 2004-01-23 09:41:32.000000000 +0000 |
||||
+++ libid3tag-0.15.1b/compat.gperf 2007-01-14 14:36:53.000000000 +0000 |
||||
@@ -236,6 +236,10 @@ |
||||
|
||||
encoding = id3_parse_uint(&data, 1); |
||||
string = id3_parse_string(&data, end - data, encoding, 0); |
||||
+ if (!string) |
||||
+ { |
||||
+ continue; |
||||
+ } |
||||
|
||||
if (id3_ucs4_length(string) < 4) { |
||||
free(string); |
||||
diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c |
||||
--- libid3tag-0.15.1b~/parse.c 2004-01-23 09:41:32.000000000 +0000 |
||||
+++ libid3tag-0.15.1b/parse.c 2007-01-14 14:37:34.000000000 +0000 |
||||
@@ -165,6 +165,9 @@ |
||||
case ID3_FIELD_TEXTENCODING_UTF_8: |
||||
ucs4 = id3_utf8_deserialize(ptr, length); |
||||
break; |
||||
+ default: |
||||
+ /* FIXME: Unknown encoding! Print warning? */ |
||||
+ return NULL; |
||||
} |
||||
|
||||
if (ucs4 && !full) { |
@ -0,0 +1,37 @@
@@ -0,0 +1,37 @@
|
||||
#! /bin/sh /usr/share/dpatch/dpatch-run |
||||
## 10_id3v1_zeropadding.dpatch by <sm17hs@gmail.com> |
||||
## |
||||
## All lines beginning with `## DP:' are a description of the patch. |
||||
## DP: Use zero padding instead of space padding for ID3V1 fields |
||||
## DP: (as requested by http://id3lib.sourceforge.net/id3/id3v1.html). |
||||
|
||||
@DPATCH@ |
||||
diff -urNad libid3tag-0.15.1b~/render.c libid3tag-0.15.1b/render.c |
||||
--- libid3tag-0.15.1b~/render.c 2004-01-23 10:41:32.000000000 +0100 |
||||
+++ libid3tag-0.15.1b/render.c 2009-11-09 17:17:48.000000000 +0100 |
||||
@@ -183,18 +183,16 @@ |
||||
end = data + length; |
||||
|
||||
if (ucs4) { |
||||
- while (*ucs4 && end - data > 0) { |
||||
+ while (*ucs4 && end - data > 0) |
||||
*data++ = *ucs4++; |
||||
- |
||||
- if (data[-1] == '\n') |
||||
- data[-1] = ' '; |
||||
- } |
||||
} |
||||
|
||||
- while (end - data > 0) |
||||
- *data++ = ' '; |
||||
- |
||||
*data = 0; |
||||
|
||||
- return id3_latin1_serialize(ptr, padded, 0); |
||||
+ id3_latin1_serialize(ptr, padded, 0); |
||||
+ |
||||
+ if (end - data > 0) |
||||
+ id3_render_padding(ptr, 0, end - data); |
||||
+ |
||||
+ return length; |
||||
} |
@ -0,0 +1,11 @@
@@ -0,0 +1,11 @@
|
||||
--- utf16.c.old 2005-01-07 12:35:28.622883237 +0100 |
||||
+++ utf16.c 2005-01-07 12:35:36.603673548 +0100 |
||||
@@ -250,6 +250,8 @@ |
||||
id3_ucs4_t *ucs4; |
||||
|
||||
end = *ptr + (length & ~1); |
||||
+ if (end == *ptr) |
||||
+ return 0; |
||||
|
||||
utf16 = malloc((length / 2 + 1) * sizeof(*utf16)); |
||||
if (utf16 == 0) |
@ -0,0 +1,254 @@
@@ -0,0 +1,254 @@
|
||||
Name: libid3tag |
||||
Version: 0.15.1b |
||||
Release: 35%{?dist} |
||||
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-id3v1-zero-padding.patch |
||||
Patch2: libid3tag-0.15.1b-handle-unknown-encoding.patch |
||||
Patch3: libid3tag-0.15.1b-id3v2-endless-loop.patch |
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869598 |
||||
Patch4: libid3tag-0.15.1b-gperf-size_t.patch |
||||
|
||||
BuildRequires: gcc |
||||
BuildRequires: autoconf |
||||
BuildRequires: automake |
||||
BuildRequires: libtool |
||||
BuildRequires: gperf |
||||
BuildRequires: zlib-devel >= 1.1.4 |
||||
BuildRequires: make |
||||
|
||||
%description |
||||
libid3tag is a library for reading and (eventually) writing ID3 tags, |
||||
both ID3v1 and the various versions of ID3v2. |
||||
|
||||
|
||||
%package devel |
||||
Summary: Development files for %{name} |
||||
Requires: %{name}%{?_isa} = %{version}-%{release} |
||||
|
||||
%description devel |
||||
ID3 tag library development files. |
||||
|
||||
|
||||
%prep |
||||
%setup -q |
||||
%patch0 -p0 -b .CVE-2008-2109 |
||||
%patch1 -p1 -b .zero-padding |
||||
%patch2 -p1 -b .unknown-encoding |
||||
%patch3 -p0 -b .endless-loop |
||||
%patch4 -p1 -b .gperf |
||||
|
||||
touch NEWS AUTHORS ChangeLog |
||||
|
||||
# Force these files to be regenerated from the .gperf sources. |
||||
rm compat.c frametype.c |
||||
|
||||
# *.pc originally from the Debian package. |
||||
cat << \EOF > %{name}.pc |
||||
prefix=%{_prefix} |
||||
exec_prefix=%{_exec_prefix} |
||||
libdir=%{_libdir} |
||||
includedir=%{_includedir} |
||||
|
||||
Name: id3tag |
||||
Description: ID3 tag manipulation library |
||||
Requires: |
||||
Version: %{version} |
||||
Libs: -lid3tag |
||||
Cflags: |
||||
EOF |
||||
|
||||
|
||||
%build |
||||
# Run autoreconf so that it doesn't check for cxx and doesn't clobber CFLAGS |
||||
autoreconf -vfi |
||||
%configure --disable-static |
||||
%make_build |
||||
|
||||
|
||||
%install |
||||
%make_install |
||||
rm -vf $RPM_BUILD_ROOT%{_libdir}/*.la |
||||
install -Dpm 644 %{name}.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/id3tag.pc |
||||
|
||||
%ldconfig_scriptlets |
||||
|
||||
%files |
||||
%doc CHANGES CREDITS README TODO |
||||
%license COPYING COPYRIGHT |
||||
%{_libdir}/libid3tag.so.* |
||||
|
||||
%files devel |
||||
%{_includedir}/id3tag.h |
||||
%{_libdir}/libid3tag.so |
||||
%{_libdir}/pkgconfig/id3tag.pc |
||||
|
||||
|
||||
%changelog |
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-35 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild |
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-34 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild |
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-33 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild |
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-32 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild |
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-31 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild |
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-30 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild |
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-29 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild |
||||
|
||||
* Fri Mar 30 2018 David King <amigadave@amigadave.com> - 0.15.1b-28 |
||||
- Add gperf patch from Debian |
||||
|
||||
* Thu Mar 29 2018 David King <amigadave@amigadave.com> - 0.15.1b-27 |
||||
- Add ID3v1 zero padding patch from Debian |
||||
- Add a fix for CVE-2017-11550 (#1478934) |
||||
- Add a fix for CVE-2004-2779 (#1561983) |
||||
- Use %%license, remove Group tag |
||||
- Add BuildRequires on gcc |
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-26 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild |
||||
|
||||
* Wed Jan 31 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.15.1b-25 |
||||
- Switch to %%ldconfig_scriptlets |
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-24 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild |
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-23 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild |
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-22 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild |
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1b-21 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild |
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.1b-20 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild |
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.1b-19 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild |
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.1b-18 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild |
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.1b-17 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild |
||||
|
||||
* Fri May 10 2013 Hans de Goede <hdegoede@redhat.com> - 0.15.1b-16 |
||||
- Remove no longer needed autoreconf call, %%configure from redhat-rpm-config |
||||
>= 9.1.0-42 updates config.guess and config.sub for new architecture support |
||||
|
||||
* Mon Mar 25 2013 Hans de Goede <hdegoede@redhat.com> - 0.15.1b-15 |
||||
- Run autoreconf for aarch64 support (rhbz#925768) |
||||
- Make build honor RPM_OPT_FLAGS |
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.1b-14 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild |
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.1b-13 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild |
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.1b-12 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild |
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.1b-11 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild |
||||
|
||||
* Wed Jan 13 2010 Todd Zullinger <tmz@pobox.com> - 0.15.1b-10 |
||||
- Rebuild to ensure n-v-r is greater than F-12 branch |
||||
- Fix Source0 URL |
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.1b-9 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild |
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.1b-8 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild |
||||
|
||||
* Thu Aug 28 2008 Todd Zullinger <tmz@pobox.com> - 0.15.1b-7 |
||||
- Fix %%patch incantation for new rpm |
||||
|
||||
* Fri May 09 2008 Todd Zullinger <tmz@pobox.com> - 0.15.1b-6 |
||||
- fix for CVE-2008-2109 (#445812) |
||||
|
||||
* Tue Feb 12 2008 Todd Zullinger <tmz@pobox.com> - 0.15.1b-5 |
||||
- rebuild for gcc 4.3 |
||||
|
||||
* Mon Aug 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.15.1b-4 |
||||
- License: GPLv2+ |
||||
|
||||
* Mon Aug 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.15.1b-3 |
||||
- Rebuild. |
||||
|
||||
* Mon Feb 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.15.1b-2 |
||||
- Rebuild. |
||||
|
||||
* Wed Nov 9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.15.1b-1 |
||||
- Don't ship static libraries. |
||||
- Embed *.pc in specfile to keep it in sync with the build. |
||||
- Build with dependency tracking disabled. |
||||
|
||||
* Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.15.1-3.b |
||||
- Rebuild. |
||||
|
||||
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.15.1-2.b |
||||
- rebuilt |
||||
|
||||
* Wed Feb 18 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.15.1-0.fdr.1.b |
||||
- Update to 0.15.1b. |
||||
|
||||
* Wed Oct 29 2003 Ville Skytta <ville.skytta at iki.fi> - 0:0.15.0-0.fdr.2.b |
||||
- Rebuild. |
||||
|
||||
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:0.15.0-0.fdr.1.b.0.94 |
||||
- Remove comment after scriptlets |
||||
|
||||
* Mon Jun 30 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.15.0-0.fdr.1.b |
||||
- Update to 0.15.0b. |
||||
- Split separate from the old mad package to follow upstream. |
||||
- -devel requires zlib-devel and pkgconfig. |
||||
|
||||
* Thu Apr 24 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.3.b |
||||
- Fix missing "main" package dependencies in *-devel. |
||||
- Include patch from Debian, possibly fixes #187 comment 7, and adds |
||||
pkgconfig files for libraries. |
||||
|
||||
* Sun Apr 20 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.2.b |
||||
- Split into mad, libmad, -devel, libid3tag and -devel packages (#187). |
||||
- Provide mp3-cmdline virtual package and alternative. |
||||
- Build shared library. |
||||
|
||||
* Fri Apr 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.1.b |
||||
- Update to current Fedora guidelines. |
||||
- Exclude %%{_libdir}/*.la. |
||||
|
||||
* Thu Feb 20 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.14.2b-1.fedora.1 |
||||
- First Fedora release, based on Matthias Saou's work. |
||||
|
||||
* Fri Sep 27 2002 Matthias Saou <matthias.saou@est.une.marmotte.net> |
||||
- Rebuild for Red Hat Linux 8.0 (missing because of license issues). |
||||
- Spec file cleanup. |
||||
|
||||
* Tue Mar 12 2002 Bill Nottingham <notting@redhat.com> 0.14.2b-3 |
||||
- ship libid3tag too |
||||
|
||||
* Thu Feb 21 2002 Bill Nottingham <notting@redhat.com> |
||||
- rebuild |
||||
|
||||
* Mon Jan 28 2002 Bill Nottingham <notting@redhat.com> |
||||
- split libmad off into a separate package |
Loading…
Reference in new issue