[gentoo-commits] repo/gentoo:master commit in: media-radio/ax25-apps/files/

[gentoo-commits] repo/gentoo:master commit in: media-radio/ax25-apps/files/

[Thomas Beierlein]

commit:     529d655455b6f04af50cfbf3b27b3faa32c723c5
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  5 10:51:02 2024 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Mon Aug  5 10:51:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=529d6554

media-radio/ax25-apps/files: Cleanup patches

Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 .../files/ax25-apps-0.0.8-fno-common.patch         | 87 ----------------------
 .../ax25-apps/files/ax25-apps-0.8.4-tinfo.patch    | 12 ---
 2 files changed, 99 deletions(-)

diff --git a/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch b/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch
deleted file mode 100644
index 1ea5c779ff38..000000000000
--- a/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/ax25ipd/ax25ipd.c b/ax25ipd/ax25ipd.c
-index 461147d..e85b44d 100644
---- a/ax25ipd/ax25ipd.c
-+++ b/ax25ipd/ax25ipd.c
-@@ -35,6 +35,25 @@ int opt_help = 0;
- char opt_configfile[PATH_MAX];
- char opt_ttydevice[PATH_MAX];
- 
-+struct stats_s stats;
-+
-+int udp_mode;
-+int ip_mode;
-+unsigned short my_udp;
-+char ttydevice[PATH_MAX];
-+int ttyspeed;
-+signed 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 option options[] = {
- 	{"version", 0, NULL, 'v'},
- 	{"loglevel", 1, NULL, 'l'},
-diff --git a/ax25ipd/ax25ipd.h b/ax25ipd/ax25ipd.h
-index b088247..367024b 100644
---- a/ax25ipd/ax25ipd.h
-+++ b/ax25ipd/ax25ipd.h
-@@ -72,24 +72,25 @@
- #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[PATH_MAX];       /* 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[PATH_MAX]; /* the tty device for serial comms */
-+extern int ttyspeed;            /* The baud rate on the tty device */
-+extern signed 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 stats_s {
- 	int kiss_in;            /* # packets received */
- 	int kiss_toobig;        /* packet too large */
- 	int kiss_badtype;       /* control byte non-zero */
-@@ -107,7 +108,9 @@ struct {
- 	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 stats_s stats;
- 
- #define MAX_FRAME 2048
- 

diff --git a/media-radio/ax25-apps/files/ax25-apps-0.8.4-tinfo.patch b/media-radio/ax25-apps/files/ax25-apps-0.8.4-tinfo.patch
deleted file mode 100644
index ee1c2ffd92b6..000000000000
--- a/media-radio/ax25-apps/files/ax25-apps-0.8.4-tinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# fix tinof handling (bug 529776)
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@
- AC_SUBST(AX25_LIB)
- AC_SUBST(NCURSES_LIB)
- AC_CHECK_LIB(ax25, ax25_config_load_ports, AX25_LIB="-lax25", AC_MSG_ERROR(Could not find the libax25 libraries; aborting))
--AC_CHECK_LIB(ncurses, initscr,NCURSES_LIB="-lncurses", AC_MSG_ERROR(Could not find the ncurses library; aborting))
-+PKG_CHECK_MODULES(ncurses, ncurses, [NCURSES_LIB="$ncurses_LIBS"], AC_MSG_ERROR(Could not find the ncurses library))
- 
- dnl Checks for working glibc 2.1 headers
- AC_CHECK_TYPES([struct ax25_fwd_struct], [],