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 7748e87..a39f283 100644 --- a/aprsd.spec +++ b/aprsd.spec @@ -2,9 +2,9 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.6%{?dist}.19 -Group: Applications/Internet -License: GPLv2+ +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 Source1: aprsd.conf Source2: aprsd.service @@ -16,10 +16,13 @@ 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 BuildRequires: systemd-units +BuildRequires: make +BuildRequires: libxcrypt-devel #Requires (preun): /sbin/chkconfig #Requires (preun): /sbin/service #Requires (post): /sbin/chkconfig @@ -36,11 +39,13 @@ 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 +%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" %configure make %{?_smp_mflags} @@ -116,6 +121,69 @@ 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* Wed Jan 19 2022 Fedora Release Engineering - 2.2.5-15.6.28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.2.5-15.6.27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.2.5-15.6.26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Jeff Law - 2.2.5-15.6.25 +- Force C++14 as the code is not ready for C++17 + +* Mon Jul 27 2020 Fedora Release Engineering - 2.2.5-15.6.24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 2.2.5-15.6.23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 2.2.5-15.6.22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 2.2.5-15.6.21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 14 2019 Björn Esser - 2.2.5-15.6.20 +- Rebuilt for libcrypt.so.2 (#1666033) + * Thu Jul 12 2018 Fedora Release Engineering - 2.2.5-15.6.19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild