rpms/id3lib/EL-5 id3lib-no_date_footer.hml, NONE, 1.1 id3lib-vbr_buffer_overflow.diff, NONE, 1.1 id3lib.spec, 1.15, 1.16

[Adrian Reber]

Author: adrian

Update of /cvs/extras/rpms/id3lib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29560

Modified Files:
	id3lib.spec 
Added Files:
	id3lib-no_date_footer.hml id3lib-vbr_buffer_overflow.diff 
Log Message:
* Thu Nov 12 2009 Adrian Reber <adrian at lisas.de> - 3.8.3-24
- Fix "Stack smashing with vbr mp3 files" (bz #533706)
  also see https://bugs.launchpad.net/ubuntu/+source/id3lib3.8.3/+bug/444466

* Mon Jun 29 2009 Adrian Reber <adrian at lisas.de> - 3.8.3-22
- Fix "id3lib-devel multilib conflict" (bz #507700)



--- NEW FILE id3lib-no_date_footer.hml ---
<hr size="1"><address style="text-align: right;"><small>
Generated for $projectname by&nbsp;<a href="http://www.doxygen.org/
index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
$doxygenversion</small></address></body></html>

id3lib-vbr_buffer_overflow.diff:
 mp3_parse.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE id3lib-vbr_buffer_overflow.diff ---
diff -ru id3lib3.8.3-3.8.3.orig/src/mp3_parse.cpp id3lib3.8.3-3.8.3/src/mp3_parse.cpp
--- id3lib3.8.3-3.8.3.orig/src/mp3_parse.cpp	2003-03-02 01:23:00.000000000 +0100
+++ id3lib3.8.3-3.8.3/src/mp3_parse.cpp	2009-10-06 11:45:37.897681290 +0200
@@ -465,7 +465,7 @@
   // from http://www.xingtech.com/developer/mp3/
 
   const size_t VBR_HEADER_MIN_SIZE = 8;     // "xing" + flags are fixed
-  const size_t VBR_HEADER_MAX_SIZE = 116;   // frames, bytes, toc and scale are optional
+  const size_t VBR_HEADER_MAX_SIZE = 120;   // frames, bytes, toc and scale are optional
 
   if (mp3size >= vbr_header_offest + VBR_HEADER_MIN_SIZE) 
   {


Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/EL-5/id3lib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- id3lib.spec	8 Aug 2008 06:30:33 -0000	1.15
+++ id3lib.spec	19 Nov 2009 10:02:19 -0000	1.16
@@ -1,16 +1,18 @@
 Summary:        Library for manipulating ID3v1 and ID3v2 tags
 Name:           id3lib
 Version:        3.8.3
-Release:        20%{?dist}
+Release:        24%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://id3lib.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/id3lib/%{name}-%{version}.tar.gz
+Source1:        id3lib-no_date_footer.hml
 Patch0:         id3lib-dox.patch
 Patch1:         id3lib-3.8.3-libtool-autofoo.patch.bz2
 Patch2:         id3lib-3.8.3-io_helpers-163101.patch
 Patch3:         id3lib-3.8.3-mkstemp.patch
 Patch4:         id3lib-3.8.3-includes.patch
+Patch5:         http://launchpadlibrarian.net/33114077/id3lib-vbr_buffer_overflow.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  zlib-devel doxygen
 
@@ -41,12 +43,15 @@ This package provides files needed to de
 %patch2 -p1 -b .io_helpers-163101
 %patch3 -p1 -b .mkstemp
 %patch4 -p1 -b .gcc43
+%patch5 -p1
 chmod -x src/*.h src/*.cpp include/id3/*.h
 sed -i -e 's/\r//' doc/id3v2.3.0.*
 sed -i -e 's|@DOX_DIR_HTML@|%{_docdir}/%{name}-devel-%{version}/api|' \
   doc/index.html.in
 iconv -f ISO-8859-1 -t UTF8 ChangeLog > tmp; mv tmp ChangeLog
 iconv -f ISO-8859-1 -t UTF8 THANKS > tmp; mv tmp THANKS
+sed -i -e "s,HTML_FOOTER.*$,HTML_FOOTER = id3lib-no_date_footer.hml,g" doc/Doxyfile.in
+cp %{SOURCE1} doc
 
 
 %build
@@ -92,6 +97,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 12 2009 Adrian Reber <adrian at lisas.de> - 3.8.3-24
+- Fix "Stack smashing with vbr mp3 files" (bz #533706)
+  also see https://bugs.launchpad.net/ubuntu/+source/id3lib3.8.3/+bug/444466
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.3-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 29 2009 Adrian Reber <adrian at lisas.de> - 3.8.3-22
+- Fix "id3lib-devel multilib conflict" (bz #507700)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.3-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.8.3-20
 - Autorebuild for GCC 4.3