gentoo resync : 25.03.2022

4 files changed, 55 insertions, 2 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 5dac3fd453ef..fa51c0454b3d 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 9b9c885c60aa..f2ce2019d3b2 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,4 +1,5 @@
+AUX xlog-2.0.24-musl.patch 1561 BLAKE2B fb65f5e702a8103f30b41b2248187cc8c923a9d765e618328baba893fb7004541078ded9ca3b197126f7163331061802d28fd42c177f38d543f9a6ab2c9a249f SHA512 68071bfa84d2b14738801ce0ecdd668a77373fc6d92a10d84e68768a4c8790f18ed7d4b8a4dc3abb10672cde8f1574ae97b6d4afab372e019873cb61903a41d7
 AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15f927525694100471b296412675eb97237c7e239cc407a2ffb145dbf779e802c1a1f5914a064d70f73ad269d12 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6
 DIST xlog-2.0.24.tar.gz 11407825 BLAKE2B 0de5203d4229005ba84940443672a9787a9ab2a87565bcbf47e0a0fcf375dcddec7636d11a359a117c42b7e07ea81fd482a2684b8a75379da1fe72cbc991643d SHA512 cc96dfabf01a6c49ed7db1257cc102a469642bdd32a158b0a026da2017181060f8aace5de22ada5df42b3bc89c14448dd372332a9ff0101121570f5b1187e5ab
-EBUILD xlog-2.0.24.ebuild 1888 BLAKE2B 33e2cfd2ad41fb29e1e94b6bc63599b2ce18b6c2fa68cc0d6afb52ebb5b51426317894eb68cb737af7e8a41834f97059d0d53e36712a227ccff3070514b0f42d SHA512 a6ca6d01b238f37fa9be9e073466e9ceccaa121b5ba09fd8f806ebbe194aff377df0cae53d13580df2587ff71eeac458c0cc5e99e8a68e3e8697d768f94bee34
+EBUILD xlog-2.0.24.ebuild 1934 BLAKE2B 5c5a06c92188d5074a3d98e55a33d8542aa4d3187a4a660da9d470a381b72b815c347e33054808b3d009538798a267ca40c889815ad119bba9e114a5798b892a SHA512 c23cbfeb7f6f7216816357d1612239ea4b0873d3484adc3fbbbd099c75e38ef8b7682941000554113aa457699d94906ba6b96ca080960b81fd3ba751237ccdc7
 MISC metadata.xml 246 BLAKE2B 0e24c5acb9f25df4ce675d772f01ef4cca1df3e885dff8c64c0c6f255b9ec49c4761ee159c30a35f77bbeefa1ec62ac6e835d2facdae2b63fbf0d6b350ac23b0 SHA512 be18486abf39193c34501128c8f1bf7e1886b74a7d551735d00c3492c7bae8845ba2dbea93b2ca73d5467cb7764d90b670014143ae8a8ca0a480a02d9af60efb
diff --git a/media-radio/xlog/files/xlog-2.0.24-musl.patch b/media-radio/xlog/files/xlog-2.0.24-musl.patch
new file mode 100644
index 000000000000..a235f37e45dc
--- /dev/null
+++ b/media-radio/xlog/files/xlog-2.0.24-musl.patch
@@ -0,0 +1,51 @@
+Avoid assignment to read only stderr variable 
+Bug #832236
+diff --git a/src/gui_tracedialog.c b/src/gui_tracedialog.c
+index a00020e..52b6c76 100644
+--- a/src/gui_tracedialog.c
++++ b/src/gui_tracedialog.c
+@@ -32,6 +32,7 @@
+ #include <unistd.h>
+ #include <glib/gstdio.h>
+ #include <hamlib/rig.h>
++#include <fcntl.h>
+ 
+ #include "gui_tracedialog.h"
+ #include "gui_warningdialog.h"
+@@ -43,7 +44,7 @@ typedef struct
+ {
+ 	time_t modified;		/* Last Modified Time */				
+ 	gchar *filename;		/* File Name */
+-	FILE *fd;				/* File Descriptor */
++	gint filedesc;			/* File Descriptor */
+ 	unsigned long filesize; /* File Size */
+ } fileinfo;
+ 
+@@ -62,14 +63,9 @@ stop_tracing (void)
+ 
+ 	stop_hamlib ();
+ 	g_source_remove (tracetimer);
+-	fclose (finfo.fd);
++	close(finfo.filedesc);
+ 	dup2 (saved_fd, STDERR_FILENO);
+ 	close (saved_fd);
+-#ifndef __NetBSD__
+-#ifndef G_OS_WIN32
+-	stderr = fdopen (STDERR_FILENO, "w");
+-#endif
+-#endif
+ 	hamlibresult = start_hamlib (preferences.rigid, preferences.device,
+ 		RIG_DEBUG_NONE, preferences.polltime);
+ }
+@@ -180,7 +176,10 @@ on_trace_hamlib_activate(GtkMenuItem * menuitem, gpointer user_data)
+ 			(GTK_BOX (vbox), tracelabel, FALSE, FALSE, 0);
+ 		g_free (tracestr);
+ 		stop_hamlib();
+-		finfo.fd = freopen (finfo.filename, "w", stderr);
++	 	finfo.filedesc = open(finfo.filename, O_WRONLY|O_CREAT, 0644);
++		if (finfo.filedesc >= 0) {
++			dup2 (finfo.filedesc, STDERR_FILENO); 
++		}
+ 		hamlibresult = start_hamlib (preferences.rigid, preferences.device, 
+ 			RIG_DEBUG_TRACE, preferences.polltime);
+ 		tracetimer = g_timeout_add
diff --git a/media-radio/xlog/xlog-2.0.24.ebuild b/media-radio/xlog/xlog-2.0.24.ebuild
index 936fb932a6cb..ea01d2109129 100644
--- a/media-radio/xlog/xlog-2.0.24.ebuild
+++ b/media-radio/xlog/xlog-2.0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,6 +30,7 @@ DOCS=( AUTHORS data/doc/THANKS NEWS README )
 src_prepare() {
 	eapply_user
 	eapply -p0 "${FILESDIR}/${PN}-2.0.7-desktop.patch"
+	eapply "${FILESDIR}/${PN}-2.0.24-musl.patch"
 
 	# Drop -Werror
 	sed -i -e "s:-Werror::g" configure.ac || die