gentoo auto-resync : 25:01:2024 - 04:44:48

5 files changed, 85 insertions, 10 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index e75c38aef7cf..06fd311e111b 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index f4aa692136ba..3209d7262026 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,4 +1,5 @@
+AUX PR7093.patch 3317 BLAKE2B d369dfa91c8de3c62d1c14be52f5ad9491bf10f8fb904295bb92497a43150bcf9d1576442f3087b439e54fb4dac572d421e3cac95d71d01604cf329284e7ff5a SHA512 01758de8ecb721fcaadd31d478551420290b5e59c9b8fa3d421d4170665915c21e50ed765a9647b81d4f6acf71099c98628b823a66897b4f5e57df3c3b2643ba
 DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd
-EBUILD gnuradio-3.10.9.2.ebuild 6784 BLAKE2B 30cbebc98a4450ce18493628ea1dc2b18a9f05d3d2d1cc3d3eb2b6602c7352ccd2bf2fcc151bc1278cdb40b077d284edf03da268850a5d7a11e3eacf2ee41e15 SHA512 810a5c05a57022a4be9a1b298ec93108462e37a49ff6006c4bc1124ad136c239ad769f2bea30a17ae89d785a2d593fc1d5e25f25d7cd3f48041d8c667d38aa3e
-EBUILD gnuradio-9999.ebuild 6784 BLAKE2B 30cbebc98a4450ce18493628ea1dc2b18a9f05d3d2d1cc3d3eb2b6602c7352ccd2bf2fcc151bc1278cdb40b077d284edf03da268850a5d7a11e3eacf2ee41e15 SHA512 810a5c05a57022a4be9a1b298ec93108462e37a49ff6006c4bc1124ad136c239ad769f2bea30a17ae89d785a2d593fc1d5e25f25d7cd3f48041d8c667d38aa3e
+EBUILD gnuradio-3.10.9.2-r1.ebuild 6776 BLAKE2B 1b0ced533f958d87767fbe38ed1836d221d9488e04bb6651778feeb1c13a1fcf8d5350dc8ecaa3df132ec0cdd5c84b6a0c0b2c50a813f68d0f6c7186f8cd3d66 SHA512 2dd06676aded58cb1f98662ae29d8842af037885fa5ac36b42091da42247a0d0e31570d82c3c144f80300f441d9e503758e4a6228dad9ea675ec209586986397
+EBUILD gnuradio-9999.ebuild 6736 BLAKE2B 1071027c522c8141e0ffe2028ebb0ee9e02f19ea94f17ee74a36787eb2682098128e464f6cdf170853410580e8bbc5954a26eabe75aec24531d197f73fa6cad4 SHA512 3cd7f489acc64fda572541d04334123364d8993824b0f9e6dd189f28a7a72276e25e3dbd7cbe6b75eeb6a16fa0082db60c1fdc5a9440e40f4254c56744ad16fc
 MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0
diff --git a/net-wireless/gnuradio/files/PR7093.patch b/net-wireless/gnuradio/files/PR7093.patch
new file mode 100644
index 000000000000..98581054d49d
--- /dev/null
+++ b/net-wireless/gnuradio/files/PR7093.patch
@@ -0,0 +1,76 @@
+From 677d22b5226a3edb274c252cc3aa727a16de3c68 Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Tue, 23 Jan 2024 18:28:46 -0500
+Subject: [PATCH] filter: Fix undefined behaviour in fir_filter_with_buffer
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-filter/lib/fir_filter_with_buffer.cc    | 9 ++++++---
+ gr-filter/lib/qa_fir_filter_with_buffer.cc | 6 +++---
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/gr-filter/lib/fir_filter_with_buffer.cc b/gr-filter/lib/fir_filter_with_buffer.cc
+index 4fc571ec57d..f6cb3b20854 100644
+--- a/gr-filter/lib/fir_filter_with_buffer.cc
++++ b/gr-filter/lib/fir_filter_with_buffer.cc
+@@ -52,7 +52,8 @@ void fir_filter_with_buffer_fff::set_taps(const std::vector<float>& taps)
+     for (int i = 0; i < d_naligned; i++) {
+         d_aligned_taps[i].clear();
+         d_aligned_taps[i].resize(d_ntaps + d_naligned - 1);
+-        std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]);
++        std::copy(
++            std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i);
+     }
+ 
+     d_idx = 0;
+@@ -157,7 +158,8 @@ void fir_filter_with_buffer_ccc::set_taps(const std::vector<gr_complex>& taps)
+     for (int i = 0; i < d_naligned; i++) {
+         d_aligned_taps[i].clear();
+         d_aligned_taps[i].resize(d_ntaps + d_naligned - 1);
+-        std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]);
++        std::copy(
++            std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i);
+     }
+ 
+     d_idx = 0;
+@@ -261,7 +263,8 @@ void fir_filter_with_buffer_ccf::set_taps(const std::vector<float>& taps)
+     for (int i = 0; i < d_naligned; i++) {
+         d_aligned_taps[i].clear();
+         d_aligned_taps[i].resize(d_ntaps + d_naligned - 1);
+-        std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]);
++        std::copy(
++            std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i);
+     }
+ 
+     d_idx = 0;
+diff --git a/gr-filter/lib/qa_fir_filter_with_buffer.cc b/gr-filter/lib/qa_fir_filter_with_buffer.cc
+index 32f5c6780fc..72cdd9fa1c0 100644
+--- a/gr-filter/lib/qa_fir_filter_with_buffer.cc
++++ b/gr-filter/lib/qa_fir_filter_with_buffer.cc
+@@ -107,7 +107,7 @@ void test_decimate(unsigned int decimate)
+             }
+ 
+             // build filter
+-            vector<tap_type> f1_taps(&taps[0], &taps[n]);
++            vector<tap_type> f1_taps(taps.begin(), taps.begin() + n);
+             kernel::fir_filter_with_buffer_fff f1(f1_taps);
+ 
+             // zero the output, then do the filtering
+@@ -198,7 +198,7 @@ void test_decimate(unsigned int decimate)
+             }
+ 
+             // build filter
+-            vector<tap_type> f1_taps(&taps[0], &taps[n]);
++            vector<tap_type> f1_taps(taps.begin(), taps.begin() + n);
+             kernel::fir_filter_with_buffer_ccc f1(f1_taps);
+ 
+             // zero the output, then do the filtering
+@@ -287,7 +287,7 @@ void test_decimate(unsigned int decimate)
+             }
+ 
+             // build filter
+-            vector<tap_type> f1_taps(&taps[0], &taps[n]);
++            vector<tap_type> f1_taps(taps.begin(), taps.begin() + n);
+             kernel::fir_filter_with_buffer_ccf f1(f1_taps);
+ 
+             // zero the output, then do the filtering
diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild
index 68eff59630d3..bbbc55d8c42e 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild
@@ -23,9 +23,7 @@ fi
 
 IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq"
 
-#RESTRICT="!test? ( test )"
-# https://github.com/gnuradio/gnuradio/issues/7085
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	audio? ( || ( alsa oss jack portaudio ) )
@@ -131,6 +129,8 @@ DEPEND="${RDEPEND}
 	zeromq? ( net-libs/cppzmq )
 "
 
+PATCHES=( "${FILESDIR}/PR7093.patch" )
+
 src_prepare() {
 	xdg_environment_reset #534582
 
@@ -225,7 +225,7 @@ src_install() {
 
 src_test() {
 	# skip test which needs internet
-	virtx cmake_src_test -E metainfo_test
+	virtx cmake_src_test -E metainfo_test --output-on-failure
 }
 
 pkg_postinst() {
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 68eff59630d3..6270b80fb9f0 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -23,9 +23,7 @@ fi
 
 IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq"
 
-#RESTRICT="!test? ( test )"
-# https://github.com/gnuradio/gnuradio/issues/7085
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	audio? ( || ( alsa oss jack portaudio ) )
@@ -225,7 +223,7 @@ src_install() {
 
 src_test() {
 	# skip test which needs internet
-	virtx cmake_src_test -E metainfo_test
+	virtx cmake_src_test -E metainfo_test --output-on-failure
 }
 
 pkg_postinst() {