aprsd-configure-c99.patch

@@ -1,94 +0,0 @@
-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 <stdlib.h>' \
-    '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 <stdlib.h>' \
-    '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 <sys/types.h>
--      #if HAVE_UNISTD_H
--      # include <unistd.h>
--      #endif
-+      #include <unistd.h>
-       /* 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 <string.h>
- 
- 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;
-   }
- 
-   ;

aprsd.spec

@@ -2,9 +2,8 @@
 Name: aprsd
 Summary: Internet gateway and client access to amateur radio APRS packet data
 Version: 2.2.5
-Release: %{uprel}.6%{?dist}.40
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License: GPL-2.0-or-later
+Release: %{uprel}.6%{?dist}.28
+License: GPLv2+
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz
 Source1: aprsd.conf
 Source2: aprsd.service
@@ -16,13 +15,11 @@ 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
@@ -39,10 +36,9 @@ real-time data in an easy to use package.
 
 %prep
 %setup -q -n %{name}-%{version}-%{uprel}
-%patch -P0 -p1 -b compile
-%patch -P1 -p1 -b gccport
-%patch -P2 -p1 -b sysconfdir
-%patch -P3 -p1 -b configure-c99
+%patch0 -p1 -b compile
+%patch1 -p1 -b gccport
+%patch2 -p1 -b sysconfdir
 
 %build
 export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
@@ -121,42 +117,6 @@ fi
 %doc doc/qalgorithm.html
 
 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-15.6.40
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-15.6.39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 2.2.5-15.6.38
-- Add explicit BR: libxcrypt-devel
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-15.6.37
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 2.2.5-15.6.36
-- convert license to SPDX
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-15.6.35
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-15.6.34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-15.6.33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-15.6.32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-15.6.31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Nov 24 2022 Florian Weimer <fweimer@redhat.com> - 2.2.5-15.6.30
-- Avoid C89 constructs in configure
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-15.6.29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-15.6.28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild