Author: ranger
Date: Thu Apr 16 14:51:49 2009
New Revision: 1505
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1505&repname=user%3a+ranger>
Log:
giflib fixes
Added:
trunk/experimental/common/main/finkinfo/graphics/giflib.patch
Modified:
trunk/experimental/10.4/main/finkinfo/kde/kdegraphics3.info
trunk/experimental/common/main/finkinfo/graphics/giflib.info
trunk/experimental/common/main/finkinfo/graphics/imlib.info
trunk/experimental/common/main/finkinfo/graphics/imlib2.info
trunk/experimental/common/main/finkinfo/kde/kdegraphics3.info
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdegraphics3.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdegraphics3.info&rev=1505&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdegraphics3.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdegraphics3.info Thu Apr 16
14:51:49 2009
@@ -35,7 +35,7 @@
fribidi (>= 0.10.4-1),
fribidi-dev (>= 0.10.4-1),
gettext-tools,
- giflib | libungif,
+ giflib,
imlib (>= 1.9.14-2),
kdelibs3-unified-dev (>= %v-1),
lcms,
@@ -647,7 +647,7 @@
Description: KDE - slideshow application
Depends: <<
%N-base (>= %v-%r),
- giflib-shlibs | libungif-shlibs,
+ giflib-shlibs,
imlib-shlibs
<<
Replaces: %N (<< %v-%r)
Modified: trunk/experimental/common/main/finkinfo/graphics/giflib.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/giflib.info&rev=1505&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/giflib.info (original)
+++ trunk/experimental/common/main/finkinfo/graphics/giflib.info Thu Apr 16
14:51:49 2009
@@ -1,12 +1,16 @@
Package: giflib
Version: 4.1.6
-Revision: 1
+Revision: 2
Depends: %N-shlibs (= %v-%r), %N-bin (= %v-%r)
+BuildDepends: fink (>= 0.28.0-1)
BuildDependsOnly: True
-Conflicts: libungif (<< 4.1.6-1)
-Replaces: libungif (<< 4.1.6-1)
+Conflicts: libungif (<< 4.1.6-2)
+Replaces: libungif (<< 4.1.6-2)
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
Source-MD5: 7125644155ae6ad33dbc9fc15a14735f
+PatchFile: %n.patch
+PatchFile-MD5: 4afe1a9f59418d6aa11b79dc0c82529a
+
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
InstallScript: <<
@@ -19,7 +23,7 @@
popd
install -d -m 755 %i/share/doc/installed-packages
- for package in libungif libungif-shlibs libungif-bin; do
+ for package in libungif-shlibs libungif-bin; do
touch %i/share/doc/installed-packages/$package
done
<<
@@ -46,15 +50,6 @@
Files: bin
DocFiles: README COPYING AUTHORS
<<
-SplitOff3: <<
- Package: libungif
- Depends: %N (>= %v-%r), fink-obsolete-packages
- Files: <<
- lib/libungif.dylib
- lib/libungif.a
- share/doc/installed-packages/%n
- <<
-<<
SplitOff4: <<
Package: libungif-shlibs
Depends: %N-shlibs (>= %v-%r), fink-obsolete-packages
Added: trunk/experimental/common/main/finkinfo/graphics/giflib.patch
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/graphics/giflib.patch&rev=1505&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/giflib.patch (added)
+++ trunk/experimental/common/main/finkinfo/graphics/giflib.patch Thu Apr 16
14:51:49 2009
@@ -1,0 +1,43 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 01-cve.dpatch by Michael Fedrowitz <micha...@debian.org>
+##
+## DP: Fix CVE-2005-2974 and CVE-2005-3350 (Closes: #337972).
+
+...@dpatch@
+
+diff -Naurp giflib-4.1.6.orig/lib/dgif_lib.c giflib-4.1.6/lib/dgif_lib.c
+--- giflib-4.1.6.orig/lib/dgif_lib.c 2007-11-10 22:54:44.000000000 +0000
++++ giflib-4.1.6/lib/dgif_lib.c 2008-03-07 13:45:02.000000000 +0000
+@@ -249,6 +249,8 @@ DGifGetScreenDesc(GifFileType * GifFile)
+
+ if (READ(GifFile, Buf, 3) != 3) {
+ _GifError = D_GIF_ERR_READ_FAILED;
++ FreeMapObject(GifFile->SColorMap);
++ GifFile->SColorMap = NULL;
+ return GIF_ERROR;
+ }
+ GifFile->SColorResolution = (((Buf[0] & 0x70) + 1) >> 4) + 1;
+@@ -346,6 +348,8 @@ DGifGetImageDesc(GifFileType * GifFile)
+ return GIF_ERROR;
+ if (READ(GifFile, Buf, 1) != 1) {
+ _GifError = D_GIF_ERR_READ_FAILED;
++ FreeMapObject(GifFile->Image.ColorMap);
++ GifFile->Image.ColorMap = NULL;
+ return GIF_ERROR;
+ }
+ BitsPerPixel = (Buf[0] & 0x07) + 1;
+@@ -994,6 +998,14 @@ DGifBufferedInput(GifFileType * GifFile,
+ _GifError = D_GIF_ERR_IMAGE_DEFECT;
+ return GIF_ERROR;
+ }
++ /* There shouldn't be any empty data blocks here as the LZW spec
++ * says the LZW termination code should come first. Therefore we
++ * shouldn't be inside this routine at that point.
++ */
++ if (Buf[0] == 0) {
++ _GifError = D_GIF_ERR_IMAGE_DEFECT;
++ return GIF_ERROR;
++ }
+ if (READ(GifFile, &Buf[1], Buf[0]) != Buf[0]) {
+ _GifError = D_GIF_ERR_READ_FAILED;
+ return GIF_ERROR;
Modified: trunk/experimental/common/main/finkinfo/graphics/imlib.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/imlib.info&rev=1505&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/imlib.info (original)
+++ trunk/experimental/common/main/finkinfo/graphics/imlib.info Thu Apr 16
14:51:49 2009
@@ -53,7 +53,7 @@
libiconv,
libjpeg-bin,
libtiff-bin,
- giflib-bin | libungif-bin,
+ giflib-bin,
libpng3-shlibs,
netpbm-bin,
x11-shlibs
Modified: trunk/experimental/common/main/finkinfo/graphics/imlib2.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/imlib2.info&rev=1505&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/imlib2.info (original)
+++ trunk/experimental/common/main/finkinfo/graphics/imlib2.info Thu Apr 16
14:51:49 2009
@@ -18,7 +18,7 @@
libjpeg,
libpng3,
libtiff,
- giflib | libungif,
+ giflib,
x11-dev,
xmkmf (>= 1.0.2-3)
<<
@@ -59,7 +59,7 @@
libjpeg-shlibs,
libpng3-shlibs (>= 1.2.5-4),
libtiff-shlibs,
- giflib-shlibs | libungif-shlibs,
+ giflib-shlibs,
x11
<<
DocFiles: COPYING
Modified: trunk/experimental/common/main/finkinfo/kde/kdegraphics3.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdegraphics3.info&rev=1505&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdegraphics3.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdegraphics3.info Thu Apr 16
14:51:49 2009
@@ -17,7 +17,7 @@
fribidi (>= 0.10.4-1),
fribidi-dev (>= 0.10.4-1),
gettext-tools,
- giflib | libungif,
+ giflib,
imlib (>= 1.9.14-2),
kdelibs3-unified-dev (>= %v-1),
lcms,
@@ -503,7 +503,7 @@
SplitOff15: <<
Package: kuickshow
Description: KDE - slideshow application
- Depends: %N-base (>= %v-%r), giflib-shlibs | libungif-shlibs,
imlib-shlibs
+ Depends: %N-base (>= %v-%r), giflib-shlibs, imlib-shlibs
Replaces: %N (<< %v-%r)
Recommends: %N (>= %v-%r)
Files: <<
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
