1 files changed, 0 insertions, 94 deletions

diff --git a/patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.patch b/patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.patch
deleted file mode 100644
index 2b19cb0..0000000
--- a/patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 242819ba38ed77e28629737dff9bfd5410ec1fdc Mon Sep 17 00:00:00 2001
-From: Ricardo Wurmus <rekado@elephly.net>
-Date: Fri, 18 Dec 2020 10:32:01 +0100
-Subject: [PATCH 2/7] sessionProcessConfig: Configure R version from active
- session.
-
-When switching projects the R version is recorded in the active
-session.  Before launching a new rsession process R environment
-variables need to be set to select the variant of libR.so that should
-be used to launch the embedded R.
-
-* src/cpp/server/ServerSessionManager.cpp (sessionProcessConfig):
-Configure R environment using the R version that has been recorded in
-the active session.
----
- .../server/session/ServerSessionManager.cpp   | 44 ++++++++++++++++++-
- 1 file changed, 43 insertions(+), 1 deletion(-)
-
-diff --git a/src/cpp/server/session/ServerSessionManager.cpp b/src/cpp/server/session/ServerSessionManager.cpp
-index d4da986378..28d3248606 100644
---- a/src/cpp/server/session/ServerSessionManager.cpp
-+++ b/src/cpp/server/session/ServerSessionManager.cpp
-@@ -2,6 +2,7 @@
-  * ServerSessionManager.cpp
-  *
-  * Copyright (C) 2022 by Posit Software, PBC
-+ * Copyright (C) 2020-2025 Ricardo Wurmus
-  *
-  * Unless you have received this program directly from Posit Software pursuant
-  * to the terms of a commercial license agreement with Posit Software, then
-@@ -22,10 +23,14 @@
- #include <shared_core/SafeConvert.hpp>
- #include <core/SocketRpc.hpp>
- #include <core/system/Process.hpp>
-+#include <shared_core/system/User.hpp>
- #include <core/system/PosixUser.hpp>
- #include <core/system/Environment.hpp>
- #include <core/json/JsonRpc.hpp>
- 
-+#include <core/r_util/RActiveSessions.hpp>
-+#include <core/r_util/RUserData.hpp>
-+
- #include <monitor/MonitorClient.hpp>
- #include <session/SessionConstants.hpp>
- 
-@@ -160,7 +165,44 @@ core::system::ProcessConfig sessionProcessConfig(
-    std::copy(extraArgs.begin(), extraArgs.end(), std::back_inserter(args));
- 
-    // append R environment variables
--   r_util::RVersion rVersion = r_environment::rVersion();
-+   // Get the active session (e.g. after switching projects) and set R
-+   // variables according to the configured R version.
-+
-+   // We cannot use core::system::userHomePath because it always
-+   // returns the server user's home directory.  This is /root when
-+   // rserver runs as root.  Instead we want to get the home directory
-+   // of the *target* user for which rsession will be run.  This is
-+   // why we launch a shell to determine the user's home directory.
-+   core::system::ProcessOptions poptions;
-+   core::system::ProcessResult presult;
-+   Error rError = core::system::runCommand(
-+            "/bin/sh -c 'echo -n ~" + context.username + "'",
-+            poptions,
-+            &presult);
-+   if (rError)
-+      LOG_ERROR(rError);
-+
-+   FilePath homeDir = FilePath(presult.stdOut);
-+   FilePath userScratchPath_ = core::system::xdg::userDataDir(context.username, homeDir);
-+
-+   r_util::ActiveSessions activeSessions(userScratchPath_);
-+   std::vector<boost::shared_ptr<r_util::ActiveSession> > sessions =
-+     activeSessions.list(homeDir, false);
-+
-+   r_util::RVersion rVersion;
-+   if (sessions.size() > 0) {
-+     // Get the R version from the active user session.  This will
-+     // have been set earlier when the user switched to a project.
-+     std::string errorMsg;
-+     bool success = r_environment::detectRVersion(FilePath((*sessions.front()).rVersionHome()).completePath("bin/R"),
-+                                   &rVersion, &errorMsg);
-+
-+     if (!success) {
-+       rVersion = r_environment::rVersion();
-+     }
-+   } else {
-+     rVersion = r_environment::rVersion();
-+   }
-    core::system::Options rEnvVars = rVersion.environment();
-    environment.insert(environment.end(), rEnvVars.begin(), rEnvVars.end());
-    
--- 
-2.49.0
-