diff --git a/audacity.spec b/audacity.spec index 4435f5c..3829ce7 100644 --- a/audacity.spec +++ b/audacity.spec @@ -9,7 +9,7 @@ Name: audacity Version: 3.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multitrack audio editor License: GPLv2 URL: https://www.audacityteam.org/ @@ -26,6 +26,12 @@ Source1: http://www.fosshub.com/Audacity.html/%{name}-manual-%{version}.zip Patch0: system-wx.patch +# Fix CMake find of the Jack module (RHBZ 1972963) - Remove for 3.0.3 (backported from master branch - https://github.com/audacity/audacity/commit/b4b5cc812483b311627bba48e26b91ae389ce713) +Patch1: find-jack.patch + +# Fix CVE-2020-1867 - Remove for 3.0.3 (backported from https://github.com/audacity/audacity/pull/700) +Patch2: permissions-fix.patch + BuildRequires: cmake BuildRequires: gettext-devel @@ -54,7 +60,6 @@ BuildRequires: twolame-devel BuildRequires: libogg-devel BuildRequires: libsndfile-devel BuildRequires: libvorbis-devel -BuildRequires: lv2-devel BuildRequires: portaudio-devel >= 19-16 BuildRequires: portmidi-devel BuildRequires: soundtouch-devel @@ -79,6 +84,15 @@ BuildRequires: libappstream-glib BuildRequires: ffmpeg-devel %endif %endif + +# LV2 interface and the plugins used +BuildRequires: lv2-devel >= 1.16 +BuildRequires: lilv-devel >= 0.24.6 +BuildRequires: serd-devel >= 0.30.2 +BuildRequires: sord-devel >= 0.16.4 +BuildRequires: sratom-devel >= 0.6.4 +BuildRequires: suil-devel >= 0.10.6 + # For new symbols in portaudio Requires: portaudio%{?_isa} >= 19-16 @@ -108,6 +122,10 @@ For the most up to date manual content, use the on-line manual. %patch0 -p0 +# Remove both for 3.0.3 +%patch1 -p1 +%patch2 -p0 + %build %if 0%{?rhel} == 7 export WX_CONFIG=wx-config-3.0 @@ -123,8 +141,10 @@ cd build %cmake \ .. \ %else +# Need bundled sqlite for now (RHBZ: 1973455) %cmake \ %endif + -Daudacity_use_sqlite=local \ -Daudacity_use_sndfile=system \ -Daudacity_use_soxr=system \ -Daudacity_use_lame=system \ @@ -222,6 +242,12 @@ rm %{buildroot}%{_datadir}/doc/%{name}/LICENSE.txt %changelog +* Thu Jun 17 2021 Ian McInerney - 3.0.2-4 +- Fix detection of Jack development package (fixes rhbz #1972963) +- Add packages needed for the LV2 interface to use the system libraries +- Temporarily disable the rpath checks until upstream fixes it +- Fix CVE-2020-1867 (fixes rhbz #1904016) + * Wed May 05 2021 Gwyn Ciesla - 3.0.2-3 - wxGTK rebuild. diff --git a/find-jack.patch b/find-jack.patch new file mode 100644 index 0000000..8f9676e --- /dev/null +++ b/find-jack.patch @@ -0,0 +1,22 @@ +From b4b5cc812483b311627bba48e26b91ae389ce713 Mon Sep 17 00:00:00 2001 +From: SteveDaulton +Date: Mon, 26 Apr 2021 15:45:40 +0100 +Subject: [PATCH] Bug 2757 - No support for Jack Audio System + +--- + cmake-proxies/portaudio-v19/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake-proxies/portaudio-v19/CMakeLists.txt b/cmake-proxies/portaudio-v19/CMakeLists.txt +index d8930ff8ce5..9baf5f6a8eb 100644 +--- a/cmake-proxies/portaudio-v19/CMakeLists.txt ++++ b/cmake-proxies/portaudio-v19/CMakeLists.txt +@@ -88,7 +88,7 @@ cmd_option( ${_OPT}use_pa_jack + + if( NOT ${_OPT}use_pa_jack STREQUAL "off" ) + # Find it +- find_package( jack ) ++ find_package( Jack ) + if( NOT JACK_FOUND) + set_cache_value( ${_OPT}use_pa_jack "off" ) + endif() diff --git a/permissions-fix.patch b/permissions-fix.patch new file mode 100644 index 0000000..4a97035 --- /dev/null +++ b/permissions-fix.patch @@ -0,0 +1,11 @@ +--- src/AudacityApp.cpp 2021-04-11 11:29:19.000000000 +0100 ++++ src/AudacityApp.cpp 2021-06-17 23:41:43.333628774 +0100 +@@ -1692,7 +1692,7 @@ + // The permissions don't always seem to be set on + // some platforms. Hopefully this fixes it... + #ifdef __UNIX__ +- chmod(OSFILENAME(temp), 0755); ++ chmod(OSFILENAME(temp), 0700); + #endif + + TempDirectory::ResetTempDir();