From 8c00511f559cd479ab58eed894e53c9ab4ad3de3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Feb 11 2018 19:32:31 +0000 Subject: Update to 5.1.4 --- diff --git a/.gitignore b/.gitignore index 1fb1734..596e41a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ giflib-4.1.6.tar.bz2 +/giflib-5.1.4.tar.bz2 diff --git a/giflib-4.1.6-format-security.patch b/giflib-4.1.6-format-security.patch deleted file mode 100644 index abe7946..0000000 --- a/giflib-4.1.6-format-security.patch +++ /dev/null @@ -1,349 +0,0 @@ -diff -ruN giflib-4.1.6.orig/util/gif2epsn.c giflib-4.1.6/util/gif2epsn.c ---- giflib-4.1.6.orig/util/gif2epsn.c 2017-03-29 13:56:44.778740660 -0400 -+++ giflib-4.1.6/util/gif2epsn.c 2017-03-29 15:19:12.024193066 -0400 -@@ -146,7 +146,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gif2iris.c giflib-4.1.6/util/gif2iris.c ---- giflib-4.1.6.orig/util/gif2iris.c 2017-03-29 13:56:44.762740913 -0400 -+++ giflib-4.1.6/util/gif2iris.c 2017-03-29 15:19:12.013193238 -0400 -@@ -111,7 +111,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gif2ps.c giflib-4.1.6/util/gif2ps.c ---- giflib-4.1.6.orig/util/gif2ps.c 2017-03-29 13:56:44.747741149 -0400 -+++ giflib-4.1.6/util/gif2ps.c 2017-03-29 15:19:12.002193410 -0400 -@@ -129,7 +129,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -Binary files giflib-4.1.6.orig/util/.gif2ps.c.swp and giflib-4.1.6/util/.gif2ps.c.swp differ -diff -ruN giflib-4.1.6.orig/util/gif2rgb.c giflib-4.1.6/util/gif2rgb.c ---- giflib-4.1.6.orig/util/gif2rgb.c 2017-03-29 13:56:44.785740550 -0400 -+++ giflib-4.1.6/util/gif2rgb.c 2017-03-29 15:19:12.029192988 -0400 -@@ -108,7 +108,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gif2rle.c giflib-4.1.6/util/gif2rle.c ---- giflib-4.1.6.orig/util/gif2rle.c 2017-03-29 13:56:44.783740581 -0400 -+++ giflib-4.1.6/util/gif2rle.c 2017-03-29 15:19:12.027193019 -0400 -@@ -103,7 +103,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gif2x11.c giflib-4.1.6/util/gif2x11.c ---- giflib-4.1.6.orig/util/gif2x11.c 2017-03-29 13:56:44.759740960 -0400 -+++ giflib-4.1.6/util/gif2x11.c 2017-03-29 15:19:12.011193270 -0400 -@@ -143,7 +143,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifasm.c giflib-4.1.6/util/gifasm.c ---- giflib-4.1.6.orig/util/gifasm.c 2017-03-29 13:56:44.781740613 -0400 -+++ giflib-4.1.6/util/gifasm.c 2017-03-29 15:19:12.026193035 -0400 -@@ -98,7 +98,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifbg.c giflib-4.1.6/util/gifbg.c ---- giflib-4.1.6.orig/util/gifbg.c 2017-03-29 13:56:44.787740518 -0400 -+++ giflib-4.1.6/util/gifbg.c 2017-03-29 15:19:12.031192956 -0400 -@@ -130,7 +130,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifclip.c giflib-4.1.6/util/gifclip.c ---- giflib-4.1.6.orig/util/gifclip.c 2017-03-29 13:56:44.734741354 -0400 -+++ giflib-4.1.6/util/gifclip.c 2017-03-29 15:19:11.995193520 -0400 -@@ -92,7 +92,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifclrmp.c giflib-4.1.6/util/gifclrmp.c ---- giflib-4.1.6.orig/util/gifclrmp.c 2017-03-29 13:56:44.795740392 -0400 -+++ giflib-4.1.6/util/gifclrmp.c 2017-03-29 15:19:12.035192894 -0400 -@@ -111,7 +111,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifcolor.c giflib-4.1.6/util/gifcolor.c ---- giflib-4.1.6.orig/util/gifcolor.c 2017-03-29 13:56:44.724741512 -0400 -+++ giflib-4.1.6/util/gifcolor.c 2017-03-29 15:19:11.984193692 -0400 -@@ -89,7 +89,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifcomb.c giflib-4.1.6/util/gifcomb.c ---- giflib-4.1.6.orig/util/gifcomb.c 2017-03-29 13:56:44.744741197 -0400 -+++ giflib-4.1.6/util/gifcomb.c 2017-03-29 15:19:12.001193426 -0400 -@@ -93,7 +93,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/giffix.c giflib-4.1.6/util/giffix.c ---- giflib-4.1.6.orig/util/giffix.c 2017-03-29 13:56:44.737741307 -0400 -+++ giflib-4.1.6/util/giffix.c 2017-03-29 15:19:11.998193473 -0400 -@@ -90,7 +90,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifflip.c giflib-4.1.6/util/gifflip.c ---- giflib-4.1.6.orig/util/gifflip.c 2017-03-29 13:56:44.732741386 -0400 -+++ giflib-4.1.6/util/gifflip.c 2017-03-29 15:19:11.994193536 -0400 -@@ -104,7 +104,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifhisto.c giflib-4.1.6/util/gifhisto.c ---- giflib-4.1.6.orig/util/gifhisto.c 2017-03-29 13:56:44.773740739 -0400 -+++ giflib-4.1.6/util/gifhisto.c 2017-03-29 15:19:12.021193113 -0400 -@@ -112,7 +112,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifinfo.c giflib-4.1.6/util/gifinfo.c ---- giflib-4.1.6.orig/util/gifinfo.c 2017-03-29 13:56:44.730741417 -0400 -+++ giflib-4.1.6/util/gifinfo.c 2017-03-29 15:19:11.992193567 -0400 -@@ -104,7 +104,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - printf("Format: quoted text string used for formating of information\n"); - printf(" Special characters for various information can be used\n"); -diff -ruN giflib-4.1.6.orig/util/gifinter.c giflib-4.1.6/util/gifinter.c ---- giflib-4.1.6.orig/util/gifinter.c 2017-03-29 13:56:44.751741086 -0400 -+++ giflib-4.1.6/util/gifinter.c 2017-03-29 15:19:12.007193332 -0400 -@@ -98,7 +98,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifinto.c giflib-4.1.6/util/gifinto.c ---- giflib-4.1.6.orig/util/gifinto.c 2017-03-29 13:56:44.769740802 -0400 -+++ giflib-4.1.6/util/gifinto.c 2017-03-29 15:19:12.019193144 -0400 -@@ -96,7 +96,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifovly.c giflib-4.1.6/util/gifovly.c ---- giflib-4.1.6.orig/util/gifovly.c 2017-03-29 13:56:44.739741275 -0400 -+++ giflib-4.1.6/util/gifovly.c 2017-03-29 15:19:11.999193457 -0400 -@@ -73,7 +73,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifpos.c giflib-4.1.6/util/gifpos.c ---- giflib-4.1.6.orig/util/gifpos.c 2017-03-29 13:56:44.756741007 -0400 -+++ giflib-4.1.6/util/gifpos.c 2017-03-29 15:19:12.010193285 -0400 -@@ -90,7 +90,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifrotat.c giflib-4.1.6/util/gifrotat.c ---- giflib-4.1.6.orig/util/gifrotat.c 2017-03-29 13:56:44.771740771 -0400 -+++ giflib-4.1.6/util/gifrotat.c 2017-03-29 15:19:12.020193129 -0400 -@@ -117,7 +117,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifrsize.c giflib-4.1.6/util/gifrsize.c ---- giflib-4.1.6.orig/util/gifrsize.c 2017-03-29 13:56:44.754741039 -0400 -+++ giflib-4.1.6/util/gifrsize.c 2017-03-29 15:19:12.008193317 -0400 -@@ -113,7 +113,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/giftext.c giflib-4.1.6/util/giftext.c ---- giflib-4.1.6.orig/util/giftext.c 2017-03-29 13:56:44.764740881 -0400 -+++ giflib-4.1.6/util/giftext.c 2017-03-29 15:19:12.015193207 -0400 -@@ -102,7 +102,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/gifwedge.c giflib-4.1.6/util/gifwedge.c ---- giflib-4.1.6.orig/util/gifwedge.c 2017-03-29 13:56:44.789740487 -0400 -+++ giflib-4.1.6/util/gifwedge.c 2017-03-29 15:19:12.032192941 -0400 -@@ -94,7 +94,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/icon2gif.c giflib-4.1.6/util/icon2gif.c ---- giflib-4.1.6.orig/util/icon2gif.c 2017-03-29 13:56:44.766740850 -0400 -+++ giflib-4.1.6/util/icon2gif.c 2017-03-29 15:19:12.016193191 -0400 -@@ -94,7 +94,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/raw2gif.c giflib-4.1.6/util/raw2gif.c ---- giflib-4.1.6.orig/util/raw2gif.c 2017-03-29 13:56:44.776740692 -0400 -+++ giflib-4.1.6/util/raw2gif.c 2017-03-29 15:19:12.022193098 -0400 -@@ -118,7 +118,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/rgb2gif.c giflib-4.1.6/util/rgb2gif.c ---- giflib-4.1.6.orig/util/rgb2gif.c 2017-03-29 13:56:44.741741244 -0400 -+++ giflib-4.1.6/util/rgb2gif.c 2017-03-29 15:19:12.000193442 -0400 -@@ -111,7 +111,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/rle2gif.c giflib-4.1.6/util/rle2gif.c ---- giflib-4.1.6.orig/util/rle2gif.c 2017-03-29 13:56:44.768740818 -0400 -+++ giflib-4.1.6/util/rle2gif.c 2017-03-29 15:19:12.018193160 -0400 -@@ -105,7 +105,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } -diff -ruN giflib-4.1.6.orig/util/text2gif.c giflib-4.1.6/util/text2gif.c ---- giflib-4.1.6.orig/util/text2gif.c 2017-03-29 13:56:44.729741433 -0400 -+++ giflib-4.1.6/util/text2gif.c 2017-03-29 15:19:11.989193614 -0400 -@@ -107,7 +107,7 @@ - } - - if (HelpFlag) { -- fprintf(stderr, VersionStr); -+ fprintf(stderr, "%s", VersionStr); - GAPrintHowTo(CtrlStr); - exit(EXIT_SUCCESS); - } diff --git a/giflib.spec b/giflib.spec index 0d9317d..1a0c43b 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,90 +1,82 @@ -Summary: Library for manipulating GIF format image files -Name: giflib -Version: 4.1.6 -Release: 22%{?dist} -License: MIT -Group: System Environment/Libraries -URL: http://www.sourceforge.net/projects/%{name}/ -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -BuildRequires: libX11-devel, libICE-devel, libSM-devel, libXt-devel -BuildRequires: perl-generators -Provides: libungif = %{version}-%{release} -Obsoletes: libungif <= %{version}-%{release} - -# Patches -Patch1: giflib-4.1.6-format-security.patch +Name: giflib +Summary: A library and utilities for processing GIFs +Version: 5.1.4 +Release: 1%{?dist} + +License: MIT +URL: http://www.sourceforge.net/projects/%{name}/ +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 + +BuildRequires: gcc +BuildRequires: make +BuildRequires: xmlto + %description -The giflib package contains a shared library of functions for loading and -saving GIF format image files. It is API and ABI compatible with libungif, -the library which supported uncompressed GIFs while the Unisys LZW patent -was in effect. +giflib is a library for reading and writing gif images. + %package devel -Summary: Development tools for programs using the giflib library -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Provides: libungif-devel = %{version}-%{release} -Obsoletes: libungif-devel <= %{version}-%{release} +Summary: Development files for programs using the giflib library +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The giflib-devel package includes header files, libraries necessary for -developing programs which use the giflib library to load and save GIF format -image files. It contains the documentation of the giflib library, too. +developing programs which use the giflib library. + %package utils -Summary: Programs for manipulating GIF format image files -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -Provides: libungif-progs = %{version}-%{release} -Obsoletes: libungif-progs <= %{version}-%{release} +Summary: Programs for manipulating GIF format image files +Requires: %{name}%{?_isa} = %{version}-%{release} %description utils The giflib-utils package contains various programs for manipulating GIF -format image files. Install it if you need to manipulate GIF format image -files. +format image files. + %prep -%setup -q -%patch1 -p1 +%autosetup -p1 + %build %configure -make %{?_smp_mflags} all +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%make_build -# Handling of libungif compatibility -MAJOR=`echo '%{version}' | sed -e 's/\([0-9]\+\)\..*/\1/'` -%{__cc} $RPM_OPT_FLAGS $RPM_LD_FLAGS -shared -Wl,-soname,libungif.so.$MAJOR -Llib/.libs -lgif -o libungif.so.%{version} %install -make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install - -# Handling of libungif compatibility -install -p -m 755 libungif.so.%{version} $RPM_BUILD_ROOT%{_libdir} -ln -sf libungif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so.4 -ln -sf libungif.so.4 $RPM_BUILD_ROOT%{_libdir}/libungif.so +%make_install # Don't install any static .a and libtool .la files -rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} +rm -f %{buildroot}%{_libdir}/*.{a,la} # Remove makefile relics from documentation rm -f doc/Makefile* + %ldconfig_scriptlets + %files -%doc AUTHORS ChangeLog COPYING NEWS README -%{_libdir}/lib*.so.* +%doc AUTHORS ChangeLog NEWS README +%license COPYING +%{_libdir}/libgif.so.7* %files devel -%doc doc/* util/giffiltr.c util/gifspnge.c -%{_libdir}/lib*.so -%{_includedir}/*.h +%doc doc/* +%{_libdir}/libgif.so +%{_includedir}/gif_lib.h %files utils -%{_bindir}/* +%{_bindir}/gif* +%{_mandir}/man1/gif*.1* + %changelog +* Sun Feb 11 2018 Sandro Mani - 5.1.4-1 +- Update to 5.1.4 + * Thu Feb 8 2018 Florian Weimer - 4.1.6-22 - Build libungif with linker flags from redhat-rpm-config diff --git a/sources b/sources index c66eb81..a2edad6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7125644155ae6ad33dbc9fc15a14735f giflib-4.1.6.tar.bz2 +SHA512 (giflib-5.1.4.tar.bz2) = 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d