From 78da91f48b9657ee8ea416adb725e38e1ea42ec1 Mon Sep 17 00:00:00 2001
From: Iñaki Úcar <iucar@fedoraproject.org>
Date: Jun 03 2022 14:40:22 +0000
Subject: Update to 2022.02.3+492


---

diff --git a/.gitignore b/.gitignore
index 5e528a3..e52aaaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /rstudio-2022.02.0+443.tar.gz
 /rstudio-2022.02.1+461.tar.gz
 /rstudio-2022.02.2+485.tar.gz
+/rstudio-2022.02.3+492.tar.gz
diff --git a/0006-do-not-disable-seccomp-filter-sandbox.patch b/0006-do-not-disable-seccomp-filter-sandbox.patch
new file mode 100644
index 0000000..85b2bf3
--- /dev/null
+++ b/0006-do-not-disable-seccomp-filter-sandbox.patch
@@ -0,0 +1,37 @@
+From c109ef6f7b7f879b24db8574ada3a731a3c3b4a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 3 Jun 2022 16:10:44 +0200
+Subject: [PATCH] do not disable seccomp filter sandbox
+
+---
+ src/cpp/desktop/DesktopMain.cpp | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/cpp/desktop/DesktopMain.cpp b/src/cpp/desktop/DesktopMain.cpp
+index 7ab82e1..5cf6127 100644
+--- a/src/cpp/desktop/DesktopMain.cpp
++++ b/src/cpp/desktop/DesktopMain.cpp
+@@ -643,20 +643,6 @@ int main(int argc, char* argv[])
+          arguments.push_back(noSandbox);
+       }
+ 
+-      static char disableSeccompFilterSandbox[] = "--disable-seccomp-filter-sandbox";
+-
+-      // newer versions of glibc require us to disable the seccomp filter
+-      // sandbox, as the sandbox included with the version of chromium bundled
+-      // with Qt 5.12.x does not play well with newer versions of glibc.
+-      //
+-      // the seccomp filter sandbox is used to prevent user-mode applications
+-      // from executing potentially malicious system calls; however, it doesn't
+-      // understand some of the newer syscalls introduced in newer versions of
+-      // Linux (and used by newer versions of glibc)
+-      const char* libcVersion = gnu_get_libc_version();
+-      if (core::Version(libcVersion) >= core::Version("2.34"))
+-         arguments.push_back(disableSeccompFilterSandbox);
+-
+ #endif
+ 
+ #ifdef Q_OS_WIN32
+-- 
+2.34.1
+
diff --git a/rstudio.spec b/rstudio.spec
index c01bd81..0d35ca1 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -26,9 +26,9 @@
 %global rstudio_visual_editor       panmirror-0.1.0
 %global rstudio_version_major       2022
 %global rstudio_version_minor       02
-%global rstudio_version_patch       2
-%global rstudio_version_suffix      485
-%global rstudio_git_revision_hash   8acbd38b0d4ca3c86c570cf4112a8180c48cc6fb
+%global rstudio_version_patch       3
+%global rstudio_version_suffix      492
+%global rstudio_git_revision_hash   aaa7a713740a0767e6476f025b85cc57769e3283
 %global rstudio_version             %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}
 # Do not build non-lto objects, as that may result in
 # memory exhaustion by the linker.
@@ -36,7 +36,7 @@
 
 Name:           rstudio
 Version:        %{rstudio_version}+%{rstudio_version_suffix}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        RStudio base package
 
 # AGPLv3:       RStudio, hunspell, tree.hh
@@ -72,6 +72,9 @@ Patch3:         0003-fix-resources-path.patch
 Patch4:         0004-use-system-node.patch
 # Disable quarto, stick to pandoc
 Patch5:         0005-disable-quarto.patch
+# https://github.com/rstudio/rstudio/issues/9854
+# We don't need this with our version of QtWebEngine
+Patch6:         0006-do-not-disable-seccomp-filter-sandbox.patch
 
 BuildRequires:  make, cmake, ant
 BuildRequires:  gcc-c++, java-11-openjdk-devel, R-core-devel
@@ -344,6 +347,9 @@ chown -R %{name}-server:%{name}-server %{_sharedstatedir}/%{name}-server
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 
 %changelog
+* Fri Jun 03 2022 Iñaki Úcar <iucar@fedoraproject.org> - 2022.02.3+492-1
+- Update to 2022.02.3+492
+
 * Tue May 24 2022 Iñaki Úcar <iucar@fedoraproject.org> - 2022.02.2+485-3
 - Remove custom stack-protector definition
 
diff --git a/sources b/sources
index 00632af..35d55a4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rstudio-2022.02.2+485.tar.gz) = cc9bae851a6eff5959fcf65e2f48cb20909eb9c55b5e378560f5178fe755aba90a756902aee69886ab4a666c4c149fd59e8ec2eddef52070cf464cafe18ff05a
+SHA512 (rstudio-2022.02.3+492.tar.gz) = e13432e8e36d04e1c353aeaa9371f579bcaa2088999bbe36b1f25bd3d591dbfcb455844dc532e035a8a0f3a3e1ae4f3542ca74484477f0cea06ed62726b1a56c
 SHA512 (panmirror-0.1.0-nm.tgz) = 45f6d7d49588e4949a41e5c6558bd42d0f0696a0f785eba5664a4d5ece0735d5eb62b9712883a243142ee6a294b0bc2e5c4ec40b27f6749c953e4ac485221313