[packages/ax25-apps] Rel 8
arekm
arekm at pld-linux.org
Sun May 17 02:04:19 CEST 2026
commit 98c421d46ca1fafcb4df1c343814ccb939c7a2ce
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun May 17 02:04:04 2026 +0200
Rel 8
ax25-apps-fno-common.patch | 89 ++++++++++++++++++++++++++++++++++++++++++++++
ax25-apps-termios.patch | 31 ++++++++++++++++
ax25-apps.spec | 8 +++--
3 files changed, 126 insertions(+), 2 deletions(-)
---
diff --git a/ax25-apps.spec b/ax25-apps.spec
index a51c83d..113d5ac 100644
--- a/ax25-apps.spec
+++ b/ax25-apps.spec
@@ -2,12 +2,14 @@ Summary: ax25 tools for hamradio
Summary(pl.UTF-8): Narzędzia ax25 dla hamradio
Name: ax25-apps
Version: 0.0.6
-Release: 7
+Release: 8
License: GPL v2+
Group: Applications/Communications
Source0: https://downloads.sourceforge.net/ax25/%{name}-%{version}.tar.gz
# Source0-md5: 47d9a775890f3694cf47659423a69ae5
Patch0: %{name}-optflags.patch
+Patch1: %{name}-termios.patch
+Patch2: %{name}-fno-common.patch
URL: https://ax25.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
@@ -29,13 +31,15 @@ Aplikacje testujące sprawność połączeń protokołu AX25.
%prep
%setup -q
%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
%build
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__automake}
-CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses" \
%configure
%{__make}
diff --git a/ax25-apps-fno-common.patch b/ax25-apps-fno-common.patch
new file mode 100644
index 0000000..78d8f91
--- /dev/null
+++ b/ax25-apps-fno-common.patch
@@ -0,0 +1,89 @@
+Fix linker errors from -fno-common (GCC 10+ default).
+
+ax25ipd.h declared all global variables as tentative definitions
+(no `extern`). Every TU including the header got its own copy,
+which the linker rejects under -fno-common. Mark them `extern`
+in the header and define them once in ax25ipd.c. Also give the
+previously-anonymous `stats` struct a tag (`struct ax25ipd_stats`)
+so it can be referred to from another TU.
+
+--- ax25-apps-0.0.6.orig/ax25ipd/ax25ipd.h 2026-05-17 01:49:20.517171140 +0200
++++ ax25-apps-0.0.6/ax25ipd/ax25ipd.h 2026-05-17 01:49:25.844720683 +0200
+@@ -70,24 +70,24 @@
+ #include <sys/types.h>
+ #include <netax25/daemon.h>
+
+-int udp_mode; /* true if we need a UDP socket */
+-int ip_mode; /* true if we need the raw IP socket */
+-unsigned short my_udp; /* the UDP port to use (network byte order) */
+-char ttydevice[128]; /* the tty device for serial comms */
+-int ttyspeed; /* The baud rate on the tty device */
+-unsigned char mycallsign[7]; /* My callsign, shifted ASCII with SSID */
+-unsigned char mycallsign2[7]; /* My seconds port callsign, shifted ASCII with SSID */
+-unsigned char myalias[7]; /* An alias to use */
+-unsigned char myalias2[7]; /* An alias for second port */
+-char bc_text[128]; /* The text for beacon messages */
+-int bc_interval; /* The interval, in seconds, between beacons */
+-int bc_every; /* true=every, false=after */
+-int digi; /* True if we are connected to a TNC */
+-int loglevel; /* Verbosity level */
++extern int udp_mode; /* true if we need a UDP socket */
++extern int ip_mode; /* true if we need the raw IP socket */
++extern unsigned short my_udp; /* the UDP port to use (network byte order) */
++extern char ttydevice[128]; /* the tty device for serial comms */
++extern int ttyspeed; /* The baud rate on the tty device */
++extern unsigned char mycallsign[7]; /* My callsign, shifted ASCII with SSID */
++extern unsigned char mycallsign2[7]; /* My seconds port callsign, shifted ASCII with SSID */
++extern unsigned char myalias[7]; /* An alias to use */
++extern unsigned char myalias2[7]; /* An alias for second port */
++extern char bc_text[128]; /* The text for beacon messages */
++extern int bc_interval; /* The interval, in seconds, between beacons */
++extern int bc_every; /* true=every, false=after */
++extern int digi; /* True if we are connected to a TNC */
++extern int loglevel; /* Verbosity level */
+ /* addition for dual port flag */
+-int dual_port;
++extern int dual_port;
+
+-struct {
++struct ax25ipd_stats {
+ int kiss_in; /* # packets received */
+ int kiss_toobig; /* packet too large */
+ int kiss_badtype; /* control byte non-zero */
+@@ -105,7 +105,8 @@
+ int ip_tooshort; /* packet too short to be a valid frame */
+ int ip_not_for_me; /* packet not for me (in digi mode) */
+ int ip_i_am_dest; /* I am destination (in digi mode) */
+-} stats;
++};
++extern struct ax25ipd_stats stats;
+
+ #define MAX_FRAME 2048
+
+--- ax25-apps-0.0.6.orig/ax25ipd/ax25ipd.c 2026-05-17 01:49:20.517142085 +0200
++++ ax25-apps-0.0.6/ax25ipd/ax25ipd.c 2026-05-17 01:49:32.606642426 +0200
+@@ -23,6 +23,24 @@
+ #include "../pathnames.h"
+ #include "ax25ipd.h"
+
++/* Global definitions for variables declared extern in ax25ipd.h. */
++int udp_mode;
++int ip_mode;
++unsigned short my_udp;
++char ttydevice[128];
++int ttyspeed;
++unsigned char mycallsign[7];
++unsigned char mycallsign2[7];
++unsigned char myalias[7];
++unsigned char myalias2[7];
++char bc_text[128];
++int bc_interval;
++int bc_every;
++int digi;
++int loglevel;
++int dual_port;
++struct ax25ipd_stats stats;
++
+ jmp_buf restart_env;
+
+ /* Prototypes */
diff --git a/ax25-apps-termios.patch b/ax25-apps-termios.patch
new file mode 100644
index 0000000..b124e81
--- /dev/null
+++ b/ax25-apps-termios.patch
@@ -0,0 +1,31 @@
+--- ax25-apps-0.0.6/ax25ipd/Makefile.am.orig 2001-10-09 03:03:05.000000000 +0200
++++ ax25-apps-0.0.6/ax25ipd/Makefile.am 2026-05-13 23:51:36.453020717 +0200
+@@ -8,7 +8,7 @@
+ docdir = ${datadir}/doc/ax25-apps
+ doc_DATA = README.ax25ipd HISTORY.ax25ipd COPYING.ax25ipd
+
+-AM_CFLAGS = -DUSE_TERMIO
++AM_CFLAGS = -DUSE_TERMIOS
+ ax25ipd_LDADD = $(AX25_LIB)
+
+ ax25ipd_SOURCES = \
+--- ax25-apps-0.0.6/ax25ipd/ax25ipd.h.orig 2001-10-09 03:03:12.000000000 +0200
++++ ax25-apps-0.0.6/ax25ipd/ax25ipd.h 2026-05-13 23:51:36.455063206 +0200
+@@ -64,7 +64,6 @@
+ #include <netinet/ip_icmp.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+-#include <termio.h>
+ #include <sys/termios.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+--- ax25-apps-0.0.6/ax25ipd/io.c.orig 2001-10-09 03:03:11.000000000 +0200
++++ ax25-apps-0.0.6/ax25ipd/io.c 2026-05-13 23:52:27.029897922 +0200
+@@ -29,6 +29,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <syslog.h>
++#include <time.h>
+
+ #ifdef __bsdi__
+ #define USE_TERMIOS
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ax25-apps.git/commitdiff/98c421d46ca1fafcb4df1c343814ccb939c7a2ce
More information about the pld-cvs-commit
mailing list