From 52f6e40a2fefe08ba37252f7c10a3b588e025836 Mon Sep 17 00:00:00 2001 From: Peter Fordham Date: Tue, 6 Dec 2022 07:32:46 +0000 Subject: [PATCH 01/10] Port configure script to C99. https://fedoraproject.org/wiki/Toolchain/PortingToModernC Rebuilding configure with new autotools would also solve the problem. --- aggregate-configure-c99.patch | 13 +++++++++++++ aggregate.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 aggregate-configure-c99.patch diff --git a/aggregate-configure-c99.patch b/aggregate-configure-c99.patch new file mode 100644 index 0000000..8551b50 --- /dev/null +++ b/aggregate-configure-c99.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 57591f2..2f440f0 100755 +--- a/configure ++++ b/configure +@@ -652,7 +652,7 @@ cat > conftest.$ac_ext << EOF + #line 653 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes diff --git a/aggregate.spec b/aggregate.spec index 77281b1..0cf7abf 100644 --- a/aggregate.spec +++ b/aggregate.spec @@ -1,12 +1,13 @@ Name: aggregate Version: 1.6 -Release: 24%{?dist} +Release: 25%{?dist} Summary: IPv4 CIDR prefix aggregator License: ISC URL: http://ftp.isc.org/isc/aggregate/ Source0: http://ftp.isc.org/isc/aggregate/aggregate-%{version}.tar.gz Patch0: aggregate-fedora.patch +Patch1: aggregate-configure-c99.patch BuildRequires: gcc BuildRequires: perl-generators @@ -31,6 +32,7 @@ any prefix filters found using aggregate. %setup -q chmod -x LICENSE %patch0 -p1 -b .fedora +%patch1 -p1 %build @@ -53,6 +55,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Tue Dec 06 2022 Peter Fordham - 1.6-25 +- Port configure script to C99. + * Wed Jul 20 2022 Fedora Release Engineering - 1.6-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e32759932c00394264ba93be842e1db9a9ab60e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:29:42 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aggregate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate.spec b/aggregate.spec index 0cf7abf..c86fb5c 100644 --- a/aggregate.spec +++ b/aggregate.spec @@ -1,6 +1,6 @@ Name: aggregate Version: 1.6 -Release: 25%{?dist} +Release: 26%{?dist} Summary: IPv4 CIDR prefix aggregator License: ISC @@ -55,6 +55,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.6-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 06 2022 Peter Fordham - 1.6-25 - Port configure script to C99. From 9d47848c1895bcbd66ec344d0a088ccfe3a5b748 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Fri, 7 Jul 2023 17:59:37 +0300 Subject: [PATCH 03/10] SPDX migration - ISC is ISC. Modernize a bit --- aggregate.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/aggregate.spec b/aggregate.spec index c86fb5c..8673828 100644 --- a/aggregate.spec +++ b/aggregate.spec @@ -1,6 +1,6 @@ Name: aggregate Version: 1.6 -Release: 26%{?dist} +Release: 27%{?dist} Summary: IPv4 CIDR prefix aggregator License: ISC @@ -29,25 +29,24 @@ aggregate-ios takes Cisco IOS configuration on stdin, and optimizes any prefix filters found using aggregate. %prep -%setup -q +%autosetup chmod -x LICENSE -%patch0 -p1 -b .fedora -%patch1 -p1 %build %configure -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install %files +%doc HISTORY +%license LICENSE %{_bindir}/aggregate %{_mandir}/man1/aggregate.1.* -%doc HISTORY LICENSE %files ios %{_bindir}/aggregate-ios @@ -55,6 +54,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Fri Jul 7 2023 Yanko Kaneti - 1.6-27 +- SPDX migration - ISC is ISC. Modernize a bit + * Wed Jan 18 2023 Fedora Release Engineering - 1.6-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d6dec5ddd866ccc1578096dbf9783e009b9256cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:00:51 +0000 Subject: [PATCH 04/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aggregate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate.spec b/aggregate.spec index 8673828..dd5b4ad 100644 --- a/aggregate.spec +++ b/aggregate.spec @@ -1,6 +1,6 @@ Name: aggregate Version: 1.6 -Release: 27%{?dist} +Release: 28%{?dist} Summary: IPv4 CIDR prefix aggregator License: ISC @@ -54,6 +54,9 @@ chmod -x LICENSE %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.6-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jul 7 2023 Yanko Kaneti - 1.6-27 - SPDX migration - ISC is ISC. Modernize a bit From e996ae22c0ef823c7c2ca838295299d494c79ce5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:24:19 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- aggregate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate.spec b/aggregate.spec index dd5b4ad..87633ff 100644 --- a/aggregate.spec +++ b/aggregate.spec @@ -1,6 +1,6 @@ Name: aggregate Version: 1.6 -Release: 28%{?dist} +Release: 29%{?dist} Summary: IPv4 CIDR prefix aggregator License: ISC @@ -54,6 +54,9 @@ chmod -x LICENSE %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.6-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.6-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e508c40ab280a3b274c178c7e1f2ef4cfdd8287d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:46:50 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- aggregate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate.spec b/aggregate.spec index 87633ff..5a71c0a 100644 --- a/aggregate.spec +++ b/aggregate.spec @@ -1,6 +1,6 @@ Name: aggregate Version: 1.6 -Release: 29%{?dist} +Release: 30%{?dist} Summary: IPv4 CIDR prefix aggregator License: ISC @@ -54,6 +54,9 @@ chmod -x LICENSE %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.6-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.6-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cdb07bc01b7095510fc368ad5556fadc8a9d4851 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:43:07 +0000 Subject: [PATCH 07/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- aggregate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate.spec b/aggregate.spec index 5a71c0a..3834b67 100644 --- a/aggregate.spec +++ b/aggregate.spec @@ -1,6 +1,6 @@ Name: aggregate Version: 1.6 -Release: 30%{?dist} +Release: 31%{?dist} Summary: IPv4 CIDR prefix aggregator License: ISC @@ -54,6 +54,9 @@ chmod -x LICENSE %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.6-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1.6-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 579c5a6d6d2122564cfc15bc3af044d878f88cd2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:42:57 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- aggregate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate.spec b/aggregate.spec index 3834b67..510b830 100644 --- a/aggregate.spec +++ b/aggregate.spec @@ -1,6 +1,6 @@ Name: aggregate Version: 1.6 -Release: 31%{?dist} +Release: 32%{?dist} Summary: IPv4 CIDR prefix aggregator License: ISC @@ -54,6 +54,9 @@ chmod -x LICENSE %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.6-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.6-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8b244ecf408ec8237e1bf0f64f500517d38460e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:49:39 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- aggregate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate.spec b/aggregate.spec index 510b830..7371928 100644 --- a/aggregate.spec +++ b/aggregate.spec @@ -1,6 +1,6 @@ Name: aggregate Version: 1.6 -Release: 32%{?dist} +Release: 33%{?dist} Summary: IPv4 CIDR prefix aggregator License: ISC @@ -54,6 +54,9 @@ chmod -x LICENSE %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.6-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1.6-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6fdb5d593a921ec5e1c0868f3793747d8be1df49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:30:57 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- aggregate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate.spec b/aggregate.spec index 7371928..898e0e2 100644 --- a/aggregate.spec +++ b/aggregate.spec @@ -1,6 +1,6 @@ Name: aggregate Version: 1.6 -Release: 33%{?dist} +Release: 34%{?dist} Summary: IPv4 CIDR prefix aggregator License: ISC @@ -54,6 +54,9 @@ chmod -x LICENSE %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.6-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 1.6-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild