From d3ddec7ec10d3d7d48690768cf6e03fb2bf80d9f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 2 Aug 2019 17:33:22 -0400 Subject: [PATCH] import giflib-5.1.4-3.el8 --- .giflib.metadata | 1 + .gitignore | 1 + SOURCES/giflib-5.1.4-coverity.patch | 82 +++++++ ...iflib-5.1.4-html-docs-consistent-ids.patch | 13 ++ SPECS/giflib.spec | 201 ++++++++++++++++++ 5 files changed, 298 insertions(+) create mode 100644 .giflib.metadata create mode 100644 .gitignore create mode 100644 SOURCES/giflib-5.1.4-coverity.patch create mode 100644 SOURCES/giflib-5.1.4-html-docs-consistent-ids.patch create mode 100644 SPECS/giflib.spec diff --git a/.giflib.metadata b/.giflib.metadata new file mode 100644 index 0000000..8a946ca --- /dev/null +++ b/.giflib.metadata @@ -0,0 +1 @@ +5f1157cfc377916280849e247b8e34fa0446513f SOURCES/giflib-5.1.4.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2ea7aa8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/giflib-5.1.4.tar.bz2 diff --git a/SOURCES/giflib-5.1.4-coverity.patch b/SOURCES/giflib-5.1.4-coverity.patch new file mode 100644 index 0000000..41ef7a4 --- /dev/null +++ b/SOURCES/giflib-5.1.4-coverity.patch @@ -0,0 +1,82 @@ +diff --git a/util/gif2rgb.c b/util/gif2rgb.c +index e39f37b..92bf82f 100644 +--- a/util/gif2rgb.c ++++ b/util/gif2rgb.c +@@ -171,6 +171,8 @@ static void SaveGif(GifByteType *OutputBuffer, + /* Open stdout for the output file: */ + if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -179,25 +181,34 @@ static void SaveGif(GifByteType *OutputBuffer, + OutputColorMap) == GIF_ERROR || + EGifPutImageDesc(GifFile, + 0, 0, Width, Height, false, NULL) == +- GIF_ERROR) ++ GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); ++ } + + GifQprintf("\n%s: Image 1 at (%d, %d) [%dx%d]: ", + PROGRAM_NAME, GifFile->Image.Left, GifFile->Image.Top, + GifFile->Image.Width, GifFile->Image.Height); + + for (i = 0; i < Height; i++) { +- if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) ++ if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); ++ } + GifQprintf("\b\b\b\b%-4d", Height - i - 1); + + Ptr += Width; + } + +- if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) ++ if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); ++ } + } + + /****************************************************************************** +diff --git a/util/gifsponge.c b/util/gifsponge.c +index 6e248d8..12bce36 100644 +--- a/util/gifsponge.c ++++ b/util/gifsponge.c +@@ -73,8 +73,7 @@ int main(int argc, char **argv) + * data; it's *your* responsibility to keep your changes consistent. + * Caveat hacker! + */ +- if (EGifSpew(GifFileOut) == GIF_ERROR) +- PrintGifError(GifFileOut->Error); ++ EGifSpew(GifFileOut); + + if (DGifCloseFile(GifFileIn, &ErrorCode) == GIF_ERROR) + PrintGifError(ErrorCode); +diff --git a/util/giftool.c b/util/giftool.c +index e61281c..fe6325c 100644 +--- a/util/giftool.c ++++ b/util/giftool.c +@@ -565,9 +565,9 @@ int main(int argc, char **argv) + for (i = 0; i < GifFileIn->ImageCount; i++) + (void) GifMakeSavedImage(GifFileOut, &GifFileIn->SavedImages[i]); + +- if (EGifSpew(GifFileOut) == GIF_ERROR) +- PrintGifError(GifFileOut->Error); +- else if (DGifCloseFile(GifFileIn, &ErrorCode) == GIF_ERROR) ++ EGifSpew(GifFileOut); ++ ++ if (DGifCloseFile(GifFileIn, &ErrorCode) == GIF_ERROR) + PrintGifError(ErrorCode); + + return 0; diff --git a/SOURCES/giflib-5.1.4-html-docs-consistent-ids.patch b/SOURCES/giflib-5.1.4-html-docs-consistent-ids.patch new file mode 100644 index 0000000..c7f23ca --- /dev/null +++ b/SOURCES/giflib-5.1.4-html-docs-consistent-ids.patch @@ -0,0 +1,13 @@ +diff --git a/doc/Makefile.am b/doc/Makefile.am +index b9696ea..698104b 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,7 +1,7 @@ + SUFFIXES = .xml .html .txt .asc .1 + + .xml.html: +- xmlto xhtml-nochunks $< ++ xmlto --stringparam generate.consistent.ids=1 xhtml-nochunks $< + + .xml.1: + xmlto man $< diff --git a/SPECS/giflib.spec b/SPECS/giflib.spec new file mode 100644 index 0000000..80d0066 --- /dev/null +++ b/SPECS/giflib.spec @@ -0,0 +1,201 @@ +Name: giflib +Summary: A library and utilities for processing GIFs +Version: 5.1.4 +Release: 3%{?dist} + +License: MIT +URL: http://www.sourceforge.net/projects/%{name}/ +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 + +Patch0: giflib-5.1.4-coverity.patch +Patch1: giflib-5.1.4-html-docs-consistent-ids.patch + +BuildRequires: autoconf automake libtool +BuildRequires: gcc +BuildRequires: make +BuildRequires: xmlto + + +%description +giflib is a library for reading and writing gif images. + + +%package devel +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. + + +%package utils +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. + + +%prep +%autosetup -p1 + + +%build +autoreconf -vif +%configure +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 + + +%install +%make_install + +# Don't install any static .a and libtool .la files +rm -f %{buildroot}%{_libdir}/*.{a,la} + +# Remove makefile relics from documentation +rm -f doc/Makefile* + + +%ldconfig_scriptlets + + +%files +%doc AUTHORS ChangeLog NEWS README +%license COPYING +%{_libdir}/libgif.so.7* + +%files devel +%doc doc/* +%{_libdir}/libgif.so +%{_includedir}/gif_lib.h + +%files utils +%{_bindir}/gif* +%{_mandir}/man1/gif*.1* + + +%changelog +* Thu Nov 08 2018 Nikola Forró - 5.1.4-3 +- Generate HTML docs with consistent section IDs to avoid multilib difference + related: #1602513 + +* Mon Oct 29 2018 Nikola Forró - 5.1.4-2 +- Fix important Covscan defects + resolves: #1602513 + +* 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 + +* Wed Feb 07 2018 Fedora Release Engineering - 4.1.6-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Feb 03 2018 Igor Gnatenko - 4.1.6-20 +- Switch to %%ldconfig_scriptlets + +* Wed Aug 02 2017 Fedora Release Engineering - 4.1.6-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 4.1.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 29 2017 Stephen Gallagher - 4.1.6-17 +- Fix compilation errors when -Werror=format-security + +* Fri Feb 10 2017 Fedora Release Engineering - 4.1.6-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 4.1.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Aug 14 2015 Adam Jackson 4.1.6-14 +- Link libungif with -z now too + +* Wed Jun 17 2015 Fedora Release Engineering - 4.1.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Aug 16 2014 Fedora Release Engineering - 4.1.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 4.1.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Dec 18 2013 Peter Robinson 4.1.6-10 +- Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 4.1.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar - 4.1.6-8 +- Perl 5.18 rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 4.1.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 4.1.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 4.1.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 4.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 24 2009 Fedora Release Engineering - 4.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat May 09 2009 Robert Scheck 4.1.6-2 +- Solved multilib problems with documentation (#465208, #474538) +- Removed static library from giflib-devel package (#225796 #c1) + +* Mon Apr 13 2009 Tom "spot" Callaway - 4.1.6-1 +- update to 4.1.6 + +* Tue Feb 24 2009 Fedora Release Engineering - 4.1.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Feb 19 2008 Fedora Release Engineering - 4.1.3-9 +- Autorebuild for GCC 4.3 + +* Tue Mar 13 2007 Karsten Hopp 4.1.3-8 +- add BR libXt-devel, otherwise X support will be disabled + +* Wed Jul 12 2006 Jesse Keating +- rebuild + +* Mon May 22 2006 Karsten Hopp 4.1.3-7 +- buildrequires libICE-devel, libSM-devel + +* Fri Feb 10 2006 Jesse Keating - 4.1.3-6.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 4.1.3-6.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Tue Nov 1 2005 Matthias Clasen 4.1.3-6 +- Switch requires to modular X + +* Wed Sep 21 2005 Toshio Kuratomi 4.1.3-5 +- Merge an option on the empty library link line. +- Obsolete libungif progs package. +- Rename -progs to -utils as FC packages seem to have moved in this direction + for subpackages. + +* Tue Sep 20 2005 Toshio Kuratomi 4.1.3-4 +- Modify the way we provide libungif compatibility by building an empty + library that requires libgif. +- Remove chmod in install. It doesn't seem to be necessary. +- Add a patch to fix a problem with long being 64 bit on x86_64 but the code + assuming it was 32 bit. + +* Mon Sep 19 2005 Toshio Kuratomi 4.1.3-1 +- Port package from libungif to giflib.