diff --git a/.cvsignore b/.cvsignore index 8f0d94b..134eb61 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -SDL_image-1.2.6.tar.gz +SDL_image-1.2.7.tar.gz diff --git a/SDL_image-IMG_lbm.patch b/SDL_image-IMG_lbm.patch deleted file mode 100644 index cc4a29b..0000000 --- a/SDL_image-IMG_lbm.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- trunk/SDL_image/IMG_lbm.c 2007/07/20 04:37:11 3341 -+++ trunk/SDL_image/IMG_lbm.c 2008/01/03 20:05:34 3521 -@@ -28,6 +28,7 @@ - EHB and HAM (specific Amiga graphic chip modes) support added by Marc Le Douarain - (http://www.multimania.com/mavati) in December 2003. - Stencil and colorkey fixes by David Raulo (david.raulo AT free DOT fr) in February 2004. -+ Buffer overflow fix in RLE decompression by David Raulo in January 2008. - */ - - #include -@@ -328,7 +329,7 @@ - count ^= 0xFF; - count += 2; /* now it */ - -- if ( !SDL_RWread( src, &color, 1, 1 ) ) -+ if ( ( count > remainingbytes ) || !SDL_RWread( src, &color, 1, 1 ) ) - { - error="error reading BODY chunk"; - goto done; -@@ -339,7 +340,7 @@ - { - ++count; - -- if ( !SDL_RWread( src, ptr, count, 1 ) ) -+ if ( ( count > remainingbytes ) || !SDL_RWread( src, ptr, count, 1 ) ) - { - error="error reading BODY chunk"; - goto done; diff --git a/SDL_image-buffer-overflow.patch b/SDL_image-buffer-overflow.patch deleted file mode 100644 index 0be82dc..0000000 --- a/SDL_image-buffer-overflow.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- trunk/SDL_image/IMG_gif.c 2007/12/28 08:17:23 3461 -+++ trunk/SDL_image/IMG_gif.c 2007/12/28 16:43:56 3462 -@@ -418,6 +418,10 @@ - static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp; - register int i; - -+ /* Fixed buffer overflow found by Michael Skladnikiewicz */ -+ if (input_code_size > MAX_LWZ_BITS) -+ return -1; -+ - if (flag) { - set_code_size = input_code_size; - code_size = set_code_size + 1; diff --git a/SDL_image.spec b/SDL_image.spec index 1ebf795..d3a2515 100644 --- a/SDL_image.spec +++ b/SDL_image.spec @@ -1,14 +1,12 @@ Name: SDL_image -Version: 1.2.6 -Release: 8%{?dist} +Version: 1.2.7 +Release: 1%{?dist} Summary: Image loading library for SDL Group: System Environment/Libraries License: LGPLv2+ URL: http://www.libsdl.org/projects/SDL_image/ Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz -Patch0: %{name}-buffer-overflow.patch -Patch1: %{name}-IMG_lbm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.10 @@ -38,8 +36,7 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p2 -b .overflow -%patch1 -p2 -b .ilbm + %build # XCF support is crashy in 1.2.4 @@ -85,6 +82,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 9 2009 Brian Pepple - 1.2.7-1 +- Update to 1.2.7. +- Drop IMG_lbm patch. Fixed upstream. +- Drop buffer overflow patch. Fixed upstream. + * Fri Jul 24 2009 Fedora Release Engineering - 1.2.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 14cba9a..a842702 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b866dc4f647517bdaf57f6ffdefd013e SDL_image-1.2.6.tar.gz +a729ff61f74f0a45ec7fe36354cf938e SDL_image-1.2.7.tar.gz