Changes of Revision 2
| [-] | Changed | SDL_image.spec |
|
x 1 2 #3 # spec file for package SDL_image (Version 1.2.4)4 #5 -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.6 +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.7 # This file and all modifications and additions to the pristine8 # package are under the same license as the package itself.9 #10 11 #12 13 # norootforbuild14 -# usedforbuild SDL SDL-devel aaa_base aalib aalib-devel acl alsa alsa-devel attr audit-libs autoconf automake bash bind-libs bind-utils binutils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db diffutils e2fsprogs expat file filesystem fillup findutils flex fontconfig fontconfig-devel gawk gcc gdbm gdbm-devel gettext gettext-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libcom_err libgcc libjpeg libjpeg-devel libnscd libpng libpng-devel libstdc++ libstdc++-devel libtiff libtiff-devel libtool libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch perl permissions popt procinfo procps psmisc pwdutils rcs readline resmgr rpm sed slang slang-devel strace sysvinit tar tcpd texinfo timezone unzip util-linux vim xorg-x11 xorg-x11-devel xorg-x11-libs zlib zlib-devel15 +# usedforbuild SDL SDL-devel aaa_base aalib aalib-devel acl alsa alsa-devel attr audit-libs autoconf automake bash bind-libs bind-utils binutils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db diffutils e2fsprogs expat file filesystem fillup findutils flex fontconfig fontconfig-devel gawk gcc gdbm gdbm-devel gettext gettext-devel glibc glibc-32bit glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libcom_err libgcc libjpeg libjpeg-devel libmudflap libnscd libpng libpng-devel libstdc++ libstdc++-devel libtiff libtiff-devel libtool libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch perl permissions popt procinfo procps psmisc pwdutils rcs readline resmgr rpm sed slang slang-devel strace sysvinit tar tcpd texinfo timezone unzip util-linux vim xorg-x11 xorg-x11-devel xorg-x11-libs zlib zlib-devel16 17 Name: SDL_image18 BuildRequires: SDL-devel libjpeg-devel libpng-devel libtiff-devel xorg-x1119 -URL: http://www.libsdl.org/projects/SDL_image/20 +Url: http://www.libsdl.org/projects/SDL_image/21 Summary: Simple DirectMedia Layer--Sample Image Loading Library22 Version: 1.2.423 -Release: 1624 +Release: 16.825 Source0: %{name}-%{version}.tar.bz226 -License: LGPL27 +Patch0: %{name}-%{version}-gif-overflow.patch28 +Patch1: %{name}-%{version}-lbm-overflow.patch29 +License: LGPL v2.1 or later30 Group: System/Libraries31 BuildRoot: %{_tmppath}/%{name}-%{version}-build32 Prefix: %{_prefix}33 34 %prep35 rm -rf ${RPM_BUILD_ROOT}36 %setup 37 +%patch038 +%patch139 40 %build41 %{?suse_update_config:%{suse_update_config -f }}42 43 %{prefix}/include/SDL/44 %{prefix}/%_lib/lib*.so45 46 -%changelog -n SDL_image47 -* Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com>48 +%changelog49 +* Sat Feb 02 2008 Carsten Schoene <cs@linux-administrator.com>50 - import for SLE_10 build51 +52 +* Tue Jan 29 2008 - prusnak@suse.cz53 +- fix buffer overflow in LBM code (lbm-overflow.patch) [#355864]54 +* Fri Jan 25 2008 - prusnak@suse.cz55 +- fix buffer overflow in GIF code (gif-overflow.patch) [#355864]56 * Fri Mar 10 2006 - bk@suse.de57 - SDL_image-devel: add libstdc++, gcc and gpm to Requires (.la check)58 * Mon Jan 30 2006 - coolo@suse.de59 60 - changed neededforbuild <kdelibs-artsd> to <kdelibs3-artsd>61 * Tue Jan 08 2002 - nadvornik@suse.cz62 - updated to 1.2.1:63 -- added LBM format64 -- fixed transparent GIF and PNG65 + - added LBM format66 + - fixed transparent GIF and PNG67 * Wed Aug 08 2001 - uli@suse.de68 - fixed neededforbuild wrt SDL renaming69 * Wed Jun 20 2001 - nadvornik@suse.cz70 |
||
| [+] | Added | SDL_image-1.2.4-gif-overflow.patch ^ |
| @@ -0,0 +1,13 @@ +--- IMG_gif.c ++++ IMG_gif.c +@@ -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; | ||
| [+] | Added | SDL_image-1.2.4-lbm-overflow.patch ^ |
| @@ -0,0 +1,28 @@ +--- IMG_lbm.c ++++ IMG_lbm.c +@@ -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 <stdio.h> +@@ -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; | ||