diff --git a/driftnet-giflib5.patch b/driftnet-giflib5.patch new file mode 100644 index 0000000..588b0f1 --- /dev/null +++ b/driftnet-giflib5.patch @@ -0,0 +1,42 @@ +diff -rupN driftnet-0.1.6-20040426cvs/gif.c driftnet-0.1.6-20040426cvs-new/gif.c +--- driftnet-0.1.6-20040426cvs/gif.c 2002-07-08 22:57:17.000000000 +0200 ++++ driftnet-0.1.6-20040426cvs-new/gif.c 2018-01-22 23:32:29.986155812 +0100 +@@ -20,7 +20,7 @@ static const char rcsid[] = "$Id: gif.c, + */ + int gif_load_hdr(img I) { + GifFileType *g; +- g = I->us = DGifOpenFileHandle(fileno(I->fp)); ++ g = I->us = DGifOpenFileHandle(fileno(I->fp), NULL); + if (!I->us) { + I->err = IE_HDRFORMAT; + return 0; +@@ -36,7 +36,7 @@ int gif_load_hdr(img I) { + * Abort loading a GIF file after the header is done. + */ + int gif_abort_load(img I) { +- DGifCloseFile((GifFileType*)I->us); ++ DGifCloseFile((GifFileType*)I->us, NULL); + return 1; + } + +@@ -114,7 +114,7 @@ int gif_load_img(img I) { + ret = 1; + fail: + +- DGifCloseFile(g); ++ DGifCloseFile(g, NULL); + + return ret; + } +diff -rupN driftnet-0.1.6-20040426cvs/Makefile driftnet-0.1.6-20040426cvs-new/Makefile +--- driftnet-0.1.6-20040426cvs/Makefile 2007-10-22 03:51:34.000000000 +0200 ++++ driftnet-0.1.6-20040426cvs-new/Makefile 2018-01-22 23:37:58.604137635 +0100 +@@ -35,7 +35,7 @@ LDLIBS += -lpcap -lpthread #-lefence + # Optional C compiler and linker flags. Typical driftnet builds have support + # for displaying captured images in an X window, and need the following flags: + CFLAGS += `pkg-config --cflags gtk+-2.0` +-LDLIBS += -ljpeg -lungif -lpng `pkg-config --libs gtk+-2.0` ++LDLIBS += -ljpeg -lgif -lpng `pkg-config --libs gtk+-2.0` + + # Alternatively, you can build a version of driftnet which can only be used + # in `adjunct' mode as the back end for some other image-processing program. To diff --git a/driftnet.spec b/driftnet.spec index d2df6c2..07f8f2f 100644 --- a/driftnet.spec +++ b/driftnet.spec @@ -2,7 +2,7 @@ Name: driftnet License: GPLv2+ Group: Applications/Internet Version: 0.1.6 -Release: 37.20040426cvs%{?dist} +Release: 38.20040426cvs%{?dist} Summary: Network image sniffer URL: http://www.ex-parrot.com/~chris/driftnet/ Source0: driftnet-0.1.6-20040426cvs.tar.gz @@ -12,9 +12,11 @@ Source2: %name-%{version}-security.config #Patch0: driftnet-gtk2-port.patch Patch1: driftnet-dont-use-tmpnam.patch Patch2: driftnet-0.1.6-no-makedepend.patch -Patch3: driftnet-0.1.6-libpng.patch +Patch3: driftnet-0.1.6-libpng.patch +# giflib-5.x compatibility +Patch4: driftnet-giflib5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libpcap-devel gtk2-devel libungif-devel libjpeg-devel giflib-devel +BuildRequires: libpcap-devel gtk2-devel libjpeg-devel giflib-devel Requires: %{_bindir}/consolehelper %description @@ -28,6 +30,7 @@ traffic. %patch1 -p1 -b .tmpnam %patch2 -p1 -b .makedep %patch3 -p1 -b .libpng +%patch4 -p1 -b .giflib sed -i 's#LDLIBS += -ljpeg -lungif -lpng `pkg-config --libs gtk+-2.0`#LDLIBS += -ljpeg -lungif -lpng -lgif `pkg-config --libs gtk+-2.0`#g' Makefile %build CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -58,6 +61,9 @@ install -Dpm 644 %{SOURCE2} \ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 11 2018 Sandro Mani - 0.1.6-38.20040426cvs +- Rebuild (giflib) + * Wed Feb 07 2018 Fedora Release Engineering - 0.1.6-37.20040426cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild