From d680864c4a8334c73404c790aaf291c3b6b3f993 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:36 +0000 Subject: [PATCH 01/87] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3e85c15..f033b25 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := advancecomp SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 1cd120a718e4c40c7ef1466564b7de08c0f76dcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:37:08 +0000 Subject: [PATCH 02/87] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f033b25..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: advancecomp -# $Id$ -NAME := advancecomp -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 33b910e73eafbc289fc7178c1351b1edf9ec25cc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:31:27 -0600 Subject: [PATCH 03/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index adb2eef..3099761 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,7 +1,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files Name: advancecomp Version: 1.15 -Release: 12 +Release: 13 License: GPLv2+ Group: Applications/Emulators URL: http://advancemame.sourceforge.net/ @@ -42,6 +42,9 @@ The main features are : %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.15-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jul 24 2009 Fedora Release Engineering - 1.15-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 43477181ae7e2b5680ef89b6ccc2041d05028344 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:02:21 -0600 Subject: [PATCH 04/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 3099761..fcb88b6 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,7 +1,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files Name: advancecomp Version: 1.15 -Release: 13 +Release: 14 License: GPLv2+ Group: Applications/Emulators URL: http://advancemame.sourceforge.net/ @@ -42,6 +42,9 @@ The main features are : %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1.15-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 1.15-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 039196259b97eb5a7d7ecfde28c4ec7a7e4acba3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 11:40:07 -0600 Subject: [PATCH 05/87] - Rebuilt for c++ ABI breakage --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index fcb88b6..842d11e 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,7 +1,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files Name: advancecomp Version: 1.15 -Release: 14 +Release: 15 License: GPLv2+ Group: Applications/Emulators URL: http://advancemame.sourceforge.net/ @@ -42,6 +42,9 @@ The main features are : %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 1.15-15 +- Rebuilt for c++ ABI breakage + * Thu Jan 12 2012 Fedora Release Engineering - 1.15-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From fc3bc880761efcec95c5dd816599a5a97aeb8abb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 27 Apr 2012 12:05:08 +0100 Subject: [PATCH 06/87] Add disttag, modernise spec file --- advancecomp.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index 842d11e..66e87b7 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,12 +1,11 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files Name: advancecomp Version: 1.15 -Release: 15 +Release: 16%{?dist} License: GPLv2+ Group: Applications/Emulators URL: http://advancemame.sourceforge.net/ Source: http://downloads.sf.net/advancemame/advancecomp-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: zlib-devel %description @@ -22,16 +21,11 @@ The main features are : %build %configure -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} -%{__make} install DESTDIR=%{buildroot} - - -%clean -%{__rm} -rf %{buildroot} +make install DESTDIR=%{buildroot} %files @@ -42,6 +36,9 @@ The main features are : %changelog +* Fri Apr 27 2012 Peter Robinson - 1.15-16 +- Add disttag, modernise spec file + * Tue Feb 28 2012 Fedora Release Engineering - 1.15-15 - Rebuilt for c++ ABI breakage From e4710a1e446fd809fe0d9037fd866dc5c492d451 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:37:15 -0500 Subject: [PATCH 07/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 66e87b7..ee0f527 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,7 +1,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files Name: advancecomp Version: 1.15 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ Group: Applications/Emulators URL: http://advancemame.sourceforge.net/ @@ -36,6 +36,9 @@ make install DESTDIR=%{buildroot} %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1.15-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Apr 27 2012 Peter Robinson - 1.15-16 - Add disttag, modernise spec file From 5ad7513ac07a9997f209bac52698b361042a25e7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:19:57 -0600 Subject: [PATCH 08/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index ee0f527..62b16bd 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,7 +1,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files Name: advancecomp Version: 1.15 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ Group: Applications/Emulators URL: http://advancemame.sourceforge.net/ @@ -36,6 +36,9 @@ make install DESTDIR=%{buildroot} %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.15-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 1.15-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From c976707bf0d7a37f13b48153bb1c1f915395a91b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:19:45 -0500 Subject: [PATCH 09/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 62b16bd..3942888 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,7 +1,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files Name: advancecomp Version: 1.15 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ Group: Applications/Emulators URL: http://advancemame.sourceforge.net/ @@ -36,6 +36,9 @@ make install DESTDIR=%{buildroot} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.15-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 1.15-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 33a53dfe2053dd8055ecb0f8b309499709c09547 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Mon, 10 Feb 2014 12:07:51 +0800 Subject: [PATCH 10/87] Update to 1.18 Add a check section recommended by upstream. --- .gitignore | 1 + advancecomp.spec | 35 ++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 14da08e..a9890b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ advancecomp-1.15.tar.gz +/advancecomp-1.18.tar.gz diff --git a/advancecomp.spec b/advancecomp.spec index 3942888..bc6ae77 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,12 +1,11 @@ -Summary: Recompression utilities for .PNG, .MNG and .ZIP files -Name: advancecomp -Version: 1.15 -Release: 19%{?dist} -License: GPLv2+ -Group: Applications/Emulators -URL: http://advancemame.sourceforge.net/ -Source: http://downloads.sf.net/advancemame/advancecomp-%{version}.tar.gz -BuildRequires: zlib-devel +Name: advancecomp +Version: 1.18 +Release: 1%{?dist} +Summary: Recompression utilities for .PNG, .MNG and .ZIP files +License: GPLv2+ +URL: http://advancemame.sourceforge.net/ +Source0: http://downloads.sf.net/advancemame/advancecomp-%{version}.tar.gz +BuildRequires: zlib-devel %description AdvanceCOMP is a set of recompression utilities for .PNG, .MNG and .ZIP files. @@ -14,28 +13,35 @@ The main features are : * Recompress ZIP, PNG and MNG files using the Deflate 7-Zip implementation. * Recompress MNG files using Delta and Move optimization. +This package contains: +* advzip - Recompression and test utility for zip files +* advpng - Recompression utility for png files +* advmng - Recompression utility for mng files +* advdef - Recompression utility for deflate streams in .png, .mng and .gz +files %prep %setup -q - %build %configure make %{?_smp_mflags} - %install make install DESTDIR=%{buildroot} +%check +make check %files -%defattr(-,root,root,-) %doc AUTHORS COPYING HISTORY README %{_bindir}/* %{_mandir}/man1/* - %changelog +* Mon Feb 10 2014 Christopher Meng - 1.18-1 +- Update to 1.18 + * Sat Aug 03 2013 Fedora Release Engineering - 1.15-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -104,7 +110,7 @@ make install DESTDIR=%{buildroot} * Sun May 22 2005 Jeremy Katz - 1.14-3 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt 1.14-2 +* Thu Apr 7 2005 Michael Schwendt 1.14-2 - rebuilt * Wed Feb 23 2005 Matthias Saou 1.14-1 @@ -131,4 +137,3 @@ make install DESTDIR=%{buildroot} * Thu May 22 2003 Matthias Saou - Initial RPM release. - diff --git a/sources b/sources index 620cbe1..2836a3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb236d8bee6fa473d34108cda1e09076 advancecomp-1.15.tar.gz +0610cbcdc293ccc5f32d5f82aa6995e4 advancecomp-1.18.tar.gz From 97747248897d86195b0dd72fc4c38471136c086d Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Thu, 27 Feb 2014 17:11:56 +0800 Subject: [PATCH 11/87] Add missing tofrodos dep for %check. --- advancecomp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/advancecomp.spec b/advancecomp.spec index bc6ae77..9352429 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -5,6 +5,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv2+ URL: http://advancemame.sourceforge.net/ Source0: http://downloads.sf.net/advancemame/advancecomp-%{version}.tar.gz +BuildRequires: tofrodos BuildRequires: zlib-devel %description From 36deb1f8e83c8187a02160e474e3b02a5ce8e23f Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Thu, 27 Feb 2014 17:43:25 +0800 Subject: [PATCH 12/87] Update license! --- advancecomp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 9352429..8d75f29 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -2,7 +2,7 @@ Name: advancecomp Version: 1.18 Release: 1%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files -License: GPLv2+ +License: GPLv3 URL: http://advancemame.sourceforge.net/ Source0: http://downloads.sf.net/advancemame/advancecomp-%{version}.tar.gz BuildRequires: tofrodos From 6e9f6cca91d8b20c1b6459aa503e46cb88c3b536 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Fri, 21 Mar 2014 12:49:43 +0800 Subject: [PATCH 13/87] Update to 1.1.9 --- .gitignore | 1 + advancecomp.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a9890b0..498a27b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ advancecomp-1.15.tar.gz /advancecomp-1.18.tar.gz +/advancecomp-1.19.tar.gz diff --git a/advancecomp.spec b/advancecomp.spec index 8d75f29..3e63448 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,5 +1,5 @@ Name: advancecomp -Version: 1.18 +Version: 1.19 Release: 1%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 @@ -36,10 +36,14 @@ make check %files %doc AUTHORS COPYING HISTORY README +%doc doc/{advdef*,authors,history,readme}.{txt,html} %{_bindir}/* %{_mandir}/man1/* %changelog +* Thu Mar 20 2014 Christopher Meng - 1.19-1 +- Update to 1.19 + * Mon Feb 10 2014 Christopher Meng - 1.18-1 - Update to 1.18 diff --git a/sources b/sources index 2836a3a..cabe218 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0610cbcdc293ccc5f32d5f82aa6995e4 advancecomp-1.18.tar.gz +371548ce4cc38cb452c20414cbd8c4fe advancecomp-1.19.tar.gz From aaf8f7a5e307e13e99fb9c7a28dad34668a96908 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:11:08 -0500 Subject: [PATCH 14/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 3e63448..e0b2756 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 1.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://advancemame.sourceforge.net/ @@ -41,6 +41,9 @@ make check %{_mandir}/man1/* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Mar 20 2014 Christopher Meng - 1.19-1 - Update to 1.19 From e1cf8294f59b9ba5ce70a2f0b6216ecf3461cc59 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 20:04:27 +0000 Subject: [PATCH 15/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index e0b2756..982062a 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 1.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://advancemame.sourceforge.net/ @@ -41,6 +41,9 @@ make check %{_mandir}/man1/* %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 1.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From d4079bc3f65f38385d128cbfc0308a8c6011f573 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 11:38:13 +0200 Subject: [PATCH 16/87] Rebuilt for GCC 5 C++11 ABI change --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 982062a..f73e7af 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 1.19 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://advancemame.sourceforge.net/ @@ -41,6 +41,9 @@ make check %{_mandir}/man1/* %changelog +* Sat May 02 2015 Kalev Lember - 1.19-4 +- Rebuilt for GCC 5 C++11 ABI change + * Fri Aug 15 2014 Fedora Release Engineering - 1.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 99b4d446938f0f87d65924025df73320e16fca49 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:39:15 +0000 Subject: [PATCH 17/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index f73e7af..124034d 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 1.19 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://advancemame.sourceforge.net/ @@ -41,6 +41,9 @@ make check %{_mandir}/man1/* %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 1.19-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1.19-4 - Rebuilt for GCC 5 C++11 ABI change From c44c1c8b3a6bd7b7f851ac87f09b5557c91a7310 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Mon, 5 Oct 2015 18:23:15 +0200 Subject: [PATCH 18/87] new version 1.20 --- .gitignore | 1 + advancecomp.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 498a27b..6c698d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ advancecomp-1.15.tar.gz /advancecomp-1.18.tar.gz /advancecomp-1.19.tar.gz +/advancecomp-1.20.tar.gz diff --git a/advancecomp.spec b/advancecomp.spec index 124034d..289e95c 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp -Version: 1.19 -Release: 5%{?dist} +Version: 1.20 +Release: 1%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://advancemame.sourceforge.net/ @@ -35,12 +35,17 @@ make install DESTDIR=%{buildroot} make check %files -%doc AUTHORS COPYING HISTORY README +%license COPYING +%doc AUTHORS HISTORY README %doc doc/{advdef*,authors,history,readme}.{txt,html} %{_bindir}/* %{_mandir}/man1/* %changelog +* Mon Oct 05 2015 Christian Dersch - 1.20-1 +- new version 1.20 +- use license tag + * Tue Jun 16 2015 Fedora Release Engineering - 1.19-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index cabe218..4194206 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -371548ce4cc38cb452c20414cbd8c4fe advancecomp-1.19.tar.gz +c53a2c3a806fab1d3a99a1f1be83f148 advancecomp-1.20.tar.gz From 9a8460d78c0b22412c2a300ec833b64858e9df77 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:00:35 +0000 Subject: [PATCH 19/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 289e95c..a1707ea 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 1.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://advancemame.sourceforge.net/ @@ -42,6 +42,9 @@ make check %{_mandir}/man1/* %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Oct 05 2015 Christian Dersch - 1.20-1 - new version 1.20 - use license tag From f7841bfd5b306666a9cc2f350f82dc31693b4bc6 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Sun, 13 Nov 2016 13:51:12 +0100 Subject: [PATCH 20/87] new version (1.22) --- .gitignore | 1 + advancecomp.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6c698d2..5a4c211 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ advancecomp-1.15.tar.gz /advancecomp-1.18.tar.gz /advancecomp-1.19.tar.gz /advancecomp-1.20.tar.gz +/advancecomp-1.22.tar.gz diff --git a/advancecomp.spec b/advancecomp.spec index a1707ea..599be38 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,10 +1,10 @@ Name: advancecomp -Version: 1.20 -Release: 2%{?dist} +Version: 1.22 +Release: 1%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 -URL: http://advancemame.sourceforge.net/ -Source0: http://downloads.sf.net/advancemame/advancecomp-%{version}.tar.gz +URL: http://www.advancemame.it/ +Source0: https://github.com/amadvance/advancecomp/releases/download/v%{version}/advancecomp-%{version}.tar.gz BuildRequires: tofrodos BuildRequires: zlib-devel @@ -42,6 +42,9 @@ make check %{_mandir}/man1/* %changelog +* Sun Nov 13 2016 Christian Dersch - 1.22-1 +- new version + * Wed Feb 03 2016 Fedora Release Engineering - 1.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 4194206..8e31e8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c53a2c3a806fab1d3a99a1f1be83f148 advancecomp-1.20.tar.gz +2a2a24f79960c0b271d27bab647c43fc advancecomp-1.22.tar.gz From e0945f567c5d7a7e850c4ac45a0be8f8a0deb27f Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Sun, 13 Nov 2016 14:17:07 +0100 Subject: [PATCH 21/87] revert to 1.20 --- .gitignore | 1 + advancecomp.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5a4c211..26bc499 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ advancecomp-1.15.tar.gz /advancecomp-1.19.tar.gz /advancecomp-1.20.tar.gz /advancecomp-1.22.tar.gz +/advancecomp.spec diff --git a/advancecomp.spec b/advancecomp.spec index 599be38..4189d5b 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp -Version: 1.22 -Release: 1%{?dist} +Version: 1.20 +Release: 3%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://www.advancemame.it/ @@ -42,6 +42,9 @@ make check %{_mandir}/man1/* %changelog +* Sun Nov 13 2016 Christian Dersch - 1.20-3 +- revert to 1.20, 1.22 does not build and also needs unbundling of libdeflate first + * Sun Nov 13 2016 Christian Dersch - 1.22-1 - new version diff --git a/sources b/sources index 8e31e8c..0bf7ca4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a2a24f79960c0b271d27bab647c43fc advancecomp-1.22.tar.gz +0de9352a10833ae2ed0ac5f53c582210 advancecomp.spec From d65b75f45ffd7095ff55714a9684011f973388e1 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Sun, 13 Nov 2016 14:22:21 +0100 Subject: [PATCH 22/87] revert to 1.20 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 0bf7ca4..4194206 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0de9352a10833ae2ed0ac5f53c582210 advancecomp.spec +c53a2c3a806fab1d3a99a1f1be83f148 advancecomp-1.20.tar.gz From 5a14219c96497b96b0d1949696b04273e01acc0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:46:53 +0000 Subject: [PATCH 23/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 4189d5b..1a4bde0 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 1.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://www.advancemame.it/ @@ -42,6 +42,9 @@ make check %{_mandir}/man1/* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Nov 13 2016 Christian Dersch - 1.20-3 - revert to 1.20, 1.22 does not build and also needs unbundling of libdeflate first From ef3b8d90cf80d2a5e57e987e3edd082be7771e8f Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Tue, 28 Feb 2017 16:01:33 +0100 Subject: [PATCH 24/87] new version (1.23) --- .gitignore | 1 + advancecomp.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 26bc499..6ea161a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ advancecomp-1.15.tar.gz /advancecomp-1.20.tar.gz /advancecomp-1.22.tar.gz /advancecomp.spec +/advancecomp-1.23.tar.gz diff --git a/advancecomp.spec b/advancecomp.spec index 1a4bde0..d6bb883 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp -Version: 1.20 -Release: 4%{?dist} +Version: 1.23 +Release: 1%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://www.advancemame.it/ @@ -37,11 +37,14 @@ make check %files %license COPYING %doc AUTHORS HISTORY README -%doc doc/{advdef*,authors,history,readme}.{txt,html} +%doc doc/{adv*,authors,history,readme}.txt %{_bindir}/* %{_mandir}/man1/* %changelog +* Tue Feb 28 2017 Christian Dersch - 1.23-1 +- new version + * Fri Feb 10 2017 Fedora Release Engineering - 1.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 4194206..f3cedb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c53a2c3a806fab1d3a99a1f1be83f148 advancecomp-1.20.tar.gz +SHA512 (advancecomp-1.23.tar.gz) = 2218d8677787d3f72434e2d5dd3f6b21f69de7042c7533ad29625522adedd56d765e70e4749bbfac14973b9b2bb6958db2900e62b26e5242106caf760cbc2236 From 24cf97a73fb77e13904f9a56e7ce54e722980cf2 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Tue, 28 Feb 2017 16:10:41 +0100 Subject: [PATCH 25/87] new version (1.23) --- advancecomp.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index d6bb883..3fc0cf5 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -31,9 +31,6 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -%check -make check - %files %license COPYING %doc AUTHORS HISTORY README From 43a89b1b505fb8f66d32cc6e037ff27bd47c7c3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:38:07 +0000 Subject: [PATCH 26/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 3fc0cf5..20b6f14 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 1.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://www.advancemame.it/ @@ -39,6 +39,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Feb 28 2017 Christian Dersch - 1.23-1 - new version From 2e86b659141968c6eeb73dbc1ad7263693a99f52 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:25:15 +0000 Subject: [PATCH 27/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 20b6f14..fa432d1 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 1.23 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://www.advancemame.it/ @@ -39,6 +39,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 663d84fea480c9a9086751032a0f1adba6753b44 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:56:32 +0000 Subject: [PATCH 28/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index fa432d1..e1ddc19 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 1.23 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://www.advancemame.it/ @@ -39,6 +39,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 1.23-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 57ed50160213f334e93dc93973531b9cc1a4fb66 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 7 Mar 2018 12:04:29 +0100 Subject: [PATCH 29/87] - updated to 2.1 (fix CVE-2018-1056) --- .gitignore | 1 + advancecomp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6ea161a..7ed4cc9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ advancecomp-1.15.tar.gz /advancecomp-1.22.tar.gz /advancecomp.spec /advancecomp-1.23.tar.gz +/advancecomp-2.1.tar.gz diff --git a/advancecomp.spec b/advancecomp.spec index e1ddc19..61b034c 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,5 +1,5 @@ Name: advancecomp -Version: 1.23 +Version: 2.1 Release: 4%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 @@ -39,6 +39,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Wed Mar 07 2018 Than Ngo - - 2.1-4 +- updated to 2.1 (fix CVE-2018-1056) + * Wed Feb 07 2018 Fedora Release Engineering - 1.23-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index f3cedb4..977b309 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (advancecomp-1.23.tar.gz) = 2218d8677787d3f72434e2d5dd3f6b21f69de7042c7533ad29625522adedd56d765e70e4749bbfac14973b9b2bb6958db2900e62b26e5242106caf760cbc2236 +SHA512 (advancecomp-2.1.tar.gz) = 62abc585b282483bf5994491db3965463f4a54db642e489460d678f95faefc5d62f80bcd9e5a2a2ba3cd708d5cda7457a2b773be1a65385ef5528324e2d2949b From 8f27b29fe98ce498991ed91c94b3c1c335764ae9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:42 +0200 Subject: [PATCH 30/87] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- advancecomp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/advancecomp.spec b/advancecomp.spec index 61b034c..d0bdbbd 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -5,6 +5,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://www.advancemame.it/ Source0: https://github.com/amadvance/advancecomp/releases/download/v%{version}/advancecomp-%{version}.tar.gz +BuildRequires: gcc BuildRequires: tofrodos BuildRequires: zlib-devel From 3ea435fdfc262b28bcb048276a7fea0eea66e099 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:01:59 +0000 Subject: [PATCH 31/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index d0bdbbd..603e224 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://www.advancemame.it/ @@ -40,6 +40,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Mar 07 2018 Than Ngo - - 2.1-4 - updated to 2.1 (fix CVE-2018-1056) From bf30060601648f1a6205a8546f251586f3093cf0 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Sat, 14 Jul 2018 14:50:12 +0200 Subject: [PATCH 32/87] BuildRequires: gcc-c++ --- advancecomp.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index 603e224..5025483 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,11 +1,12 @@ Name: advancecomp Version: 2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Recompression utilities for .PNG, .MNG and .ZIP files License: GPLv3 URL: http://www.advancemame.it/ Source0: https://github.com/amadvance/advancecomp/releases/download/v%{version}/advancecomp-%{version}.tar.gz -BuildRequires: gcc + +BuildRequires: gcc gcc-c++ BuildRequires: tofrodos BuildRequires: zlib-devel @@ -40,6 +41,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Sat Jul 14 2018 Christian Dersch - 2.1-6 +- BuildRequires: gcc-c++ + * Thu Jul 12 2018 Fedora Release Engineering - 2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 974e22b74c9d71f715cba9e75a6b7675f383561f Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 29 Jan 2019 12:42:55 +0100 Subject: [PATCH 33/87] Fix doc EOL and minor cosmetic updates --- advancecomp.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index 5025483..e606986 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,7 +1,7 @@ Name: advancecomp Version: 2.1 -Release: 6%{?dist} -Summary: Recompression utilities for .PNG, .MNG and .ZIP files +Release: 7%{?dist} +Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ Source0: https://github.com/amadvance/advancecomp/releases/download/v%{version}/advancecomp-%{version}.tar.gz @@ -9,6 +9,7 @@ Source0: https://github.com/amadvance/advancecomp/releases/download/v%{ve BuildRequires: gcc gcc-c++ BuildRequires: tofrodos BuildRequires: zlib-devel +BuildRequires: dos2unix %description AdvanceCOMP is a set of recompression utilities for .PNG, .MNG and .ZIP files. @@ -20,11 +21,11 @@ This package contains: * advzip - Recompression and test utility for zip files * advpng - Recompression utility for png files * advmng - Recompression utility for mng files -* advdef - Recompression utility for deflate streams in .png, .mng and .gz -files +* advdef - Recompression utility for deflate streams in png, mng and gz files %prep %setup -q +dos2unix -k doc/*.txt %build %configure @@ -41,14 +42,18 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Tue Jan 29 2019 Matthias Saou 2.1-7 +- Fix doc EOL. +- Minor cosmetic updates (summary, description...). + * Sat Jul 14 2018 Christian Dersch - 2.1-6 - BuildRequires: gcc-c++ * Thu Jul 12 2018 Fedora Release Engineering - 2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Wed Mar 07 2018 Than Ngo - - 2.1-4 -- updated to 2.1 (fix CVE-2018-1056) +* Wed Mar 07 2018 Than Ngo - 2.1-4 +- updated to 2.1 (fix CVE-2018-1056) * Wed Feb 07 2018 Fedora Release Engineering - 1.23-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e9d9c22b7f0a22c7e63f472ee9b722dda20492e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:01:57 +0000 Subject: [PATCH 34/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index e606986..e1872c2 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ @@ -42,6 +42,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 29 2019 Matthias Saou 2.1-7 - Fix doc EOL. - Minor cosmetic updates (summary, description...). From 36220a694fe178bdbf0fe70153a54d7cee050984 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 1 Mar 2019 17:20:36 +0100 Subject: [PATCH 35/87] fixed CVE-2019-9210 advancecomp: integer overflow in png_compress in pngex.cc --- advancecomp-CVE-2019-9210.patch | 85 +++++++++++++++++++++++++++++++++ advancecomp.spec | 10 +++- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 advancecomp-CVE-2019-9210.patch diff --git a/advancecomp-CVE-2019-9210.patch b/advancecomp-CVE-2019-9210.patch new file mode 100644 index 0000000..5bb32a7 --- /dev/null +++ b/advancecomp-CVE-2019-9210.patch @@ -0,0 +1,85 @@ +commit 7894a6e684ce68ddff9f4f4919ab8e3911ac8040 +Author: Andrea Mazzoleni +Date: Fri Jan 4 20:49:48 2019 +0100 + + Fix a buffer overflow caused by invalid chunks + +diff --git a/pngex.cc b/pngex.cc +index 55d16f5..3f5b49f 100644 +--- a/pngex.cc ++++ b/pngex.cc +@@ -163,6 +163,10 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) + + switch (type) { + case ADV_MNG_CN_MHDR : ++ if (size < 28) { ++ cout << " invalid chunk size"; ++ break; ++ } + cout << " width:" << be_uint32_read(data+0) << " height:" << be_uint32_read(data+4) << " frequency:" << be_uint32_read(data+8); + cout << " simplicity:" << be_uint32_read(data+24); + cout << "(bit"; +@@ -174,6 +178,10 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) + cout << ")"; + break; + case ADV_MNG_CN_DHDR : ++ if (size < 4) { ++ cout << " invalid chunk size"; ++ break; ++ } + cout << " id:" << be_uint16_read(data+0); + switch (data[2]) { + case 0 : cout << " img:unspecified"; break; +@@ -243,6 +251,10 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) + } + break; + case ADV_MNG_CN_DEFI : ++ if (size < 2) { ++ cout << " invalid chunk size"; ++ break; ++ } + cout << " id:" << be_uint16_read(data+0); + if (size >= 3) { + switch (data[2]) { +@@ -266,6 +278,10 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) + } + break; + case ADV_MNG_CN_MOVE : ++ if (size < 13) { ++ cout << " invalid chunk size"; ++ break; ++ } + cout << " id_from:" << be_uint16_read(data+0) << " id_to:" << be_uint16_read(data+2); + switch (data[4]) { + case 0 : cout << " type:replace"; break; +@@ -275,6 +291,10 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) + cout << " x:" << (int)be_uint32_read(data + 5) << " y:" << (int)be_uint32_read(data + 9); + break; + case ADV_MNG_CN_PPLT : ++ if (size < 1) { ++ cout << " invalid chunk size"; ++ break; ++ } + switch (data[0]) { + case 0 : cout << " type:replacement_rgb"; break; + case 1 : cout << " type:delta_rgb"; break; +@@ -285,7 +305,7 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) + default : cout << " type:?"; break; + } + i = 1; +- while (i - 2.1-9 +- fixed CVE-2019-9210 advancecomp: integer overflow in png_compress in pngex.cc + * Thu Jan 31 2019 Fedora Release Engineering - 2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 712227b41fe8bbd8bc8675627c0e0ad0ea5d1ace Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 6 Mar 2019 21:51:43 +0100 Subject: [PATCH 36/87] Backport, fix a buffer overflow with image of invalid size --- advancecomp-CVE-2019-9210.patch | 15 +++++++++++++++ advancecomp.spec | 5 ++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/advancecomp-CVE-2019-9210.patch b/advancecomp-CVE-2019-9210.patch index 5bb32a7..dc40bc8 100644 --- a/advancecomp-CVE-2019-9210.patch +++ b/advancecomp-CVE-2019-9210.patch @@ -83,3 +83,18 @@ index 55d16f5..3f5b49f 100644 cout << " width:" << be_uint32_read(data) << " height:" << be_uint32_read(data + 4); cout << " depth:" << (unsigned)data[8]; cout << " color_type:" << (unsigned)data[9]; +diff -up advancecomp-2.1/lib/png.c.me advancecomp-2.1/lib/png.c +--- advancecomp-2.1/lib/png.c.me 2019-03-06 21:38:19.099210846 +0100 ++++ advancecomp-2.1/lib/png.c 2019-03-06 21:38:49.193040592 +0100 +@@ -655,6 +655,11 @@ adv_error adv_png_read_ihdr( + } + *pix_pixel = pixel; + ++ if (width_align < width) { ++ error_unsupported_set("Invalid image size"); ++ goto err; ++ } ++ + if (data[10] != 0) { /* compression */ + error_unsupported_set("Unsupported compression, %d instead of 0", (unsigned)data[10]); + goto err; diff --git a/advancecomp.spec b/advancecomp.spec index ccba9c4..14b0f99 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ @@ -47,6 +47,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Wed Mar 06 2019 Than Ngo - 2.1-10 +- Backport, fix a buffer overflow with image of invalid size + * Fri Mar 01 2019 Than Ngo - 2.1-9 - fixed CVE-2019-9210 advancecomp: integer overflow in png_compress in pngex.cc From f1cf3952da9fd9853754e2db9d44a1aee29c62e0 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 10 May 2019 11:43:43 +0200 Subject: [PATCH 37/87] Backport for #1708563, CVE-2019-8383 - denial of service in function adv_png_unfilter_8 --- advancecomp-CVE-2019-8383.patch | 44 +++++++++++++++++++++++++++++++++ advancecomp.spec | 12 ++++++--- 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 advancecomp-CVE-2019-8383.patch diff --git a/advancecomp-CVE-2019-8383.patch b/advancecomp-CVE-2019-8383.patch new file mode 100644 index 0000000..3a9b35e --- /dev/null +++ b/advancecomp-CVE-2019-8383.patch @@ -0,0 +1,44 @@ +commit 78a56b21340157775be2462a19276b4d31d2bd01 +Author: Andrea Mazzoleni +Date: Fri Jan 4 20:49:25 2019 +0100 + + Fix a buffer overflow caused by invalid images + +diff --git a/lib/png.c b/lib/png.c +index 0939a5a..cbf140b 100644 +--- a/lib/png.c ++++ b/lib/png.c +@@ -603,6 +603,7 @@ adv_error adv_png_read_ihdr( + unsigned pixel; + unsigned width; + unsigned width_align; ++ unsigned scanline; + unsigned height; + unsigned depth; + int r; +@@ -719,9 +720,23 @@ adv_error adv_png_read_ihdr( + goto err_ptr; + } + +- *dat_size = height * (width_align * pixel + 1); ++ /* check for overflow */ ++ if (pixel == 0 || width_align >= UINT_MAX / pixel) { ++ error_set("Invalid image size"); ++ goto err_ptr; ++ } ++ ++ scanline = width_align * pixel + 1; ++ ++ /* check for overflow */ ++ if (scanline == 0 || height >= UINT_MAX / scanline) { ++ error_set("Invalid image size"); ++ goto err_ptr; ++ } ++ ++ *dat_size = height * scanline; + *dat_ptr = malloc(*dat_size); +- *pix_scanline = width_align * pixel + 1; ++ *pix_scanline = scanline; + *pix_ptr = *dat_ptr + 1; + + z.zalloc = 0; diff --git a/advancecomp.spec b/advancecomp.spec index 14b0f99..c71e25b 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,13 +1,15 @@ Name: advancecomp Version: 2.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ Source0: https://github.com/amadvance/advancecomp/releases/download/v%{version}/advancecomp-%{version}.tar.gz +# CVE-2019-8383 advancecomp: denial of service in function adv_png_unfilter_8 +Patch0: advancecomp-CVE-2019-8383.patch # CVE-2019-9210 advancecomp: integer overflow in png_compress in pngex.cc -Patch0: advancecomp-CVE-2019-9210.patch +Patch1: advancecomp-CVE-2019-9210.patch BuildRequires: gcc gcc-c++ BuildRequires: tofrodos @@ -28,7 +30,8 @@ This package contains: %prep %setup -q -%patch0 -p1 -b .CVE-2019-9210 +%patch0 -p1 -b .CVE-2019-8383 +%patch1 -p1 -b .CVE-2019-9210 dos2unix -k doc/*.txt @@ -47,6 +50,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Fri May 10 2019 Than Ngo - 2.1-11 +- Backport for #1708563, CVE-2019-8383 - denial of service in function adv_png_unfilter_8 + * Wed Mar 06 2019 Than Ngo - 2.1-10 - Backport, fix a buffer overflow with image of invalid size From 3efe68edb9670e89f622859719c74e36bad06d81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:37:23 +0000 Subject: [PATCH 38/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index c71e25b..0c87762 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ @@ -50,6 +50,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 10 2019 Than Ngo - 2.1-11 - Backport for #1708563, CVE-2019-8383 - denial of service in function adv_png_unfilter_8 From 4485493463324ced311a43ec3ff8b4fe9cc5f31c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:16:46 +0000 Subject: [PATCH 39/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 0c87762..f054737 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ @@ -50,6 +50,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 2.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e752bb0ce3f550ae2fa7f0f414ccae0b44b470dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:47:59 +0000 Subject: [PATCH 40/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index f054737..3f6dc99 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ @@ -50,6 +50,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 7e7ae4f973517e9e75cfbb2933ba6a871d21a269 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 27 Jul 2020 15:41:50 -0600 Subject: [PATCH 41/87] Force C++14 as the code is not ready for C++17 --- advancecomp.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 3f6dc99..bc7187d 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ @@ -36,6 +36,7 @@ This package contains: dos2unix -k doc/*.txt %build +export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" %configure make %{?_smp_mflags} @@ -50,6 +51,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Mon Jul 27 2020 Jeff Law - 2.1-15 +- Force C++14 as the code is not ready for C++17 + * Mon Jul 27 2020 Fedora Release Engineering - 2.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f020f87b3ae02bbad0dffd6ced6159eac241213a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:49:47 +0000 Subject: [PATCH 42/87] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- advancecomp.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index bc7187d..10d4211 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ @@ -51,6 +51,10 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 2.1-16 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Jeff Law - 2.1-15 - Force C++14 as the code is not ready for C++17 From 91d640e9557984dfcf1ebb70a81b4914fadd3ebb Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:54:25 +0000 Subject: [PATCH 43/87] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- advancecomp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/advancecomp.spec b/advancecomp.spec index 10d4211..c77c0cc 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -15,6 +15,7 @@ BuildRequires: gcc gcc-c++ BuildRequires: tofrodos BuildRequires: zlib-devel BuildRequires: dos2unix +BuildRequires: make %description AdvanceCOMP is a set of recompression utilities for .PNG, .MNG and .ZIP files. From 13d60f1edb6bd0e2d0a4a3dc4226bc4f141d94e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:51:34 +0000 Subject: [PATCH 44/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index c77c0cc..7bd8ab1 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ @@ -52,6 +52,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 2.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 2.1-16 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b880a63b8cb79ea1ebc5b0ced9a810813c0ee8b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:23:43 +0000 Subject: [PATCH 45/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7d1fe65e53ea288e7767e66957417de0931d938d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:18:59 +0000 Subject: [PATCH 46/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 7bd8ab1..7907a24 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ @@ -52,6 +52,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 2.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 79a978d5c5f084efe902059f123de71ad3c166a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:59:13 +0000 Subject: [PATCH 47/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 7907a24..e521331 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ @@ -52,6 +52,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From bd967215425a2ffc29137fe05da7cd7087b5bd0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:30:11 +0000 Subject: [PATCH 48/87] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index e521331..0a09296 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Recompression utilities for png, mng, zip and gz files License: GPLv3 URL: http://www.advancemame.it/ @@ -52,6 +52,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f30873d776baa8fd302397f91ebdb750eade155b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 24 Sep 2022 09:16:00 -0400 Subject: [PATCH 49/87] Spec file formatting tweaks --- advancecomp.spec | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index 0a09296..37ac8a8 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,7 +1,8 @@ Name: advancecomp Version: 2.1 -Release: 20%{?dist} -Summary: Recompression utilities for png, mng, zip and gz files +Release: 21%{?dist} +Summary: Recompression utilities for .png, .mng, .zip and .gz files + License: GPLv3 URL: http://www.advancemame.it/ Source0: https://github.com/amadvance/advancecomp/releases/download/v%{version}/advancecomp-%{version}.tar.gz @@ -11,23 +12,29 @@ Patch0: advancecomp-CVE-2019-8383.patch # CVE-2019-9210 advancecomp: integer overflow in png_compress in pngex.cc Patch1: advancecomp-CVE-2019-9210.patch -BuildRequires: gcc gcc-c++ -BuildRequires: tofrodos -BuildRequires: zlib-devel +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: make + BuildRequires: dos2unix -BuildRequires: make +BuildRequires: tofrodos + +BuildRequires: zlib-devel %description -AdvanceCOMP is a set of recompression utilities for .PNG, .MNG and .ZIP files. -The main features are : -* Recompress ZIP, PNG and MNG files using the Deflate 7-Zip implementation. -* Recompress MNG files using Delta and Move optimization. +AdvanceCOMP contains recompression utilities for your .zip archives, +.png images, .mng video clips and .gz files. + +The official site of AdvanceCOMP is: + + http://www.advancemame.it This package contains: -* advzip - Recompression and test utility for zip files -* advpng - Recompression utility for png files -* advmng - Recompression utility for mng files -* advdef - Recompression utility for deflate streams in png, mng and gz files + advzip - Recompression and test utility for zip files + advpng - Recompression utility for png files + advmng - Recompression utility for mng files + advdef - Recompression utility for deflate streams in .png, .mng and .gz files + %prep %setup -q @@ -36,22 +43,30 @@ This package contains: dos2unix -k doc/*.txt + %build export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" %configure make %{?_smp_mflags} + %install make install DESTDIR=%{buildroot} + %files %license COPYING %doc AUTHORS HISTORY README %doc doc/{adv*,authors,history,readme}.txt + %{_bindir}/* %{_mandir}/man1/* + %changelog +* Sat Sep 24 2022 Benjamin A. Beasley - 2.1-21 +- Spec file formatting tweaks + * Wed Jul 20 2022 Fedora Release Engineering - 2.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 9c137bf0d5056736f8836e8b4340959a58bc64f4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 24 Sep 2022 09:20:54 -0400 Subject: [PATCH 50/87] Convert URLs from HTTP to HTTPS --- advancecomp.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index 37ac8a8..afec5af 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -4,7 +4,7 @@ Release: 21%{?dist} Summary: Recompression utilities for .png, .mng, .zip and .gz files License: GPLv3 -URL: http://www.advancemame.it/ +URL: https://www.advancemame.it/ Source0: https://github.com/amadvance/advancecomp/releases/download/v%{version}/advancecomp-%{version}.tar.gz # CVE-2019-8383 advancecomp: denial of service in function adv_png_unfilter_8 @@ -27,7 +27,7 @@ AdvanceCOMP contains recompression utilities for your .zip archives, The official site of AdvanceCOMP is: - http://www.advancemame.it + https://www.advancemame.it This package contains: advzip - Recompression and test utility for zip files @@ -66,6 +66,7 @@ make install DESTDIR=%{buildroot} %changelog * Sat Sep 24 2022 Benjamin A. Beasley - 2.1-21 - Spec file formatting tweaks +- Convert URLs from HTTP to HTTPS * Wed Jul 20 2022 Fedora Release Engineering - 2.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 40e3826b34f6fec22045b08df87b2091fd4722c8 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 24 Sep 2022 09:26:11 -0400 Subject: [PATCH 51/87] Use modern spec file macros (make_build/make_install/etc.) --- advancecomp.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index afec5af..f409506 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -37,21 +37,21 @@ This package contains: %prep -%setup -q -%patch0 -p1 -b .CVE-2019-8383 -%patch1 -p1 -b .CVE-2019-9210 - +%autosetup -p1 dos2unix -k doc/*.txt %build -export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" +# error: ISO C++17 does not allow dynamic exception specifications +%set_build_flags +export CXXFLAGS="-std=gnu++14 ${CXXFLAGS-}" + %configure -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install %files @@ -67,6 +67,7 @@ make install DESTDIR=%{buildroot} * Sat Sep 24 2022 Benjamin A. Beasley - 2.1-21 - Spec file formatting tweaks - Convert URLs from HTTP to HTTPS +- Use modern spec file macros (make_build/make_install/etc.) * Wed Jul 20 2022 Fedora Release Engineering - 2.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 4422886c1f7f5a077c325535ef8acbf8ffa0d9b2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 24 Sep 2022 09:44:07 -0400 Subject: [PATCH 52/87] Unbundle libdeflate --- advancecomp.spec | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/advancecomp.spec b/advancecomp.spec index f409506..62eeaf9 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -12,6 +12,9 @@ Patch0: advancecomp-CVE-2019-8383.patch # CVE-2019-9210 advancecomp: integer overflow in png_compress in pngex.cc Patch1: advancecomp-CVE-2019-9210.patch +BuildRequires: autoconf +BuildRequires: automake + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: make @@ -19,8 +22,17 @@ BuildRequires: make BuildRequires: dos2unix BuildRequires: tofrodos +# System library supported by upstream BuildRequires: zlib-devel +%if 0%{?el7} +# No libdeflate package in EPEL7 +Provides: bundled(libdeflate) = 0.6 +%else +# Unbundled downstream +BuildRequires: pkgconfig(libdeflate) +%endif + %description AdvanceCOMP contains recompression utilities for your .zip archives, .png images, .mng video clips and .gz files. @@ -40,12 +52,33 @@ This package contains: %autosetup -p1 dos2unix -k doc/*.txt +%if ! 0%{?el7} +# Patch out bundled libdeflate +rm -rvf libdeflate +sed -r -i '/libdeflate/d' Makefile.am +# Fix up #include paths. The find-then-modify pattern keeps us from discarding +# mtimes on any sources that do not need modification. +find . -type f -exec gawk \ + '/^[[:blank:]]*#include.*libdeflate/ { print FILENAME; nextfile }' \ + '{}' '+' | + xargs -r -t sed -r -i 's@^([[:blank:]]*#include.*)libdeflate/@\1@' +%endif + %build +autoreconf --force --install --verbose + # error: ISO C++17 does not allow dynamic exception specifications %set_build_flags export CXXFLAGS="-std=gnu++14 ${CXXFLAGS-}" +%if ! 0%{?el7} +# Link against system libdeflate +export CFLAGS="$(pkgconf --cflags libdeflate) ${CFLAGS-}" +export CXXFLAGS="$(pkgconf --cflags libdeflate) ${CXXFLAGS-}" +export LDFLAGS="$(pkgconf --libs libdeflate) ${LDFLAGS-}" +%endif + %configure %make_build @@ -68,6 +101,7 @@ export CXXFLAGS="-std=gnu++14 ${CXXFLAGS-}" - Spec file formatting tweaks - Convert URLs from HTTP to HTTPS - Use modern spec file macros (make_build/make_install/etc.) +- Unbundle libdeflate * Wed Jul 20 2022 Fedora Release Engineering - 2.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 67fc8d1f10dc8248928696b70b7e8dafbbf4afe4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 24 Sep 2022 10:22:11 -0400 Subject: [PATCH 53/87] Unbundle zopfli where it is available as a system library (i.e., Fedora) --- advancecomp.spec | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 62eeaf9..50e2466 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -33,6 +33,16 @@ Provides: bundled(libdeflate) = 0.6 BuildRequires: pkgconfig(libdeflate) %endif +%if 0%{?el9} || 0%{?el8} || 0%{?el7} +# No libzopfli/zopfli-devel in these distributions +# Version number based on HISTORY, which mentions that upstream commit +# 6818a0859063b946094fb6f94732836404a0d89a was used from +# https://github.com/google/zopfli/. +Provides: bundled(zopfli) = 1.0.2%{?!el7:^20160527git6818a08} +%else +BuildRequires: zopfli-devel +%endif + %description AdvanceCOMP contains recompression utilities for your .zip archives, .png images, .mng video clips and .gz files. @@ -55,7 +65,7 @@ dos2unix -k doc/*.txt %if ! 0%{?el7} # Patch out bundled libdeflate rm -rvf libdeflate -sed -r -i '/libdeflate/d' Makefile.am +sed -r -i '/libdeflate[\/_]/d' Makefile.am # Fix up #include paths. The find-then-modify pattern keeps us from discarding # mtimes on any sources that do not need modification. find . -type f -exec gawk \ @@ -64,6 +74,21 @@ find . -type f -exec gawk \ xargs -r -t sed -r -i 's@^([[:blank:]]*#include.*)libdeflate/@\1@' %endif +%if !(0%{?el9} || 0%{?el8} || 0%{?el7}) +# Patch out bundled zopfli +rm -rvf zopfli +sed -r -i \ + -e '/zopfli[\/_]/d' \ + -e 's/((\(7z_SOURCES\)|WindowOut\.h).*)[[:blank:]]*\\/\1/' \ + Makefile.am +# Fix up #include paths. The find-then-modify pattern keeps us from discarding +# mtimes on any sources that do not need modification. +find . -type f -exec gawk \ + '/^[[:blank:]]*#include.*zopfli/ { print FILENAME; nextfile }' \ + '{}' '+' | + xargs -r -t sed -r -i -e 's@^([[:blank:]]*#include.*)zopfli/@\1@' +%endif + %build autoreconf --force --install --verbose @@ -79,6 +104,11 @@ export CXXFLAGS="$(pkgconf --cflags libdeflate) ${CXXFLAGS-}" export LDFLAGS="$(pkgconf --libs libdeflate) ${LDFLAGS-}" %endif +%if !(0%{?el9} || 0%{?el8} || 0%{?el7}) +# Link against system zopfli +export LDFLAGS="-lzopfli ${LDFLAGS-}" +%endif + %configure %make_build @@ -102,6 +132,7 @@ export LDFLAGS="$(pkgconf --libs libdeflate) ${LDFLAGS-}" - Convert URLs from HTTP to HTTPS - Use modern spec file macros (make_build/make_install/etc.) - Unbundle libdeflate +- Unbundle zopfli where it is available as a system library (i.e., Fedora) * Wed Jul 20 2022 Fedora Release Engineering - 2.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 31d6b3fb26fe3902f2b825b22b0cb30dd2b8d77f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Sep 2022 09:11:53 -0400 Subject: [PATCH 54/87] Remove unnecessary BR on tofrodos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Makefile.am uses “todos”, but only when a tool called “advd2” is installed. --- advancecomp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 50e2466..19e8fb3 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -20,7 +20,6 @@ BuildRequires: gcc-c++ BuildRequires: make BuildRequires: dos2unix -BuildRequires: tofrodos # System library supported by upstream BuildRequires: zlib-devel @@ -133,6 +132,7 @@ export LDFLAGS="-lzopfli ${LDFLAGS-}" - Use modern spec file macros (make_build/make_install/etc.) - Unbundle libdeflate - Unbundle zopfli where it is available as a system library (i.e., Fedora) +- Remove unnecessary BR on tofrodos * Wed Jul 20 2022 Fedora Release Engineering - 2.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 496bc34298dfffe950c74e69f4c326dd94c2582a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Sep 2022 10:49:35 -0400 Subject: [PATCH 55/87] Properly document bundled 7z code --- advancecomp.spec | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/advancecomp.spec b/advancecomp.spec index 19e8fb3..47a4f9f 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -3,6 +3,13 @@ Version: 2.1 Release: 21%{?dist} Summary: Recompression utilities for .png, .mng, .zip and .gz files +# The bundled and forked 7z (7-Zip code) in 7z/ is under the “LGPL” license. +# Based on https://www.7-zip.org/license.txt, and the absence of any mention of +# license changes in https://www.7-zip.org/history.txt, 7-Zip has always been +# licensed under LGPL-2.1-or-later, specifically; we thus assume this is the +# intended specific license for the contents of the 7z/ directory. None of the +# sources that would be covered by the “unRAR license restriction” or the +# BSD-3-Clause license for LZFSE are present in this fork. License: GPLv3 URL: https://www.advancemame.it/ Source0: https://github.com/amadvance/advancecomp/releases/download/v%{version}/advancecomp-%{version}.tar.gz @@ -42,6 +49,24 @@ Provides: bundled(zopfli) = 1.0.2%{?!el7:^20160527git6818a08} BuildRequires: zopfli-devel %endif +# From 7z/README: +# +# This directory contains some source files from the +# 7z archive utility. (www.7-zip.org) +# +# All the files in this directory was originally released +# with the LGPL license. +# +# All the modifications made on the original files must +# be considered Copyright (C) 2002 Andrea Mazzoleni and +# released under the LGPL license. +# +# It is not clear which version was forked. Because 7-Zip does not provide a +# library, and because the implementation is modified, there is no possibility +# of unbundling. Note that this was forked from the original 7-Zip, not from +# p7zip. +Provides: bundled(7z) + %description AdvanceCOMP contains recompression utilities for your .zip archives, .png images, .mng video clips and .gz files. @@ -133,6 +158,7 @@ export LDFLAGS="-lzopfli ${LDFLAGS-}" - Unbundle libdeflate - Unbundle zopfli where it is available as a system library (i.e., Fedora) - Remove unnecessary BR on tofrodos +- Properly document bundled 7z code * Wed Jul 20 2022 Fedora Release Engineering - 2.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From be02239d4e8696e306dfbf1dfced79f315c7feac Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Sep 2022 11:00:53 -0400 Subject: [PATCH 56/87] Convert to rpmautospec --- advancecomp.spec | 206 +---------------------------------------------- changelog | 203 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+), 204 deletions(-) create mode 100644 changelog diff --git a/advancecomp.spec b/advancecomp.spec index 47a4f9f..bf7859b 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,6 +1,6 @@ Name: advancecomp Version: 2.1 -Release: 21%{?dist} +Release: %autorelease Summary: Recompression utilities for .png, .mng, .zip and .gz files # The bundled and forked 7z (7-Zip code) in 7z/ is under the “LGPL” license. @@ -151,206 +151,4 @@ export LDFLAGS="-lzopfli ${LDFLAGS-}" %changelog -* Sat Sep 24 2022 Benjamin A. Beasley - 2.1-21 -- Spec file formatting tweaks -- Convert URLs from HTTP to HTTPS -- Use modern spec file macros (make_build/make_install/etc.) -- Unbundle libdeflate -- Unbundle zopfli where it is available as a system library (i.e., Fedora) -- Remove unnecessary BR on tofrodos -- Properly document bundled 7z code - -* Wed Jul 20 2022 Fedora Release Engineering - 2.1-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 2.1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2.1-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 2.1-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jul 31 2020 Fedora Release Engineering - 2.1-16 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Jeff Law - 2.1-15 -- Force C++14 as the code is not ready for C++17 - -* Mon Jul 27 2020 Fedora Release Engineering - 2.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 2.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 2.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 10 2019 Than Ngo - 2.1-11 -- Backport for #1708563, CVE-2019-8383 - denial of service in function adv_png_unfilter_8 - -* Wed Mar 06 2019 Than Ngo - 2.1-10 -- Backport, fix a buffer overflow with image of invalid size - -* Fri Mar 01 2019 Than Ngo - 2.1-9 -- fixed CVE-2019-9210 advancecomp: integer overflow in png_compress in pngex.cc - -* Thu Jan 31 2019 Fedora Release Engineering - 2.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 29 2019 Matthias Saou 2.1-7 -- Fix doc EOL. -- Minor cosmetic updates (summary, description...). - -* Sat Jul 14 2018 Christian Dersch - 2.1-6 -- BuildRequires: gcc-c++ - -* Thu Jul 12 2018 Fedora Release Engineering - 2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Mar 07 2018 Than Ngo - 2.1-4 -- updated to 2.1 (fix CVE-2018-1056) - -* Wed Feb 07 2018 Fedora Release Engineering - 1.23-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 1.23-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.23-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Feb 28 2017 Christian Dersch - 1.23-1 -- new version - -* Fri Feb 10 2017 Fedora Release Engineering - 1.20-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Nov 13 2016 Christian Dersch - 1.20-3 -- revert to 1.20, 1.22 does not build and also needs unbundling of libdeflate first - -* Sun Nov 13 2016 Christian Dersch - 1.22-1 -- new version - -* Wed Feb 03 2016 Fedora Release Engineering - 1.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Oct 05 2015 Christian Dersch - 1.20-1 -- new version 1.20 -- use license tag - -* Tue Jun 16 2015 Fedora Release Engineering - 1.19-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.19-4 -- Rebuilt for GCC 5 C++11 ABI change - -* Fri Aug 15 2014 Fedora Release Engineering - 1.19-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Mar 20 2014 Christopher Meng - 1.19-1 -- Update to 1.19 - -* Mon Feb 10 2014 Christopher Meng - 1.18-1 -- Update to 1.18 - -* Sat Aug 03 2013 Fedora Release Engineering - 1.15-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 1.15-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.15-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Apr 27 2012 Peter Robinson - 1.15-16 -- Add disttag, modernise spec file - -* Tue Feb 28 2012 Fedora Release Engineering - 1.15-15 -- Rebuilt for c++ ABI breakage - -* Thu Jan 12 2012 Fedora Release Engineering - 1.15-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.15-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 24 2009 Fedora Release Engineering - 1.15-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 1.15-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 19 2008 Fedora Release Engineering - 1.15-10 -- Autorebuild for GCC 4.3 - -* Wed Aug 22 2007 Matthias Saou 1.15-9 -- Rebuild for new BuildID feature. - -* Fri Aug 3 2007 Matthias Saou 1.15-8 -- Update License field. -- Remove dist tag, since the package will seldom change. - -* Thu Mar 29 2007 Matthias Saou 1.15-7 -- Switch to using DESTDIR install method. - -* Thu Mar 29 2007 Matthias Saou 1.15-6 -- Switch to use downloads.sf.net source URL. -- Tweak defattr. - -* Mon Aug 28 2006 Matthias Saou 1.15-5 -- FC6 rebuild, remove gcc-c++ build requirement (it's a default). - -* Mon Mar 6 2006 Matthias Saou 1.15-4 -- FC5 rebuild. - -* Wed Feb 8 2006 Matthias Saou 1.15-3 -- Rebuild for new gcc/glibc. - -* Tue Jan 24 2006 Matthias Saou 1.15-2 -- Rebuild for FC5. - -* Wed Nov 2 2005 Matthias Saou 1.15-1 -- Update to 1.15, includes 64bit fixes. - -* Fri May 27 2005 Matthias Saou 1.14-5 -- Update 64bit patch to a cleaner approach as Ralf suggested. - -* Thu May 26 2005 Jeremy Katz - 1.14-4 -- fix build on 64bit arches - -* Sun May 22 2005 Jeremy Katz - 1.14-3 -- rebuild on all arches - -* Thu Apr 7 2005 Michael Schwendt 1.14-2 -- rebuilt - -* Wed Feb 23 2005 Matthias Saou 1.14-1 -- Update to 1.14. - -* Mon Nov 29 2004 Matthias Saou 1.13-1 -- Update to 1.13. - -* Tue Nov 2 2004 Matthias Saou 1.12-1 -- Update to 1.12. - -* Tue Aug 24 2004 Matthias Saou 1.11-1 -- Update to 1.11. - -* Mon May 17 2004 Matthias Saou 1.10-1 -- Update to 1.10. - -* Mon Nov 3 2003 Matthias Saou 1.7-2 -- Rebuild for Fedora Core 1. -- Added missing build dependencies, thanks to mach. - -* Tue Aug 26 2003 Matthias Saou -- Update to 1.7. - -* Thu May 22 2003 Matthias Saou -- Initial RPM release. +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..27f0b1a --- /dev/null +++ b/changelog @@ -0,0 +1,203 @@ +* Sat Sep 24 2022 Benjamin A. Beasley - 2.1-21 +- Spec file formatting tweaks +- Convert URLs from HTTP to HTTPS +- Use modern spec file macros (make_build/make_install/etc.) +- Unbundle libdeflate +- Unbundle zopfli where it is available as a system library (i.e., Fedora) +- Remove unnecessary BR on tofrodos +- Properly document bundled 7z code + +* Wed Jul 20 2022 Fedora Release Engineering - 2.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 2.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jan 25 2021 Fedora Release Engineering - 2.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jul 31 2020 Fedora Release Engineering - 2.1-16 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Jeff Law - 2.1-15 +- Force C++14 as the code is not ready for C++17 + +* Mon Jul 27 2020 Fedora Release Engineering - 2.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 2.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 2.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 10 2019 Than Ngo - 2.1-11 +- Backport for #1708563, CVE-2019-8383 - denial of service in function adv_png_unfilter_8 + +* Wed Mar 06 2019 Than Ngo - 2.1-10 +- Backport, fix a buffer overflow with image of invalid size + +* Fri Mar 01 2019 Than Ngo - 2.1-9 +- fixed CVE-2019-9210 advancecomp: integer overflow in png_compress in pngex.cc + +* Thu Jan 31 2019 Fedora Release Engineering - 2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 29 2019 Matthias Saou 2.1-7 +- Fix doc EOL. +- Minor cosmetic updates (summary, description...). + +* Sat Jul 14 2018 Christian Dersch - 2.1-6 +- BuildRequires: gcc-c++ + +* Thu Jul 12 2018 Fedora Release Engineering - 2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Mar 07 2018 Than Ngo - 2.1-4 +- updated to 2.1 (fix CVE-2018-1056) + +* Wed Feb 07 2018 Fedora Release Engineering - 1.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 1.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Feb 28 2017 Christian Dersch - 1.23-1 +- new version + +* Fri Feb 10 2017 Fedora Release Engineering - 1.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Nov 13 2016 Christian Dersch - 1.20-3 +- revert to 1.20, 1.22 does not build and also needs unbundling of libdeflate first + +* Sun Nov 13 2016 Christian Dersch - 1.22-1 +- new version + +* Wed Feb 03 2016 Fedora Release Engineering - 1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Oct 05 2015 Christian Dersch - 1.20-1 +- new version 1.20 +- use license tag + +* Tue Jun 16 2015 Fedora Release Engineering - 1.19-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.19-4 +- Rebuilt for GCC 5 C++11 ABI change + +* Fri Aug 15 2014 Fedora Release Engineering - 1.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Mar 20 2014 Christopher Meng - 1.19-1 +- Update to 1.19 + +* Mon Feb 10 2014 Christopher Meng - 1.18-1 +- Update to 1.18 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.15-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 1.15-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.15-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Apr 27 2012 Peter Robinson - 1.15-16 +- Add disttag, modernise spec file + +* Tue Feb 28 2012 Fedora Release Engineering - 1.15-15 +- Rebuilt for c++ ABI breakage + +* Thu Jan 12 2012 Fedora Release Engineering - 1.15-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 1.15-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 24 2009 Fedora Release Engineering - 1.15-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 1.15-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Feb 19 2008 Fedora Release Engineering - 1.15-10 +- Autorebuild for GCC 4.3 + +* Wed Aug 22 2007 Matthias Saou 1.15-9 +- Rebuild for new BuildID feature. + +* Fri Aug 3 2007 Matthias Saou 1.15-8 +- Update License field. +- Remove dist tag, since the package will seldom change. + +* Thu Mar 29 2007 Matthias Saou 1.15-7 +- Switch to using DESTDIR install method. + +* Thu Mar 29 2007 Matthias Saou 1.15-6 +- Switch to use downloads.sf.net source URL. +- Tweak defattr. + +* Mon Aug 28 2006 Matthias Saou 1.15-5 +- FC6 rebuild, remove gcc-c++ build requirement (it's a default). + +* Mon Mar 6 2006 Matthias Saou 1.15-4 +- FC5 rebuild. + +* Wed Feb 8 2006 Matthias Saou 1.15-3 +- Rebuild for new gcc/glibc. + +* Tue Jan 24 2006 Matthias Saou 1.15-2 +- Rebuild for FC5. + +* Wed Nov 2 2005 Matthias Saou 1.15-1 +- Update to 1.15, includes 64bit fixes. + +* Fri May 27 2005 Matthias Saou 1.14-5 +- Update 64bit patch to a cleaner approach as Ralf suggested. + +* Thu May 26 2005 Jeremy Katz - 1.14-4 +- fix build on 64bit arches + +* Sun May 22 2005 Jeremy Katz - 1.14-3 +- rebuild on all arches + +* Thu Apr 7 2005 Michael Schwendt 1.14-2 +- rebuilt + +* Wed Feb 23 2005 Matthias Saou 1.14-1 +- Update to 1.14. + +* Mon Nov 29 2004 Matthias Saou 1.13-1 +- Update to 1.13. + +* Tue Nov 2 2004 Matthias Saou 1.12-1 +- Update to 1.12. + +* Tue Aug 24 2004 Matthias Saou 1.11-1 +- Update to 1.11. + +* Mon May 17 2004 Matthias Saou 1.10-1 +- Update to 1.10. + +* Mon Nov 3 2003 Matthias Saou 1.7-2 +- Rebuild for Fedora Core 1. +- Added missing build dependencies, thanks to mach. + +* Tue Aug 26 2003 Matthias Saou +- Update to 1.7. + +* Thu May 22 2003 Matthias Saou +- Initial RPM release. From 2153fc922fdcf3e44f0b7aa16d2a1028e103520f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Sep 2022 11:41:50 -0400 Subject: [PATCH 57/87] Drop {authors,history,readme}.txt These duplicate AUTHORS, HISTORY, and README, respectively. --- advancecomp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index bf7859b..0950637 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -144,7 +144,7 @@ export LDFLAGS="-lzopfli ${LDFLAGS-}" %files %license COPYING %doc AUTHORS HISTORY README -%doc doc/{adv*,authors,history,readme}.txt +%doc doc/adv*.txt %{_bindir}/* %{_mandir}/man1/* From 015bf0b20eacb4fe5963b261a3c869fc59250ce6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Sep 2022 10:58:02 -0400 Subject: [PATCH 58/87] Update License to SPDX --- advancecomp.spec | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index 0950637..5afeef6 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -3,14 +3,24 @@ Version: 2.1 Release: %autorelease Summary: Recompression utilities for .png, .mng, .zip and .gz files -# The bundled and forked 7z (7-Zip code) in 7z/ is under the “LGPL” license. -# Based on https://www.7-zip.org/license.txt, and the absence of any mention of -# license changes in https://www.7-zip.org/history.txt, 7-Zip has always been -# licensed under LGPL-2.1-or-later, specifically; we thus assume this is the -# intended specific license for the contents of the 7z/ directory. None of the -# sources that would be covered by the “unRAR license restriction” or the -# BSD-3-Clause license for LZFSE are present in this fork. -License: GPLv3 +# Source file headers all specify GPL-2.0-or-later (see source file headers), +# except: +# +# The bundled and forked 7z (7-Zip code) in 7z/ is under the “LGPL” license. +# Based on https://www.7-zip.org/license.txt, and the absence of any mention +# of license changes in https://www.7-zip.org/history.txt, 7-Zip has always +# been licensed under LGPL-2.1-or-later, specifically; we thus assume this is +# the intended specific license for the contents of the 7z/ directory. None +# of the sources that would be covered by the “unRAR license restriction” or +# the BSD-3-Clause license for LZFSE are present in this fork. +# +# Certain build-system files, which do not contribute to the license of the +# binary RPM, are under other permissible licenses. +# +# However, in version 1.17, the COPYING file was updated to GPLv3, with a +# changelog message (in HISTORY and elsewhere) of “Changes to GPL3.” We +# interpret this as an overall license of GPL-3.0-only. +License: GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://www.advancemame.it/ Source0: https://github.com/amadvance/advancecomp/releases/download/v%{version}/advancecomp-%{version}.tar.gz From 24225a166bdc5df6ee25e54aebb3a977120f55e9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Sep 2022 11:40:06 -0400 Subject: [PATCH 59/87] Update to 2.3 (close RHBZ#2075857) --- .gitignore | 1 + advancecomp-CVE-2019-8383.patch | 44 -------------- advancecomp-CVE-2019-9210.patch | 100 -------------------------------- advancecomp.spec | 14 +---- sources | 2 +- 5 files changed, 5 insertions(+), 156 deletions(-) delete mode 100644 advancecomp-CVE-2019-8383.patch delete mode 100644 advancecomp-CVE-2019-9210.patch diff --git a/.gitignore b/.gitignore index 7ed4cc9..2ec630f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ advancecomp-1.15.tar.gz /advancecomp.spec /advancecomp-1.23.tar.gz /advancecomp-2.1.tar.gz +/advancecomp-2.3.tar.gz diff --git a/advancecomp-CVE-2019-8383.patch b/advancecomp-CVE-2019-8383.patch deleted file mode 100644 index 3a9b35e..0000000 --- a/advancecomp-CVE-2019-8383.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 78a56b21340157775be2462a19276b4d31d2bd01 -Author: Andrea Mazzoleni -Date: Fri Jan 4 20:49:25 2019 +0100 - - Fix a buffer overflow caused by invalid images - -diff --git a/lib/png.c b/lib/png.c -index 0939a5a..cbf140b 100644 ---- a/lib/png.c -+++ b/lib/png.c -@@ -603,6 +603,7 @@ adv_error adv_png_read_ihdr( - unsigned pixel; - unsigned width; - unsigned width_align; -+ unsigned scanline; - unsigned height; - unsigned depth; - int r; -@@ -719,9 +720,23 @@ adv_error adv_png_read_ihdr( - goto err_ptr; - } - -- *dat_size = height * (width_align * pixel + 1); -+ /* check for overflow */ -+ if (pixel == 0 || width_align >= UINT_MAX / pixel) { -+ error_set("Invalid image size"); -+ goto err_ptr; -+ } -+ -+ scanline = width_align * pixel + 1; -+ -+ /* check for overflow */ -+ if (scanline == 0 || height >= UINT_MAX / scanline) { -+ error_set("Invalid image size"); -+ goto err_ptr; -+ } -+ -+ *dat_size = height * scanline; - *dat_ptr = malloc(*dat_size); -- *pix_scanline = width_align * pixel + 1; -+ *pix_scanline = scanline; - *pix_ptr = *dat_ptr + 1; - - z.zalloc = 0; diff --git a/advancecomp-CVE-2019-9210.patch b/advancecomp-CVE-2019-9210.patch deleted file mode 100644 index dc40bc8..0000000 --- a/advancecomp-CVE-2019-9210.patch +++ /dev/null @@ -1,100 +0,0 @@ -commit 7894a6e684ce68ddff9f4f4919ab8e3911ac8040 -Author: Andrea Mazzoleni -Date: Fri Jan 4 20:49:48 2019 +0100 - - Fix a buffer overflow caused by invalid chunks - -diff --git a/pngex.cc b/pngex.cc -index 55d16f5..3f5b49f 100644 ---- a/pngex.cc -+++ b/pngex.cc -@@ -163,6 +163,10 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) - - switch (type) { - case ADV_MNG_CN_MHDR : -+ if (size < 28) { -+ cout << " invalid chunk size"; -+ break; -+ } - cout << " width:" << be_uint32_read(data+0) << " height:" << be_uint32_read(data+4) << " frequency:" << be_uint32_read(data+8); - cout << " simplicity:" << be_uint32_read(data+24); - cout << "(bit"; -@@ -174,6 +178,10 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) - cout << ")"; - break; - case ADV_MNG_CN_DHDR : -+ if (size < 4) { -+ cout << " invalid chunk size"; -+ break; -+ } - cout << " id:" << be_uint16_read(data+0); - switch (data[2]) { - case 0 : cout << " img:unspecified"; break; -@@ -243,6 +251,10 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) - } - break; - case ADV_MNG_CN_DEFI : -+ if (size < 2) { -+ cout << " invalid chunk size"; -+ break; -+ } - cout << " id:" << be_uint16_read(data+0); - if (size >= 3) { - switch (data[2]) { -@@ -266,6 +278,10 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) - } - break; - case ADV_MNG_CN_MOVE : -+ if (size < 13) { -+ cout << " invalid chunk size"; -+ break; -+ } - cout << " id_from:" << be_uint16_read(data+0) << " id_to:" << be_uint16_read(data+2); - switch (data[4]) { - case 0 : cout << " type:replace"; break; -@@ -275,6 +291,10 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) - cout << " x:" << (int)be_uint32_read(data + 5) << " y:" << (int)be_uint32_read(data + 9); - break; - case ADV_MNG_CN_PPLT : -+ if (size < 1) { -+ cout << " invalid chunk size"; -+ break; -+ } - switch (data[0]) { - case 0 : cout << " type:replacement_rgb"; break; - case 1 : cout << " type:delta_rgb"; break; -@@ -285,7 +305,7 @@ void png_print_chunk(unsigned type, unsigned char* data, unsigned size) - default : cout << " type:?"; break; - } - i = 1; -- while (i Date: Wed, 28 Sep 2022 11:54:40 -0400 Subject: [PATCH 60/87] Drop EPEL conditionals from Fedora branches --- advancecomp.spec | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index 5610ada..2f2d136 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -36,23 +36,10 @@ BuildRequires: dos2unix # System library supported by upstream BuildRequires: zlib-devel -%if 0%{?el7} -# No libdeflate package in EPEL7 -Provides: bundled(libdeflate) = 0.6 -%else # Unbundled downstream BuildRequires: pkgconfig(libdeflate) -%endif -%if 0%{?el9} || 0%{?el8} || 0%{?el7} -# No libzopfli/zopfli-devel in these distributions -# Version number based on HISTORY, which mentions that upstream commit -# 6818a0859063b946094fb6f94732836404a0d89a was used from -# https://github.com/google/zopfli/. -Provides: bundled(zopfli) = 1.0.2%{?!el7:^20160527git6818a08} -%else BuildRequires: zopfli-devel -%endif # From 7z/README: # @@ -91,7 +78,6 @@ This package contains: %autosetup -p1 dos2unix -k doc/*.txt -%if ! 0%{?el7} # Patch out bundled libdeflate rm -rvf libdeflate sed -r -i '/libdeflate[\/_]/d' Makefile.am @@ -101,9 +87,7 @@ find . -type f -exec gawk \ '/^[[:blank:]]*#include.*libdeflate/ { print FILENAME; nextfile }' \ '{}' '+' | xargs -r -t sed -r -i 's@^([[:blank:]]*#include.*)libdeflate/@\1@' -%endif -%if !(0%{?el9} || 0%{?el8} || 0%{?el7}) # Patch out bundled zopfli rm -rvf zopfli sed -r -i \ @@ -116,24 +100,19 @@ find . -type f -exec gawk \ '/^[[:blank:]]*#include.*zopfli/ { print FILENAME; nextfile }' \ '{}' '+' | xargs -r -t sed -r -i -e 's@^([[:blank:]]*#include.*)zopfli/@\1@' -%endif %build %set_build_flags autoreconf --force --install --verbose -%if ! 0%{?el7} # Link against system libdeflate export CFLAGS="$(pkgconf --cflags libdeflate) ${CFLAGS-}" export CXXFLAGS="$(pkgconf --cflags libdeflate) ${CXXFLAGS-}" export LDFLAGS="$(pkgconf --libs libdeflate) ${LDFLAGS-}" -%endif -%if !(0%{?el9} || 0%{?el8} || 0%{?el7}) # Link against system zopfli export LDFLAGS="-lzopfli ${LDFLAGS-}" -%endif %configure %make_build From 791cf7b520296afd70e1a322d9a7f7c8eeb77b04 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Sep 2022 17:21:51 -0400 Subject: [PATCH 61/87] Stricter file globs --- advancecomp.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index 2f2d136..3cb9413 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -124,11 +124,13 @@ export LDFLAGS="-lzopfli ${LDFLAGS-}" %files %license COPYING -%doc AUTHORS HISTORY README -%doc doc/adv*.txt +%doc AUTHORS +%doc HISTORY +%doc README +%doc doc/adv{def,mng,png,zip}.txt -%{_bindir}/* -%{_mandir}/man1/* +%{_bindir}/adv{def,mng,png,zip} +%{_mandir}/man1/adv{def,mng,png,zip}.1* %changelog From 91a8c8347b3ee5ca1d4e84f982e85a769829dd52 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Sep 2022 17:24:48 -0400 Subject: [PATCH 62/87] Add a comment about upstream tests --- advancecomp.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/advancecomp.spec b/advancecomp.spec index 3cb9413..cd174f9 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -122,6 +122,11 @@ export LDFLAGS="-lzopfli ${LDFLAGS-}" %make_install +# We don’t run upstream tests (%%make_build check) because they are too +# brittle, expecting recompressed outputs to be identical. Across platforms, +# compilers, and unbundled library versions, this doesn’t hold up. + + %files %license COPYING %doc AUTHORS From 0ee3b4785e3535117c35af49b0261980c5d3a425 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Sep 2022 08:21:33 -0400 Subject: [PATCH 63/87] =?UTF-8?q?Identify=20bundled=207-Zip=20as=20?= =?UTF-8?q?=E2=80=9C7zip=E2=80=9D=20rather=20than=20=E2=80=9C7z=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is closer to the upstream name, to “p7zip”, and to existing usage in the “retroarch” package. --- advancecomp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index cd174f9..29c366a 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -57,7 +57,7 @@ BuildRequires: zopfli-devel # library, and because the implementation is modified, there is no possibility # of unbundling. Note that this was forked from the original 7-Zip, not from # p7zip. -Provides: bundled(7z) +Provides: bundled(7zip) %description AdvanceCOMP contains recompression utilities for your .zip archives, From 649d63913c3cd06d073046f3cce70f9db5bf573f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 23 Nov 2022 15:45:08 -0500 Subject: [PATCH 64/87] Update to 2.4 (close RHBZ#2145023) - Security fix for CVE-2022-35014, CVE-2022-35015, CVE-2022-35016, CVE-2022-35017, CVE-2022-35018, CVE-2022-35019, CVE-2022-35020 --- .gitignore | 1 + advancecomp.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2ec630f..90d97e9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ advancecomp-1.15.tar.gz /advancecomp-1.23.tar.gz /advancecomp-2.1.tar.gz /advancecomp-2.3.tar.gz +/advancecomp-2.4.tar.gz diff --git a/advancecomp.spec b/advancecomp.spec index 29c366a..f949b14 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,5 +1,5 @@ Name: advancecomp -Version: 2.3 +Version: 2.4 Release: %autorelease Summary: Recompression utilities for .png, .mng, .zip and .gz files diff --git a/sources b/sources index 59b074f..3b60e66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (advancecomp-2.3.tar.gz) = 129bb820a044b03b94d9980c7fc675ee5c273ba8ba84f1fdd341c6b2d9847c3f379cc21e64bb75c0a3c5a45a3df9e560d92143728adb4e8834ae0525ff7d5d1c +SHA512 (advancecomp-2.4.tar.gz) = 648e89b684725743df4338a0958cdb9c37a7676f4b1a7209d016be0348d089eae9a0d20b3531838fc42887990f4c57749926c27e619887d8106a197961696a06 From e2ff0b6664ef762dafd6965aa6fc6e4fa35c2051 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:27:30 +0000 Subject: [PATCH 65/87] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 101f35baa06418542e2254b5144b5458f76ca7cf Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 22 Jan 2023 13:43:51 -0500 Subject: [PATCH 66/87] Update to 2.5 (close RHBZ#2162990; fix RHBZ#2161641) --- .gitignore | 1 + advancecomp.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 90d97e9..91d5d6f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ advancecomp-1.15.tar.gz /advancecomp-2.1.tar.gz /advancecomp-2.3.tar.gz /advancecomp-2.4.tar.gz +/advancecomp-2.5.tar.gz diff --git a/advancecomp.spec b/advancecomp.spec index f949b14..4458095 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,5 +1,5 @@ Name: advancecomp -Version: 2.4 +Version: 2.5 Release: %autorelease Summary: Recompression utilities for .png, .mng, .zip and .gz files diff --git a/sources b/sources index 3b60e66..04420d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (advancecomp-2.4.tar.gz) = 648e89b684725743df4338a0958cdb9c37a7676f4b1a7209d016be0348d089eae9a0d20b3531838fc42887990f4c57749926c27e619887d8106a197961696a06 +SHA512 (advancecomp-2.5.tar.gz) = c508526415dc002dad442e3f55202494ab2c49ecac3f5ea6e1a3fe27d224dd9a1a33dace02f59c18123d3f4bc74e3f03556b1cff6541cb88dcaaa32ac35c0043 From 824d7ad4cd8ad2962c6dbeafff7a8d4e1c1b219f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 11 May 2023 10:19:34 -0400 Subject: [PATCH 67/87] Add an rpmlintrc file --- advancecomp.rpmlintrc | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 advancecomp.rpmlintrc diff --git a/advancecomp.rpmlintrc b/advancecomp.rpmlintrc new file mode 100644 index 0000000..f783f4d --- /dev/null +++ b/advancecomp.rpmlintrc @@ -0,0 +1,4 @@ +# There is really no version information available. +addFilter(r' unversioned-explicit-provides bundled\(7zip\)') +# Every RPM has this… +addFilter(r' strange-permission advancecomp\.spec 600$') From 6d18adf8196d195f8314f9ab7ec70c0c2581f1f8 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 26 May 2023 09:27:20 -0400 Subject: [PATCH 68/87] Do not number the sole Source [skip changelog] --- advancecomp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 4458095..a20d937 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -22,7 +22,7 @@ Summary: Recompression utilities for .png, .mng, .zip and .gz files # interpret this as an overall license of GPL-3.0-only. License: GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://www.advancemame.it/ -Source0: https://github.com/amadvance/advancecomp/archive/v%{version}/advancecomp-%{version}.tar.gz +Source: https://github.com/amadvance/advancecomp/archive/v%{version}/advancecomp-%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake From 22e119134b1385cf1751d613e240cca4278a3cd2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 26 May 2023 09:28:09 -0400 Subject: [PATCH 69/87] Break a long line with a macro [skip changelog] --- advancecomp.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index a20d937..838e001 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -22,7 +22,8 @@ Summary: Recompression utilities for .png, .mng, .zip and .gz files # interpret this as an overall license of GPL-3.0-only. License: GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://www.advancemame.it/ -Source: https://github.com/amadvance/advancecomp/archive/v%{version}/advancecomp-%{version}.tar.gz +%global forgeurl https://github.com/amadvance/advancecomp +Source: %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake From 0d1703faacf46713549472b2b3032547f06537fe Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 26 May 2023 09:29:06 -0400 Subject: [PATCH 70/87] Trivial tidying [skip changelog] --- advancecomp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index 838e001..f117b9f 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -39,7 +39,6 @@ BuildRequires: zlib-devel # Unbundled downstream BuildRequires: pkgconfig(libdeflate) - BuildRequires: zopfli-devel # From 7z/README: @@ -76,7 +75,8 @@ This package contains: %prep -%autosetup -p1 +%autosetup + dos2unix -k doc/*.txt # Patch out bundled libdeflate From ab3c30af1ade90349145c7b7755c81c143fca9c4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 3 Jun 2023 10:21:50 -0400 Subject: [PATCH 71/87] Remove explicit %set_build_flags, not needed since F36 https://www.fedoraproject.org/wiki/Changes/SetBuildFlagsBuildCheck --- advancecomp.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index f117b9f..246bda8 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -104,7 +104,6 @@ find . -type f -exec gawk \ %build -%set_build_flags autoreconf --force --install --verbose # Link against system libdeflate From fcef08707e9d74e5b85c49705ce6534008403be0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:58:14 +0000 Subject: [PATCH 72/87] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 93f35b31735e4362bcf2129cf03f6d1a6eeaaa8b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 10:46:52 -0500 Subject: [PATCH 73/87] Update to 2.6 (close RHBZ#2243085) --- .gitignore | 1 + advancecomp.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 91d5d6f..6e4a9e6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ advancecomp-1.15.tar.gz /advancecomp-2.3.tar.gz /advancecomp-2.4.tar.gz /advancecomp-2.5.tar.gz +/advancecomp-2.6.tar.gz diff --git a/advancecomp.spec b/advancecomp.spec index 246bda8..8866ff3 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -1,5 +1,5 @@ Name: advancecomp -Version: 2.5 +Version: 2.6 Release: %autorelease Summary: Recompression utilities for .png, .mng, .zip and .gz files @@ -38,9 +38,13 @@ BuildRequires: dos2unix BuildRequires: zlib-devel # Unbundled downstream -BuildRequires: pkgconfig(libdeflate) +BuildRequires: pkgconfig(libdeflate) >= 1.19 BuildRequires: zopfli-devel +# The point of the 2.6 release was to upgrade the bundled libdeflate; enforce +# this on the unbundled libdeflate. +Requires: libdeflate >= 1.19 + # From 7z/README: # # This directory contains some source files from the @@ -80,7 +84,7 @@ This package contains: dos2unix -k doc/*.txt # Patch out bundled libdeflate -rm -rvf libdeflate +rm -rv libdeflate sed -r -i '/libdeflate[\/_]/d' Makefile.am # Fix up #include paths. The find-then-modify pattern keeps us from discarding # mtimes on any sources that do not need modification. @@ -90,7 +94,7 @@ find . -type f -exec gawk \ xargs -r -t sed -r -i 's@^([[:blank:]]*#include.*)libdeflate/@\1@' # Patch out bundled zopfli -rm -rvf zopfli +rm -rv zopfli sed -r -i \ -e '/zopfli[\/_]/d' \ -e 's/((\(7z_SOURCES\)|WindowOut\.h).*)[[:blank:]]*\\/\1/' \ diff --git a/sources b/sources index 04420d1..a8812ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (advancecomp-2.5.tar.gz) = c508526415dc002dad442e3f55202494ab2c49ecac3f5ea6e1a3fe27d224dd9a1a33dace02f59c18123d3f4bc74e3f03556b1cff6541cb88dcaaa32ac35c0043 +SHA512 (advancecomp-2.6.tar.gz) = 63cbb0578f96fd3f55ccb49e31bfe945649d36a11558aa482332440943d6d347f161de797b8d4469562b1d551b274c22fe08818179926d56aa4746581d3926dd From b5dda5d8e28be94d1fd6b0fccb248ee02ca3547e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:18:11 +0000 Subject: [PATCH 74/87] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 97cb7201ea2fb805e1706864b8a66a93ce032f31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:43:47 +0000 Subject: [PATCH 75/87] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b849bab27f3a01b9e435e96a58835863b29ae492 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 5 Mar 2024 08:55:52 -0500 Subject: [PATCH 76/87] Add an rpmlintrc file [skip changelog] --- advancecomp.rpmlintrc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/advancecomp.rpmlintrc b/advancecomp.rpmlintrc index f783f4d..483f617 100644 --- a/advancecomp.rpmlintrc +++ b/advancecomp.rpmlintrc @@ -1,4 +1,6 @@ -# There is really no version information available. -addFilter(r' unversioned-explicit-provides bundled\(7zip\)') -# Every RPM has this… -addFilter(r' strange-permission advancecomp\.spec 600$') +# Spec file comment shows that exact version is unknown +addFilter(r" unversioned-explicit-provides bundled\(7zip\)") +# Not real spelling errors +addFilter(r" spelling-error \('[Rr]ecompression',") +addFilter(r" spelling-error \('([pm]ng|gz)',") +addFilter(r" spelling-error \('adv(zip|[pm]ng|def)',") From b5736a5b661e73c265b04ee5547ab6023cf055ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:39:52 +0000 Subject: [PATCH 77/87] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 014ec9f6e9b09ea75be27c2b6197a7404843fa0d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 31 Oct 2024 14:10:42 -0400 Subject: [PATCH 78/87] Invoke autoreconf and configure in %conf rather than in %build --- advancecomp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advancecomp.spec b/advancecomp.spec index 8866ff3..5fcc0ab 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -107,7 +107,7 @@ find . -type f -exec gawk \ xargs -r -t sed -r -i -e 's@^([[:blank:]]*#include.*)zopfli/@\1@' -%build +%conf autoreconf --force --install --verbose # Link against system libdeflate @@ -119,6 +119,9 @@ export LDFLAGS="$(pkgconf --libs libdeflate) ${LDFLAGS-}" export LDFLAGS="-lzopfli ${LDFLAGS-}" %configure + + +%build %make_build From 304257fd2c83b4ba9cdee1a2bced867b6a0e89aa Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 11 Dec 2024 14:03:31 -0500 Subject: [PATCH 79/87] Improve the license-breakdown spec-file comment --- advancecomp.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index 5fcc0ab..a037ca2 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -14,13 +14,17 @@ Summary: Recompression utilities for .png, .mng, .zip and .gz files # of the sources that would be covered by the “unRAR license restriction” or # the BSD-3-Clause license for LZFSE are present in this fork. # -# Certain build-system files, which do not contribute to the license of the -# binary RPM, are under other permissible licenses. -# # However, in version 1.17, the COPYING file was updated to GPLv3, with a # changelog message (in HISTORY and elsewhere) of “Changes to GPL3.” We # interpret this as an overall license of GPL-3.0-only. License: GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later +# Additionally, the following bundled libraries are removed in %%prep and do +# not contribute to the licenses of the binary RPMs: +# +# Apache-2.0: +# - zopfli/ +# MIT: +# - libdeflate/ URL: https://www.advancemame.it/ %global forgeurl https://github.com/amadvance/advancecomp Source: %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz From 0b1d468e63c58152cee5de7938179a256b948936 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 11 Dec 2024 14:05:55 -0500 Subject: [PATCH 80/87] Add a SourceLicense field --- advancecomp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/advancecomp.spec b/advancecomp.spec index a037ca2..3c193c4 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -25,6 +25,7 @@ License: GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later # - zopfli/ # MIT: # - libdeflate/ +SourceLicense: %{license} AND Apache-2.0 AND MIT URL: https://www.advancemame.it/ %global forgeurl https://github.com/amadvance/advancecomp Source: %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz From f12f185d6d99c45aa96c4873e28b7f371e998869 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:39:37 +0000 Subject: [PATCH 81/87] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6d02d1e9e5f613c4798a855757baa1849ab9b44f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 24 Apr 2025 07:57:12 -0400 Subject: [PATCH 82/87] Update .rpmlintrc file for a new rpmlint verison --- advancecomp.rpmlintrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/advancecomp.rpmlintrc b/advancecomp.rpmlintrc index 483f617..e6d1b0b 100644 --- a/advancecomp.rpmlintrc +++ b/advancecomp.rpmlintrc @@ -4,3 +4,5 @@ addFilter(r" unversioned-explicit-provides bundled\(7zip\)") addFilter(r" spelling-error \('[Rr]ecompression',") addFilter(r" spelling-error \('([pm]ng|gz)',") addFilter(r" spelling-error \('adv(zip|[pm]ng|def)',") +# Intentional, with a justifying spec-file comment +addFilter(r" no-%install-section") From c9ae8fd33cfb1cb4eb01d6ad2853dde60a7c8f1d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 13 Jun 2025 06:18:39 -0400 Subject: [PATCH 83/87] Use the VCS tag --- advancecomp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index 3c193c4..c407f26 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -27,8 +27,8 @@ License: GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later # - libdeflate/ SourceLicense: %{license} AND Apache-2.0 AND MIT URL: https://www.advancemame.it/ -%global forgeurl https://github.com/amadvance/advancecomp -Source: %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz +VCS: https://github.com/amadvance/advancecomp +Source: %{vcs}/archive/v%{version}/advancecomp-%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake From 6d838becc0ebd031bc26de1cbe79dca3d9178d6c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 13 Jun 2025 06:36:08 -0400 Subject: [PATCH 84/87] Revert "Use the VCS tag"; tag contents did not follow convention This reverts commit c9ae8fd33cfb1cb4eb01d6ad2853dde60a7c8f1d. --- advancecomp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/advancecomp.spec b/advancecomp.spec index c407f26..3c193c4 100644 --- a/advancecomp.spec +++ b/advancecomp.spec @@ -27,8 +27,8 @@ License: GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later # - libdeflate/ SourceLicense: %{license} AND Apache-2.0 AND MIT URL: https://www.advancemame.it/ -VCS: https://github.com/amadvance/advancecomp -Source: %{vcs}/archive/v%{version}/advancecomp-%{version}.tar.gz +%global forgeurl https://github.com/amadvance/advancecomp +Source: %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake From 52005ff32026b6717e2c596a384ed96ab18f913f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:47:43 +0000 Subject: [PATCH 85/87] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 999f9deb8e761bb2b77c76c66d7d17df28da9885 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 7 Jan 2026 16:35:44 +0000 Subject: [PATCH 86/87] Update the .rpmlintrc file [skip changelog] --- advancecomp.rpmlintrc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/advancecomp.rpmlintrc b/advancecomp.rpmlintrc index e6d1b0b..4e393f3 100644 --- a/advancecomp.rpmlintrc +++ b/advancecomp.rpmlintrc @@ -1,8 +1,6 @@ -# Spec file comment shows that exact version is unknown -addFilter(r" unversioned-explicit-provides bundled\(7zip\)") # Not real spelling errors addFilter(r" spelling-error \('[Rr]ecompression',") addFilter(r" spelling-error \('([pm]ng|gz)',") addFilter(r" spelling-error \('adv(zip|[pm]ng|def)',") # Intentional, with a justifying spec-file comment -addFilter(r" no-%install-section") +addFilter(r" no-%check-section") From 5066c0040bd172fa978e9efd6107b37668c49f5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:29:01 +0000 Subject: [PATCH 87/87] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild