From 2beaa8fecdc8180d3be5a2db87621655546ef859 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 24 Nov 2022 07:06:44 +0100 Subject: [PATCH 01/12] Avoid C89 constructs in configure Related to: --- aprsd-configure-c99.patch | 94 +++++++++++++++++++++++++++++++++++++++ aprsd.spec | 7 ++- 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 aprsd-configure-c99.patch diff --git a/aprsd-configure-c99.patch b/aprsd-configure-c99.patch new file mode 100644 index 0000000..ffd8313 --- /dev/null +++ b/aprsd-configure-c99.patch @@ -0,0 +1,94 @@ +These changes appear to be for autoconf-generated code only, so there is +nothing to upstream to aprsd. (The issues should go away with any new +release.) + +diff --git a/configure b/configure +index 573145de07e658e9..df75bd55673f1943 100755 +--- a/configure ++++ b/configure +@@ -2132,7 +2132,6 @@ else + fi + fi + for ac_declaration in \ +- ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ +@@ -2958,7 +2957,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ +- ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ +@@ -3671,8 +3669,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext +@@ -4102,8 +4100,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext +@@ -5413,15 +5411,13 @@ else + cat >conftest.$ac_ext <<_ACEOF + /* By Ruediger Kuhlmann. */ + #include +- #if HAVE_UNISTD_H +- # include +- #endif ++ #include + /* Some systems only have a dummy stub for fork() */ + int main () + { + if (fork() < 0) +- exit (1); +- exit (0); ++ return 1; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext +@@ -5917,6 +5913,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include + + int + main () +@@ -5925,7 +5922,7 @@ main () + /* Some versions of memcmp are not 8-bit clean. */ + char c0 = 0x40, c1 = 0x80, c2 = 0x81; + if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) +- exit (1); ++ return 1; + + /* The Next x86 OpenStep bug shows up only when comparing 16 bytes + or more and with at least one buffer not starting on a 4-byte boundary. +@@ -5941,9 +5938,9 @@ main () + strcpy (a, "--------01111111"); + strcpy (b, "--------10000000"); + if (memcmp (a, b, 16) >= 0) +- exit (1); ++ return 1; + } +- exit (0); ++ return 0; + } + + ; diff --git a/aprsd.spec b/aprsd.spec index b9ee6a0..637e9e0 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.29 +Release: %{uprel}.6%{?dist}.30 License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz Source1: aprsd.conf @@ -15,6 +15,7 @@ Source7: aprsd.logrotate Patch0: aprsd-2.2.5-15-compile.patch Patch1: aprsd-2.2.5-15-gcc43-port.patch Patch2: aprsd-2.2.5-15-sysconfdir.patch +Patch3: aprsd-configure-c99.patch URL: http://sourceforge.net/projects/aprsd/ BuildRequires: gcc-c++ BuildRequires: libax25-devel @@ -39,6 +40,7 @@ real-time data in an easy to use package. %patch0 -p1 -b compile %patch1 -p1 -b gccport %patch2 -p1 -b sysconfdir +%patch3 -p1 -b configure-c99 %build export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" @@ -117,6 +119,9 @@ fi %doc doc/qalgorithm.html %changelog +* Thu Nov 24 2022 Florian Weimer - 2.2.5-15.6.30 +- Avoid C89 constructs in configure + * Wed Jul 20 2022 Fedora Release Engineering - 2.2.5-15.6.29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c9a1ded1ad4f68fd196a3693cc3505aed769cd72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:00:52 +0000 Subject: [PATCH 02/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aprsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aprsd.spec b/aprsd.spec index 637e9e0..88f42e2 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.30 +Release: %{uprel}.6%{?dist}.31 License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz Source1: aprsd.conf @@ -119,6 +119,9 @@ fi %doc doc/qalgorithm.html %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.2.5-15.6.31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Nov 24 2022 Florian Weimer - 2.2.5-15.6.30 - Avoid C89 constructs in configure From 0fb3505192ec8ce982bd7b1d1dfb518aa04c203a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:37:28 +0000 Subject: [PATCH 03/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aprsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aprsd.spec b/aprsd.spec index 88f42e2..0def280 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.31 +Release: %{uprel}.6%{?dist}.32 License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz Source1: aprsd.conf @@ -119,6 +119,9 @@ fi %doc doc/qalgorithm.html %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.2.5-15.6.32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 2.2.5-15.6.31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From b094d0b0e26d752e65fe5a25bd9880aef8ec61aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:24:51 +0000 Subject: [PATCH 04/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- aprsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aprsd.spec b/aprsd.spec index 0def280..0c86043 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.32 +Release: %{uprel}.6%{?dist}.33 License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz Source1: aprsd.conf @@ -119,6 +119,9 @@ fi %doc doc/qalgorithm.html %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.2.5-15.6.33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.2.5-15.6.32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From fae102242c67f2c413fc119767558addf128d857 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:20:19 +0000 Subject: [PATCH 05/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- aprsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aprsd.spec b/aprsd.spec index 0c86043..1bcaf1e 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.33 +Release: %{uprel}.6%{?dist}.34 License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz Source1: aprsd.conf @@ -119,6 +119,9 @@ fi %doc doc/qalgorithm.html %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.2.5-15.6.34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.2.5-15.6.33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1bf8e8771a93e35416b549e82ff916153b77910b Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 06/12] Eliminate use of obsolete %patchN syntax (#2283636) --- aprsd.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aprsd.spec b/aprsd.spec index 1bcaf1e..4834c2b 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -37,10 +37,10 @@ real-time data in an easy to use package. %prep %setup -q -n %{name}-%{version}-%{uprel} -%patch0 -p1 -b compile -%patch1 -p1 -b gccport -%patch2 -p1 -b sysconfdir -%patch3 -p1 -b configure-c99 +%patch -P0 -p1 -b compile +%patch -P1 -p1 -b gccport +%patch -P2 -p1 -b sysconfdir +%patch -P3 -p1 -b configure-c99 %build export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" From 51a0dc9d362cb22bc3664bbe739d27aea4c77b95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:18:26 +0000 Subject: [PATCH 07/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- aprsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aprsd.spec b/aprsd.spec index 4834c2b..c2a0aef 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.34 +Release: %{uprel}.6%{?dist}.35 License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz Source1: aprsd.conf @@ -119,6 +119,9 @@ fi %doc doc/qalgorithm.html %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.2.5-15.6.35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2.2.5-15.6.34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cf0527b36504a2c07a5f6cc62e36bde92eae9283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 22:57:26 +0200 Subject: [PATCH 08/12] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- aprsd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/aprsd.spec b/aprsd.spec index c2a0aef..25e456e 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,8 +2,9 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.35 -License: GPLv2+ +Release: %{uprel}.6%{?dist}.36 +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz Source1: aprsd.conf Source2: aprsd.service @@ -119,6 +120,9 @@ fi %doc doc/qalgorithm.html %changelog +* Thu Jul 25 2024 Miroslav Suchý - 2.2.5-15.6.36 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 2.2.5-15.6.35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3ca3a761725b2e2de93866c19ad3c4085e7f79d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:24:02 +0000 Subject: [PATCH 09/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- aprsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aprsd.spec b/aprsd.spec index 25e456e..ea05ff0 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.36 +Release: %{uprel}.6%{?dist}.37 # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz @@ -120,6 +120,9 @@ fi %doc doc/qalgorithm.html %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.2.5-15.6.37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 2.2.5-15.6.36 - convert license to SPDX From 522c76be4486b439265d990bf58716681dd79e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:53:04 +0100 Subject: [PATCH 10/12] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- aprsd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/aprsd.spec b/aprsd.spec index ea05ff0..262a42b 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.37 +Release: %{uprel}.6%{?dist}.38 # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz @@ -22,6 +22,7 @@ BuildRequires: gcc-c++ BuildRequires: libax25-devel BuildRequires: systemd-units BuildRequires: make +BuildRequires: libxcrypt-devel #Requires (preun): /sbin/chkconfig #Requires (preun): /sbin/service #Requires (post): /sbin/chkconfig @@ -120,6 +121,9 @@ fi %doc doc/qalgorithm.html %changelog +* Sat Feb 01 2025 Björn Esser - 2.2.5-15.6.38 +- Add explicit BR: libxcrypt-devel + * Thu Jan 16 2025 Fedora Release Engineering - 2.2.5-15.6.37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a810cd208ce87424bcc7da0cff6ed98b95ad6e9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:09:50 +0000 Subject: [PATCH 11/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- aprsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aprsd.spec b/aprsd.spec index 262a42b..4189673 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.38 +Release: %{uprel}.6%{?dist}.39 # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz @@ -121,6 +121,9 @@ fi %doc doc/qalgorithm.html %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.2.5-15.6.39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Feb 01 2025 Björn Esser - 2.2.5-15.6.38 - Add explicit BR: libxcrypt-devel From 90c56a578eae2e624dda2f3c1e8d3129f190d9aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:51:07 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- aprsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aprsd.spec b/aprsd.spec index 4189673..a39f283 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.39 +Release: %{uprel}.6%{?dist}.40 # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz @@ -121,6 +121,9 @@ fi %doc doc/qalgorithm.html %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.2.5-15.6.40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 2.2.5-15.6.39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild