From 53a91f1671385317efbfcd8dd9be53201e58b7eb96ee74120f0da4259d9180f0 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 18 Jul 2018 06:36:00 +0000 Subject: [PATCH 1/5] Accepting request 623468 from home:wkazubski:test:science - Update to version 3.7.13.4 * Fix Boost 1.67 linking issue * Logging - fixed issues where messages weren't properly written to stdout/stderr due to incorrect strings * gr-analog - `fmdet_cf`'s derivative coefficients were wrong. * gr-blocks - `skiphead` used to incorrectly handle tags, now properly shifts * gr-digital - `qa_packet_format`: Unit test used to potentially lock up due to incorrect conditionals - `clock_recovery_cc`, `crc32_bb`: Accessing the `[0]` element of an empty vector is UB, even if you don't use the result afterwards. * gr-fec - `polar_encoder`/`_common`: Fixed multiple out-of-bound accesses due to insufficient vector length checks * gr-filter - `fft_filter`, `filter_delay`: Accessing the `[0]` element of an empty vector is UB, even if you don't use the result afterwards. - Patch missing_libraries.patch modified OBS-URL: https://build.opensuse.org/request/show/623468 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=20 --- gnuradio-3.7.13.3.tar.gz | 3 --- gnuradio-3.7.13.4.tar.gz | 3 +++ gnuradio.changes | 22 ++++++++++++++++++++++ gnuradio.spec | 2 +- missing_library.patch | 8 +------- 5 files changed, 27 insertions(+), 11 deletions(-) delete mode 100644 gnuradio-3.7.13.3.tar.gz create mode 100644 gnuradio-3.7.13.4.tar.gz diff --git a/gnuradio-3.7.13.3.tar.gz b/gnuradio-3.7.13.3.tar.gz deleted file mode 100644 index 7b691f6..0000000 --- a/gnuradio-3.7.13.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03fc4d63960e1ab1edb881f792f896a47b16e51a04b81abf00db0bd4e5bdb5c1 -size 4430594 diff --git a/gnuradio-3.7.13.4.tar.gz b/gnuradio-3.7.13.4.tar.gz new file mode 100644 index 0000000..2b78015 --- /dev/null +++ b/gnuradio-3.7.13.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c536c268b1e9c24f1206bbc881a5819ac46e662f4e8beaded6f3f441d3502f0d +size 4546663 diff --git a/gnuradio.changes b/gnuradio.changes index bfe26d3..fc7125b 100644 --- a/gnuradio.changes +++ b/gnuradio.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jul 17 07:41:57 UTC 2018 - wk@ire.pw.edu.pl + +- Update to version 3.7.13.4 + * Fix Boost 1.67 linking issue + * Logging - fixed issues where messages weren't properly written + to stdout/stderr due to incorrect strings + * gr-analog - `fmdet_cf`'s derivative coefficients were wrong. + * gr-blocks - `skiphead` used to incorrectly handle tags, + now properly shifts + * gr-digital - `qa_packet_format`: Unit test used to potentially + lock up due to incorrect conditionals + - `clock_recovery_cc`, `crc32_bb`: Accessing the `[0]` element + of an empty vector is UB, even if you don't use the result + afterwards. + * gr-fec - `polar_encoder`/`_common`: Fixed multiple out-of-bound + accesses due to insufficient vector length checks + * gr-filter - `fft_filter`, `filter_delay`: Accessing the `[0]` + element of an empty vector is UB, even if you don't use the + result afterwards. +- Patch missing_libraries.patch modified + ------------------------------------------------------------------- Fri Jun 15 08:50:15 UTC 2018 - mardnh@gmx.de diff --git a/gnuradio.spec b/gnuradio.spec index 02fa537..ac63a77 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -20,7 +20,7 @@ %define sover_volk 1_4 %define volk_version 1.4 Name: gnuradio -Version: 3.7.13.3 +Version: 3.7.13.4 Release: 0 Summary: GNU software radio License: GPL-3.0-or-later diff --git a/missing_library.patch b/missing_library.patch index cb8a996..4b6f3eb 100644 --- a/missing_library.patch +++ b/missing_library.patch @@ -13,7 +13,7 @@ Index: gnuradio-3.7.12.0/gr-uhd/examples/c++/CMakeLists.txt =================================================================== --- gnuradio-3.7.12.0.orig/gr-uhd/examples/c++/CMakeLists.txt +++ gnuradio-3.7.12.0/gr-uhd/examples/c++/CMakeLists.txt -@@ -31,11 +31,14 @@ include_directories( +@@ -31,6 +31,9 @@ include_directories( link_directories(${UHD_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) @@ -23,12 +23,6 @@ Index: gnuradio-3.7.12.0/gr-uhd/examples/c++/CMakeLists.txt ######################################################################## # Build executable ######################################################################## - add_executable(tags_demo tags_demo.cc) --target_link_libraries(tags_demo gnuradio-uhd) -+target_link_libraries(tags_demo gnuradio-uhd Threads::Threads) - - INSTALL(TARGETS - tags_demo Index: gnuradio-3.7.12.0/volk/lib/CMakeLists.txt =================================================================== --- gnuradio-3.7.12.0.orig/volk/lib/CMakeLists.txt From 0ab29a15e478d1b8605aef23c39f60bde13a3f6d41058fe39d2b4232a8790f24 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 18 Jul 2018 06:50:12 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=21 --- gnuradio-3.7.13.4.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnuradio-3.7.13.4.tar.gz b/gnuradio-3.7.13.4.tar.gz index 2b78015..ecdb89a 100644 --- a/gnuradio-3.7.13.4.tar.gz +++ b/gnuradio-3.7.13.4.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c536c268b1e9c24f1206bbc881a5819ac46e662f4e8beaded6f3f441d3502f0d -size 4546663 +oid sha256:903ca4a7ccccdbd0bf2cc3f4412971f5f56ab6834932056b0f6791112c4e4787 +size 4431079 From d4134f21fd33cc039d6014a050333128271ee580e80623425aa81446840e7ec7 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 18 Jul 2018 06:59:31 +0000 Subject: [PATCH 3/5] - Update source urls - Use gpg to verify sources - Modernise spec file with spec-cleaner OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=22 --- gnuradio-3.7.13.4.tar.gz | 3 - gnuradio-3.7.13.4.tar.xz | 3 + gnuradio-3.7.13.4.tar.xz.asc | 16 +++++ gnuradio.changes | 7 ++ gnuradio.keyring | 123 +++++++++++++++++++++++++++++++++++ gnuradio.spec | 46 +++++-------- 6 files changed, 167 insertions(+), 31 deletions(-) delete mode 100644 gnuradio-3.7.13.4.tar.gz create mode 100644 gnuradio-3.7.13.4.tar.xz create mode 100644 gnuradio-3.7.13.4.tar.xz.asc create mode 100644 gnuradio.keyring diff --git a/gnuradio-3.7.13.4.tar.gz b/gnuradio-3.7.13.4.tar.gz deleted file mode 100644 index ecdb89a..0000000 --- a/gnuradio-3.7.13.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:903ca4a7ccccdbd0bf2cc3f4412971f5f56ab6834932056b0f6791112c4e4787 -size 4431079 diff --git a/gnuradio-3.7.13.4.tar.xz b/gnuradio-3.7.13.4.tar.xz new file mode 100644 index 0000000..eab6c38 --- /dev/null +++ b/gnuradio-3.7.13.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5e7cf253707b3baa36e1f069c078d0747ebdc61b9b9a8066938def64025df03 +size 2971892 diff --git a/gnuradio-3.7.13.4.tar.xz.asc b/gnuradio-3.7.13.4.tar.xz.asc new file mode 100644 index 0000000..ad682e4 --- /dev/null +++ b/gnuradio-3.7.13.4.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE000aH0pECI3rcAheoGxtld/HFHUFAltLcb4ACgkQoGxtld/H +FHXlNA//dhGErH+JJwqyz/b52dTA4PXuYk/dPXBYmjTGiwHqYq6TlHmeQC8AvcTs +Un3f+iFovRDnSfrK7y+HJVKRjbxo4mee07x0BIj/TbdIP3SUPD/yu1cU8zTS8A0C +VPeyfN/abk08REluobz4vRl74J3qf6NiUg6S8NbLcOEdWxNVgqXb9hDRhHTUUBkC +cxRSgQshK/orke4FGNBJ95vPnbV/MrWeUrQiaEbndZaTe7hI9Dd4CNA+FR4BToP3 +7A08CJw6TtVded5FxXYSJCumtjcsBv3OaBMx2KP9N/de6/GutI5EJ7QTE85r3aKI +ujsuxSJbzPe7MIiE1NepRQrThHkH824+2nt1fZfzfM0xU2vroS54KQkEtwbVNy1d +B+YLTV8mm0cSoXbIcJ68PYYkli9RcVmCpoEFNTRJc0Df0jpmM8mZ0yeRSSTyjuHC +2YZT5SxiRVlAbdjCY032SDiTOcxyzVzRueNGOXKsrNm+6JscFD+D9p1z32G3nfcD +8gWcAgsq8wVOIcQd2WdG0g0QUl4yDLQkRBy3Oa9yFyKfkOzSkfUmY5mVHMlq6IyC +rQGby33B6/HtbIWVUQNyUR05v1hO2nWhMi0fnkAoRizuQMHrOJkQ+x/Mpc9LHSKo +5Z2pBa+kATK0diNgkR6sfVYM9IafX7nYNG2bKsxD+9FuC/qlSYk= +=LL7o +-----END PGP SIGNATURE----- diff --git a/gnuradio.changes b/gnuradio.changes index fc7125b..0221c70 100644 --- a/gnuradio.changes +++ b/gnuradio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 18 06:55:27 UTC 2018 - mpluskal@suse.com + +- Update source urls +- Use gpg to verify sources +- Modernise spec file with spec-cleaner + ------------------------------------------------------------------- Tue Jul 17 07:41:57 UTC 2018 - wk@ire.pw.edu.pl diff --git a/gnuradio.keyring b/gnuradio.keyring new file mode 100644 index 0000000..0745c19 --- /dev/null +++ b/gnuradio.keyring @@ -0,0 +1,123 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +GSPvyy/aZ962sdGRXDIyMJQ3g/m44Enx7A== +=fiq4 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gnuradio.spec b/gnuradio.spec index ac63a77..ba20e3d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,10 +26,12 @@ Summary: GNU software radio License: GPL-3.0-or-later Group: Productivity/Hamradio/Other URL: http://gnuradio.org -Source: https://github.com/gnuradio/gnuradio/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source1: https://github.com/gnuradio/volk/archive/v%{volk_version}.tar.gz#/volk-%{volk_version}.tar.gz +Source0: https://github.com/gnuradio/gnuradio/releases/download/v%{version}/gnuradio-%{version}.tar.xz +Source1: https://github.com/gnuradio/gnuradio/releases/download/v%{version}/gnuradio-%{version}.tar.xz.asc +Source2: %{name}.keyring +Source3: https://github.com/gnuradio/volk/archive/v%{volk_version}.tar.gz#/volk-%{volk_version}.tar.gz # http://www.nathanwest.us/grc_to_37.sh -Source2: grc_to_37.sh +Source4: grc_to_37.sh Source99: %{name}-rpmlintrc Patch2: missing_library.patch BuildRequires: alsa-devel @@ -200,7 +202,6 @@ sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxyg %build %limit_build -m 2000 %cmake -# -DCMAKE_SHARED_LINKER_FLAGS="" %make_jobs %install @@ -214,22 +215,22 @@ mv %{buildroot}/%{_datadir}/doc/%{name}-*/* %{buildroot}%{_docdir}/%{name}/ %py_compile -O %{buildroot}%{python_sitearch} # install icons and desktop file -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps -cp %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/gnuradio-grc.png -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps -cp %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/gnuradio-grc.png -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps -cp %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-64.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/gnuradio-grc.png -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps -cp %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/gnuradio-grc.png -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/256x256/apps -cp %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-256.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/gnuradio-grc.png +install -Dpm 0644 %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-32.png \ + %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/gnuradio-grc.png +install -Dpm 0644 %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-48.png \ + %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/gnuradio-grc.png +install -Dpm 0644 %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-64.png \ + %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/gnuradio-grc.png +install -Dpm 0644 %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-128.png \ + %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/gnuradio-grc.png +install -Dpm 0644 %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-256.png \ + %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/gnuradio-grc.png -mkdir -p %{buildroot}%{_datadir}/applications -cp %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/gnuradio-grc.desktop %{buildroot}%{_datadir}/applications +install -Dpm 0644%{buildroot}%{_datadir}/gnuradio/grc/freedesktop/gnuradio-grc.desktop \ + %{buildroot}%{_datadir}/applications/gnuradio-grc.desktop %suse_update_desktop_file -r %{buildroot}%{_datadir}/applications/gnuradio-grc.desktop Network HamRadio -install -m 755 %{SOURCE2} %{buildroot}/%{_bindir} +install -Dpm 0755 %{SOURCE4} %{buildroot}/%{_bindir} #remove unneeded stuff rm -rf %{buildroot}%{_datadir}/%{name}/grc/freedesktop @@ -240,15 +241,11 @@ rm -rf %{buildroot}%{_prefix}/libexec %fdupes -s %{buildroot}%{_libdir} %post -n libgnuradio-%{sover} -p /sbin/ldconfig - %post -n libvolk%{sover_volk} -p /sbin/ldconfig - %postun -n libgnuradio-%{sover} -p /sbin/ldconfig - %postun -n libvolk%{sover_volk} -p /sbin/ldconfig %files -%defattr(-,root,root,-) %license COPYING %{_bindir}/* %dir %{_datadir}/gnuradio @@ -281,7 +278,6 @@ rm -rf %{buildroot}%{_prefix}/libexec %exclude %{_datadir}/gnuradio/grc/blocks/variable_text_box.xml %files wxgui -%defattr(-,root,root,-) %{python_sitearch}/gnuradio/wxgui/ %{_datadir}/gnuradio/grc/blocks/wxgui*.xml %{_datadir}/gnuradio/grc/blocks/notebook.xml @@ -292,15 +288,12 @@ rm -rf %{buildroot}%{_prefix}/libexec %{_datadir}/gnuradio/grc/blocks/variable_text_box.xml %files -n libgnuradio-%{sover} -%defattr(-,root,root,-) %{_libdir}/libgnuradio*.so.* %files -n libvolk%{sover_volk} -%defattr(-,root,root,-) %{_libdir}/libvolk*.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/%{name}/ %{_includedir}/pmt/ %{_includedir}/volk/ @@ -310,7 +303,6 @@ rm -rf %{buildroot}%{_prefix}/libexec %{_libdir}/cmake/volk/ %files doc -%defattr(-,root,root,-) %dir %{_docdir}/%{name} %{_docdir}/%{name}/html/ %{_docdir}/%{name}/xml/ @@ -318,7 +310,6 @@ rm -rf %{buildroot}%{_prefix}/libexec %{_docdir}/%{name}/*.grc %files examples -%defattr(-,root,root,-) %{_datadir}/gnuradio/examples/ %exclude %{_datadir}/gnuradio/examples/audio/audio_fft.py %exclude %{_datadir}/gnuradio/examples/hf_explorer/ @@ -336,7 +327,6 @@ rm -rf %{buildroot}%{_prefix}/libexec %exclude %{_datadir}/gnuradio/examples/uhd/usrp_wxapt_rcv.py %files examples-wxgui -%defattr(-,root,root,-) %{_datadir}/gnuradio/examples/audio/audio_fft.py %{_datadir}/gnuradio/examples/hf_explorer/ %{_datadir}/gnuradio/examples/hf_radio/ From 4d4202b7b5bb299ac0e33eaa5707449b9886ded2b286b76e9e8baa102ef6837b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 18 Jul 2018 07:04:14 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=23 --- gnuradio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index ba20e3d..3d99a78 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -193,7 +193,7 @@ This package contains the examples of using GNU Radio depending on wxWidgets. %prep %setup -q -tar xzf %{SOURCE1} -C volk/ --strip-components=1 +tar xzf %{SOURCE3} -C volk/ --strip-components=1 %patch2 -p1 # remove buildtime from documentation sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.in From a77792e96b3e88f1a31ba1462ff608437c32bcf93b5b96793b319cac172720d0 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 19 Jul 2018 07:37:45 +0000 Subject: [PATCH 5/5] Accepting request 623927 from home:wkazubski:test:science - Fixed missing space in specfile OBS-URL: https://build.opensuse.org/request/show/623927 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=24 --- gnuradio.changes | 5 +++++ gnuradio.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gnuradio.changes b/gnuradio.changes index 0221c70..c54428f 100644 --- a/gnuradio.changes +++ b/gnuradio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 18 16:41:20 UTC 2018 - wk@ire.pw.edu.pl + +- Fixed missing space in specfile + ------------------------------------------------------------------- Wed Jul 18 06:55:27 UTC 2018 - mpluskal@suse.com diff --git a/gnuradio.spec b/gnuradio.spec index 3d99a78..b60f657 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -226,7 +226,7 @@ install -Dpm 0644 %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-128. install -Dpm 0644 %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/grc-icon-256.png \ %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/gnuradio-grc.png -install -Dpm 0644%{buildroot}%{_datadir}/gnuradio/grc/freedesktop/gnuradio-grc.desktop \ +install -Dpm 0644 %{buildroot}%{_datadir}/gnuradio/grc/freedesktop/gnuradio-grc.desktop \ %{buildroot}%{_datadir}/applications/gnuradio-grc.desktop %suse_update_desktop_file -r %{buildroot}%{_datadir}/applications/gnuradio-grc.desktop Network HamRadio