From 2cff8cdd64fee218cab3f2ee788a89599e8bd61e Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Mon, 10 Jul 2017 10:21:10 +0200 Subject: [PATCH 01/40] rebuild with new gnat --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index e695ae6..710ee9a 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.15.20120830CVS%{?dist} +Release: 0.16.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -94,6 +94,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Mon Jul 10 2017 Pavel Zhukov - 1.4-0.16.20120830CVS +- rebuild with new gnat + * Sat Feb 11 2017 Fedora Release Engineering - 1.4-0.15.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 49b3055df3ef65e91c500f50048cf5ec11305d53 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:44:48 +0000 Subject: [PATCH 02/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 710ee9a..f3ae72c 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.16.20120830CVS%{?dist} +Release: 0.17.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -94,6 +94,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.4-0.17.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jul 10 2017 Pavel Zhukov - 1.4-0.16.20120830CVS - rebuild with new gnat From 2717af0caa1cebe77c2058ceb8ad4fd88e81937d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:12:43 +0000 Subject: [PATCH 03/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index f3ae72c..11fc6e1 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.17.20120830CVS%{?dist} +Release: 0.18.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -94,6 +94,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.4-0.18.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.4-0.17.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 631861e8b713877813ae4febdf5e3f794eec870c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 4 Feb 2018 15:04:11 +0100 Subject: [PATCH 04/40] Dropped the separate Object_Dir. Debugsource packages don't conflict these days, and this usage of Object_Dir triggered a weird bug in GPRbuild. --- build_zlib_ada.gpr | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build_zlib_ada.gpr b/build_zlib_ada.gpr index 6150b81..1db3be4 100644 --- a/build_zlib_ada.gpr +++ b/build_zlib_ada.gpr @@ -21,10 +21,6 @@ library project Build_Zlib_Ada is for Library_ALI_Dir use Destdir & Directories.Libdir & "/zlib-ada"; for Library_Options use ("-lz") & external_as_list("LDFLAGS", " "); - -- Put the binder files for different architectures in subdirectories where - -- they won't conflict with each other. - for Object_Dir use Directories.Hardware_Platform; - for Source_Files use ("zlib.ads", "zlib.adb", "zlib-streams.ads", From d31c3e832735621ad46dc56b2492734e1d6fa278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 4 Feb 2018 15:04:11 +0100 Subject: [PATCH 05/40] Switched to building with GPRbuild. Project file support was removed from Gnatmake in GCC 8. --- zlib-ada.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 11fc6e1..06d3a5a 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.18.20120830CVS%{?dist} +Release: 0.19.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -16,10 +16,11 @@ Source: zlib-ada-20120830.tar.bz2 Source2: build_zlib_ada.gpr Source3: zlib_ada.gpr -BuildRequires: gcc-gnat >= 4.7 fedora-gnat-project-common zlib-devel chrpath -# Gnatmake learned about external_as_list sometime between 4.4 and 4.7. -# Build only on architectures where gcc-gnat is available: -ExclusiveArch: %{GNAT_arches} +BuildRequires: gcc-gnat fedora-gnat-project-common +BuildRequires: gprbuild +BuildRequires: zlib-devel +# Build only on architectures where GPRbuild is available: +ExclusiveArch: %{GPRbuild_arches} %global common_description_en \ Zlib-Ada is a thick Ada binding to the popular compression/decompression \ @@ -59,9 +60,7 @@ cp %{SOURCE2} . %build -gnatmake -P build_zlib_ada.gpr %{Gnatmake_optflags} -XDESTDIR=build_target -XLDFLAGS='%{__global_ldflags}' -# Remove the unnecessary runpath that Gnatmake added. -chrpath --delete build_target%{_libdir}/*.so.* +gprbuild -P build_zlib_ada.gpr %{GPRbuild_optflags} -XDESTDIR=build_target -XLDFLAGS='%{__global_ldflags}' %install @@ -94,6 +93,10 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Sun Feb 04 2018 Björn Persson - 1.4-0.19.20120830CVS +- Switched to building with GPRbuild as project file support was removed from + Gnatmake in GCC 8. + * Thu Aug 03 2017 Fedora Release Engineering - 1.4-0.18.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From cbdf87d6dea177c6a564110af868b227a099e78b Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 6 Feb 2018 15:27:54 +0100 Subject: [PATCH 06/40] Rebuild with new gnat --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 06d3a5a..163b6a7 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.19.20120830CVS%{?dist} +Release: 0.20.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -93,6 +93,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Tue Feb 06 2018 Pavel Zhukov - 1.4-0.19.20120830CVS - Switched to building with GPRbuild as project file support was removed from Gnatmake in GCC 8. From 639cba9783234308ab703e10e8b901b5d1c9f31d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sat, 24 Feb 2018 17:43:59 +0100 Subject: [PATCH 07/40] Removed ldconfig invocations. In F28 and later these are unnecessary and only slow things down. --- zlib-ada.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 163b6a7..d7a8990 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -74,11 +74,6 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %{_rpmconfigdir}/check-rpaths -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - %files %doc readme.txt %license COPYING3 COPYING.RUNTIME From 56e1f84f9a42a50879bbef16d2ed83b0d4ebb9b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:52:06 +0000 Subject: [PATCH 08/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index d7a8990..092499f 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.20.20120830CVS%{?dist} +Release: 0.21.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -88,6 +88,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.4-0.21.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Feb 06 2018 Pavel Zhukov Date: Mon, 28 Jan 2019 20:18:32 +0100 Subject: [PATCH 09/40] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- zlib-ada.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 092499f..880aea4 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -4,7 +4,6 @@ Release: 0.21.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada -Group: System Environment/Libraries License: GPLv3+ with exceptions URL: http://zlib-ada.sourceforge.net/ # The tarball was made with these commands: @@ -38,7 +37,6 @@ avkomprimeringsbiblioteket Zlib. %package devel Summary: Development files for Zlib-Ada Summary(sv): Filer för programmering med Zlib-Ada -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: fedora-gnat-project-common From 04a811c6109e85366b4301d297645d198471846b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:13:34 +0000 Subject: [PATCH 10/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 880aea4..f365632 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.21.20120830CVS%{?dist} +Release: 0.22.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -86,6 +86,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.4-0.22.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1.4-0.21.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From fcec3ff4a421640cb85cf34dc3088a1a3cd13c40 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 12 Feb 2019 21:27:26 +0100 Subject: [PATCH 11/40] Rebuild with new gprbuild (i686) --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index f365632..aa811f6 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.22.20120830CVS%{?dist} +Release: 0.23.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -86,6 +86,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Tue Feb 12 2019 Pavel Zhukov - 1.4-0.23.20120830CVS +- Rebuild for i686 + * Sun Feb 03 2019 Fedora Release Engineering - 1.4-0.22.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 1d1c732a49882d745cc640ba297df248e139edf3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 05:03:22 +0000 Subject: [PATCH 12/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index aa811f6..658a140 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.23.20120830CVS%{?dist} +Release: 0.24.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -86,6 +86,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.4-0.24.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Feb 12 2019 Pavel Zhukov - 1.4-0.23.20120830CVS - Rebuild for i686 From ff4429030bdce4eb7159651e9b88ff33028df61f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:22:00 +0000 Subject: [PATCH 13/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 658a140..460756a 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.24.20120830CVS%{?dist} +Release: 0.25.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -86,6 +86,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.4-0.25.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.4-0.24.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From bc376cce0ecdc5d6eba6fc3d7f21e537304f7334 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:25:40 +0000 Subject: [PATCH 14/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 460756a..9f80ef8 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.25.20120830CVS%{?dist} +Release: 0.26.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -86,6 +86,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.4-0.26.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.4-0.25.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 37c3b46aa39b5a3f68253e9d9d4a1481bb62a699 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 8 Dec 2020 09:47:03 +0100 Subject: [PATCH 15/40] Rebuild with new libgnat --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 9f80ef8..35859a2 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.26.20120830CVS%{?dist} +Release: 0.27.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -86,6 +86,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Tue Dec 8 2020 Pavel Zhukov - 1.4-0.27.20120830CVS +- Rebuild with new libgnat + * Wed Jul 29 2020 Fedora Release Engineering - 1.4-0.26.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 626125bf2c49771aec4e363dee2c3b92af8c8cf9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:44:19 +0000 Subject: [PATCH 16/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 35859a2..91bb7fb 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.27.20120830CVS%{?dist} +Release: 0.28.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -86,6 +86,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 1.4-0.28.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Dec 8 2020 Pavel Zhukov - 1.4-0.27.20120830CVS - Rebuild with new libgnat From 0f4880b4a0d2b144efba34a31bcf1d109bb74d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sat, 10 Jul 2021 18:47:55 +0200 Subject: [PATCH 17/40] Removed the explicit check-rpaths invocation as that is done automatically now. --- zlib-ada.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 91bb7fb..84d56b8 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -68,10 +68,6 @@ mkdir --parents %{buildroot}%{_GNAT_project_dir} cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ -%check -%{_rpmconfigdir}/check-rpaths - - %files %doc readme.txt %license COPYING3 COPYING.RUNTIME From ca09f04e6e760ea98ec23750754cd4dff8ff84c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:20:32 +0000 Subject: [PATCH 18/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 84d56b8..93ea243 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.28.20120830CVS%{?dist} +Release: 0.29.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -82,6 +82,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.4-0.29.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 1.4-0.28.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 1bd8fdb05e9e4c9c188f1b0b91f6838de75a562e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:54:07 +0000 Subject: [PATCH 19/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 93ea243..0e8350a 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.29.20120830CVS%{?dist} +Release: 0.30.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -82,6 +82,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.4-0.30.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.4-0.29.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 85017316b2844d2df5d401b5437a2dfe98e31a0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:58:02 +0000 Subject: [PATCH 20/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 0e8350a..ccff647 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.30.20120830CVS%{?dist} +Release: 0.31.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -82,6 +82,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.4-0.31.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.4-0.30.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 185fd85ecedd4bbfaca6fab0e2dc02e39770ac70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Tue, 17 Jan 2023 17:48:54 +0100 Subject: [PATCH 21/40] Rebuilt with GCC 13. --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index ccff647..641459e 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.31.20120830CVS%{?dist} +Release: 0.32.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -82,6 +82,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Tue Jan 17 2023 Björn Persson - 1.4-0.32.20120830CVS +- Rebuilt with GCC 13. + * Sat Jul 23 2022 Fedora Release Engineering - 1.4-0.31.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a4b46e9407bf83429e926c665135a8f8b19c1459 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:18:38 +0000 Subject: [PATCH 22/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 641459e..96613cf 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.32.20120830CVS%{?dist} +Release: 0.33.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -82,6 +82,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.4-0.33.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 17 2023 Björn Persson - 1.4-0.32.20120830CVS - Rebuilt with GCC 13. From 0224ffc165c6165f1ff507ca16043a9c25f415a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:45:05 +0000 Subject: [PATCH 23/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 96613cf..4606046 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.33.20120830CVS%{?dist} +Release: 0.34.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -82,6 +82,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.4-0.34.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.4-0.33.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6f629314d49056a19caf817eaf42dbeb110e7bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Tue, 16 Jan 2024 11:52:14 +0100 Subject: [PATCH 24/40] Rebuilt with GCC 14 prerelease. --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 4606046..bc81451 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.34.20120830CVS%{?dist} +Release: 0.35.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -82,6 +82,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Tue Jan 16 2024 Björn Persson - 1.4-0.35.20120830CVS +- Rebuilt with GCC 14 prerelease. + * Sat Jul 22 2023 Fedora Release Engineering - 1.4-0.34.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 563d74b079f7514feea735cfd851c8620a84c3bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:12:45 +0000 Subject: [PATCH 25/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index bc81451..2496130 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,6 +1,6 @@ Name: zlib-ada Version: 1.4 -Release: 0.35.20120830CVS%{?dist} +Release: 0.36.20120830CVS%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -82,6 +82,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.4-0.36.20120830CVS +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jan 16 2024 Björn Persson - 1.4-0.35.20120830CVS - Rebuilt with GCC 14 prerelease. From 0448fa3085b1c50f75326d990753657a32615abe Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Thu, 8 Feb 2024 19:10:31 +0100 Subject: [PATCH 26/40] Updated to new prerelease of v1.4 (Git commit ca39312, 2021-08-11). --- .gitignore | 1 + build_zlib_ada.gpr | 2 +- sources | 2 +- zlib-ada.spec | 61 ++++++++++++++++++++++++++++++++-------------- 4 files changed, 46 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 6ce4806..a4033fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zlib-ada-20120830.tar.bz2 +/zlib-ada-git-ca39312ba02e84eb15799300ef83607a83402868.zip diff --git a/build_zlib_ada.gpr b/build_zlib_ada.gpr index 1db3be4..8c69dd9 100644 --- a/build_zlib_ada.gpr +++ b/build_zlib_ada.gpr @@ -10,7 +10,7 @@ with "directories"; library project Build_Zlib_Ada is - Version := external("RPM_PACKAGE_VERSION"); + Version := external("VERSION"); Destdir := external("DESTDIR"); for Library_Name use "zlib_ada"; diff --git a/sources b/sources index c54ab10..bcd4273 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d24e104d1671dedc3714edb295794bd zlib-ada-20120830.tar.bz2 +SHA512 (zlib-ada-git-ca39312ba02e84eb15799300ef83607a83402868.zip) = 0304881e8808d107c2b3259ced3202857641ddfed5850e404602c952c97ab744986e031bac2fecb07dd101b74d57931b27afd18ed5fde144db658278d0dc55f1 \ No newline at end of file diff --git a/zlib-ada.spec b/zlib-ada.spec index 2496130..2882555 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,23 +1,38 @@ +# Upstream source information. +%global upstream_name zlib-ada +%global upstream_version 1.4 +%global upstream_commit_date 20210811 +%global upstream_commit ca39312ba02e84eb15799300ef83607a83402868 +%global upstream_shortcommit %(c=%{upstream_commit}; echo ${c:0:7}) + Name: zlib-ada -Version: 1.4 -Release: 0.36.20120830CVS%{?dist} +Version: %{upstream_version} +Release: 0.37.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada -License: GPLv3+ with exceptions -URL: http://zlib-ada.sourceforge.net/ -# The tarball was made with these commands: -# cvs -z3 -d:pserver:anonymous@zlib-ada.cvs.sourceforge.net:/cvsroot/zlib-ada co -P zlib-ada -# tar --create --exclude-vcs --bzip2 --file=zlib-ada-20120830.tar.bz2 zlib-ada -Source: zlib-ada-20120830.tar.bz2 -# This will be the source when there is a new release: -#Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source2: build_zlib_ada.gpr -Source3: zlib_ada.gpr +URL: https://zlib-ada.sourceforge.net/ +Source0: https://sourceforge.net/code-snapshots/git/z/zl/%{upstream_name}/git.git/%{upstream_name}-git-%{upstream_commit}.zip -BuildRequires: gcc-gnat fedora-gnat-project-common +# NOTE: The above link points to a source package that is being generated on +# demand by opening the source code page in a browser (see [Code] below), +# selecting the correct commit and then clicking "Download Snapshot". The +# generated Zip-file will remain available at the mentioned location for some +# time (at most 24h, as it seems). +# +# See also: +# [Code] https://sourceforge.net/p/zlib-ada/git/ci/master/tree/ +# [Releases] https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz + +Source1: build_zlib_ada.gpr +Source2: zlib_ada.gpr + +BuildRequires: gcc-gnat gprbuild +# A fedora-gnat-project-common that contains GPRbuild_flags is needed. +BuildRequires: fedora-gnat-project-common >= 3.17 BuildRequires: gprbuild BuildRequires: zlib-devel + # Build only on architectures where GPRbuild is available: ExclusiveArch: %{GPRbuild_arches} @@ -52,20 +67,27 @@ för att utveckla program som använder Zlib-Ada. %prep -%setup -q -n zlib-ada -chmod a-x * # Remove bogus executable bits. -cp %{SOURCE2} . +%autosetup -n %{upstream_name}-git-%{upstream_commit} + +# Remove bogus executable bits. +chmod a-x * + +# Copy the GPRbuild-file with which we will build the library. +cp %{SOURCE1} . %build -gprbuild -P build_zlib_ada.gpr %{GPRbuild_optflags} -XDESTDIR=build_target -XLDFLAGS='%{__global_ldflags}' +gprbuild %{GPRbuild_flags} -XVERSION=%{upstream_version} \ + -XDESTDIR=build_target -XLDFLAGS='%{__global_ldflags}' \ + -P build_zlib_ada.gpr %install mv build_target/* --target-directory=%{buildroot} + # Add the project file for projects that use this library. mkdir --parents %{buildroot}%{_GNAT_project_dir} -cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ +cp --preserve=timestamps %{SOURCE2} %{buildroot}%{_GNAT_project_dir}/ %files @@ -82,6 +104,9 @@ cp --preserve=timestamps %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %changelog +* Sun Jan 28 2024 Dennis van Raaij - 1.4-0.37.20210811gitca39312 +- Updated to new prerelease of v1.4 (Git commit ca39312, 2021-08-11). + * Sat Jan 27 2024 Fedora Release Engineering - 1.4-0.36.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 876e94e9b303bc02c577dd926b97a959df1a0f62 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Thu, 14 Dec 2023 19:19:29 +0100 Subject: [PATCH 27/40] Use an SPDX license expression. --- zlib-ada.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zlib-ada.spec b/zlib-ada.spec index 2882555..bade5da 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -11,6 +11,9 @@ Release: 0.37.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada +License: GPL-3.0-or-later WITH GCC-exception-3.1 AND GPL-3.0-or-later WITH GNAT-exception +# Based on the header of zlib.ads. + URL: https://zlib-ada.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/z/zl/%{upstream_name}/git.git/%{upstream_name}-git-%{upstream_commit}.zip @@ -106,6 +109,7 @@ cp --preserve=timestamps %{SOURCE2} %{buildroot}%{_GNAT_project_dir}/ %changelog * Sun Jan 28 2024 Dennis van Raaij - 1.4-0.37.20210811gitca39312 - Updated to new prerelease of v1.4 (Git commit ca39312, 2021-08-11). +- License field now contains an SPDX license expression. * Sat Jan 27 2024 Fedora Release Engineering - 1.4-0.36.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 236208f4dc8f1d4abee6f102c07d7ed8ca9c06b5 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Thu, 14 Dec 2023 19:20:22 +0100 Subject: [PATCH 28/40] Improve spec file readability. --- zlib-ada.spec | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/zlib-ada.spec b/zlib-ada.spec index bade5da..5a545f4 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -52,6 +52,10 @@ avkomprimeringsbiblioteket Zlib. %description -l sv %{common_description_sv} +################# +## Subpackages ## +################# + %package devel Summary: Development files for Zlib-Ada Summary(sv): Filer för programmering med Zlib-Ada @@ -69,6 +73,10 @@ Paketet %{name}-devel innehåller källkod och länkningsinformation som behövs för att utveckla program som använder Zlib-Ada. +############# +## Prepare ## +############# + %prep %autosetup -n %{upstream_name}-git-%{upstream_commit} @@ -79,12 +87,20 @@ chmod a-x * cp %{SOURCE1} . +########### +## Build ## +########### + %build gprbuild %{GPRbuild_flags} -XVERSION=%{upstream_version} \ -XDESTDIR=build_target -XLDFLAGS='%{__global_ldflags}' \ -P build_zlib_ada.gpr +############# +## Install ## +############# + %install mv build_target/* --target-directory=%{buildroot} @@ -93,11 +109,16 @@ mkdir --parents %{buildroot}%{_GNAT_project_dir} cp --preserve=timestamps %{SOURCE2} %{buildroot}%{_GNAT_project_dir}/ +########### +## Files ## +########### + %files %doc readme.txt %license COPYING3 COPYING.RUNTIME %{_libdir}/*.so.* + %files devel %doc test.adb mtest.adb read.adb buffer_demo.adb %{_includedir}/* @@ -106,6 +127,10 @@ cp --preserve=timestamps %{SOURCE2} %{buildroot}%{_GNAT_project_dir}/ %{_GNAT_project_dir}/* +############### +## Changelog ## +############### + %changelog * Sun Jan 28 2024 Dennis van Raaij - 1.4-0.37.20210811gitca39312 - Updated to new prerelease of v1.4 (Git commit ca39312, 2021-08-11). From 6511c780a7bb389b2f133547550d4ec168f9f12a Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Thu, 14 Dec 2023 19:44:14 +0100 Subject: [PATCH 29/40] Add option to run some tests. --- zlib-ada.spec | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/zlib-ada.spec b/zlib-ada.spec index 5a545f4..d0e3f39 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -1,3 +1,6 @@ +# The test suite is normally run. It can be disabled with "--without=check". +%bcond_without check + # Upstream source information. %global upstream_name zlib-ada %global upstream_version 1.4 @@ -109,6 +112,25 @@ mkdir --parents %{buildroot}%{_GNAT_project_dir} cp --preserve=timestamps %{SOURCE2} %{buildroot}%{_GNAT_project_dir}/ +########### +## Check ## +########### + +%if %{with check} +%check + +# Let the multithreading test run for a limited amount of time. +sed --in-place \ + --expression="156 { s,Ada.Text_IO.Get_Immediate (Dummy),delay 2.0, ; t; q1 }" \ + mtest.adb + +# Build & run the tests. +gnatmake test.adb -largs -lz && ./test +gnatmake mtest.adb -largs -lz && ./mtest + +%endif + + ########### ## Files ## ########### @@ -135,6 +157,7 @@ cp --preserve=timestamps %{SOURCE2} %{buildroot}%{_GNAT_project_dir}/ * Sun Jan 28 2024 Dennis van Raaij - 1.4-0.37.20210811gitca39312 - Updated to new prerelease of v1.4 (Git commit ca39312, 2021-08-11). - License field now contains an SPDX license expression. +- Added an option to run some small tests (enabled by default). * Sat Jan 27 2024 Fedora Release Engineering - 1.4-0.36.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0ad786adfc7b709cb0ee970ebb89a5496cc34449 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Thu, 8 Feb 2024 19:25:00 +0100 Subject: [PATCH 30/40] Add two additional fixes from AWS. --- ...ada-detect-end-of-zlib-stream-better.patch | 134 ++++++++++++++++++ zlib-ada-properly-initialize-in_last.patch | 11 ++ zlib-ada.spec | 16 +++ 3 files changed, 161 insertions(+) create mode 100644 zlib-ada-detect-end-of-zlib-stream-better.patch create mode 100644 zlib-ada-properly-initialize-in_last.patch diff --git a/zlib-ada-detect-end-of-zlib-stream-better.patch b/zlib-ada-detect-end-of-zlib-stream-better.patch new file mode 100644 index 0000000..acd8382 --- /dev/null +++ b/zlib-ada-detect-end-of-zlib-stream-better.patch @@ -0,0 +1,134 @@ +--- a/zlib-streams.adb ++++ b/zlib-streams.adb +@@ -83,6 +83,7 @@ package body ZLib.Streams is + Stream.Buffer := new Buffer_Subtype; + Stream.Rest_First := Stream.Buffer'Last + 1; + Stream.Rest_Last := Stream.Buffer'Last; ++ Stream.Ahead_Last := Stream.Buffer'First - 1; + end if; + end Create; + +@@ -100,9 +101,9 @@ package body ZLib.Streams is + loop + Flush (Stream.Writer, Buffer, Last, Mode); + +- Ada.Streams.Write (Stream.Back.all, Buffer (1 .. Last)); ++ exit when Last < Buffer'First; + +- exit when Last < Buffer'Last; ++ Ada.Streams.Write (Stream.Back.all, Buffer (1 .. Last)); + end loop; + end Flush; + +@@ -146,8 +147,71 @@ package body ZLib.Streams is + Rest_First => Stream.Rest_First, + Rest_Last => Stream.Rest_Last); + ++ Ahead_First : Stream_Element_Offset; ++ Ahead_Last : Stream_Element_Offset; ++ + begin +- Read (Stream.Reader, Item, Last); ++ if Stream.Ahead_Last > Stream.Rest_Last then ++ Last := Item'First - 1; ++ Ahead_First := Stream.Rest_Last + 1; ++ ++ loop ++ if Last = Item'Last then ++ Ahead_Last := ++ Stream.Rest_Last + Stream.Ahead_Last - Ahead_First + 1; ++ Stream.Buffer ++ (Stream.Rest_Last + 1 .. Ahead_Last) := ++ Stream.Buffer (Ahead_First .. Stream.Ahead_Last); ++ Stream.Ahead_Last := Ahead_Last; ++ return; ++ end if; ++ ++ Last := Last + 1; ++ ++ Item (Last) := Stream.Buffer (Ahead_First); ++ ++ if Ahead_First = Stream.Ahead_Last then ++ Stream.Ahead_Last := Stream.Buffer'First - 1; ++ exit; ++ end if; ++ ++ Ahead_First := Ahead_First + 1; ++ end loop; ++ ++ if Last < Item'Last then ++ Read (Stream.Reader, Item (Last + 1 .. Item'Last), Last); ++ end if; ++ ++ else ++ Read (Stream.Reader, Item, Last); ++ end if; ++ ++ if not Stream.Reader.Stream_End ++ and then Stream.Rest_First > Stream.Rest_Last ++ then ++ -- Try read ahead to detect end of stream early ++ ++ Read (Stream.Buffer.all, Stream.Rest_Last); ++ Stream.Rest_First := Stream.Buffer'First; ++ ++ if Stream.Rest_Last = Stream.Buffer'Last then ++ -- No space to read ahead ++ return; ++ end if; ++ ++ Translate ++ (Stream.Reader, ++ Stream.Buffer (Stream.Rest_First .. Stream.Rest_Last), ++ In_Last => Stream.Rest_First, ++ Out_Data => ++ Stream.Buffer (Stream.Rest_Last + 1 .. Stream.Buffer'Last), ++ Out_Last => Stream.Ahead_Last, ++ Flush => (if Stream.Rest_First > Stream.Rest_Last ++ then Finish ++ else No_Flush)); ++ ++ Stream.Rest_First := Stream.Rest_First + 1; ++ end if; + end Read; + + ------------------- +--- a/zlib-streams.ads ++++ b/zlib-streams.ads +@@ -91,6 +91,11 @@ private + -- We need to have this buffer in the record because not all read data + -- from back stream could be processed during the read operation. + ++ Ahead_Last : Stream_Element_Offset; ++ -- Sometimes the decompressed data is over but the gzip footer still was ++ -- not read from back stream. We should try to read ahead in case we are ++ -- suspect this to detect end of stream proper. ++ + Buffer_Size : Stream_Element_Offset; + -- Buffer size for write operation. + -- We do not need to have this buffer in the record because all data +@@ -102,6 +107,8 @@ private + end record; + + function End_Of_Stream (Stream : in Stream_Type) return Boolean is +- (Stream_End (Stream.Reader)); ++ (Stream_End (Stream.Reader) ++ and then Stream.Rest_First > Stream.Rest_Last ++ and then Stream.Rest_Last >= Stream.Ahead_Last); + + end ZLib.Streams; +--- a/zlib.ads ++++ b/zlib.ads +@@ -263,8 +263,10 @@ package ZLib is + + Rest_First, Rest_Last : in out Stream_Element_Offset; + -- Rest_First have to be initialized to Buffer'Last + 1 +- -- Rest_Last have to be initialized to Buffer'Last +- -- before usage. ++ -- Rest_Last have to be initialized to Buffer'Last before usage. ++ -- When no more data provided with first generic parameter procedure ++ -- Read then the Read_First became Buffer'First and the Read_Last became ++ -- Buffer'First - 1. + + Allow_Read_Some : in Boolean := False; + -- Is it allowed to return Last < Item'Last before end of data diff --git a/zlib-ada-properly-initialize-in_last.patch b/zlib-ada-properly-initialize-in_last.patch new file mode 100644 index 0000000..b7d9c5c --- /dev/null +++ b/zlib-ada-properly-initialize-in_last.patch @@ -0,0 +1,11 @@ +--- a/zlib.adb ++++ b/zlib.adb +@@ -631,6 +631,8 @@ package body ZLib is + Flush => Flush); + + CRC32 (Filter.CRC, In_Data (In_Data'First .. In_Last)); ++ else ++ In_Last := In_Data'First - 1; + end if; + + if Filter.Stream_End and then Out_Last <= Out_Data'Last then diff --git a/zlib-ada.spec b/zlib-ada.spec index d0e3f39..c9294f2 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -33,6 +33,21 @@ Source0: https://sourceforge.net/code-snapshots/git/z/zl/%{upstream_name} Source1: build_zlib_ada.gpr Source2: zlib_ada.gpr +# The Ada Web Server bundles the Zlib-Ada library. The authors of the +# Ada Web Server found that a previous fix in the upstream source of +# Zlib-Ada did not solve all problems in the end-of-stream detection +# and therefore made additional improvements, but only in the bundled +# sources; The improvements, have, for some reason, not been offered +# to/integrated into the upstream repository of Zlib-Ada on +# SourceForge. Tests have been added to the AWS test suite that +# explicitly test for the bug(s). As the Ada Web Server is packaged on +# Fedora (package "aws"), we apply these patches here as well. + +# Adapted from: https://github.com/AdaCore/aws/commit/178767546df544388bb8a921d8314957b88a6ae0 +Patch: %{name}-detect-end-of-zlib-stream-better.patch +# Adapted from: https://github.com/AdaCore/aws/commit/76ae4648ee0e8c38e92b0ee71ae60db259ff27ce +Patch: %{name}-properly-initialize-in_last.patch + BuildRequires: gcc-gnat gprbuild # A fedora-gnat-project-common that contains GPRbuild_flags is needed. BuildRequires: fedora-gnat-project-common >= 3.17 @@ -158,6 +173,7 @@ gnatmake mtest.adb -largs -lz && ./mtest - Updated to new prerelease of v1.4 (Git commit ca39312, 2021-08-11). - License field now contains an SPDX license expression. - Added an option to run some small tests (enabled by default). +- Added two additional fixes from AWS; a libray that bundles this library. * Sat Jan 27 2024 Fedora Release Engineering - 1.4-0.36.20120830CVS - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 03b2ac6cc4cd9a2f5d482845ccf8f9bd8aa35ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 11 Feb 2024 18:27:48 +0100 Subject: [PATCH 31/40] Changed the soname. The soname is now date-based as version numbers aren't assigned upstream. --- zlib-ada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index c9294f2..5b03d1c 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -110,7 +110,7 @@ cp %{SOURCE1} . ########### %build -gprbuild %{GPRbuild_flags} -XVERSION=%{upstream_version} \ +gprbuild %{GPRbuild_flags} -XVERSION=%{upstream_commit_date} \ -XDESTDIR=build_target -XLDFLAGS='%{__global_ldflags}' \ -P build_zlib_ada.gpr From 756ecb1fa5c9362cdd80231ba2e723f42ca4b14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 11 Feb 2024 18:32:18 +0100 Subject: [PATCH 32/40] Removed a duplicated dependency. Requiring gprbuild once is enough. --- zlib-ada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 5b03d1c..a4be69e 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -48,7 +48,7 @@ Patch: %{name}-detect-end-of-zlib-stream-better.patch # Adapted from: https://github.com/AdaCore/aws/commit/76ae4648ee0e8c38e92b0ee71ae60db259ff27ce Patch: %{name}-properly-initialize-in_last.patch -BuildRequires: gcc-gnat gprbuild +BuildRequires: gcc-gnat # A fedora-gnat-project-common that contains GPRbuild_flags is needed. BuildRequires: fedora-gnat-project-common >= 3.17 BuildRequires: gprbuild From ab14485d2659ef7e4615ec1a183d6e71ee397b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 11 Feb 2024 18:35:56 +0100 Subject: [PATCH 33/40] Removed the LDFLAGS workaround. -largs is finally fixed in GPRbuild, so the LDFLAGS workaround is no longer needed. --- build_zlib_ada.gpr | 2 +- zlib-ada.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_zlib_ada.gpr b/build_zlib_ada.gpr index 8c69dd9..212b584 100644 --- a/build_zlib_ada.gpr +++ b/build_zlib_ada.gpr @@ -19,7 +19,7 @@ library project Build_Zlib_Ada is for Library_Src_Dir use Destdir & Directories.Includedir & "/zlib-ada"; for Library_Dir use Destdir & Directories.Libdir; for Library_ALI_Dir use Destdir & Directories.Libdir & "/zlib-ada"; - for Library_Options use ("-lz") & external_as_list("LDFLAGS", " "); + for Library_Options use ("-lz"); for Source_Files use ("zlib.ads", "zlib.adb", diff --git a/zlib-ada.spec b/zlib-ada.spec index a4be69e..e00ec9c 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -111,7 +111,7 @@ cp %{SOURCE1} . %build gprbuild %{GPRbuild_flags} -XVERSION=%{upstream_commit_date} \ - -XDESTDIR=build_target -XLDFLAGS='%{__global_ldflags}' \ + -XDESTDIR=build_target \ -P build_zlib_ada.gpr From 784de00cca2d28c37fbeaf75c90d5cd3e04ad80c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 11 Feb 2024 18:51:28 +0100 Subject: [PATCH 34/40] grammar --- zlib-ada.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index e00ec9c..86f28d4 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -20,7 +20,7 @@ License: GPL-3.0-or-later WITH GCC-exception-3.1 AND GPL-3.0-or-later WIT URL: https://zlib-ada.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/z/zl/%{upstream_name}/git.git/%{upstream_name}-git-%{upstream_commit}.zip -# NOTE: The above link points to a source package that is being generated on +# NOTE: The above link points to a source package that is generated on # demand by opening the source code page in a browser (see [Code] below), # selecting the correct commit and then clicking "Download Snapshot". The # generated Zip-file will remain available at the mentioned location for some @@ -37,10 +37,10 @@ Source2: zlib_ada.gpr # Ada Web Server found that a previous fix in the upstream source of # Zlib-Ada did not solve all problems in the end-of-stream detection # and therefore made additional improvements, but only in the bundled -# sources; The improvements, have, for some reason, not been offered +# sources. The improvements have, for some reason, not been offered # to/integrated into the upstream repository of Zlib-Ada on # SourceForge. Tests have been added to the AWS test suite that -# explicitly test for the bug(s). As the Ada Web Server is packaged on +# explicitly test for the bug(s). As the Ada Web Server is packaged in # Fedora (package "aws"), we apply these patches here as well. # Adapted from: https://github.com/AdaCore/aws/commit/178767546df544388bb8a921d8314957b88a6ae0 From f8cc13412ca10b8d5a89b4c531aeb14d75e27aa8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:55:07 +0000 Subject: [PATCH 35/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 86f28d4..367e0fb 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -10,7 +10,7 @@ Name: zlib-ada Version: %{upstream_version} -Release: 0.37.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} +Release: 0.38.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -169,6 +169,9 @@ gnatmake mtest.adb -largs -lz && ./mtest ############### %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.4-0.38.20210811gitca39312 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jan 28 2024 Dennis van Raaij - 1.4-0.37.20210811gitca39312 - Updated to new prerelease of v1.4 (Git commit ca39312, 2021-08-11). - License field now contains an SPDX license expression. From 057f10efc0690934c385056aa25ecd14a4bbc6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Tue, 14 Jan 2025 08:42:44 +0100 Subject: [PATCH 36/40] Rebuilt with GCC 15 prerelease. --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 367e0fb..684f3b1 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -10,7 +10,7 @@ Name: zlib-ada Version: %{upstream_version} -Release: 0.38.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} +Release: 0.39.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -169,6 +169,9 @@ gnatmake mtest.adb -largs -lz && ./mtest ############### %changelog +* Tue Jan 14 2025 Björn Persson - 1.4-0.39.20210811gitca39312 +- Rebuilt with GCC 15 prerelease. + * Sat Jul 20 2024 Fedora Release Engineering - 1.4-0.38.20210811gitca39312 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d043fb3477ac1ee218b406a7f6d587e47b4fd5b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:49:47 +0000 Subject: [PATCH 37/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 684f3b1..709506d 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -10,7 +10,7 @@ Name: zlib-ada Version: %{upstream_version} -Release: 0.39.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} +Release: 0.40.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -169,6 +169,9 @@ gnatmake mtest.adb -largs -lz && ./mtest ############### %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.4-0.40.20210811gitca39312 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jan 14 2025 Björn Persson - 1.4-0.39.20210811gitca39312 - Rebuilt with GCC 15 prerelease. From fb540c8f89c88f7a0e910555689e4105b085b755 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:19:48 +0000 Subject: [PATCH 38/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 709506d..1714fd8 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -10,7 +10,7 @@ Name: zlib-ada Version: %{upstream_version} -Release: 0.40.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} +Release: 0.41.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -169,6 +169,9 @@ gnatmake mtest.adb -largs -lz && ./mtest ############### %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.4-0.41.20210811gitca39312 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.4-0.40.20210811gitca39312 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b15354e53e45467bfac521042d0951ab9e4e7265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 10 Aug 2025 14:50:15 +0200 Subject: [PATCH 39/40] Rebuilt because the ALI of System.OS_Constants changed. --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index 1714fd8..d8c3a6d 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -10,7 +10,7 @@ Name: zlib-ada Version: %{upstream_version} -Release: 0.41.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} +Release: 0.42.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -169,6 +169,9 @@ gnatmake mtest.adb -largs -lz && ./mtest ############### %changelog +* Sun Aug 10 2025 Björn Persson - 1.4-0.42.20210811gitca39312 +- Rebuilt because the ALI of System.OS_Constants changed. + * Fri Jul 25 2025 Fedora Release Engineering - 1.4-0.41.20210811gitca39312 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2d410a70169e13a3be8a60938de71634579e2e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Wed, 7 Jan 2026 15:04:58 +0100 Subject: [PATCH 40/40] Rebuild with GCC 16 prerelease. --- zlib-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ada.spec b/zlib-ada.spec index d8c3a6d..92c3c4d 100644 --- a/zlib-ada.spec +++ b/zlib-ada.spec @@ -10,7 +10,7 @@ Name: zlib-ada Version: %{upstream_version} -Release: 0.42.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} +Release: 0.43.%{upstream_commit_date}git%{upstream_shortcommit}%{?dist} Summary: Zlib for Ada Summary(sv): Zlib för ada @@ -169,6 +169,9 @@ gnatmake mtest.adb -largs -lz && ./mtest ############### %changelog +* Wed Jan 07 2026 Björn Persson - 1.4-0.43.20210811gitca39312 +- Rebuilt with GCC 16 prerelease. + * Sun Aug 10 2025 Björn Persson - 1.4-0.42.20210811gitca39312 - Rebuilt because the ALI of System.OS_Constants changed.