From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 25 Oct 2003 18:17:14 +0000 (+0000)
Subject: - added egid-inithash patch (one more SEGV fix, this one from perl-Imager site)
X-Git-Tag: auto/ac/giflib-4_1_0-4
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=157a723d5b5d7389b4e7f3a88ce30f18e1bd7692;p=packages%2Fgiflib.git

- added egid-inithash patch (one more SEGV fix, this one from perl-Imager site)
- release 4

Changed files:
    giflib-egif-inithash.patch -> 1.1
    giflib.spec -> 1.10
---

diff --git a/giflib-egif-inithash.patch b/giflib-egif-inithash.patch
new file mode 100644
index 0000000..629ee98
--- /dev/null
+++ b/giflib-egif-inithash.patch
@@ -0,0 +1,17 @@
+From http://www.develop-help.com/imager/giflib.patch
+(only one hunk, the second is already in fixes-from-libungif patch)
+--- giflib-4.1.0/lib/egif_lib.c.orig	2003-10-25 19:23:35.000000000 +0200
++++ giflib-4.1.0/lib/egif_lib.c	2003-10-25 19:24:25.049338168 +0200
+@@ -177,6 +177,12 @@
+         _GifError = E_GIF_ERR_NOT_ENOUGH_MEM;
+         return NULL;
+     }
++    if ((Private->HashTable = _InitHashTable()) == NULL) {
++        free(GifFile);
++        free(Private);
++        _GifError = E_GIF_ERR_NOT_ENOUGH_MEM;
++        return NULL;
++    }
+ 
+     GifFile->Private = (VoidPtr) Private;
+     Private->FileHandle = 0;
diff --git a/giflib.spec b/giflib.spec
index d8966fd..ee46b98 100644
--- a/giflib.spec
+++ b/giflib.spec
@@ -7,7 +7,7 @@ Summary(uk):	
 Name:		giflib
 Version:	4.1.0
 %define		so_ver	4.1.0
-Release:	3
+Release:	4
 License:	X Consortium-like
 Group:		Libraries
 # not original URL, but working
@@ -16,6 +16,7 @@ Source0:	http://www.netsw.org/graphic/bitmap/formats/gif/giflib/%{name}-%{versio
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/libungif-man-pages.tar.bz2
 # Source1-md5: 580c50403ed8f7e678ed04b3e0d712f3
 Patch0:		%{name}-fixes-from-libungif.patch
+Patch1:		%{name}-egif-inithash.patch
 URL:		http://prtr-13.ucsc.edu/~badger/software/libungif/giflib.shtml
 BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
@@ -145,10 +146,10 @@ GIF.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
@@ -161,7 +162,8 @@ CFLAGS="%{rpmcflags} -fwritable-strings"; export CFLAGS
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} DESTDIR="$RPM_BUILD_ROOT" install
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 ln -sf libgif.so.%{so_ver} $RPM_BUILD_ROOT%{_libdir}/libungif.so.%{so_ver}
 ln -sf libgif.so.%{so_ver} $RPM_BUILD_ROOT%{_libdir}/libungif.so.4