From 55db1fc6de248bff4c2dc514877a8400e656c618 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 21:29:18 -0600 Subject: [PATCH 01/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 492ead6..907e86e 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* 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 From c82d5017f63ab672baf439fd13fe0f714b14a3b6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 01:31:40 -0500 Subject: [PATCH 02/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 907e86e..25eb60e 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* 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 From 4baa85dbd304fcd51095f96017806107b0affcd3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 17:25:41 -0600 Subject: [PATCH 03/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 25eb60e..833e6b9 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* 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 From d325b17853457fb463c6862fb54109f22c8e3407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 10:01:15 +0200 Subject: [PATCH 04/58] Perl 5.18 rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 833e6b9..d960ac8 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* 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 From cb4be3da23c21477bfee35faadfa7d426d32b020 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 09:17:33 -0500 Subject: [PATCH 05/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index d960ac8..88dc4ea 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* 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 From 48f0569c4a006ec119ff68748832e9ee240f1940 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 25 Nov 2013 00:59:27 +0100 Subject: [PATCH 06/58] - Upgrade to 5.0.5 (#822844) - Tight run-time dependencies between sub-packages via %{?_isa} - Only obsolete but no longer provide any libungif packages --- .gitignore | 2 +- giflib.spec | 40 +++++++++++++++++----------------------- sources | 2 +- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 1fb1734..834bea1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -giflib-4.1.6.tar.bz2 +/giflib-?.?.?.tar.bz2 diff --git a/giflib.spec b/giflib.spec index 88dc4ea..9965fca 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,27 +1,24 @@ Summary: Library for manipulating GIF format image files Name: giflib -Version: 4.1.6 -Release: 9%{?dist} +Version: 5.0.5 +Release: 1%{?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 -Provides: libungif = %{version}-%{release} Obsoletes: libungif <= %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %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. +The giflib package contains a shared library of functions for reading GIF +files, transforming them into RGB bitmaps and and for writing RGB bitmaps +as GIF files. %package devel Summary: Development tools for programs using the giflib library Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Provides: libungif-devel = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: libungif-devel <= %{version}-%{release} %description devel @@ -32,8 +29,7 @@ image files. It contains the documentation of the giflib library, too. %package utils Summary: Programs for manipulating GIF format image files Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -Provides: libungif-progs = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: libungif-progs <= %{version}-%{release} %description utils @@ -48,24 +44,16 @@ files. %configure make %{?_smp_mflags} all -# Handling of libungif compatibility -MAJOR=`echo '%{version}' | sed -e 's/\([0-9]\+\)\..*/\1/'` -%{__cc} $RPM_OPT_FLAGS -shared -Wl,-soname,libungif.so.$MAJOR -Llib/.libs -lgif -o libungif.so.%{version} - %install rm -rf $RPM_BUILD_ROOT 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 -C doc DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install-man # Don't install any static .a and libtool .la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} -# Remove makefile relics from documentation -rm -f doc/Makefile* +# Clean up for later usage in documentation +rm -f doc/Makefile* doc/*.1 %clean rm -rf $RPM_BUILD_ROOT @@ -81,15 +69,21 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc doc/* util/giffiltr.c util/gifspnge.c +%doc doc/* util/giffilter.c util/gifsponge.c %{_libdir}/lib*.so %{_includedir}/*.h %files utils %defattr(-,root,root,-) %{_bindir}/* +%{_mandir}/man1/*.1* %changelog +* Mon Nov 25 2013 Robert Scheck 5.0.5-1 +- Upgrade to 5.0.5 (#822844) +- Tight run-time dependencies between sub-packages via %%{?_isa} +- Only obsolete but no longer provide any libungif packages + * Sat Aug 03 2013 Fedora Release Engineering - 4.1.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index c66eb81..b7fb941 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7125644155ae6ad33dbc9fc15a14735f giflib-4.1.6.tar.bz2 +c3262ba0a3dad31ba876fb5ba1d71a02 giflib-5.0.5.tar.bz2 From 2d3809225d877487a31b9bd7a0f56c9e0d8bc098 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 18 Dec 2013 11:32:13 +0000 Subject: [PATCH 07/58] Revert "- Upgrade to 5.0.5 (#822844)" Revert this for the time being as it needs to be properly planned and as it's not in rawhide yet it'll likely just break things if it gets built in something like a mass rebuild This reverts commit 48f0569c4a006ec119ff68748832e9ee240f1940. --- .gitignore | 2 +- giflib.spec | 40 +++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 834bea1..1fb1734 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/giflib-?.?.?.tar.bz2 +giflib-4.1.6.tar.bz2 diff --git a/giflib.spec b/giflib.spec index 9965fca..88dc4ea 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,24 +1,27 @@ Summary: Library for manipulating GIF format image files Name: giflib -Version: 5.0.5 -Release: 1%{?dist} +Version: 4.1.6 +Release: 9%{?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 +Provides: libungif = %{version}-%{release} Obsoletes: libungif <= %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -The giflib package contains a shared library of functions for reading GIF -files, transforming them into RGB bitmaps and and for writing RGB bitmaps -as GIF files. +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. %package devel Summary: Development tools for programs using the giflib library Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Provides: libungif-devel = %{version}-%{release} Obsoletes: libungif-devel <= %{version}-%{release} %description devel @@ -29,7 +32,8 @@ image files. It contains the documentation of the giflib library, too. %package utils Summary: Programs for manipulating GIF format image files Group: Applications/Multimedia -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Provides: libungif-progs = %{version}-%{release} Obsoletes: libungif-progs <= %{version}-%{release} %description utils @@ -44,16 +48,24 @@ files. %configure make %{?_smp_mflags} all +# Handling of libungif compatibility +MAJOR=`echo '%{version}' | sed -e 's/\([0-9]\+\)\..*/\1/'` +%{__cc} $RPM_OPT_FLAGS -shared -Wl,-soname,libungif.so.$MAJOR -Llib/.libs -lgif -o libungif.so.%{version} + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install -make -C doc DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install-man + +# 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 # Don't install any static .a and libtool .la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} -# Clean up for later usage in documentation -rm -f doc/Makefile* doc/*.1 +# Remove makefile relics from documentation +rm -f doc/Makefile* %clean rm -rf $RPM_BUILD_ROOT @@ -69,21 +81,15 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc doc/* util/giffilter.c util/gifsponge.c +%doc doc/* util/giffiltr.c util/gifspnge.c %{_libdir}/lib*.so %{_includedir}/*.h %files utils %defattr(-,root,root,-) %{_bindir}/* -%{_mandir}/man1/*.1* %changelog -* Mon Nov 25 2013 Robert Scheck 5.0.5-1 -- Upgrade to 5.0.5 (#822844) -- Tight run-time dependencies between sub-packages via %%{?_isa} -- Only obsolete but no longer provide any libungif packages - * Sat Aug 03 2013 Fedora Release Engineering - 4.1.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index b7fb941..c66eb81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3262ba0a3dad31ba876fb5ba1d71a02 giflib-5.0.5.tar.bz2 +7125644155ae6ad33dbc9fc15a14735f giflib-4.1.6.tar.bz2 From 62ac16a9ce8141f7c4d6073189fc903f5d8aa2ed Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 18 Dec 2013 11:35:44 +0000 Subject: [PATCH 08/58] rebuild post revert --- giflib.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/giflib.spec b/giflib.spec index 88dc4ea..8a12fea 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 9%{?dist} +Release: 10%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -9,7 +9,6 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRequires: libX11-devel, libICE-devel, libSM-devel, libXt-devel Provides: libungif = %{version}-%{release} Obsoletes: libungif <= %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description The giflib package contains a shared library of functions for loading and @@ -53,7 +52,6 @@ MAJOR=`echo '%{version}' | sed -e 's/\([0-9]\+\)\..*/\1/'` %{__cc} $RPM_OPT_FLAGS -shared -Wl,-soname,libungif.so.$MAJOR -Llib/.libs -lgif -o libungif.so.%{version} %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install # Handling of libungif compatibility @@ -67,29 +65,26 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} # Remove makefile relics from documentation rm -f doc/Makefile* -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib*.so.* %files devel -%defattr(-,root,root,-) %doc doc/* util/giffiltr.c util/gifspnge.c %{_libdir}/lib*.so %{_includedir}/*.h %files utils -%defattr(-,root,root,-) %{_bindir}/* %changelog +* 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 From ccb61e4bbc216446db47a483d268ed98ed79a4ba Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 10:38:13 -0500 Subject: [PATCH 09/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 8a12fea..178ac36 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 10%{?dist} +Release: 11%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -82,6 +82,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From e25f4c1508c9eadf491edaee05c08b4ccc5adac9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 16:20:56 +0000 Subject: [PATCH 10/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 178ac36..8e83396 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 11%{?dist} +Release: 12%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -82,6 +82,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From c63c004224449a4f8dbd5415800f41bf4ae1e955 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 08:10:11 +0000 Subject: [PATCH 11/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 8e83396..9438beb 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 12%{?dist} +Release: 13%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -82,6 +82,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From 97e35a0fe031320a1f8758a3a9ef192b7398f814 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 14 Aug 2015 14:40:09 -0400 Subject: [PATCH 12/58] Link libungif with -z now too --- giflib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/giflib.spec b/giflib.spec index 9438beb..24e9585 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 13%{?dist} +Release: 14%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -49,7 +49,7 @@ make %{?_smp_mflags} all # Handling of libungif compatibility MAJOR=`echo '%{version}' | sed -e 's/\([0-9]\+\)\..*/\1/'` -%{__cc} $RPM_OPT_FLAGS -shared -Wl,-soname,libungif.so.$MAJOR -Llib/.libs -lgif -o libungif.so.%{version} +%{__cc} $RPM_OPT_FLAGS -Wl,-z,now -shared -Wl,-soname,libungif.so.$MAJOR -Llib/.libs -lgif -o libungif.so.%{version} %install make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install @@ -82,6 +82,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From 8e717b75e251f4f3ad21fdb21a108008c773d799 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:52:00 +0000 Subject: [PATCH 13/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 24e9585..1524a8e 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 14%{?dist} +Release: 15%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -82,6 +82,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From 23d3c726c385c0e2c79e0efad20818a168f1deac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:27:44 +0200 Subject: [PATCH 14/58] Mandatory Perl build-requires added --- giflib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/giflib.spec b/giflib.spec index 1524a8e..fccfc2e 100644 --- a/giflib.spec +++ b/giflib.spec @@ -7,6 +7,7 @@ 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} From ce1fbdd3ab194442138e04b587b37d4133bdbe4c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:55:51 +0000 Subject: [PATCH 15/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index fccfc2e..58f8d62 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 15%{?dist} +Release: 16%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -83,6 +83,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From c6d6d71b3afe7f88cea131f91322675ba2ae1f71 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 29 Mar 2017 15:21:12 -0400 Subject: [PATCH 16/58] Fix compilation errors when -Werror=format-security --- giflib-4.1.6-format-security.patch | 349 +++++++++++++++++++++++++++++ giflib.spec | 9 +- 2 files changed, 357 insertions(+), 1 deletion(-) create mode 100644 giflib-4.1.6-format-security.patch diff --git a/giflib-4.1.6-format-security.patch b/giflib-4.1.6-format-security.patch new file mode 100644 index 0000000..abe7946 --- /dev/null +++ b/giflib-4.1.6-format-security.patch @@ -0,0 +1,349 @@ +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 58f8d62..e45a372 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 16%{?dist} +Release: 17%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -11,6 +11,9 @@ BuildRequires: perl-generators Provides: libungif = %{version}-%{release} Obsoletes: libungif <= %{version}-%{release} +# Patches +Patch1: giflib-4.1.6-format-security.patch + %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, @@ -43,6 +46,7 @@ files. %prep %setup -q +%patch1 -p1 %build %configure @@ -83,6 +87,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From d7c7ef4d196e473c56a31ae3e68347978aa20fc1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 10:04:58 +0000 Subject: [PATCH 17/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index e45a372..c375dee 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 17%{?dist} +Release: 18%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -87,6 +87,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From fe469abbbc28f29b9ae8cc8c2a0d87ca4f5e41da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:39:47 +0000 Subject: [PATCH 18/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index c375dee..7e64f8c 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 18%{?dist} +Release: 19%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -87,6 +87,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From e18cb39348f817bcc278e6cd7c05cc0620331154 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 3 Feb 2018 13:41:43 +0100 Subject: [PATCH 19/58] Switch to %ldconfig_scriptlets Signed-off-by: Igor Gnatenko --- giflib.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/giflib.spec b/giflib.spec index 7e64f8c..350ab82 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 19%{?dist} +Release: 20%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -70,9 +70,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} # Remove makefile relics from documentation rm -f doc/Makefile* -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc AUTHORS ChangeLog COPYING NEWS README @@ -87,6 +85,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From 393fc0721795bc595f469dba28728cb0b402b42f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:27:20 +0000 Subject: [PATCH 20/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 350ab82..c091567 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 20%{?dist} +Release: 21%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -85,6 +85,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From 2dabc514744ca4a961467b0c6f2fd807a6299e58 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 8 Feb 2018 15:57:24 +0100 Subject: [PATCH 21/58] Build libungif with linker flags from redhat-rpm-config --- giflib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/giflib.spec b/giflib.spec index c091567..0d9317d 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 21%{?dist} +Release: 22%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -54,7 +54,7 @@ make %{?_smp_mflags} all # Handling of libungif compatibility MAJOR=`echo '%{version}' | sed -e 's/\([0-9]\+\)\..*/\1/'` -%{__cc} $RPM_OPT_FLAGS -Wl,-z,now -shared -Wl,-soname,libungif.so.$MAJOR -Llib/.libs -lgif -o libungif.so.%{version} +%{__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 @@ -85,6 +85,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* 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 From 8c00511f559cd479ab58eed894e53c9ab4ad3de3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 11 Feb 2018 20:32:31 +0100 Subject: [PATCH 22/58] Update to 5.1.4 --- .gitignore | 1 + giflib-4.1.6-format-security.patch | 349 ----------------------------- giflib.spec | 94 ++++---- sources | 2 +- 4 files changed, 45 insertions(+), 401 deletions(-) delete mode 100644 giflib-4.1.6-format-security.patch 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} +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 -# Patches -Patch1: giflib-4.1.6-format-security.patch %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 From 1e69d64a07274160087100d383aecab60c780d90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:19:58 +0000 Subject: [PATCH 23/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 1a0c43b..d296dcb 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.1.4 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -74,6 +74,9 @@ rm -f doc/Makefile* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 5.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Feb 11 2018 Sandro Mani - 5.1.4-1 - Update to 5.1.4 From 3eeb518ee35b3d8464da54ed90a662b9cf6df7e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:20:02 +0000 Subject: [PATCH 24/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index d296dcb..0117272 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.1.4 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -74,6 +74,9 @@ rm -f doc/Makefile* %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 5.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 5.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From cec422d17e39cd78963f7e63fce3703379ebbe2f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 23 Feb 2019 18:58:50 +0100 Subject: [PATCH 25/58] Update to 5.1.6 --- .gitignore | 1 + giflib.spec | 32 ++++++++++++++++---------------- giflib_mandir.patch | 23 +++++++++++++++++++++++ sources | 2 +- 4 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 giflib_mandir.patch diff --git a/.gitignore b/.gitignore index 596e41a..cd5213f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ giflib-4.1.6.tar.bz2 /giflib-5.1.4.tar.bz2 +/giflib-5.1.6.tar.gz diff --git a/giflib.spec b/giflib.spec index 0117272..c3e1f2d 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,11 +1,14 @@ Name: giflib Summary: A library and utilities for processing GIFs -Version: 5.1.4 -Release: 3%{?dist} +Version: 5.1.6 +Release: 1%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz + +# Instal *.1 manpages to mandir/man1 +Patch0: giflib_mandir.patch BuildRequires: gcc BuildRequires: make @@ -39,27 +42,21 @@ format image files. %build -%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 +%make_build CFLAGS="%{optflags} -fPIC" LDFLAGS="%{__global_ldflags}" %install -%make_install +%make_install PREFIX="%{_prefix}" LIBDIR="%{_libdir}" -# 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* +# Drop static library +rm -f %{buildroot}%{_libdir}/libgif.a %ldconfig_scriptlets -%files -%doc AUTHORS ChangeLog NEWS README +%files +%doc ChangeLog NEWS README %license COPYING %{_libdir}/libgif.so.7* @@ -70,10 +67,13 @@ rm -f doc/Makefile* %files utils %{_bindir}/gif* -%{_mandir}/man1/gif*.1* +%{_mandir}/man1/*.1* %changelog +* Mon Feb 18 2019 Sandro Mani - 5.1.6-1 +- Update to 5.1.6 + * Thu Jan 31 2019 Fedora Release Engineering - 5.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/giflib_mandir.patch b/giflib_mandir.patch new file mode 100644 index 0000000..b10fc7b --- /dev/null +++ b/giflib_mandir.patch @@ -0,0 +1,23 @@ +diff -rupN giflib-5.1.6/Makefile giflib-5.1.6-new/Makefile +--- giflib-5.1.6/Makefile 2019-02-12 15:26:13.000000000 +0100 ++++ giflib-5.1.6-new/Makefile 2019-02-23 18:43:34.425669380 +0100 +@@ -96,8 +96,8 @@ install-lib: + ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" + ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" + install-man: +- $(INSTALL) -d "$(DESTDIR)$(MANDIR)" +- $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)" ++ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" ++ $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1" + uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin + uninstall-bin: + cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE) +@@ -107,7 +107,7 @@ uninstall-lib: + cd "$(DESTDIR)$(LIBDIR)" && \ + rm -f libgif.a libgif.so libgif.so.$(LIBMAJOR) libgif.so.$(LIBVER) + uninstall-man: +- cd "$(DESTDIR)$(MANDIR)" && rm -f $(shell cd doc >/dev/null && echo *.1) ++ cd "$(DESTDIR)$(MANDIR)/man1" && rm -f $(shell cd doc >/dev/null && echo *.1) + + # Make distribution tarball + # diff --git a/sources b/sources index a2edad6..338e5a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giflib-5.1.4.tar.bz2) = 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d +SHA512 (giflib-5.1.6.tar.gz) = a148e3ebee6ad00ac24eb2241e5d7f51c0a22e6e931ebd751ca57b921a2a3d1a17a6d1e0e949ca0401589b539ec1458a57a9e306fadaf03dcd2ec40c11ca28be From db1305a891b86bce21d067887f234b909c4d6e87 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 23 Feb 2019 20:08:54 +0100 Subject: [PATCH 26/58] Fix broken soname --- giflib.spec | 9 +++++++-- giflib_soname.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 giflib_soname.patch diff --git a/giflib.spec b/giflib.spec index c3e1f2d..ac090fe 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,14 +1,16 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.1.6 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# Instal *.1 manpages to mandir/man1 +# Install *.1 manpages to mandir/man1 Patch0: giflib_mandir.patch +# Set the shared library soname +Patch1: giflib_soname.patch BuildRequires: gcc BuildRequires: make @@ -71,6 +73,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Sat Feb 23 2019 Sandro Mani - 5.1.6-2 +- Fix broken soname + * Mon Feb 18 2019 Sandro Mani - 5.1.6-1 - Update to 5.1.6 diff --git a/giflib_soname.patch b/giflib_soname.patch new file mode 100644 index 0000000..010a85d --- /dev/null +++ b/giflib_soname.patch @@ -0,0 +1,12 @@ +diff -rupN giflib-5.1.6/Makefile giflib-5.1.6-new/Makefile +--- giflib-5.1.6/Makefile 2019-02-12 15:26:13.000000000 +0100 ++++ giflib-5.1.6-new/Makefile 2019-02-23 20:01:33.846500996 +0100 +@@ -66,7 +66,7 @@ all: libgif.so libgif.a $(UTILS) + $(UTILS):: libgif.a + + libgif.so: $(OBJECTS) $(HEADERS) +- $(CC) $(CFLAGS) -shared $(OFLAGS) -o libgif.so $(OBJECTS) ++ $(CC) $(CFLAGS) -shared $(OFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) + + libgif.a: $(OBJECTS) $(HEADERS) + ar rcs libgif.a $(OBJECTS) From f811572386f4b519b806837772d3d379c7d558da Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 11 Mar 2019 11:39:57 +0100 Subject: [PATCH 27/58] Update to 5.1.7 --- .gitignore | 1 + giflib.spec | 7 +++++-- giflib_mandir.patch | 6 +++--- giflib_soname.patch | 6 +++--- sources | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index cd5213f..3641eae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ giflib-4.1.6.tar.bz2 /giflib-5.1.4.tar.bz2 /giflib-5.1.6.tar.gz +/giflib-5.1.7.tar.gz diff --git a/giflib.spec b/giflib.spec index ac090fe..b7076f2 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs -Version: 5.1.6 -Release: 2%{?dist} +Version: 5.1.7 +Release: 1%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -73,6 +73,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Mon Mar 11 2019 Sandro Mani - 5.1.7-1 +- Update to 5.1.7 + * Sat Feb 23 2019 Sandro Mani - 5.1.6-2 - Fix broken soname diff --git a/giflib_mandir.patch b/giflib_mandir.patch index b10fc7b..cd2c150 100644 --- a/giflib_mandir.patch +++ b/giflib_mandir.patch @@ -1,6 +1,6 @@ -diff -rupN giflib-5.1.6/Makefile giflib-5.1.6-new/Makefile ---- giflib-5.1.6/Makefile 2019-02-12 15:26:13.000000000 +0100 -+++ giflib-5.1.6-new/Makefile 2019-02-23 18:43:34.425669380 +0100 +diff -rupN giflib-5.1.7/Makefile giflib-5.1.7-new/Makefile +--- giflib-5.1.7/Makefile 2019-03-10 20:06:28.000000000 +0100 ++++ giflib-5.1.7-new/Makefile 2019-03-11 11:37:17.991404481 +0100 @@ -96,8 +96,8 @@ install-lib: ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" diff --git a/giflib_soname.patch b/giflib_soname.patch index 010a85d..9152d8c 100644 --- a/giflib_soname.patch +++ b/giflib_soname.patch @@ -1,6 +1,6 @@ -diff -rupN giflib-5.1.6/Makefile giflib-5.1.6-new/Makefile ---- giflib-5.1.6/Makefile 2019-02-12 15:26:13.000000000 +0100 -+++ giflib-5.1.6-new/Makefile 2019-02-23 20:01:33.846500996 +0100 +diff -rupN giflib-5.1.7/Makefile giflib-5.1.7-new/Makefile +--- giflib-5.1.7/Makefile 2019-03-11 11:37:18.008404458 +0100 ++++ giflib-5.1.7-new/Makefile 2019-03-11 11:37:18.011404454 +0100 @@ -66,7 +66,7 @@ all: libgif.so libgif.a $(UTILS) $(UTILS):: libgif.a diff --git a/sources b/sources index 338e5a4..d50d471 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giflib-5.1.6.tar.gz) = a148e3ebee6ad00ac24eb2241e5d7f51c0a22e6e931ebd751ca57b921a2a3d1a17a6d1e0e949ca0401589b539ec1458a57a9e306fadaf03dcd2ec40c11ca28be +SHA512 (giflib-5.1.7.tar.gz) = b30c3707839a6d66a3e54d92607c303e5ca3d04d6a02d2037fdc8b80386f9a7fa4148727705014481c3c167bdfac2e99d7e4db1ff7f277b64bd2d9193a89f8b0 From e04ff20350f925e91b9cc962c7df5fc50a3700f8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 20 Mar 2019 13:39:09 +0100 Subject: [PATCH 28/58] Update to 5.1.8 --- .gitignore | 1 + giflib.spec | 10 ++++------ giflib_mandir.patch | 23 ----------------------- giflib_soname.patch | 12 ------------ sources | 2 +- 5 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 giflib_mandir.patch delete mode 100644 giflib_soname.patch diff --git a/.gitignore b/.gitignore index 3641eae..dfed71d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ giflib-4.1.6.tar.bz2 /giflib-5.1.4.tar.bz2 /giflib-5.1.6.tar.gz /giflib-5.1.7.tar.gz +/giflib-5.1.8.tar.gz diff --git a/giflib.spec b/giflib.spec index b7076f2..fdd6545 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,17 +1,12 @@ Name: giflib Summary: A library and utilities for processing GIFs -Version: 5.1.7 +Version: 5.1.8 Release: 1%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# Install *.1 manpages to mandir/man1 -Patch0: giflib_mandir.patch -# Set the shared library soname -Patch1: giflib_soname.patch - BuildRequires: gcc BuildRequires: make BuildRequires: xmlto @@ -73,6 +68,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Wed Mar 20 2019 Sandro Mani - 5.1.8-1 +- Update to 5.1.8 + * Mon Mar 11 2019 Sandro Mani - 5.1.7-1 - Update to 5.1.7 diff --git a/giflib_mandir.patch b/giflib_mandir.patch deleted file mode 100644 index cd2c150..0000000 --- a/giflib_mandir.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -rupN giflib-5.1.7/Makefile giflib-5.1.7-new/Makefile ---- giflib-5.1.7/Makefile 2019-03-10 20:06:28.000000000 +0100 -+++ giflib-5.1.7-new/Makefile 2019-03-11 11:37:17.991404481 +0100 -@@ -96,8 +96,8 @@ install-lib: - ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" - ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" - install-man: -- $(INSTALL) -d "$(DESTDIR)$(MANDIR)" -- $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)" -+ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" -+ $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1" - uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin - uninstall-bin: - cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE) -@@ -107,7 +107,7 @@ uninstall-lib: - cd "$(DESTDIR)$(LIBDIR)" && \ - rm -f libgif.a libgif.so libgif.so.$(LIBMAJOR) libgif.so.$(LIBVER) - uninstall-man: -- cd "$(DESTDIR)$(MANDIR)" && rm -f $(shell cd doc >/dev/null && echo *.1) -+ cd "$(DESTDIR)$(MANDIR)/man1" && rm -f $(shell cd doc >/dev/null && echo *.1) - - # Make distribution tarball - # diff --git a/giflib_soname.patch b/giflib_soname.patch deleted file mode 100644 index 9152d8c..0000000 --- a/giflib_soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN giflib-5.1.7/Makefile giflib-5.1.7-new/Makefile ---- giflib-5.1.7/Makefile 2019-03-11 11:37:18.008404458 +0100 -+++ giflib-5.1.7-new/Makefile 2019-03-11 11:37:18.011404454 +0100 -@@ -66,7 +66,7 @@ all: libgif.so libgif.a $(UTILS) - $(UTILS):: libgif.a - - libgif.so: $(OBJECTS) $(HEADERS) -- $(CC) $(CFLAGS) -shared $(OFLAGS) -o libgif.so $(OBJECTS) -+ $(CC) $(CFLAGS) -shared $(OFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) - - libgif.a: $(OBJECTS) $(HEADERS) - ar rcs libgif.a $(OBJECTS) diff --git a/sources b/sources index d50d471..af59b83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giflib-5.1.7.tar.gz) = b30c3707839a6d66a3e54d92607c303e5ca3d04d6a02d2037fdc8b80386f9a7fa4148727705014481c3c167bdfac2e99d7e4db1ff7f277b64bd2d9193a89f8b0 +SHA512 (giflib-5.1.8.tar.gz) = d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3 From 40f920d1763ae3696f7c1d597e203f4fbe30b1b6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 1 Apr 2019 10:37:20 +0200 Subject: [PATCH 29/58] Update to 5.1.9 --- .gitignore | 1 + giflib.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dfed71d..1010699 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ giflib-4.1.6.tar.bz2 /giflib-5.1.6.tar.gz /giflib-5.1.7.tar.gz /giflib-5.1.8.tar.gz +/giflib-5.1.9.tar.gz diff --git a/giflib.spec b/giflib.spec index fdd6545..7510f76 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,6 +1,6 @@ Name: giflib Summary: A library and utilities for processing GIFs -Version: 5.1.8 +Version: 5.1.9 Release: 1%{?dist} License: MIT @@ -68,6 +68,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Mon Apr 01 2019 Sandro Mani - 5.1.9-1 +- Update to 5.1.9 + * Wed Mar 20 2019 Sandro Mani - 5.1.8-1 - Update to 5.1.8 diff --git a/sources b/sources index af59b83..62e449e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giflib-5.1.8.tar.gz) = d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3 +SHA512 (giflib-5.1.9.tar.gz) = b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184 From 8be59c6ecdc7e89db6c01265712da66bec5dae6a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 28 Jun 2019 12:21:58 +0200 Subject: [PATCH 30/58] Update to 5.2.1 --- .gitignore | 1 + giflib.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1010699..d4babef 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ giflib-4.1.6.tar.bz2 /giflib-5.1.7.tar.gz /giflib-5.1.8.tar.gz /giflib-5.1.9.tar.gz +/giflib-5.2.1.tar.gz diff --git a/giflib.spec b/giflib.spec index 7510f76..1ce93f8 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,6 +1,6 @@ Name: giflib Summary: A library and utilities for processing GIFs -Version: 5.1.9 +Version: 5.2.1 Release: 1%{?dist} License: MIT @@ -68,6 +68,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Fri Jun 28 2019 Sandro Mani - 5.2.1-1 +- Update to 5.2.1 + * Mon Apr 01 2019 Sandro Mani - 5.1.9-1 - Update to 5.1.9 diff --git a/sources b/sources index 62e449e..441cb4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giflib-5.1.9.tar.gz) = b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184 +SHA512 (giflib-5.2.1.tar.gz) = 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736 From 48fc3cfe92ec6b9072887c506302b52220be9cb3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:20:12 +0000 Subject: [PATCH 31/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 1ce93f8..d34cb85 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -68,6 +68,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 5.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 28 2019 Sandro Mani - 5.2.1-1 - Update to 5.2.1 From 109bf038d703a471b857aba44af673be103d7079 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 1 Oct 2019 13:08:50 +0200 Subject: [PATCH 32/58] Move quantize.c back into libgif.so (#1750122) --- giflib.spec | 7 ++++++- giflib_quantize.patch | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 giflib_quantize.patch diff --git a/giflib.spec b/giflib.spec index d34cb85..bc0dde1 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,11 +1,13 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# Move quantize.c back into libgif.so (#1750122) +Patch0: giflib_quantize.patch BuildRequires: gcc BuildRequires: make @@ -68,6 +70,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Tue Oct 01 2019 Sandro Mani - 5.2.1-3 +- Move quantize.c back into libgif.so (#1750122) + * Thu Jul 25 2019 Fedora Release Engineering - 5.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/giflib_quantize.patch b/giflib_quantize.patch new file mode 100644 index 0000000..ce1f22c --- /dev/null +++ b/giflib_quantize.patch @@ -0,0 +1,17 @@ +diff -rupN giflib-5.2.1/Makefile giflib-5.2.1-new/Makefile +--- giflib-5.2.1/Makefile 2019-06-24 18:08:57.000000000 +0200 ++++ giflib-5.2.1-new/Makefile 2019-10-01 13:02:33.227952230 +0200 +@@ -29,11 +29,11 @@ LIBPOINT=0 + LIBVER=$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) + + SOURCES = dgif_lib.c egif_lib.c gifalloc.c gif_err.c gif_font.c \ +- gif_hash.c openbsd-reallocarray.c ++ gif_hash.c openbsd-reallocarray.c quantize.c + HEADERS = gif_hash.h gif_lib.h gif_lib_private.h + OBJECTS = $(SOURCES:.c=.o) + +-USOURCES = qprintf.c quantize.c getarg.c ++USOURCES = qprintf.c getarg.c + UHEADERS = getarg.h + UOBJECTS = $(USOURCES:.c=.o) + From f871055c01a82ab20e7070eb764aac5c08871c9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:49:46 +0000 Subject: [PATCH 33/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index bc0dde1..26efcd6 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -70,6 +70,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 5.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Oct 01 2019 Sandro Mani - 5.2.1-3 - Move quantize.c back into libgif.so (#1750122) From df94d26a07ac8772b3380f4e5b4145daa7bf65e1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 17 Feb 2020 17:01:19 +0100 Subject: [PATCH 34/58] Add giflib_coverity.patch, giflib_html-docs-consistent-ids.patch --- giflib.spec | 10 ++++++- giflib_coverity.patch | 43 +++++++++++++++++++++++++++ giflib_html-docs-consistent-ids.patch | 12 ++++++++ giflib_quantize.patch | 4 +-- 4 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 giflib_coverity.patch create mode 100644 giflib_html-docs-consistent-ids.patch diff --git a/giflib.spec b/giflib.spec index 26efcd6..ee8b679 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,13 +1,17 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Move quantize.c back into libgif.so (#1750122) Patch0: giflib_quantize.patch +# Fix several defects found by Coverity scan +Patch1: giflib_coverity.patch +# Generate HTML docs with consistent section IDs to avoid multilib difference +Patch2: giflib_html-docs-consistent-ids.patch BuildRequires: gcc BuildRequires: make @@ -70,6 +74,10 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Mon Feb 17 2020 Sandro Mani - 5.2.1-5 +- Fix several defects found by Coverity scan +- Generate HTML docs with consistent section IDs to avoid multilib difference + * Tue Jan 28 2020 Fedora Release Engineering - 5.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/giflib_coverity.patch b/giflib_coverity.patch new file mode 100644 index 0000000..c51234f --- /dev/null +++ b/giflib_coverity.patch @@ -0,0 +1,43 @@ +diff -rupN --no-dereference giflib-5.2.1/gif2rgb.c giflib-5.2.1-new/gif2rgb.c +--- giflib-5.2.1/gif2rgb.c 2019-06-24 09:24:27.000000000 +0200 ++++ giflib-5.2.1-new/gif2rgb.c 2020-02-17 16:51:04.468397502 +0100 +@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputB + /* Open stdout for the output file: */ + if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputB + EGifPutImageDesc(GifFile, + 0, 0, Width, Height, false, NULL) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -187,8 +191,11 @@ static void SaveGif(GifByteType *OutputB + 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; +@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputB + + if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + } diff --git a/giflib_html-docs-consistent-ids.patch b/giflib_html-docs-consistent-ids.patch new file mode 100644 index 0000000..d4006ea --- /dev/null +++ b/giflib_html-docs-consistent-ids.patch @@ -0,0 +1,12 @@ +diff -rupN --no-dereference giflib-5.2.1/doc/Makefile giflib-5.2.1-new/doc/Makefile +--- giflib-5.2.1/doc/Makefile 2019-03-28 18:05:25.000000000 +0100 ++++ giflib-5.2.1-new/doc/Makefile 2020-02-17 16:51:04.489397582 +0100 +@@ -1,7 +1,7 @@ + .SUFFIXES: .xml .html .txt .adoc .1 + + .xml.html: +- xmlto xhtml-nochunks $< ++ xmlto --stringparam generate.consistent.ids=1 xhtml-nochunks $< + + .xml.1: + xmlto man $< diff --git a/giflib_quantize.patch b/giflib_quantize.patch index ce1f22c..aa34629 100644 --- a/giflib_quantize.patch +++ b/giflib_quantize.patch @@ -1,6 +1,6 @@ -diff -rupN giflib-5.2.1/Makefile giflib-5.2.1-new/Makefile +diff -rupN --no-dereference giflib-5.2.1/Makefile giflib-5.2.1-new/Makefile --- giflib-5.2.1/Makefile 2019-06-24 18:08:57.000000000 +0200 -+++ giflib-5.2.1-new/Makefile 2019-10-01 13:02:33.227952230 +0200 ++++ giflib-5.2.1-new/Makefile 2020-02-17 16:51:04.450397434 +0100 @@ -29,11 +29,11 @@ LIBPOINT=0 LIBVER=$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) From 0fbe9930a5ed5f50cb14ce352f580302fc8f6b87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:58:17 +0000 Subject: [PATCH 35/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index ee8b679..5d800f7 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -74,6 +74,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 5.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Feb 17 2020 Sandro Mani - 5.2.1-5 - Fix several defects found by Coverity scan - Generate HTML docs with consistent section IDs to avoid multilib difference From 9cfef479ca9d5c62c513cbd76f1e75b0ee94fc80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 08:02:28 +0000 Subject: [PATCH 36/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 5d800f7..87fe454 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -74,6 +74,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 5.2.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 5.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f4dde61417de0ea2d3fb6dd246f232acb404b47e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:34:52 +0000 Subject: [PATCH 37/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 87fe454..844e435 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -74,6 +74,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 5.2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 5.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0a8d631a31148e0bf7fb98cb1a7d8974e0429473 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:56:05 +0000 Subject: [PATCH 38/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 844e435..8ad2686 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -74,6 +74,9 @@ rm -f %{buildroot}%{_libdir}/libgif.a %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 5.2.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 5.2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 9f2b9319d785f8248e23489c52937e074f74ee41 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 24 Feb 2022 11:12:04 +0100 Subject: [PATCH 39/58] Add mingw subpackages --- giflib.spec | 86 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 78 insertions(+), 8 deletions(-) diff --git a/giflib.spec b/giflib.spec index 8ad2686..19957d9 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,11 +1,13 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 9%{?dist} +Release: 10%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# Downstream cmake support +Source1: CMakeLists.txt # Move quantize.c back into libgif.so (#1750122) Patch0: giflib_quantize.patch # Fix several defects found by Coverity scan @@ -13,10 +15,16 @@ Patch1: giflib_coverity.patch # Generate HTML docs with consistent section IDs to avoid multilib difference Patch2: giflib_html-docs-consistent-ids.patch +BuildRequires: cmake BuildRequires: gcc -BuildRequires: make BuildRequires: xmlto +BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-gcc + +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-gcc + %description giflib is a library for reading and writing gif images. @@ -39,23 +47,64 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The giflib-utils package contains various programs for manipulating GIF format image files. +%package -n mingw32-%{name} +Summary: MinGW Windows %{name} library +Obsoletes: mingw32-%{name}-static + +%description -n mingw32-%{name} +%{summary}. + + +%package -n mingw32-%{name}-tools +Summary: Tools for the MinGW Windows %{name} library +Requires: mingw32-%{name} = %{version}-%{release} + +%description -n mingw32-%{name}-tools +%{summary}. + + +%package -n mingw64-%{name} +Summary: MinGW Windows %{name} library +Obsoletes: mingw64-%{name}-static + +%description -n mingw64-%{name} +%{summary}. + + +%package -n mingw64-%{name}-tools +Summary: Tools for the MinGW Windows %{name} library +Requires: mingw64-%{name} = %{version}-%{release} + +%description -n mingw64-%{name}-tools +%{summary}. + + +%{?mingw_debug_package} + %prep %autosetup -p1 +cp -a %{SOURCE1} . %build -%make_build CFLAGS="%{optflags} -fPIC" LDFLAGS="%{__global_ldflags}" +# Native build +%cmake +%cmake_build + +# MinGW build +%mingw_cmake +%mingw_make_build %install -%make_install PREFIX="%{_prefix}" LIBDIR="%{_libdir}" - -# Drop static library -rm -f %{buildroot}%{_libdir}/libgif.a +%cmake_install +%mingw_make_install +rm -rf %{buildroot}%{mingw32_mandir} +rm -rf %{buildroot}%{mingw64_mandir} -%ldconfig_scriptlets +%mingw_debug_install_post %files @@ -72,8 +121,29 @@ rm -f %{buildroot}%{_libdir}/libgif.a %{_bindir}/gif* %{_mandir}/man1/*.1* +%files -n mingw32-%{name} +%license COPYING +%{mingw32_bindir}/libgif-7.dll +%{mingw32_includedir}/gif_lib.h +%{mingw32_libdir}/libgif.dll.a + +%files -n mingw32-%{name}-tools +%{mingw32_bindir}/*.exe + +%files -n mingw64-%{name} +%license COPYING +%{mingw64_bindir}/libgif-7.dll +%{mingw64_includedir}/gif_lib.h +%{mingw64_libdir}/libgif.dll.a + +%files -n mingw64-%{name}-tools +%{mingw64_bindir}/*.exe + %changelog +* Sat Feb 19 2022 Sandro Mani - 5.2.1-10 +- Add mingw subpackage + * Thu Jan 20 2022 Fedora Release Engineering - 5.2.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 67fb7bb61705fdbe4b0822925c7559d6d52b3504 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 24 Feb 2022 16:24:26 +0100 Subject: [PATCH 40/58] Add CMakeLists.txt --- CMakeLists.txt | 141 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..b69a03d --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,141 @@ +cmake_minimum_required(VERSION 2.6.0) + +project(giflib C) + +SET(BUILD_STATIC_LIBS OFF CACHE BOOL "Whether to also build static libs") + +execute_process(COMMAND ./getversion + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +set(LIBMAJOR 7) +set(LIBMINOR 1) +set(LIBPOINT 0) +set(LIBVER "${LIBMAJOR}.${LIBMINOR}.${LIBPOINT}") + +set(giflib_SRC + dgif_lib.c + egif_lib.c + getarg.c + gifalloc.c + gif_err.c + gif_font.c + gif_hash.c + openbsd-reallocarray.c + qprintf.c + quantize.c +) + +# Some utilities are installed +set(giflib_INSTALLABLE + gif2rgb + gifbuild + giffix + giftext + giftool + gifclrmp +) + +# Some utilities are only used internally for testing. +# There is a parallel list in doc/Makefile. +# These are all candidates for removal in future releases. +set(giflib_UTILS + ${giflib_INSTALLABLE} + gifbg + gifcolor + gifecho + giffilter + gifhisto + gifinto + gifwedge +) + +file(GLOB giflib_MAN doc/*.1) + +### Build library / tools + +add_library(gif SHARED ${giflib_SRC}) +target_link_libraries(gif m) +set_target_properties(gif PROPERTIES VERSION ${LIBVER} SOVERSION ${LIBMAJOR}) +if(WIN32) + set_target_properties(gif PROPERTIES SUFFIX "-${LIBMAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}") +endif(WIN32) + +if(${BUILD_STATIC_LIBS}) + add_library(gif_static STATIC ${giflib_SRC}) + set_target_properties(gif_static PROPERTIES OUTPUT_NAME gif) +endif(${BUILD_STATIC_LIBS}) + + +foreach(UTILITY ${giflib_UTILS}) + add_executable(${UTILITY} ${UTILITY}.c) + target_link_libraries(${UTILITY} gif) +endforeach() + +### Installation + +install(TARGETS gif + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib${LIB_SUFFIX} + LIBRARY DESTINATION lib${LIB_SUFFIX} +) + +if(${BUILD_STATIC_LIBS}) + install(TARGETS gif_static ARCHIVE DESTINATION lib${LIB_SUFFIX}) +endif(${BUILD_STATIC_LIBS}) + +foreach(UTILITY ${giflib_UTILS}) + install(TARGETS ${UTILITY} DESTINATION bin) +endforeach() + +install(FILES gif_lib.h DESTINATION include) +install(FILES ${giflib_MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) + + +### Distribution tarball +set(giflib_DIST + *.c + *.h + README + NEWS + TODO + COPYING + getversion + ChangeLog + CMakeLists.txt + build.adoc + history.adoc + control + doc/whatsinagif + doc/*.1 + doc/*.xml + doc/*.txt + doc/index.html.in + doc/00README + doc/Makefile + tests + pic +) +# We include all of the XML, and also generated manual pages +# so people working from the distribution tarball won't need xmlto. +add_custom_target(dist-gz + COMMAND tar --transform='s:^:giflib-${VERSION}/:' -czf giflib-${VERSION}.tar.gz ${giflib_DIST} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +) + +add_custom_target(dist-bz2 + COMMAND tar --transform='s:^:giflib-${VERSION}/:' -cjf giflib-${VERSION}.tar.bz2 ${giflib_DIST} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +) + +add_custom_target(dist DEPENDS dist-gz DEPENDS dist-bz2) + + +### Auditing tools + +# cppcheck should run clean +add_custom_target(cppcheck + COMMAND cppcheck --inline-suppr --template gcc --enable=all --suppress=unusedFunction --force *.[ch] +) From 8493e8a24a17201d3eeb5a98d4ab6bce9f7daa2c Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 24 Feb 2022 20:06:58 +0100 Subject: [PATCH 41/58] Make mingw subpackages noarch --- giflib.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 19957d9..7943043 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 10%{?dist} +Release: 11%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -50,6 +50,7 @@ format image files. %package -n mingw32-%{name} Summary: MinGW Windows %{name} library Obsoletes: mingw32-%{name}-static +BuildArch: noarch %description -n mingw32-%{name} %{summary}. @@ -58,6 +59,7 @@ Obsoletes: mingw32-%{name}-static %package -n mingw32-%{name}-tools Summary: Tools for the MinGW Windows %{name} library Requires: mingw32-%{name} = %{version}-%{release} +BuildArch: noarch %description -n mingw32-%{name}-tools %{summary}. @@ -66,6 +68,7 @@ Requires: mingw32-%{name} = %{version}-%{release} %package -n mingw64-%{name} Summary: MinGW Windows %{name} library Obsoletes: mingw64-%{name}-static +BuildArch: noarch %description -n mingw64-%{name} %{summary}. @@ -74,6 +77,7 @@ Obsoletes: mingw64-%{name}-static %package -n mingw64-%{name}-tools Summary: Tools for the MinGW Windows %{name} library Requires: mingw64-%{name} = %{version}-%{release} +BuildArch: noarch %description -n mingw64-%{name}-tools %{summary}. @@ -141,6 +145,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Thu Feb 24 2022 Sandro Mani - 5.2.1-11 +- Make mingw subpackages noarch + * Sat Feb 19 2022 Sandro Mani - 5.2.1-10 - Add mingw subpackage From 3395452f7e88d981a233fcfefe5ef8af9af1f942 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 25 Mar 2022 13:56:50 +0100 Subject: [PATCH 42/58] Rebuild with mingw-gcc-12 --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 7943043..8cfaf7b 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 11%{?dist} +Release: 12%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -145,6 +145,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Fri Mar 25 2022 Sandro Mani - 5.2.1-12 +- Rebuild with mingw-gcc-12 + * Thu Feb 24 2022 Sandro Mani - 5.2.1-11 - Make mingw subpackages noarch From 763a35cb09d5fa14e1281326dce9fc96db3ff012 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 06:11:03 +0000 Subject: [PATCH 43/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 8cfaf7b..43974d3 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 12%{?dist} +Release: 13%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -145,6 +145,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 5.2.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Mar 25 2022 Sandro Mani - 5.2.1-12 - Rebuild with mingw-gcc-12 From 2e9917bf13df114354163f0c0211eccc00943596 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 21 Jul 2022 10:01:11 +0200 Subject: [PATCH 44/58] Backport fix for CVE-2022-28506 --- CVE-2022-28506.patch | 15 +++++++++++++++ giflib.spec | 8 +++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 CVE-2022-28506.patch diff --git a/CVE-2022-28506.patch b/CVE-2022-28506.patch new file mode 100644 index 0000000..c5f0b9a --- /dev/null +++ b/CVE-2022-28506.patch @@ -0,0 +1,15 @@ +diff -rupN giflib-5.2.1/gif2rgb.c giflib-5.2.1-new/gif2rgb.c +--- giflib-5.2.1/gif2rgb.c 2019-06-24 09:24:27.000000000 +0200 ++++ giflib-5.2.1-new/gif2rgb.c 2022-07-21 09:58:28.256036156 +0200 +@@ -294,6 +294,11 @@ static void DumpScreen2RGB(char *FileNam + GifRow = ScreenBuffer[i]; + GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); + for (j = 0, BufferP = Buffer; j < ScreenWidth; j++) { ++ /* Check if color is within color palete */ ++ if (GifRow[j] >= ColorMap->ColorCount) ++ { ++ GIF_EXIT(GifErrorString(D_GIF_ERR_IMAGE_DEFECT)); ++ } + ColorMapEntry = &ColorMap->Colors[GifRow[j]]; + *BufferP++ = ColorMapEntry->Red; + *BufferP++ = ColorMapEntry->Green; diff --git a/giflib.spec b/giflib.spec index 43974d3..885d278 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 13%{?dist} +Release: 14%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -14,6 +14,9 @@ Patch0: giflib_quantize.patch Patch1: giflib_coverity.patch # Generate HTML docs with consistent section IDs to avoid multilib difference Patch2: giflib_html-docs-consistent-ids.patch +# Backport fix for CVE-2022-28506 +# See https://sourceforge.net/u/mmuzila/giflib/ci/5b74cdd9c1285514eaa4675347ba3eea81d32c65/ +Patch3: CVE-2022-28506.patch BuildRequires: cmake BuildRequires: gcc @@ -145,6 +148,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Thu Jul 21 2022 Sandro Mani - 5.2.1-14 +- Backport fix for CVE-2022-28506 + * Thu Jul 21 2022 Fedora Release Engineering - 5.2.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 273f1a15ca0097baff757fea079cbbdd2c67970e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 04:49:44 +0000 Subject: [PATCH 45/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 885d278..21e4810 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 14%{?dist} +Release: 15%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -148,6 +148,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 5.2.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Sandro Mani - 5.2.1-14 - Backport fix for CVE-2022-28506 From 8fe05875704f665d85249fb0d30b9723683d51e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 22:55:59 +0000 Subject: [PATCH 46/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 21e4810..1917ac8 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 15%{?dist} +Release: 16%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -148,6 +148,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 5.2.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 5.2.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4eea5ef82fe65114294d7752ddb2875ebbddffa0 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 14 Sep 2023 20:57:35 +0200 Subject: [PATCH 47/58] Add patch for CVE-2023-39742 --- fix-get-args-segment-violation.patch | 24 ++++++++++++++++++++++++ giflib.spec | 9 ++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 fix-get-args-segment-violation.patch diff --git a/fix-get-args-segment-violation.patch b/fix-get-args-segment-violation.patch new file mode 100644 index 0000000..1595450 --- /dev/null +++ b/fix-get-args-segment-violation.patch @@ -0,0 +1,24 @@ +Description: Fix segmentation faults due to non correct checking for args +Author: David Suárez +Origin: vendor +Bug: https://sourceforge.net/p/giflib/bugs/153/ +Bug-Debian: https://bugs.debian.org/715963 +Bug-Debian: https://bugs.debian.org/715964 +Bug-Debian: https://bugs.debian.org/715967 +Last-Update: 2020-12-20 + +--- a/getarg.c ++++ b/getarg.c +@@ -305,6 +305,12 @@ + int i = 0, ScanRes; + + while (!(ISSPACE(CtrlStrCopy[i]))) { ++ ++ if ((*argv) == argv_end) { ++ GAErrorToken = Option; ++ return CMD_ERR_NumRead; ++ } ++ + switch (CtrlStrCopy[i + 1]) { + case 'd': /* Get signed integers. */ + ScanRes = sscanf(*((*argv)++), "%d", diff --git a/giflib.spec b/giflib.spec index 1917ac8..319cf69 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 16%{?dist} +Release: 17%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -17,6 +17,10 @@ Patch2: giflib_html-docs-consistent-ids.patch # Backport fix for CVE-2022-28506 # See https://sourceforge.net/u/mmuzila/giflib/ci/5b74cdd9c1285514eaa4675347ba3eea81d32c65/ Patch3: CVE-2022-28506.patch +# Fix segmentation faults when invoking tools with incorrect arguments (CVE-2023-39742) +# Taken from Debian package +Patch4: fix-get-args-segment-violation.patch + BuildRequires: cmake BuildRequires: gcc @@ -148,6 +152,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Thu Sep 14 2023 Sandro Mani - 5.2.1-17 +- Add patch for CVE-2023-39742 + * Wed Jul 19 2023 Fedora Release Engineering - 5.2.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 33951725b33c1b3ca61e761b06a8d7efac4f28ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 22:17:34 +0000 Subject: [PATCH 48/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 319cf69..1c8025e 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 17%{?dist} +Release: 18%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -152,6 +152,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 5.2.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Sep 14 2023 Sandro Mani - 5.2.1-17 - Add patch for CVE-2023-39742 From c6d4a9e4fbc69e13ce5d695bc64630cf6ee8f359 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 14:46:27 +0000 Subject: [PATCH 49/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 1c8025e..7201b6e 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 18%{?dist} +Release: 19%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -152,6 +152,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 5.2.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 5.2.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d98866cb09f8b7b5b9e2f001a90b44f42dee2bd5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 19 Feb 2024 09:51:30 +0100 Subject: [PATCH 50/58] Update to 5.2.2 --- .gitignore | 1 + CVE-2022-28506.patch | 15 ------ fix-get-args-segment-violation.patch | 24 --------- giflib.spec | 13 ++--- giflib_coverity.patch | 72 +++++++++++++-------------- giflib_html-docs-consistent-ids.patch | 8 +-- giflib_quantize.patch | 6 +-- sources | 2 +- 8 files changed, 48 insertions(+), 93 deletions(-) delete mode 100644 CVE-2022-28506.patch delete mode 100644 fix-get-args-segment-violation.patch diff --git a/.gitignore b/.gitignore index d4babef..cbfea7a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ giflib-4.1.6.tar.bz2 /giflib-5.1.8.tar.gz /giflib-5.1.9.tar.gz /giflib-5.2.1.tar.gz +/giflib-5.2.2.tar.gz diff --git a/CVE-2022-28506.patch b/CVE-2022-28506.patch deleted file mode 100644 index c5f0b9a..0000000 --- a/CVE-2022-28506.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rupN giflib-5.2.1/gif2rgb.c giflib-5.2.1-new/gif2rgb.c ---- giflib-5.2.1/gif2rgb.c 2019-06-24 09:24:27.000000000 +0200 -+++ giflib-5.2.1-new/gif2rgb.c 2022-07-21 09:58:28.256036156 +0200 -@@ -294,6 +294,11 @@ static void DumpScreen2RGB(char *FileNam - GifRow = ScreenBuffer[i]; - GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); - for (j = 0, BufferP = Buffer; j < ScreenWidth; j++) { -+ /* Check if color is within color palete */ -+ if (GifRow[j] >= ColorMap->ColorCount) -+ { -+ GIF_EXIT(GifErrorString(D_GIF_ERR_IMAGE_DEFECT)); -+ } - ColorMapEntry = &ColorMap->Colors[GifRow[j]]; - *BufferP++ = ColorMapEntry->Red; - *BufferP++ = ColorMapEntry->Green; diff --git a/fix-get-args-segment-violation.patch b/fix-get-args-segment-violation.patch deleted file mode 100644 index 1595450..0000000 --- a/fix-get-args-segment-violation.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Fix segmentation faults due to non correct checking for args -Author: David Suárez -Origin: vendor -Bug: https://sourceforge.net/p/giflib/bugs/153/ -Bug-Debian: https://bugs.debian.org/715963 -Bug-Debian: https://bugs.debian.org/715964 -Bug-Debian: https://bugs.debian.org/715967 -Last-Update: 2020-12-20 - ---- a/getarg.c -+++ b/getarg.c -@@ -305,6 +305,12 @@ - int i = 0, ScanRes; - - while (!(ISSPACE(CtrlStrCopy[i]))) { -+ -+ if ((*argv) == argv_end) { -+ GAErrorToken = Option; -+ return CMD_ERR_NumRead; -+ } -+ - switch (CtrlStrCopy[i + 1]) { - case 'd': /* Get signed integers. */ - ScanRes = sscanf(*((*argv)++), "%d", diff --git a/giflib.spec b/giflib.spec index 7201b6e..fe98d4d 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs -Version: 5.2.1 -Release: 19%{?dist} +Version: 5.2.2 +Release: 1%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -14,12 +14,6 @@ Patch0: giflib_quantize.patch Patch1: giflib_coverity.patch # Generate HTML docs with consistent section IDs to avoid multilib difference Patch2: giflib_html-docs-consistent-ids.patch -# Backport fix for CVE-2022-28506 -# See https://sourceforge.net/u/mmuzila/giflib/ci/5b74cdd9c1285514eaa4675347ba3eea81d32c65/ -Patch3: CVE-2022-28506.patch -# Fix segmentation faults when invoking tools with incorrect arguments (CVE-2023-39742) -# Taken from Debian package -Patch4: fix-get-args-segment-violation.patch BuildRequires: cmake @@ -152,6 +146,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Mon Feb 19 2024 Sandro Mani - 5.2.2-1 +- Update to 5.2.2 + * Wed Jan 24 2024 Fedora Release Engineering - 5.2.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/giflib_coverity.patch b/giflib_coverity.patch index c51234f..0e995ae 100644 --- a/giflib_coverity.patch +++ b/giflib_coverity.patch @@ -1,43 +1,39 @@ -diff -rupN --no-dereference giflib-5.2.1/gif2rgb.c giflib-5.2.1-new/gif2rgb.c ---- giflib-5.2.1/gif2rgb.c 2019-06-24 09:24:27.000000000 +0200 -+++ giflib-5.2.1-new/gif2rgb.c 2020-02-17 16:51:04.468397502 +0100 -@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputB - /* Open stdout for the output file: */ - if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } +diff -rupN --no-dereference giflib-5.2.2/gif2rgb.c giflib-5.2.2-new/gif2rgb.c +--- giflib-5.2.2/gif2rgb.c 2024-02-19 04:01:28.000000000 +0100 ++++ giflib-5.2.2-new/gif2rgb.c 2024-02-19 09:39:38.750976758 +0100 +@@ -165,6 +165,8 @@ static void SaveGif(GifByteType *OutputB + /* Open stdout for the output file: */ + if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } -@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputB - EGifPutImageDesc(GifFile, - 0, 0, Width, Height, false, NULL) == GIF_ERROR) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } +@@ -173,6 +175,8 @@ static void SaveGif(GifByteType *OutputB + EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) == + GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } -@@ -187,8 +191,11 @@ static void SaveGif(GifByteType *OutputB - GifFile->Image.Width, GifFile->Image.Height); +@@ -182,6 +186,8 @@ static void SaveGif(GifByteType *OutputB - 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); + for (i = 0; i < Height; i++) { + if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + GifQprintf("\b\b\b\b%-4d", Height - i - 1); +@@ -191,6 +197,8 @@ static void SaveGif(GifByteType *OutputB - Ptr += Width; -@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputB - - if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } + if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } } diff --git a/giflib_html-docs-consistent-ids.patch b/giflib_html-docs-consistent-ids.patch index d4006ea..fd29642 100644 --- a/giflib_html-docs-consistent-ids.patch +++ b/giflib_html-docs-consistent-ids.patch @@ -1,8 +1,8 @@ -diff -rupN --no-dereference giflib-5.2.1/doc/Makefile giflib-5.2.1-new/doc/Makefile ---- giflib-5.2.1/doc/Makefile 2019-03-28 18:05:25.000000000 +0100 -+++ giflib-5.2.1-new/doc/Makefile 2020-02-17 16:51:04.489397582 +0100 +diff -rupN --no-dereference giflib-5.2.2/doc/Makefile giflib-5.2.2-new/doc/Makefile +--- giflib-5.2.2/doc/Makefile 2024-02-18 19:15:05.000000000 +0100 ++++ giflib-5.2.2-new/doc/Makefile 2024-02-19 09:39:38.785968237 +0100 @@ -1,7 +1,7 @@ - .SUFFIXES: .xml .html .txt .adoc .1 + .SUFFIXES: .xml .html .txt .adoc .1 .7 .xml.html: - xmlto xhtml-nochunks $< diff --git a/giflib_quantize.patch b/giflib_quantize.patch index aa34629..57c2b69 100644 --- a/giflib_quantize.patch +++ b/giflib_quantize.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference giflib-5.2.1/Makefile giflib-5.2.1-new/Makefile ---- giflib-5.2.1/Makefile 2019-06-24 18:08:57.000000000 +0200 -+++ giflib-5.2.1-new/Makefile 2020-02-17 16:51:04.450397434 +0100 +diff -rupN --no-dereference giflib-5.2.2/Makefile giflib-5.2.2-new/Makefile +--- giflib-5.2.2/Makefile 2024-02-19 02:01:50.000000000 +0100 ++++ giflib-5.2.2-new/Makefile 2024-02-19 09:39:38.715985279 +0100 @@ -29,11 +29,11 @@ LIBPOINT=0 LIBVER=$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) diff --git a/sources b/sources index 441cb4c..67868a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giflib-5.2.1.tar.gz) = 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736 +SHA512 (giflib-5.2.2.tar.gz) = 0865ab2b1904fa14640c655fdb14bb54244ad18a66e358565c00287875d00912343f9be8bfac7658cc0146200d626f7ec9160d7a339f20ba3be6b9941d73975f From 880d895e67db4ed60978f396be7f7c11deae7cd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 02:18:16 +0000 Subject: [PATCH 51/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index fe98d4d..8c1766b 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -146,6 +146,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 5.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Feb 19 2024 Sandro Mani - 5.2.2-1 - Update to 5.2.2 From 8e1d361c1b990d5b5680e382e899d266aaad031b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 21:57:03 +0000 Subject: [PATCH 52/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 8c1766b..251f659 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.2 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -146,6 +146,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 5.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 5.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a4acb22cd1a25bc9d3c85434d22338e0f25964a8 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Wed, 2 Apr 2025 11:31:14 +0300 Subject: [PATCH 53/58] Install getarg.h header file --- CMakeLists.txt | 2 +- giflib.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b69a03d..8404ca6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ foreach(UTILITY ${giflib_UTILS}) install(TARGETS ${UTILITY} DESTINATION bin) endforeach() -install(FILES gif_lib.h DESTINATION include) +install(FILES gif_lib.h getarg.h DESTINATION include) install(FILES ${giflib_MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) diff --git a/giflib.spec b/giflib.spec index 251f659..de2f6c1 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.2 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -121,6 +121,7 @@ rm -rf %{buildroot}%{mingw64_mandir} %doc doc/* %{_libdir}/libgif.so %{_includedir}/gif_lib.h +%{_includedir}/getarg.h %files utils %{_bindir}/gif* @@ -130,6 +131,7 @@ rm -rf %{buildroot}%{mingw64_mandir} %license COPYING %{mingw32_bindir}/libgif-7.dll %{mingw32_includedir}/gif_lib.h +%{mingw32_includedir}/getarg.h %{mingw32_libdir}/libgif.dll.a %files -n mingw32-%{name}-tools @@ -139,6 +141,7 @@ rm -rf %{buildroot}%{mingw64_mandir} %license COPYING %{mingw64_bindir}/libgif-7.dll %{mingw64_includedir}/gif_lib.h +%{mingw64_includedir}/getarg.h %{mingw64_libdir}/libgif.dll.a %files -n mingw64-%{name}-tools @@ -146,6 +149,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Wed Apr 02 2025 Benson Muite - 5.2.2-4 +- Install getarg.h header file + * Thu Jan 16 2025 Fedora Release Engineering - 5.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From cb8a423c41cf2f474194bc19b38dac0a6cb8fcc6 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Wed, 2 Apr 2025 14:29:21 +0300 Subject: [PATCH 54/58] Change getarg.h to gif_getarg.h --- CMakeLists.txt | 2 +- getarg.patch | 308 +++++++++++++++++++++++++++++++++++++++++++++++++ giflib.spec | 16 ++- 3 files changed, 319 insertions(+), 7 deletions(-) create mode 100644 getarg.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index 8404ca6..92151d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ foreach(UTILITY ${giflib_UTILS}) install(TARGETS ${UTILITY} DESTINATION bin) endforeach() -install(FILES gif_lib.h getarg.h DESTINATION include) +install(FILES gif_lib.h gif_getarg.h DESTINATION include) install(FILES ${giflib_MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) diff --git a/getarg.patch b/getarg.patch new file mode 100644 index 0000000..34e9cab --- /dev/null +++ b/getarg.patch @@ -0,0 +1,308 @@ +diff -ruN giflib-5.2.2/getarg.c giflib-5.2.2-getarg/getarg.c +--- giflib-5.2.2/getarg.c 2024-02-19 06:01:27.000000000 +0300 ++++ giflib-5.2.2-getarg/getarg.c 2025-04-02 14:06:46.761392686 +0300 +@@ -112,7 +112,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + + #define MAX_PARAM 100 /* maximum number of parameters allowed. */ + #define CTRL_STR_MAX_LEN 1024 +diff -ruN giflib-5.2.2/getarg.h giflib-5.2.2-getarg/getarg.h +--- giflib-5.2.2/getarg.h 2024-02-19 05:20:00.000000000 +0300 ++++ giflib-5.2.2-getarg/getarg.h 1970-01-01 03:00:00.000000000 +0300 +@@ -1,54 +0,0 @@ +-/*************************************************************************** +- +-getarg.h - Support routines for the giflib utilities +- +-SPDX-License-Identifier: MIT +- +- **************************************************************************/ +- +-#ifndef _GETARG_H +-#define _GETARG_H +- +-#include "gif_lib.h" +-#include +- +-#define VERSION_COOKIE " Version %d.%d, " +- +-/*************************************************************************** +- Error numbers as returned by GAGetArg routine: +-***************************************************************************/ +-#define CMD_ERR_NotAnOpt 1 /* None Option found. */ +-#define CMD_ERR_NoSuchOpt 2 /* Undefined Option Found. */ +-#define CMD_ERR_WildEmpty 3 /* Empty input for !*? seq. */ +-#define CMD_ERR_NumRead 4 /* Failed on reading number. */ +-#define CMD_ERR_AllSatis 5 /* Fail to satisfy (must-'!') option. */ +- +-bool GAGetArgs(int argc, char **argv, char *CtrlStr, ...); +-void GAPrintErrMsg(int Error); +-void GAPrintHowTo(char *CtrlStr); +- +-/****************************************************************************** +- From qprintf.c +-******************************************************************************/ +-extern void GifQprintf(char *Format, ...); +-extern void PrintGifError(int ErrorCode); +- +-/****************************************************************************** +- Color table quantization +-******************************************************************************/ +-int GifQuantizeBuffer(unsigned int Width, unsigned int Height, +- int *ColorMapSize, GifByteType *RedInput, +- GifByteType *GreenInput, GifByteType *BlueInput, +- GifByteType *OutputBuffer, GifColorType *OutputColorMap); +- +-/* These used to live in the library header */ +-#define GIF_MESSAGE(Msg) fprintf(stderr, "\n%s: %s\n", PROGRAM_NAME, Msg) +-#define GIF_EXIT(Msg) \ +- { \ +- GIF_MESSAGE(Msg); \ +- exit(-3); \ +- } +- +-#endif /* _GETARG_H */ +- +-/* end */ +diff -ruN giflib-5.2.2/gif2rgb.c giflib-5.2.2-getarg/gif2rgb.c +--- giflib-5.2.2/gif2rgb.c 2025-04-02 13:56:45.432522463 +0300 ++++ giflib-5.2.2-getarg/gif2rgb.c 2025-04-02 14:11:36.739658922 +0300 +@@ -34,7 +34,7 @@ + #include + #endif /* _WIN32 */ + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "gif2rgb" +diff -ruN giflib-5.2.2/gifbg.c giflib-5.2.2-getarg/gifbg.c +--- giflib-5.2.2/gifbg.c 2024-02-19 06:01:28.000000000 +0300 ++++ giflib-5.2.2-getarg/gifbg.c 2025-04-02 14:07:09.489604643 +0300 +@@ -12,7 +12,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "gifbg" +diff -ruN giflib-5.2.2/gifbuild.c giflib-5.2.2-getarg/gifbuild.c +--- giflib-5.2.2/gifbuild.c 2024-02-19 06:05:16.000000000 +0300 ++++ giflib-5.2.2-getarg/gifbuild.c 2025-04-02 14:07:41.226029058 +0300 +@@ -12,7 +12,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "gifbuild" +diff -ruN giflib-5.2.2/gifclrmp.c giflib-5.2.2-getarg/gifclrmp.c +--- giflib-5.2.2/gifclrmp.c 2024-02-19 06:01:27.000000000 +0300 ++++ giflib-5.2.2-getarg/gifclrmp.c 2025-04-02 14:08:05.234274976 +0300 +@@ -14,7 +14,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "gifclrmp" +diff -ruN giflib-5.2.2/gifcolor.c giflib-5.2.2-getarg/gifcolor.c +--- giflib-5.2.2/gifcolor.c 2024-02-19 06:01:28.000000000 +0300 ++++ giflib-5.2.2-getarg/gifcolor.c 2025-04-02 14:08:24.954333260 +0300 +@@ -12,7 +12,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "gifcolor" +diff -ruN giflib-5.2.2/gifecho.c giflib-5.2.2-getarg/gifecho.c +--- giflib-5.2.2/gifecho.c 2024-02-19 06:01:27.000000000 +0300 ++++ giflib-5.2.2-getarg/gifecho.c 2025-04-02 14:08:42.490448501 +0300 +@@ -12,7 +12,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "gifecho" +diff -ruN giflib-5.2.2/giffilter.c giflib-5.2.2-getarg/giffilter.c +--- giflib-5.2.2/giffilter.c 2024-02-19 06:01:28.000000000 +0300 ++++ giflib-5.2.2-getarg/giffilter.c 2025-04-02 14:09:03.546624488 +0300 +@@ -25,7 +25,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "giffilter" +diff -ruN giflib-5.2.2/giffix.c giflib-5.2.2-getarg/giffix.c +--- giflib-5.2.2/giffix.c 2024-02-19 06:01:27.000000000 +0300 ++++ giflib-5.2.2-getarg/giffix.c 2025-04-02 14:09:26.162882098 +0300 +@@ -12,7 +12,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "giffix" +diff -ruN giflib-5.2.2/gif_getarg.h giflib-5.2.2-getarg/gif_getarg.h +--- giflib-5.2.2/gif_getarg.h 1970-01-01 03:00:00.000000000 +0300 ++++ giflib-5.2.2-getarg/gif_getarg.h 2025-04-02 14:04:40.299508057 +0300 +@@ -0,0 +1,54 @@ ++/*************************************************************************** ++ ++getarg.h - Support routines for the giflib utilities ++ ++SPDX-License-Identifier: MIT ++ ++ **************************************************************************/ ++ ++#ifndef _GETARG_H ++#define _GETARG_H ++ ++#include "gif_lib.h" ++#include ++ ++#define VERSION_COOKIE " Version %d.%d, " ++ ++/*************************************************************************** ++ Error numbers as returned by GAGetArg routine: ++***************************************************************************/ ++#define CMD_ERR_NotAnOpt 1 /* None Option found. */ ++#define CMD_ERR_NoSuchOpt 2 /* Undefined Option Found. */ ++#define CMD_ERR_WildEmpty 3 /* Empty input for !*? seq. */ ++#define CMD_ERR_NumRead 4 /* Failed on reading number. */ ++#define CMD_ERR_AllSatis 5 /* Fail to satisfy (must-'!') option. */ ++ ++bool GAGetArgs(int argc, char **argv, char *CtrlStr, ...); ++void GAPrintErrMsg(int Error); ++void GAPrintHowTo(char *CtrlStr); ++ ++/****************************************************************************** ++ From qprintf.c ++******************************************************************************/ ++extern void GifQprintf(char *Format, ...); ++extern void PrintGifError(int ErrorCode); ++ ++/****************************************************************************** ++ Color table quantization ++******************************************************************************/ ++int GifQuantizeBuffer(unsigned int Width, unsigned int Height, ++ int *ColorMapSize, GifByteType *RedInput, ++ GifByteType *GreenInput, GifByteType *BlueInput, ++ GifByteType *OutputBuffer, GifColorType *OutputColorMap); ++ ++/* These used to live in the library header */ ++#define GIF_MESSAGE(Msg) fprintf(stderr, "\n%s: %s\n", PROGRAM_NAME, Msg) ++#define GIF_EXIT(Msg) \ ++ { \ ++ GIF_MESSAGE(Msg); \ ++ exit(-3); \ ++ } ++ ++#endif /* _GETARG_H */ ++ ++/* end */ +diff -ruN giflib-5.2.2/gifhisto.c giflib-5.2.2-getarg/gifhisto.c +--- giflib-5.2.2/gifhisto.c 2024-02-19 06:01:28.000000000 +0300 ++++ giflib-5.2.2-getarg/gifhisto.c 2025-04-02 14:09:45.643183312 +0300 +@@ -12,7 +12,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "gifhisto" +diff -ruN giflib-5.2.2/gifinto.c giflib-5.2.2-getarg/gifinto.c +--- giflib-5.2.2/gifinto.c 2024-02-19 06:01:28.000000000 +0300 ++++ giflib-5.2.2-getarg/gifinto.c 2025-04-02 14:10:06.403197077 +0300 +@@ -19,7 +19,7 @@ + #include + #endif /* _WIN32 */ + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "gifinto" +diff -ruN giflib-5.2.2/gifsponge.c giflib-5.2.2-getarg/gifsponge.c +--- giflib-5.2.2/gifsponge.c 2024-02-19 06:01:28.000000000 +0300 ++++ giflib-5.2.2-getarg/gifsponge.c 2025-04-02 14:10:23.555170542 +0300 +@@ -25,7 +25,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "gifsponge" +diff -ruN giflib-5.2.2/giftext.c giflib-5.2.2-getarg/giftext.c +--- giflib-5.2.2/giftext.c 2024-02-19 06:01:28.000000000 +0300 ++++ giflib-5.2.2-getarg/giftext.c 2025-04-02 14:10:40.427363509 +0300 +@@ -16,7 +16,7 @@ + #include + #endif /* _WIN32 */ + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "giftext" +diff -ruN giflib-5.2.2/giftool.c giflib-5.2.2-getarg/giftool.c +--- giflib-5.2.2/giftool.c 2024-02-19 06:01:28.000000000 +0300 ++++ giflib-5.2.2-getarg/giftool.c 2025-04-02 14:10:59.579511889 +0300 +@@ -12,7 +12,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "getopt.h" + #include "gif_lib.h" + +diff -ruN giflib-5.2.2/gifwedge.c giflib-5.2.2-getarg/gifwedge.c +--- giflib-5.2.2/gifwedge.c 2024-02-19 06:01:27.000000000 +0300 ++++ giflib-5.2.2-getarg/gifwedge.c 2025-04-02 14:11:16.163652219 +0300 +@@ -12,7 +12,7 @@ + #include + #include + +-#include "getarg.h" ++#include "gif_getarg.h" + #include "gif_lib.h" + + #define PROGRAM_NAME "gifwedge" +diff -ruN giflib-5.2.2/Makefile giflib-5.2.2-getarg/Makefile +--- giflib-5.2.2/Makefile 2025-04-02 13:56:24.568117543 +0300 ++++ giflib-5.2.2-getarg/Makefile 2025-04-02 14:05:51.785348480 +0300 +@@ -34,7 +34,7 @@ + OBJECTS = $(SOURCES:.c=.o) + + USOURCES = qprintf.c getarg.c +-UHEADERS = getarg.h ++UHEADERS = gif_getarg.h + UOBJECTS = $(USOURCES:.c=.o) + + UNAME:=$(shell uname) diff --git a/giflib.spec b/giflib.spec index de2f6c1..d5b4af7 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.2 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -14,7 +14,9 @@ Patch0: giflib_quantize.patch Patch1: giflib_coverity.patch # Generate HTML docs with consistent section IDs to avoid multilib difference Patch2: giflib_html-docs-consistent-ids.patch - +# Rename getarg.h to gif_getarg.h +# https://sourceforge.net/p/giflib/code/merge-requests/18/ +Patch3: getarg.patch BuildRequires: cmake BuildRequires: gcc @@ -91,7 +93,6 @@ BuildArch: noarch %autosetup -p1 cp -a %{SOURCE1} . - %build # Native build %cmake @@ -121,7 +122,7 @@ rm -rf %{buildroot}%{mingw64_mandir} %doc doc/* %{_libdir}/libgif.so %{_includedir}/gif_lib.h -%{_includedir}/getarg.h +%{_includedir}/gif_getarg.h %files utils %{_bindir}/gif* @@ -131,7 +132,7 @@ rm -rf %{buildroot}%{mingw64_mandir} %license COPYING %{mingw32_bindir}/libgif-7.dll %{mingw32_includedir}/gif_lib.h -%{mingw32_includedir}/getarg.h +%{mingw32_includedir}/gif_getarg.h %{mingw32_libdir}/libgif.dll.a %files -n mingw32-%{name}-tools @@ -141,7 +142,7 @@ rm -rf %{buildroot}%{mingw64_mandir} %license COPYING %{mingw64_bindir}/libgif-7.dll %{mingw64_includedir}/gif_lib.h -%{mingw64_includedir}/getarg.h +%{mingw64_includedir}/gif_getarg.h %{mingw64_libdir}/libgif.dll.a %files -n mingw64-%{name}-tools @@ -149,6 +150,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Wed Apr 02 2025 Benson Muite - 5.2.2-5 +- Rename getarg.h to gif_getarg.h + * Wed Apr 02 2025 Benson Muite - 5.2.2-4 - Install getarg.h header file From c22b8e9757d8c3cd57eb2125b706bb90b7f37791 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 15 Apr 2025 19:49:32 +0200 Subject: [PATCH 55/58] Add proposed patch for CVE-2025-31334 --- getarg.patch | 140 +++++++++++++------------- giflib-5.2.2-cve-2025-31344.patch | 15 +++ giflib.spec | 11 +- giflib_coverity.patch | 2 +- giflib_html-docs-consistent-ids.patch | 2 +- giflib_quantize.patch | 2 +- 6 files changed, 96 insertions(+), 76 deletions(-) create mode 100644 giflib-5.2.2-cve-2025-31344.patch diff --git a/getarg.patch b/getarg.patch index 34e9cab..4026183 100644 --- a/getarg.patch +++ b/getarg.patch @@ -1,7 +1,7 @@ -diff -ruN giflib-5.2.2/getarg.c giflib-5.2.2-getarg/getarg.c ---- giflib-5.2.2/getarg.c 2024-02-19 06:01:27.000000000 +0300 -+++ giflib-5.2.2-getarg/getarg.c 2025-04-02 14:06:46.761392686 +0300 -@@ -112,7 +112,7 @@ +diff -rupN --no-dereference giflib-5.2.2/getarg.c giflib-5.2.2-new/getarg.c +--- giflib-5.2.2/getarg.c 2024-02-19 04:01:27.000000000 +0100 ++++ giflib-5.2.2-new/getarg.c 2025-04-15 16:56:27.276152030 +0200 +@@ -112,7 +112,7 @@ SPDX-License-Identifier: MIT #include #include @@ -10,9 +10,9 @@ diff -ruN giflib-5.2.2/getarg.c giflib-5.2.2-getarg/getarg.c #define MAX_PARAM 100 /* maximum number of parameters allowed. */ #define CTRL_STR_MAX_LEN 1024 -diff -ruN giflib-5.2.2/getarg.h giflib-5.2.2-getarg/getarg.h ---- giflib-5.2.2/getarg.h 2024-02-19 05:20:00.000000000 +0300 -+++ giflib-5.2.2-getarg/getarg.h 1970-01-01 03:00:00.000000000 +0300 +diff -rupN --no-dereference giflib-5.2.2/getarg.h giflib-5.2.2-new/getarg.h +--- giflib-5.2.2/getarg.h 2024-02-19 03:20:00.000000000 +0100 ++++ giflib-5.2.2-new/getarg.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -/*************************************************************************** - @@ -68,10 +68,10 @@ diff -ruN giflib-5.2.2/getarg.h giflib-5.2.2-getarg/getarg.h -#endif /* _GETARG_H */ - -/* end */ -diff -ruN giflib-5.2.2/gif2rgb.c giflib-5.2.2-getarg/gif2rgb.c ---- giflib-5.2.2/gif2rgb.c 2025-04-02 13:56:45.432522463 +0300 -+++ giflib-5.2.2-getarg/gif2rgb.c 2025-04-02 14:11:36.739658922 +0300 -@@ -34,7 +34,7 @@ +diff -rupN --no-dereference giflib-5.2.2/gif2rgb.c giflib-5.2.2-new/gif2rgb.c +--- giflib-5.2.2/gif2rgb.c 2025-04-15 16:56:27.247167987 +0200 ++++ giflib-5.2.2-new/gif2rgb.c 2025-04-15 16:56:27.276617411 +0200 +@@ -34,7 +34,7 @@ with our utilities mainly interesting as #include #endif /* _WIN32 */ @@ -80,10 +80,10 @@ diff -ruN giflib-5.2.2/gif2rgb.c giflib-5.2.2-getarg/gif2rgb.c #include "gif_lib.h" #define PROGRAM_NAME "gif2rgb" -diff -ruN giflib-5.2.2/gifbg.c giflib-5.2.2-getarg/gifbg.c ---- giflib-5.2.2/gifbg.c 2024-02-19 06:01:28.000000000 +0300 -+++ giflib-5.2.2-getarg/gifbg.c 2025-04-02 14:07:09.489604643 +0300 -@@ -12,7 +12,7 @@ +diff -rupN --no-dereference giflib-5.2.2/gifbg.c giflib-5.2.2-new/gifbg.c +--- giflib-5.2.2/gifbg.c 2024-02-19 04:01:28.000000000 +0100 ++++ giflib-5.2.2-new/gifbg.c 2025-04-15 16:56:27.276870781 +0200 +@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT #include #include @@ -92,10 +92,10 @@ diff -ruN giflib-5.2.2/gifbg.c giflib-5.2.2-getarg/gifbg.c #include "gif_lib.h" #define PROGRAM_NAME "gifbg" -diff -ruN giflib-5.2.2/gifbuild.c giflib-5.2.2-getarg/gifbuild.c ---- giflib-5.2.2/gifbuild.c 2024-02-19 06:05:16.000000000 +0300 -+++ giflib-5.2.2-getarg/gifbuild.c 2025-04-02 14:07:41.226029058 +0300 -@@ -12,7 +12,7 @@ +diff -rupN --no-dereference giflib-5.2.2/gifbuild.c giflib-5.2.2-new/gifbuild.c +--- giflib-5.2.2/gifbuild.c 2024-02-19 04:05:16.000000000 +0100 ++++ giflib-5.2.2-new/gifbuild.c 2025-04-15 16:56:27.277111740 +0200 +@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT #include #include @@ -104,10 +104,10 @@ diff -ruN giflib-5.2.2/gifbuild.c giflib-5.2.2-getarg/gifbuild.c #include "gif_lib.h" #define PROGRAM_NAME "gifbuild" -diff -ruN giflib-5.2.2/gifclrmp.c giflib-5.2.2-getarg/gifclrmp.c ---- giflib-5.2.2/gifclrmp.c 2024-02-19 06:01:27.000000000 +0300 -+++ giflib-5.2.2-getarg/gifclrmp.c 2025-04-02 14:08:05.234274976 +0300 -@@ -14,7 +14,7 @@ +diff -rupN --no-dereference giflib-5.2.2/gifclrmp.c giflib-5.2.2-new/gifclrmp.c +--- giflib-5.2.2/gifclrmp.c 2024-02-19 04:01:27.000000000 +0100 ++++ giflib-5.2.2-new/gifclrmp.c 2025-04-15 16:56:27.277368098 +0200 +@@ -14,7 +14,7 @@ SPDX-License-Identifier: MIT #include #include @@ -116,10 +116,10 @@ diff -ruN giflib-5.2.2/gifclrmp.c giflib-5.2.2-getarg/gifclrmp.c #include "gif_lib.h" #define PROGRAM_NAME "gifclrmp" -diff -ruN giflib-5.2.2/gifcolor.c giflib-5.2.2-getarg/gifcolor.c ---- giflib-5.2.2/gifcolor.c 2024-02-19 06:01:28.000000000 +0300 -+++ giflib-5.2.2-getarg/gifcolor.c 2025-04-02 14:08:24.954333260 +0300 -@@ -12,7 +12,7 @@ +diff -rupN --no-dereference giflib-5.2.2/gifcolor.c giflib-5.2.2-new/gifcolor.c +--- giflib-5.2.2/gifcolor.c 2024-02-19 04:01:28.000000000 +0100 ++++ giflib-5.2.2-new/gifcolor.c 2025-04-15 16:56:27.277585194 +0200 +@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT #include #include @@ -128,10 +128,10 @@ diff -ruN giflib-5.2.2/gifcolor.c giflib-5.2.2-getarg/gifcolor.c #include "gif_lib.h" #define PROGRAM_NAME "gifcolor" -diff -ruN giflib-5.2.2/gifecho.c giflib-5.2.2-getarg/gifecho.c ---- giflib-5.2.2/gifecho.c 2024-02-19 06:01:27.000000000 +0300 -+++ giflib-5.2.2-getarg/gifecho.c 2025-04-02 14:08:42.490448501 +0300 -@@ -12,7 +12,7 @@ +diff -rupN --no-dereference giflib-5.2.2/gifecho.c giflib-5.2.2-new/gifecho.c +--- giflib-5.2.2/gifecho.c 2024-02-19 04:01:27.000000000 +0100 ++++ giflib-5.2.2-new/gifecho.c 2025-04-15 16:56:27.277769355 +0200 +@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT #include #include @@ -140,10 +140,10 @@ diff -ruN giflib-5.2.2/gifecho.c giflib-5.2.2-getarg/gifecho.c #include "gif_lib.h" #define PROGRAM_NAME "gifecho" -diff -ruN giflib-5.2.2/giffilter.c giflib-5.2.2-getarg/giffilter.c ---- giflib-5.2.2/giffilter.c 2024-02-19 06:01:28.000000000 +0300 -+++ giflib-5.2.2-getarg/giffilter.c 2025-04-02 14:09:03.546624488 +0300 -@@ -25,7 +25,7 @@ +diff -rupN --no-dereference giflib-5.2.2/giffilter.c giflib-5.2.2-new/giffilter.c +--- giflib-5.2.2/giffilter.c 2024-02-19 04:01:28.000000000 +0100 ++++ giflib-5.2.2-new/giffilter.c 2025-04-15 16:56:27.277955467 +0200 +@@ -25,7 +25,7 @@ SPDX-License-Identifier: MIT #include #include @@ -152,10 +152,10 @@ diff -ruN giflib-5.2.2/giffilter.c giflib-5.2.2-getarg/giffilter.c #include "gif_lib.h" #define PROGRAM_NAME "giffilter" -diff -ruN giflib-5.2.2/giffix.c giflib-5.2.2-getarg/giffix.c ---- giflib-5.2.2/giffix.c 2024-02-19 06:01:27.000000000 +0300 -+++ giflib-5.2.2-getarg/giffix.c 2025-04-02 14:09:26.162882098 +0300 -@@ -12,7 +12,7 @@ +diff -rupN --no-dereference giflib-5.2.2/giffix.c giflib-5.2.2-new/giffix.c +--- giflib-5.2.2/giffix.c 2024-02-19 04:01:27.000000000 +0100 ++++ giflib-5.2.2-new/giffix.c 2025-04-15 16:56:27.278150152 +0200 +@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT #include #include @@ -164,9 +164,9 @@ diff -ruN giflib-5.2.2/giffix.c giflib-5.2.2-getarg/giffix.c #include "gif_lib.h" #define PROGRAM_NAME "giffix" -diff -ruN giflib-5.2.2/gif_getarg.h giflib-5.2.2-getarg/gif_getarg.h ---- giflib-5.2.2/gif_getarg.h 1970-01-01 03:00:00.000000000 +0300 -+++ giflib-5.2.2-getarg/gif_getarg.h 2025-04-02 14:04:40.299508057 +0300 +diff -rupN --no-dereference giflib-5.2.2/gif_getarg.h giflib-5.2.2-new/gif_getarg.h +--- giflib-5.2.2/gif_getarg.h 1970-01-01 01:00:00.000000000 +0100 ++++ giflib-5.2.2-new/gif_getarg.h 2025-04-15 16:56:27.278343984 +0200 @@ -0,0 +1,54 @@ +/*************************************************************************** + @@ -222,10 +222,10 @@ diff -ruN giflib-5.2.2/gif_getarg.h giflib-5.2.2-getarg/gif_getarg.h +#endif /* _GETARG_H */ + +/* end */ -diff -ruN giflib-5.2.2/gifhisto.c giflib-5.2.2-getarg/gifhisto.c ---- giflib-5.2.2/gifhisto.c 2024-02-19 06:01:28.000000000 +0300 -+++ giflib-5.2.2-getarg/gifhisto.c 2025-04-02 14:09:45.643183312 +0300 -@@ -12,7 +12,7 @@ +diff -rupN --no-dereference giflib-5.2.2/gifhisto.c giflib-5.2.2-new/gifhisto.c +--- giflib-5.2.2/gifhisto.c 2024-02-19 04:01:28.000000000 +0100 ++++ giflib-5.2.2-new/gifhisto.c 2025-04-15 16:56:27.278489203 +0200 +@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT #include #include @@ -234,10 +234,10 @@ diff -ruN giflib-5.2.2/gifhisto.c giflib-5.2.2-getarg/gifhisto.c #include "gif_lib.h" #define PROGRAM_NAME "gifhisto" -diff -ruN giflib-5.2.2/gifinto.c giflib-5.2.2-getarg/gifinto.c ---- giflib-5.2.2/gifinto.c 2024-02-19 06:01:28.000000000 +0300 -+++ giflib-5.2.2-getarg/gifinto.c 2025-04-02 14:10:06.403197077 +0300 -@@ -19,7 +19,7 @@ +diff -rupN --no-dereference giflib-5.2.2/gifinto.c giflib-5.2.2-new/gifinto.c +--- giflib-5.2.2/gifinto.c 2024-02-19 04:01:28.000000000 +0100 ++++ giflib-5.2.2-new/gifinto.c 2025-04-15 16:56:27.278753624 +0200 +@@ -19,7 +19,7 @@ SPDX-License-Identifier: MIT #include #endif /* _WIN32 */ @@ -246,10 +246,10 @@ diff -ruN giflib-5.2.2/gifinto.c giflib-5.2.2-getarg/gifinto.c #include "gif_lib.h" #define PROGRAM_NAME "gifinto" -diff -ruN giflib-5.2.2/gifsponge.c giflib-5.2.2-getarg/gifsponge.c ---- giflib-5.2.2/gifsponge.c 2024-02-19 06:01:28.000000000 +0300 -+++ giflib-5.2.2-getarg/gifsponge.c 2025-04-02 14:10:23.555170542 +0300 -@@ -25,7 +25,7 @@ +diff -rupN --no-dereference giflib-5.2.2/gifsponge.c giflib-5.2.2-new/gifsponge.c +--- giflib-5.2.2/gifsponge.c 2024-02-19 04:01:28.000000000 +0100 ++++ giflib-5.2.2-new/gifsponge.c 2025-04-15 16:56:27.278945283 +0200 +@@ -25,7 +25,7 @@ SPDX-License-Identifier: MIT #include #include @@ -258,10 +258,10 @@ diff -ruN giflib-5.2.2/gifsponge.c giflib-5.2.2-getarg/gifsponge.c #include "gif_lib.h" #define PROGRAM_NAME "gifsponge" -diff -ruN giflib-5.2.2/giftext.c giflib-5.2.2-getarg/giftext.c ---- giflib-5.2.2/giftext.c 2024-02-19 06:01:28.000000000 +0300 -+++ giflib-5.2.2-getarg/giftext.c 2025-04-02 14:10:40.427363509 +0300 -@@ -16,7 +16,7 @@ +diff -rupN --no-dereference giflib-5.2.2/giftext.c giflib-5.2.2-new/giftext.c +--- giflib-5.2.2/giftext.c 2024-02-19 04:01:28.000000000 +0100 ++++ giflib-5.2.2-new/giftext.c 2025-04-15 16:56:27.279142751 +0200 +@@ -16,7 +16,7 @@ SPDX-License-Identifier: MIT #include #endif /* _WIN32 */ @@ -270,10 +270,10 @@ diff -ruN giflib-5.2.2/giftext.c giflib-5.2.2-getarg/giftext.c #include "gif_lib.h" #define PROGRAM_NAME "giftext" -diff -ruN giflib-5.2.2/giftool.c giflib-5.2.2-getarg/giftool.c ---- giflib-5.2.2/giftool.c 2024-02-19 06:01:28.000000000 +0300 -+++ giflib-5.2.2-getarg/giftool.c 2025-04-02 14:10:59.579511889 +0300 -@@ -12,7 +12,7 @@ +diff -rupN --no-dereference giflib-5.2.2/giftool.c giflib-5.2.2-new/giftool.c +--- giflib-5.2.2/giftool.c 2024-02-19 04:01:28.000000000 +0100 ++++ giflib-5.2.2-new/giftool.c 2025-04-15 16:56:27.279376975 +0200 +@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT #include #include @@ -282,10 +282,10 @@ diff -ruN giflib-5.2.2/giftool.c giflib-5.2.2-getarg/giftool.c #include "getopt.h" #include "gif_lib.h" -diff -ruN giflib-5.2.2/gifwedge.c giflib-5.2.2-getarg/gifwedge.c ---- giflib-5.2.2/gifwedge.c 2024-02-19 06:01:27.000000000 +0300 -+++ giflib-5.2.2-getarg/gifwedge.c 2025-04-02 14:11:16.163652219 +0300 -@@ -12,7 +12,7 @@ +diff -rupN --no-dereference giflib-5.2.2/gifwedge.c giflib-5.2.2-new/gifwedge.c +--- giflib-5.2.2/gifwedge.c 2024-02-19 04:01:27.000000000 +0100 ++++ giflib-5.2.2-new/gifwedge.c 2025-04-15 16:56:27.279666309 +0200 +@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT #include #include @@ -294,10 +294,10 @@ diff -ruN giflib-5.2.2/gifwedge.c giflib-5.2.2-getarg/gifwedge.c #include "gif_lib.h" #define PROGRAM_NAME "gifwedge" -diff -ruN giflib-5.2.2/Makefile giflib-5.2.2-getarg/Makefile ---- giflib-5.2.2/Makefile 2025-04-02 13:56:24.568117543 +0300 -+++ giflib-5.2.2-getarg/Makefile 2025-04-02 14:05:51.785348480 +0300 -@@ -34,7 +34,7 @@ +diff -rupN --no-dereference giflib-5.2.2/Makefile giflib-5.2.2-new/Makefile +--- giflib-5.2.2/Makefile 2025-04-15 16:56:27.223615747 +0200 ++++ giflib-5.2.2-new/Makefile 2025-04-15 16:56:27.279870038 +0200 +@@ -34,7 +34,7 @@ HEADERS = gif_hash.h gif_lib.h gif_lib OBJECTS = $(SOURCES:.c=.o) USOURCES = qprintf.c getarg.c diff --git a/giflib-5.2.2-cve-2025-31344.patch b/giflib-5.2.2-cve-2025-31344.patch new file mode 100644 index 0000000..bf9abfd --- /dev/null +++ b/giflib-5.2.2-cve-2025-31344.patch @@ -0,0 +1,15 @@ +diff -rupN --no-dereference giflib-5.2.2/gif2rgb.c giflib-5.2.2-new/gif2rgb.c +--- giflib-5.2.2/gif2rgb.c 2025-04-15 16:56:27.300766548 +0200 ++++ giflib-5.2.2-new/gif2rgb.c 2025-04-15 16:56:27.308678722 +0200 +@@ -337,6 +337,11 @@ static void DumpScreen2RGB(char *FileNam + GifRow = ScreenBuffer[i]; + GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); + for (j = 0; j < ScreenWidth; j++) { ++ /* Check if color is within color palete */ ++ if (GifRow[j] >= ColorMap->ColorCount) { ++ GIF_EXIT(GifErrorString( ++ D_GIF_ERR_IMAGE_DEFECT)); ++ } + ColorMapEntry = &ColorMap->Colors[GifRow[j]]; + Buffers[0][j] = ColorMapEntry->Red; + Buffers[1][j] = ColorMapEntry->Green; diff --git a/giflib.spec b/giflib.spec index d5b4af7..8d67ff6 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.2 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -17,15 +17,17 @@ Patch2: giflib_html-docs-consistent-ids.patch # Rename getarg.h to gif_getarg.h # https://sourceforge.net/p/giflib/code/merge-requests/18/ Patch3: getarg.patch +# Proposed patch for CVE-2025-31344 +Patch4: https://raw.githubusercontent.com/OpenMandrivaAssociation/giflib/refs/heads/master/giflib-5.2.2-cve-2025-31344.patch BuildRequires: cmake BuildRequires: gcc BuildRequires: xmlto -BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-filesystem BuildRequires: mingw32-gcc -BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-filesystem BuildRequires: mingw64-gcc @@ -150,6 +152,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Tue Apr 15 2025 Sandro Mani - 5.2.2-6 +- Add proposed patch for CVE-2025-31334 + * Wed Apr 02 2025 Benson Muite - 5.2.2-5 - Rename getarg.h to gif_getarg.h diff --git a/giflib_coverity.patch b/giflib_coverity.patch index 0e995ae..acba905 100644 --- a/giflib_coverity.patch +++ b/giflib_coverity.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference giflib-5.2.2/gif2rgb.c giflib-5.2.2-new/gif2rgb.c --- giflib-5.2.2/gif2rgb.c 2024-02-19 04:01:28.000000000 +0100 -+++ giflib-5.2.2-new/gif2rgb.c 2024-02-19 09:39:38.750976758 +0100 ++++ giflib-5.2.2-new/gif2rgb.c 2025-04-15 16:56:27.228197561 +0200 @@ -165,6 +165,8 @@ static void SaveGif(GifByteType *OutputB /* Open stdout for the output file: */ if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { diff --git a/giflib_html-docs-consistent-ids.patch b/giflib_html-docs-consistent-ids.patch index fd29642..ea3da5b 100644 --- a/giflib_html-docs-consistent-ids.patch +++ b/giflib_html-docs-consistent-ids.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference giflib-5.2.2/doc/Makefile giflib-5.2.2-new/doc/Makefile --- giflib-5.2.2/doc/Makefile 2024-02-18 19:15:05.000000000 +0100 -+++ giflib-5.2.2-new/doc/Makefile 2024-02-19 09:39:38.785968237 +0100 ++++ giflib-5.2.2-new/doc/Makefile 2025-04-15 16:56:27.252074979 +0200 @@ -1,7 +1,7 @@ .SUFFIXES: .xml .html .txt .adoc .1 .7 diff --git a/giflib_quantize.patch b/giflib_quantize.patch index 57c2b69..66c48e0 100644 --- a/giflib_quantize.patch +++ b/giflib_quantize.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference giflib-5.2.2/Makefile giflib-5.2.2-new/Makefile --- giflib-5.2.2/Makefile 2024-02-19 02:01:50.000000000 +0100 -+++ giflib-5.2.2-new/Makefile 2024-02-19 09:39:38.715985279 +0100 ++++ giflib-5.2.2-new/Makefile 2025-04-15 16:56:27.204960961 +0200 @@ -29,11 +29,11 @@ LIBPOINT=0 LIBVER=$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) From f73f39798eaf4f0befc9430a6195d951735c5e5a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 16 Jul 2025 22:38:42 +0200 Subject: [PATCH 56/58] Increase minimum cmake version to 3.5 --- CMakeLists.txt | 2 +- giflib.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92151d4..be7873a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.0) +cmake_minimum_required(VERSION 3.5) project(giflib C) diff --git a/giflib.spec b/giflib.spec index 8d67ff6..a099f47 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.2 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -152,6 +152,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Wed Jul 16 2025 Sandro Mani - 5.2.2-7 +- Increase minimum cmake version to 3.5 + * Tue Apr 15 2025 Sandro Mani - 5.2.2-6 - Add proposed patch for CVE-2025-31334 From 421662abf7416cbb73cb440112e58b4316b31789 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 16 Jul 2025 23:00:28 +0200 Subject: [PATCH 57/58] Use GNUInstallDirs --- CMakeLists.txt | 15 ++++++++------- giflib.spec | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be7873a..5bd836c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.5) project(giflib C) +include(GNUInstallDirs) SET(BUILD_STATIC_LIBS OFF CACHE BOOL "Whether to also build static libs") @@ -77,21 +78,21 @@ endforeach() ### Installation install(TARGETS gif - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib${LIB_SUFFIX} - LIBRARY DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) if(${BUILD_STATIC_LIBS}) - install(TARGETS gif_static ARCHIVE DESTINATION lib${LIB_SUFFIX}) + install(TARGETS gif_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif(${BUILD_STATIC_LIBS}) foreach(UTILITY ${giflib_UTILS}) - install(TARGETS ${UTILITY} DESTINATION bin) + install(TARGETS ${UTILITY} DESTINATION ${CMAKE_INSTALL_BINDIR}) endforeach() -install(FILES gif_lib.h gif_getarg.h DESTINATION include) -install(FILES ${giflib_MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) +install(FILES gif_lib.h gif_getarg.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +install(FILES ${giflib_MAN} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) ### Distribution tarball diff --git a/giflib.spec b/giflib.spec index a099f47..5283ed3 100644 --- a/giflib.spec +++ b/giflib.spec @@ -154,6 +154,7 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog * Wed Jul 16 2025 Sandro Mani - 5.2.2-7 - Increase minimum cmake version to 3.5 +- Use GnuInstallDirs * Tue Apr 15 2025 Sandro Mani - 5.2.2-6 - Add proposed patch for CVE-2025-31334 From 23eb07266efa36fb051a62b6b092fcf877025f2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:20:22 +0000 Subject: [PATCH 58/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 5283ed3..682379f 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.2 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -152,6 +152,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 5.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 16 2025 Sandro Mani - 5.2.2-7 - Increase minimum cmake version to 3.5 - Use GnuInstallDirs