patches: Update rstudio-server-multi-version patches.

Replace the patches with newer versions suitable for version
2023.06.1+524 of rstudio-server.

* patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch,
patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.patch,
patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch,
patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch,
patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch,
patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch,
patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch: Replace.

7 files changed, 104 insertions, 86 deletions

diff --git a/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch b/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch
index 4908ed9..e5d0adb 100644
--- a/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch
+++ b/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch
@@ -1,4 +1,4 @@
-From 131f634028a572b206742697d5cad2122ca940b1 Mon Sep 17 00:00:00 2001
+From 34e2450a282148e5384c1018479e9df0718574f5 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Fri, 18 Dec 2020 10:26:44 +0100
 Subject: [PATCH 1/7] handleClientInit: Store R versions in sessionInfo.
@@ -11,23 +11,24 @@ version entries from /etc/rstudio/r-versions via the RVersionsScanner.
 Add discovered entries to a JSON array at the sessionInfo object
 r_versions_info->available_r_versions.
 ---
- src/cpp/session/SessionClientInit.cpp | 31 ++++++++++++++++++++++-----
- 1 file changed, 26 insertions(+), 5 deletions(-)
+ src/cpp/session/SessionClientInit.cpp         | 35 +++++++++++++++----
+ .../session/prefs/UserPrefsComputedLayer.cpp  |  2 +-
+ 2 files changed, 30 insertions(+), 7 deletions(-)
 
 diff --git a/src/cpp/session/SessionClientInit.cpp b/src/cpp/session/SessionClientInit.cpp
-index ab1228096f..6d9e5a064b 100644
+index f1b8f35716..b1180070b5 100644
 --- a/src/cpp/session/SessionClientInit.cpp
 +++ b/src/cpp/session/SessionClientInit.cpp
 @@ -2,6 +2,7 @@
   * SessionClientInit.hpp
   *
-  * Copyright (C) 2021 by RStudio, PBC
-+ * Copyright (C) 2020 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
+  * Unless you have received this program directly from Posit Software pursuant
+  * to the terms of a commercial license agreement with Posit Software, then
 @@ -63,6 +64,8 @@
- #include <core/http/CSRFToken.hpp>
+ #include <core/r_util/RSessionContext.hpp>
  #include <core/system/Environment.hpp>
  
 +#include <server_core/RVersionsScanner.hpp>
@@ -35,7 +36,7 @@ index ab1228096f..6d9e5a064b 100644
  #include <session/SessionConsoleProcess.hpp>
  #include <session/SessionClientEventService.hpp>
  #include <session/SessionHttpConnection.hpp>
-@@ -511,11 +514,29 @@ void handleClientInit(const boost::function<void()>& initFunction,
+@@ -557,12 +560,32 @@ void handleClientInit(const boost::function<void()>& initFunction,
  
     sessionInfo["multi_session"] = options.multiSession();
  
@@ -43,6 +44,7 @@ index ab1228096f..6d9e5a064b 100644
 -   rVersionsJson["r_version"] = module_context::rVersion();
 -   rVersionsJson["r_version_label"] = module_context::rVersionLabel();
 -   rVersionsJson["r_home_dir"] = module_context::rHomeDir();
+-   rVersionsJson["r_version_module"] = module_context::rVersionModule();
 -   sessionInfo["r_versions_info"] = rVersionsJson;
 +   // Read versions from /etc/rstudio/r-versions
 +   json::Array availableRVersionsJson;
@@ -52,7 +54,8 @@ index ab1228096f..6d9e5a064b 100644
 +       json::Object rVersionJson;
 +       rVersionJson["version"] = rEntry.number();
 +       rVersionJson["label"] = rEntry.label();
-+       rVersionJson["r_home"] = rEntry.homeDir().getAbsolutePath();
++       rVersionJson["r_home_dir"] = rEntry.homeDir().getAbsolutePath();
++       rVersionJson["r_version_module"] = rEntry.module();
 +
 +       availableRVersionsJson.push_back(rVersionJson);
 +     }
@@ -61,15 +64,30 @@ index ab1228096f..6d9e5a064b 100644
 +   rVersionsInfo["available_r_versions"] = availableRVersionsJson;
 +   rVersionsInfo["r_version"] = module_context::rVersion();
 +   rVersionsInfo["r_version_label"] = module_context::rVersionLabel();
-+   rVersionsInfo["r_home"] = module_context::rHomeDir();
++   rVersionsInfo["r_home_dir"] = module_context::rHomeDir();
++   rVersionsInfo["r_version_module"] = module_context::rVersionModule();
 +   rVersionsInfo["default_r_version"] = module_context::rVersion();
 +   rVersionsInfo["default_r_version_label"] = module_context::rVersionLabel();
++   rVersionsInfo["default_r_version_module"] = module_context::rVersionModule();
 +   rVersionsInfo["default_r_home_dir"] = module_context::rHomeDir();
 +   rVersionsInfo["restore_project_r_version"] = true;
 +   sessionInfo["r_versions_info"] = rVersionsInfo;
  
     sessionInfo["show_user_home_page"] = options.showUserHomePage();
     sessionInfo["user_home_page_url"] = json::Value();
+diff --git a/src/cpp/session/prefs/UserPrefsComputedLayer.cpp b/src/cpp/session/prefs/UserPrefsComputedLayer.cpp
+index d368c3dd23..8118fff025 100644
+--- a/src/cpp/session/prefs/UserPrefsComputedLayer.cpp
++++ b/src/cpp/session/prefs/UserPrefsComputedLayer.cpp
+@@ -82,7 +82,7 @@ Error UserPrefsComputedLayer::readPrefs()
+                                                 kSessionSharedStoragePath)));
+    json::Object defaultRVersionJson;
+    defaultRVersionJson["version"] = versionSettings.defaultRVersion();
+-   defaultRVersionJson["r_home"] = versionSettings.defaultRVersionHome();
++   defaultRVersionJson["r_home_dir"] = versionSettings.defaultRVersionHome();
+    defaultRVersionJson["label"] = versionSettings.defaultRVersionLabel();
+    layer[kDefaultRVersion] = defaultRVersionJson;
+ 
 -- 
-2.33.0
+2.49.0
 
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
 
diff --git a/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch b/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch
index 74ddd99..5657898 100644
--- a/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch
+++ b/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch
@@ -1,4 +1,4 @@
-From 4063e89423325632efc734ae3d2e143f354392cf Mon Sep 17 00:00:00 2001
+From 8fefabd12965d8ca7d5292bd3d5ee1ab87c57fcc Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Fri, 18 Dec 2020 10:35:39 +0100
 Subject: [PATCH 3/7] NewProjectWizard: Unhide version selector widget.
@@ -11,17 +11,17 @@ Do not hide the widget.
  1 file changed, 1 deletion(-)
 
 diff --git a/src/gwt/src/org/rstudio/studio/client/projects/ui/newproject/NewProjectWizard.java b/src/gwt/src/org/rstudio/studio/client/projects/ui/newproject/NewProjectWizard.java
-index f386b99af1..d39ef19bf9 100644
+index e112ca7bd0..f619c72d37 100644
 --- a/src/gwt/src/org/rstudio/studio/client/projects/ui/newproject/NewProjectWizard.java
 +++ b/src/gwt/src/org/rstudio/studio/client/projects/ui/newproject/NewProjectWizard.java
-@@ -71,7 +71,6 @@ public class NewProjectWizard extends Wizard<NewProjectInput,NewProjectResult>
+@@ -74,7 +74,6 @@ public class NewProjectWizard extends Wizard<NewProjectInput,NewProjectResult>
           rVersionSelector_.setRVersion(rVersion);
           addLeftWidget(rVersionSelector_);
           rVersionSelector_.getElement().getStyle().setMarginRight(8, Unit.PX);
 -         rVersionSelector_.setVisible(false);
        }
        
-       openInNewWindow_ = new CheckBox("Open in new session");
+       openInNewWindow_ = new CheckBox(constants_.openNewSessionLabel());
 -- 
-2.33.0
+2.49.0
 
diff --git a/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch b/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
index 0cd1c7c..260fdd5 100644
--- a/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
+++ b/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
@@ -1,4 +1,4 @@
-From 54e7fb9c835b3ec8afcb5db55b03a8ead3ff6088 Mon Sep 17 00:00:00 2001
+From 18e50173670e22fc14eb64d999745f87d544d047 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sat, 19 Dec 2020 00:57:26 +0100
 Subject: [PATCH 4/7] handleConnection: Switch R version when switching
@@ -13,18 +13,18 @@ project switch back to the default.
  2 files changed, 30 insertions(+), 5 deletions(-)
 
 diff --git a/src/cpp/session/SessionHttpMethods.cpp b/src/cpp/session/SessionHttpMethods.cpp
-index 2fd08c028b..3e66f13dd7 100644
+index a90648c23c..e5d1cabcc2 100644
 --- a/src/cpp/session/SessionHttpMethods.cpp
 +++ b/src/cpp/session/SessionHttpMethods.cpp
 @@ -2,6 +2,7 @@
   * SessionHttpMethods.hpp
   *
-  * Copyright (C) 2021 by RStudio, PBC
-+ * Copyright (C) 2020 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
-@@ -667,6 +668,33 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
+  * Unless you have received this program directly from Posit Software pursuant
+  * to the terms of a commercial license agreement with Posit Software, then
+@@ -692,6 +693,33 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
                    activeSession().setWorkingDir(projDir);
                 }
  
@@ -58,7 +58,7 @@ index 2fd08c028b..3e66f13dd7 100644
                 if (options().switchProjectsWithUrl())
                 {
                    r_util::SessionScope scope;
-@@ -721,10 +749,6 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
+@@ -744,10 +772,6 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
                       {
                          FilePath projFile = resolveAliasedPath(switchToProject);
                          std::string projDir = createAliasedPath(projFile.getParent());
@@ -70,10 +70,10 @@ index 2fd08c028b..3e66f13dd7 100644
                                                             module_context::sharedProjectScratchPath(),
                                                             version,
 diff --git a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
-index 71ce880487..63937c4806 100644
+index ec76b2cb55..f8a5b7f3b1 100644
 --- a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
 +++ b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
-@@ -1127,7 +1127,8 @@ public class Projects implements OpenProjectFileEvent.Handler,
+@@ -1136,7 +1136,8 @@ public class Projects implements OpenProjectFileEvent.Handler,
                          {
                             // perform quit
                             applicationQuit_.performQuit(null, saveChanges,
@@ -84,5 +84,5 @@ index 71ce880487..63937c4806 100644
                       };
  
 -- 
-2.33.0
+2.49.0
 
diff --git a/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch b/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
index 18c1158..7d101a8 100644
--- a/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
+++ b/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
@@ -1,4 +1,4 @@
-From 0bf91a24f1d087bc78b501e0493eea7f02a9b9d3 Mon Sep 17 00:00:00 2001
+From 7351620161e0261367d7dfe7bb582db0836badde Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sat, 19 Dec 2020 23:33:16 +0100
 Subject: [PATCH 5/7] Add version switcher widget to toolbar.
@@ -14,10 +14,10 @@ Subject: [PATCH 5/7] Add version switcher widget to toolbar.
  create mode 100644 src/gwt/src/org/rstudio/studio/client/application/ui/RVersionPopupMenu.java
 
 diff --git a/src/gwt/src/org/rstudio/core/client/ElementIds.java b/src/gwt/src/org/rstudio/core/client/ElementIds.java
-index e47990a68d..eaffa48271 100644
+index 73e71d9d77..f76d88ebf8 100644
 --- a/src/gwt/src/org/rstudio/core/client/ElementIds.java
 +++ b/src/gwt/src/org/rstudio/core/client/ElementIds.java
-@@ -321,6 +321,8 @@ public class ElementIds
+@@ -378,6 +378,8 @@ public class ElementIds
     public final static String PROJECT_MENUBUTTON_TOOLBAR_SUFFIX = "toolbar";
     public final static String PROJECT_MENUBUTTON_MENUBAR_SUFFIX = "menubar";
  
@@ -27,7 +27,7 @@ index e47990a68d..eaffa48271 100644
     public final static String BUILD_MORE_MENUBUTTON = "build_more_menubutton";
     public final static String BUILD_BOOKDOWN_MENUBUTTON = "build_bookdown_menubutton";
 diff --git a/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java b/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java
-index 486146b30e..2bb2acb895 100644
+index f8bc5ef4cc..b5320f6140 100644
 --- a/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java
 +++ b/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java
 @@ -41,6 +41,7 @@ import org.rstudio.studio.client.application.AriaLiveService;
@@ -38,7 +38,7 @@ index 486146b30e..2bb2acb895 100644
  import org.rstudio.studio.client.application.ui.addins.AddinsToolbarButton;
  import org.rstudio.studio.client.application.ui.impl.DesktopApplicationHeader;
  import org.rstudio.studio.client.application.ui.impl.WebApplicationHeader;
-@@ -227,6 +228,7 @@ public interface RStudioGinjector extends Ginjector
+@@ -233,6 +234,7 @@ public interface RStudioGinjector extends Ginjector
     void injectMembers(CodeFilesList codeFilesList);
     void injectMembers(ToolbarPopupMenu toolbarPopupMenu);
     void injectMembers(ProjectPopupMenu projectPopupMenu);
@@ -47,10 +47,10 @@ index 486146b30e..2bb2acb895 100644
     void injectMembers(TextEditingTargetPresentationHelper presHelper);
     void injectMembers(TextEditingTargetRMarkdownHelper rmarkdownHelper);
 diff --git a/src/gwt/src/org/rstudio/studio/client/application/ui/GlobalToolbar.java b/src/gwt/src/org/rstudio/studio/client/application/ui/GlobalToolbar.java
-index a2bb16f115..ed5f3ed4a8 100644
+index 9e773e1331..cdef71de05 100644
 --- a/src/gwt/src/org/rstudio/studio/client/application/ui/GlobalToolbar.java
 +++ b/src/gwt/src/org/rstudio/studio/client/application/ui/GlobalToolbar.java
-@@ -236,6 +236,10 @@ public class GlobalToolbar extends Toolbar
+@@ -241,6 +241,10 @@ public class GlobalToolbar extends Toolbar
           ProjectPopupMenu projectMenu = new ProjectPopupMenu(
                 sessionInfo, commands_, ElementIds.PROJECT_MENUBUTTON_TOOLBAR_SUFFIX);
           addRightWidget(projectMenu.getToolbarButton());
@@ -63,7 +63,7 @@ index a2bb16f115..ed5f3ed4a8 100644
  
 diff --git a/src/gwt/src/org/rstudio/studio/client/application/ui/RVersionPopupMenu.java b/src/gwt/src/org/rstudio/studio/client/application/ui/RVersionPopupMenu.java
 new file mode 100644
-index 0000000000..ca66b2f53f
+index 0000000000..eedc5996ae
 --- /dev/null
 +++ b/src/gwt/src/org/rstudio/studio/client/application/ui/RVersionPopupMenu.java
 @@ -0,0 +1,162 @@
@@ -119,7 +119,7 @@ index 0000000000..ca66b2f53f
 +   public RVersionPopupMenu(SessionInfo sessionInfo, Commands commands)
 +   {
 +      RStudioGinjector.INSTANCE.injectMembers(this);
-+      
++
 +      commands_ = commands;
 +
 +      RVersionsInfo rVersionsInfo = sessionInfo.getRVersionsInfo();
@@ -128,14 +128,14 @@ index 0000000000..ca66b2f53f
 +                                      rVersionsInfo.getRVersionHome(),
 +                                      rVersionsInfo.getRVersionLabel());
 +   }
-+   
++
 +   @Inject
 +   void initialize(EventBus events,
 +                   Session session)
 +   {
 +      events_ = events;
 +   }
-+   
++
 +   public ToolbarButton getToolbarButton()
 +   {
 +      String buttonText = "R version";
@@ -146,7 +146,7 @@ index 0000000000..ca66b2f53f
 +                buttonText,
 +                ToolbarButton.NoTitle,
 +                null,
-+                this, 
++                this,
 +                true);
 +         ElementIds.assignElementId(toolbarButton_, ElementIds.VERSION_MENUBUTTON);
 +      }
@@ -154,13 +154,13 @@ index 0000000000..ca66b2f53f
 +      toolbarButton_.setTitle(buttonText);
 +      return toolbarButton_;
 +   }
-+   
++
 +   @Override
 +   protected ToolbarMenuBar createMenuBar()
 +   {
 +      return new RVersionPopupMenuBar();
 +   }
-+   
++
 +   private class RVersionPopupMenuBar extends ToolbarMenuBar
 +   {
 +      public RVersionPopupMenuBar()
@@ -168,7 +168,7 @@ index 0000000000..ca66b2f53f
 +         super(true);
 +      }
 +   }
-+   
++
 +   @Override
 +   public void getDynamicPopupMenu(final DynamicPopupMenuCallback callback)
 +   {
@@ -198,7 +198,7 @@ index 0000000000..ca66b2f53f
 +         commands_.projectVersion8(),
 +         commands_.projectVersion9()
 +      };
-+      
++
 +      for (int i = 0; i < Math.min(versionCommands.length, MAX_VERSIONS); i++)
 +      {
 +         addItem(versionCommands[i].createMenuItem(false));
@@ -215,7 +215,7 @@ index 0000000000..ca66b2f53f
 +                events_.fireEvent(new SwitchToRVersionEvent(version));
 +            }));
 +      }
-+      
++
 +      callback.onPopupMenu(this);
 +   }
 +
@@ -230,10 +230,10 @@ index 0000000000..ca66b2f53f
 +   private EventBus events_;
 +}
 diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
-index c036e2d519..0ff515aa02 100644
+index 2403ec0645..aecbc02732 100644
 --- a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
 +++ b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
-@@ -1324,6 +1324,17 @@ well as menu structures (for main menu and popup menus).
+@@ -1363,6 +1363,17 @@ See `/src/gwt/tools/i18n-helpers/README.md`.
          desc="Edit options for the current project"
          windowMode="main"/>
  
@@ -252,18 +252,18 @@ index c036e2d519..0ff515aa02 100644
          menuLabel=""
          buttonLabel=""
 diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java
-index 37a88a2369..cbe16750f4 100644
+index c3121e22d3..7d78daff78 100644
 --- a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java
 +++ b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java
 @@ -2,6 +2,7 @@
   * Commands.java
   *
-  * Copyright (C) 2021 by RStudio, PBC
-+ * Copyright (C) 2020 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
-@@ -232,6 +233,18 @@ public abstract class
+  * Unless you have received this program directly from Posit Software pursuant
+  * to the terms of a commercial license agreement with Posit Software, then
+@@ -238,6 +239,18 @@ public abstract class
     public abstract AppCommand projectSweaveOptions();
     public abstract AppCommand setWorkingDirToProjectDir();
  
@@ -283,5 +283,5 @@ index 37a88a2369..cbe16750f4 100644
     public abstract AppCommand consoleClear();
     public abstract AppCommand interruptR();
 -- 
-2.33.0
+2.49.0
 
diff --git a/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch b/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch
index cb5acec..70f8201 100644
--- a/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch
+++ b/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch
@@ -1,4 +1,4 @@
-From b5f4604100d06bc52b31a5e661bc8d4f3cef3259 Mon Sep 17 00:00:00 2001
+From c3f3da76ead0a6a2b3faea52ac4ec864d5ef4fd1 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sun, 20 Dec 2020 00:25:42 +0100
 Subject: [PATCH 6/7] Look at ~/.local/share/rstudio/r-versions for custom R
@@ -11,17 +11,17 @@ Subject: [PATCH 6/7] Look at ~/.local/share/rstudio/r-versions for custom R
  3 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/src/cpp/server_core/RVersionsScanner.cpp b/src/cpp/server_core/RVersionsScanner.cpp
-index af5974c24d..7504fbb1ff 100644
+index 5006ba83af..478e4d7006 100644
 --- a/src/cpp/server_core/RVersionsScanner.cpp
 +++ b/src/cpp/server_core/RVersionsScanner.cpp
 @@ -2,6 +2,7 @@
   * RVersionsScanner.cpp
   *
-  * Copyright (C) 2021 by RStudio, PBC
-+ * Copyright (C) 2020 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
+  * Unless you have received this program directly from Posit Software pursuant
+  * to the terms of a commercial license agreement with Posit Software, then
 @@ -138,6 +139,11 @@ void RVersionsScanner::setFallbackVersion()
  }
  
@@ -34,7 +34,7 @@ index af5974c24d..7504fbb1ff 100644
  {
     if (!cachedVersions_.empty())
        return cachedVersions_;
-@@ -173,6 +179,20 @@ std::vector<r_util::RVersion> RVersionsScanner::getRVersions()
+@@ -174,6 +180,20 @@ std::vector<r_util::RVersion> RVersionsScanner::getRVersions()
        }
     }
  
@@ -56,7 +56,7 @@ index af5974c24d..7504fbb1ff 100644
     using namespace r_util;
     std::vector<r_util::RVersion> versions = r_util::enumerateRVersions(
 diff --git a/src/cpp/server_core/include/server_core/RVersionsScanner.hpp b/src/cpp/server_core/include/server_core/RVersionsScanner.hpp
-index 840429edf5..3cf9b7d79e 100644
+index ee06a3d536..1bb653b065 100644
 --- a/src/cpp/server_core/include/server_core/RVersionsScanner.hpp
 +++ b/src/cpp/server_core/include/server_core/RVersionsScanner.hpp
 @@ -45,6 +45,7 @@ public:
@@ -68,10 +68,10 @@ index 840429edf5..3cf9b7d79e 100644
     bool detectRVersion(const core::FilePath& rScriptPath,
                         core::r_util::RVersion* pVersion,
 diff --git a/src/cpp/session/SessionClientInit.cpp b/src/cpp/session/SessionClientInit.cpp
-index 6d9e5a064b..52bf324cb2 100644
+index b1180070b5..673b3bd03a 100644
 --- a/src/cpp/session/SessionClientInit.cpp
 +++ b/src/cpp/session/SessionClientInit.cpp
-@@ -515,8 +515,14 @@ void handleClientInit(const boost::function<void()>& initFunction,
+@@ -561,8 +561,14 @@ void handleClientInit(const boost::function<void()>& initFunction,
     sessionInfo["multi_session"] = options.multiSession();
  
     // Read versions from /etc/rstudio/r-versions
@@ -88,5 +88,5 @@ index 6d9e5a064b..52bf324cb2 100644
       {
         json::Object rVersionJson;
 -- 
-2.33.0
+2.49.0
 
diff --git a/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch b/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch
index 7f61e9c..ec4da3e 100644
--- a/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch
+++ b/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch
@@ -1,4 +1,4 @@
-From 4834bd54840c7df650b10222597f06a312ce24c6 Mon Sep 17 00:00:00 2001
+From e95f6f73246a35580e12cdb80ca9639aefb0f196 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sun, 20 Dec 2020 14:49:51 +0100
 Subject: [PATCH 7/7] detectRLocationsUsingR: Restore R_HOME at the end.
@@ -11,10 +11,10 @@ process is calling it, and its R_HOME may not be unset.
  1 file changed, 3 insertions(+)
 
 diff --git a/src/cpp/core/r_util/REnvironmentPosix.cpp b/src/cpp/core/r_util/REnvironmentPosix.cpp
-index dbc9a9a1af..8ec66fd840 100644
+index a4e964d49d..3fee33ff49 100644
 --- a/src/cpp/core/r_util/REnvironmentPosix.cpp
 +++ b/src/cpp/core/r_util/REnvironmentPosix.cpp
-@@ -492,6 +492,7 @@ bool detectRLocationsUsingR(const std::string& rScriptPath,
+@@ -493,6 +493,7 @@ bool detectRLocationsUsingR(const std::string& rScriptPath,
     // (the normal semantics of invoking the R script are that it overwrites
     // R_HOME and prints a warning -- this warning is co-mingled with the
     // output of R and messes up our parsing)
@@ -22,7 +22,7 @@ index dbc9a9a1af..8ec66fd840 100644
     core::system::setenv("R_HOME", "");
  
     // if no R path was specified for a module, the module binary path MUST be specified
-@@ -601,6 +602,8 @@ bool detectRLocationsUsingR(const std::string& rScriptPath,
+@@ -602,6 +603,8 @@ bool detectRLocationsUsingR(const std::string& rScriptPath,
        return false;
     }
  
@@ -32,5 +32,5 @@ index dbc9a9a1af..8ec66fd840 100644
  }
  #endif
 -- 
-2.33.0
+2.49.0