1 files changed, 15 insertions, 15 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
index 8b70bd0..2b19cb0 100644
--- 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
@@ -1,4 +1,4 @@
-From 8202e0ae8276285afcdeee1fbec50a744a7171ff Mon Sep 17 00:00:00 2001
+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
@@ -13,24 +13,24 @@ be used to launch the embedded R.
 Configure R environment using the R version that has been recorded in
 the active session.
 ---
- src/cpp/server/ServerSessionManager.cpp | 44 ++++++++++++++++++++++++-
+ .../server/session/ServerSessionManager.cpp   | 44 ++++++++++++++++++-
  1 file changed, 43 insertions(+), 1 deletion(-)
 
-diff --git a/src/cpp/server/ServerSessionManager.cpp b/src/cpp/server/ServerSessionManager.cpp
-index 22f138a6ad..01be702a83 100644
---- a/src/cpp/server/ServerSessionManager.cpp
-+++ b/src/cpp/server/ServerSessionManager.cpp
+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) 2021 by RStudio, PBC
-+ * Copyright (C) 2020-2021 Ricardo Wurmus
+  * Copyright (C) 2022 by Posit Software, PBC
++ * Copyright (C) 2020-2025 Ricardo Wurmus
   *
-  * Unless you have received this program directly from RStudio pursuant
-  * to the terms of a commercial license agreement with RStudio, then
-@@ -21,10 +22,14 @@
- 
+  * 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>
@@ -43,7 +43,7 @@ index 22f138a6ad..01be702a83 100644
  #include <monitor/MonitorClient.hpp>
  #include <session/SessionConstants.hpp>
  
-@@ -156,7 +161,44 @@ core::system::ProcessConfig sessionProcessConfig(
+@@ -160,7 +165,44 @@ core::system::ProcessConfig sessionProcessConfig(
     std::copy(extraArgs.begin(), extraArgs.end(), std::back_inserter(args));
  
     // append R environment variables
@@ -64,7 +64,7 @@ index 22f138a6ad..01be702a83 100644
 +            &presult);
 +   if (rError)
 +      LOG_ERROR(rError);
-+   
++
 +   FilePath homeDir = FilePath(presult.stdOut);
 +   FilePath userScratchPath_ = core::system::xdg::userDataDir(context.username, homeDir);
 +
@@ -90,5 +90,5 @@ index 22f138a6ad..01be702a83 100644
     environment.insert(environment.end(), rEnvVars.begin(), rEnvVars.end());
     
 -- 
-2.33.0
+2.49.0