gentoo auto-resync : 08:08:2024 - 12:38:45

3 files changed, 47 insertions, 5 deletions

diff --git a/media-radio/ax25-tools/Manifest b/media-radio/ax25-tools/Manifest
index 721031968ba9..a8a194125b00 100644
--- a/media-radio/ax25-tools/Manifest
+++ b/media-radio/ax25-tools/Manifest
@@ -1,3 +1,4 @@
+AUX ax25-tools-0.0.10-fix-pointer-types.patch 1024 BLAKE2B b506e2dd491dedb153a3e76d461181c9fef9290ea08fd2afbb9ec61e8b2bacb0a31b58da596d6c1eeee2275e74ac067f9c8fbf7344a224fd65e5d10c48c11744 SHA512 1d167b1b62b2e1faf94f33edda97db9407d877bae05187f541b8d64e56f6e0bb4b2e85d45f7340f718c234ffdd64d38e11e3277f9173b869303a4021f1486b3a
 AUX ax25-tools-0.0.10-musl.patch 6036 BLAKE2B 0ee7c3c12854b2de007727d954623dc0ab66ba7e6bc3d9c798e098b081ade4f2df6282397ef7219dc1274eac03e644d401884d48edfa24233f300d09326e14db SHA512 54fad59f632f08ca1faee9cf2cac675e745f29d86ce939cc2ded3938d4a8c2823354da422f4f4ec811a66526235b5af215ad567062c6408ba9d1cda60e4eca72
 AUX ax25d.rc 371 BLAKE2B 4ea23047b4cfde20a40f7cfccb6bb8da9bf8d0616880dc0df258746a250d50c91b79c599c55ae78475d5eb6e8e3b99dc9ea2e8f3c41cf7da4e14de4054d63e75 SHA512 1d1e836cac175c47fdc7168bebb7d91bd6723c3304536d9e879be81c88892654a2e2b6e6783b08cc9d7ffde42477c8f53a15d281edb728d606145712f77b6998
 AUX mheardd.rc 379 BLAKE2B a9c5bd6cd890c3ba74ae95207fc42abf4f0840605603bededb51888fd752ba9990b92b316aed6870fcf0103fdd7ea4c32d094987b7ac0c8b6a6d46502545d891 SHA512 873c3befc0907c2bafbe7107f345623cae9da45721321072e6aab6990a11fea87ab88df12c2c3b640a93c177c9f8557666106ef05fa73e3d0a886a5714c88056
@@ -6,6 +7,6 @@ AUX rip98d.rc 375 BLAKE2B ed2a72057b01d168219bbb94cfdf24dfbe5ab82ecc1c7945d7a4a4
 AUX rxecho.rc 375 BLAKE2B 0500e79dab2ed7fd2488a9a1a72344bc1ee1a8433c2703c4d63d0671e4cee11d9af5111ced837141c033db3406943eda2d128a718687d6389679d60f5649b326 SHA512 4787767fc0a2c7fda39b2817dc9809a72e666bbfe98b40d9e335fe00fa5a1136fb900b6d32f58b37edffb85327482a75063d3caef7c02c40aeb46f6158bb575a
 AUX ttylinkd.rc 383 BLAKE2B 9dd842128b64751696e704ad4a5e2930e103a8bb41931186bd60e26ed66697441abca16b52d61dfbfb2ece58c49e4328aa20b4c7dc810f26a03390b5313f5072 SHA512 499f9373ecdc76b863e43d3d508231754707087197ade8b9e9c151186e953c40e57528773ddc2e8d3f116daa16ba286bcab34b6e46a6870965780c459045a9ed
 DIST ax25-tools-0.0.10-rc5.tar.gz 372851 BLAKE2B 1129e3aff22221662bfe3840288922e60236bbd09ec1f6be72ba4a9ef51a818923af55635bc50b5f6b7befd716732dad3536282b8875d7a996518dcd8c02342d SHA512 4aac4e53af5924f8f0b807bdc406fbba43043fcd33c509c1129f009e6cf8854abdd8f11087d17d9710fac2b231e80aca630ca17b8a2fe771f49df2c480c059cb
-EBUILD ax25-tools-0.0.10_rc5-r1.ebuild 1152 BLAKE2B dd485cd9be9685dcc9834cb1320668ca98857c8b85783bb62b68f48515ece2bb041279a5324059e1fe8ebd8576915cfc4144c49580ee654692931790c479416d SHA512 ac89d619c396674853adf2ff7045d03f9581a55cf103711dcfdd86311b27e9029da99b99e6a3cea5238c507bd2a87df96ecea5b24fe9cebe278b1ac9f4c830ea
+EBUILD ax25-tools-0.0.10_rc5-r1.ebuild 1388 BLAKE2B ca401a9e576f3aa6885651e60d03bf04d989fab0e9e4234b4e2e0cd2081dd5fd4d29c1df16d4c649766e6f87641d339f10a3988e0e259499d87cabf6aa98f9d2 SHA512 d071d614589a40e927b8260556b0d163fa51432d0e1384d1bd81619767f2bb31948357d1a3e388b283e368602ae8d41666d2f0e3f2a092291af0242333a73a16
 EBUILD ax25-tools-0.0.10_rc5.ebuild 1019 BLAKE2B b469bd0cda14be830c10f1893d558b54bbfba185798d507c37e535dd9e236deacf24fa347ab9740fa02be9135793e4319d1799eafb594f7647f9e24c463fa93c SHA512 3fbe3c57b236b9a17607b9b0865b8d6e817b2db5b544ff65eb04a7b5ac80fa63e1eb300c6d92c09b9755c57d2e6acda5425c7a23a8ab5f719e405593797b2f69
 MISC metadata.xml 330 BLAKE2B 1b3660ead0c7ef602da0d698a9a5b80772954c87017777790cadcf47425f039ef8e378fb39989ee62ee360e8e8cb7b18b59ab73e71b1fb35704a9dcd1fd04232 SHA512 22bf963ec3271b9e79efe6d58e972df3ee2df4e6add743c0e25869c9755b261d3a44c7db5f28b70fd35927fd8a802fe7fe6fa456d05dd673ec4e6430bdc7366c
diff --git a/media-radio/ax25-tools/ax25-tools-0.0.10_rc5-r1.ebuild b/media-radio/ax25-tools/ax25-tools-0.0.10_rc5-r1.ebuild
index 17ee50418cad..aee863ad2462 100644
--- a/media-radio/ax25-tools/ax25-tools-0.0.10_rc5-r1.ebuild
+++ b/media-radio/ax25-tools/ax25-tools-0.0.10_rc5-r1.ebuild
@@ -6,9 +6,14 @@ EAPI="8"
 MY_P=${P/_/-}
 
 DESCRIPTION="Basic AX.25 (Amateur Radio) administrative tools and daemons"
-HOMEPAGE="http://www.linux-ax25.org/"
-SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
-
+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"
@@ -30,10 +35,11 @@ RDEPEND="${DEPEND}
 	sys-libs/zlib"
 
 src_prepare() {
-	eapply_user
 	if use elibc_musl ; then
 		eapply -p1 "${FILESDIR}/${PN}-0.0.10-musl.patch"
 	fi
+	eapply -p1 "${FILESDIR}/${PN}-0.0.10-fix-pointer-types.patch"
+	eapply_user
 }
 
 src_configure() {
diff --git a/media-radio/ax25-tools/files/ax25-tools-0.0.10-fix-pointer-types.patch b/media-radio/ax25-tools/files/ax25-tools-0.0.10-fix-pointer-types.patch
new file mode 100644
index 000000000000..ca74a4970e08
--- /dev/null
+++ b/media-radio/ax25-tools/files/ax25-tools-0.0.10-fix-pointer-types.patch
@@ -0,0 +1,35 @@
+diff --git a/tcpip/rip98d.c b/tcpip/rip98d.c
+index 50df60e..70b92f1 100644
+--- a/tcpip/rip98d.c
++++ b/tcpip/rip98d.c
+@@ -243,7 +243,7 @@ int main(int argc, char **argv)
+ 	loc_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+ 	loc_addr.sin_port        = htons(RIP_PORT);
+ 
+-	if (bind(s, &loc_addr, sizeof(loc_addr)) < 0) {
++	if (bind(s, (struct sockaddr *)&loc_addr, sizeof(loc_addr)) < 0) {
+ 		perror("rip98d: bind");
+ 		close(s);
+ 		return 1;
+diff --git a/tcpip/ttylinkd.c b/tcpip/ttylinkd.c
+index c530d73..10f568e 100644
+--- a/tcpip/ttylinkd.c
++++ b/tcpip/ttylinkd.c
+@@ -43,7 +43,7 @@
+ 
+ #include <syslog.h>
+ #include <sys/types.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ 
+@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
+ 		exit(1);
+ 	}
+ 
+-	if (bind(ctl_skt, &ctl_sin, sizeof(ctl_sin)) != 0)
++	if (bind(ctl_skt, (struct sockaddr *)&ctl_sin, sizeof(ctl_sin)) != 0)
+ 	{
+ 		syslog(LOG_DAEMON | LOG_CRIT, "main(): Error when trying to bind() control socket.");
+ 		close(skt);