gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 58 insertions, 101 deletions

diff --git a/media-radio/ax25-apps/Manifest b/media-radio/ax25-apps/Manifest
index 31f40dd5d7cd..bc50ff41740e 100644
--- a/media-radio/ax25-apps/Manifest
+++ b/media-radio/ax25-apps/Manifest
@@ -1,9 +1,8 @@
-AUX ax25-apps-0.0.8-fno-common.patch 3406 BLAKE2B 528aa74bfb7a6b51215dbc4ace9b257d9bde40dd447051c1484f9bfb82df38befe8de39cc1d91d60a9065e4227c4272606a05d3351dd1d36bf9da148a44df36a SHA512 102672cffc39a942e361ebffc3d1cd910ef7977b653e8c9d1165f5bb0ca456d196f1d63dcaee55e4ea9e257c6d37c053a451c0477a916b50745e7cec2e14aa2d
 AUX ax25-apps-0.0.8_rc5-tinfo.patch 696 BLAKE2B b17b0888a7b571ad039281ee6df87aedc9549c53e08e75ff65f6c022ad643d0e92d24d9c5a8487a4b7669fb2dffe70dea8d89a774b3f6967a793963c58c2cf27 SHA512 930d1edcd56b99c9337a7306a492a9514fa38399b74ad2d6a9d80369cf5f78d86d1f2043f737fb072071db75ae937b2fdec3260bc53595ce28c7a08c47b9f80a
-AUX ax25-apps-0.8.4-tinfo.patch 582 BLAKE2B 6f5431add14ef4c2ac789d6a3159ec30a4d0a92336a90773968453658964a18db9a6afb2917e41e3688d121718f86d5ee5205effb23b8db4c29155b6eb949b45 SHA512 901218e0dd279f61892e0eadcdcb9e1bc46007c9735efb658f1ee1bd0bb6df9ab8704eec1087ce7550674e03fe643ea13811721c28f9cf0be445e881cb19b626
 AUX ax25ipd.rc 379 BLAKE2B dfc102809a52feffee96d0a5f67874f9241b26a9ee18ccf88a5c04f154f0681f8b9da9190bbad81588de805e10bd49ec0fb0c534f5861405ab0ca59129852a33 SHA512 ce11d6f4bd4f66d79feafec81cde34a62278c9a980299da2feedba8137df8efc607298ff03324dc02ceaacebd2fef9e3a100533b887ba44dec191b759d8e1e67
 AUX ax25mond.rc 383 BLAKE2B 65f830cea757b7c649ab31480e7beaa0e8b40017c3fd59559969942c27c6459340dfa0223de829049bdc0cedd67a2441202ecca60c341162f5eaf621c6fef01e SHA512 c8d8dc7ada7fa427da85b794969e821c5e3cde66871427d36fa5cfc3a03c30735d869444594f3f17074529465325c7b48806a67257b9b3e0ef3fa6ca258e90c2
 AUX ax25rtd.rc 379 BLAKE2B 823318cdaf456d0536d843ddf0a25e2a614ddcc6dfe69f98b7c6c8dda555ef6b2977b873c9e35aaab10974f1ea3d91d8743798f228665908859dc33ff34f3708 SHA512 95df04124449a652bf76a60822c9468bce71d02490beadef409975da3709f7cf2a43ee9088468146d985464a6992125c90980e38efd397c145799cca537ff8dc
 DIST ax25-apps-0.0.8-rc5.tar.gz 479590 BLAKE2B baa4814ebb68c435a9986158dcdad1333376c75202db8e3595ec35851fabb3c718e7015a721d587ee307b8b8c918a690b898addcf4194532f6d26b70219c4c98 SHA512 5886f79dcdd4b02374289e04a61101b1ccdcdd936a6a98bdefa7b091689381de75f722a0bf32a914c85a3759c7b42489fabf74a53492fe2f937b22c953fc230d
+EBUILD ax25-apps-0.0.8_rc5-r1.ebuild 1430 BLAKE2B a510223fb9fd8b26041309d3ff874ae8347b5ef8099dc34f3f22419363e61485638cf1ba39af9fc7daaa3b169e7aae2e02163ec8ebc2d80e0db9c979ba544fc3 SHA512 af665a628d8f5fe6f0cacc27dca4714934ddb9e9bf66e7dadf770eed19786e21721336349bd414146f0555bcd912e116da2ffc730c2fe0580fa3cf49f5a577b8
 EBUILD ax25-apps-0.0.8_rc5.ebuild 1228 BLAKE2B 9a67580677e0d387e146fc6ef71cb2fe462ae2c13d13b500dd5e1eee2f6d4e5e8e5d52eee1dc2762621ff294f977ab902e3235e85909a06bb5dea1d81a242e26 SHA512 fbbf685e18f4a6af2c5bea8d5a77ff1c73e51850035512995f458614744f56c1220a8772e5fee5435b5b1d4e1a0cdebe3b9584c53440401291fd65ed8e37993b
 MISC metadata.xml 256 BLAKE2B f5d5a93344d150a5211f11075344a863ec1b6b11b1ac9acb15364a05f23b7439d9688ab2a153af32e610e4ed5120cd8a044558edc48e5ee0d91f96ed9ba9ed71 SHA512 1971736573e03d6f2bbc45273991f004e8766d076ccf6369c6bf96583afe3a98665a1a0cf51cda40d678e9ef38739453837395c3f1d50c637c35d395a392ca15
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc5-r1.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc5-r1.ebuild
new file mode 100644
index 000000000000..b2cbb93ef638
--- /dev/null
+++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc5-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Basic AX.25 (Amateur Radio) user tools, additional daemons"
+HOMEPAGE="
+	https://linux-ax25.in-berlin.de/
+	https://packet-radio.net/ax-25/
+" # NOTE: ...in-berlin.de does not work but subdomains do
+SRC_URI="
+	https://linux-ax25.in-berlin.de/pub/${PN}/${MY_P}.tar.gz
+	https://ham.packet-radio.net/packet/ax25/ax25-apps/${MY_P}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-libs/libax25-0.0.12_rc2:=
+	sys-libs/ncurses:=
+	!dev-ruby/listen
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# fix missing prototype for malloc
+	sed -i -e "/^#include /i #include <stdlib.h>" ax25ipd/routing.c || die
+	eapply "${FILESDIR}"/${PN}-0.0.8_rc5-tinfo.patch
+	eapply_user
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/ax25ipd.rc ax25ipd
+	newinitd "${FILESDIR}"/ax25mond.rc ax25mond
+	newinitd "${FILESDIR}"/ax25rtd.rc ax25rtd
+
+	# HACK: one should not create instead of removing
+	rm -r "${ED}"/usr/share/doc/${PF} || die
+
+	dodoc AUTHORS ChangeLog NEWS README ax25ipd/README.ax25ipd \
+		ax25rtd/README.ax25rtd ax25ipd/HISTORY.ax25ipd ax25rtd/TODO.ax25rtd
+
+	dodir /var/lib/ax25/ax25rtd
+	touch "${ED}"/var/lib/ax25/ax25rtd/ax25_route || die
+	touch "${ED}"/var/lib/ax25/ax25rtd/ip_route || die
+}
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], [],