From 606e0ba647342967ebcf0676c59bee9ec8cb51e0 Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Thu, 16 Apr 2020 17:47:16 -0500
Subject: [PATCH 1/3] Update RStudio Inc. -> RStudio, PBC

---
 builder/package.centos-6    | 4 ++--
 builder/package.centos-7    | 4 ++--
 builder/package.centos-8    | 4 ++--
 builder/package.debian-9    | 4 ++--
 builder/package.opensuse-15 | 4 ++--
 builder/package.opensuse-42 | 4 ++--
 builder/package.ubuntu-1604 | 4 ++--
 builder/package.ubuntu-1804 | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/builder/package.centos-6 b/builder/package.centos-6
index beb371b..93fadd8 100644
--- a/builder/package.centos-6
+++ b/builder/package.centos-6
@@ -36,12 +36,12 @@ fpm \
   -t rpm \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   --after-install /post-install.sh \
   --after-remove /before-remove.sh \
diff --git a/builder/package.centos-7 b/builder/package.centos-7
index e35430d..e927d8f 100644
--- a/builder/package.centos-7
+++ b/builder/package.centos-7
@@ -22,12 +22,12 @@ fpm \
   -t rpm \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   --after-install /post-install.sh \
   --after-remove /before-remove.sh \
diff --git a/builder/package.centos-8 b/builder/package.centos-8
index 42f2c1c..a873d1d 100644
--- a/builder/package.centos-8
+++ b/builder/package.centos-8
@@ -20,12 +20,12 @@ fpm \
   -t rpm \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   --after-install /post-install.sh \
   --after-remove /before-remove.sh \
diff --git a/builder/package.debian-9 b/builder/package.debian-9
index 620dd48..eb536bf 100644
--- a/builder/package.debian-9
+++ b/builder/package.debian-9
@@ -9,12 +9,12 @@ fpm \
   -t deb \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   -p /tmp/output/debian-9/ \
   -d ca-certificates \
diff --git a/builder/package.opensuse-15 b/builder/package.opensuse-15
index 83a3ecf..db01d67 100644
--- a/builder/package.opensuse-15
+++ b/builder/package.opensuse-15
@@ -22,12 +22,12 @@ fpm \
   -t rpm \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   --after-install /post-install.sh \
   --after-remove /before-remove.sh \
diff --git a/builder/package.opensuse-42 b/builder/package.opensuse-42
index 714b8bb..5bf8221 100644
--- a/builder/package.opensuse-42
+++ b/builder/package.opensuse-42
@@ -22,12 +22,12 @@ fpm \
   -t rpm \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   --after-install /post-install.sh \
   --after-remove /before-remove.sh \
diff --git a/builder/package.ubuntu-1604 b/builder/package.ubuntu-1604
index fc5b187..395020d 100644
--- a/builder/package.ubuntu-1604
+++ b/builder/package.ubuntu-1604
@@ -9,12 +9,12 @@ fpm \
   -t deb \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   -p /tmp/output/ubuntu-1604/ \
   -d g++ \
diff --git a/builder/package.ubuntu-1804 b/builder/package.ubuntu-1804
index a1ac4de..2e59f8f 100644
--- a/builder/package.ubuntu-1804
+++ b/builder/package.ubuntu-1804
@@ -9,12 +9,12 @@ fpm \
   -t deb \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   -p /tmp/output/ubuntu-1804/ \
   -d g++ \

From 374827079c2d579889efc6386c3005846728b2b7 Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Thu, 16 Apr 2020 18:15:53 -0500
Subject: [PATCH 2/3] Fix pip installation on CentOS 6

Previously, the pip install was failing with:
InsecurePlatformWarning: A true SSLContext object is not available.
---
 builder/Dockerfile.centos-6 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builder/Dockerfile.centos-6 b/builder/Dockerfile.centos-6
index 71d60a2..a70520a 100644
--- a/builder/Dockerfile.centos-6
+++ b/builder/Dockerfile.centos-6
@@ -50,8 +50,8 @@ RUN yum -y update \
     && yum clean all
 
 # Install pip
-RUN curl "https://bootstrap.pypa.io/2.6/get-pip.py" -o "get-pip.py" && \
-    python get-pip.py
+RUN yum install -y epel-release && \
+   yum install -y python-pip
 
 # Install AWS CLI.
 RUN pip install awscli --upgrade --user && \

From 7d2f5ee7cc083292689024277f7a0460f30e66b9 Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Wed, 22 Apr 2020 17:53:27 -0500
Subject: [PATCH 3/3] Update SLES 12 installation for Science repository
 removal

The Science repo no longer supports SLES 12. Switch to using the
Python backports repository on SLES 12 for openblas-devel.
---
 README.md  | 5 +++--
 install.sh | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4fb898f..6301fd5 100644
--- a/README.md
+++ b/README.md
@@ -107,10 +107,11 @@ sudo yum install R-${R_VERSION}-1-1.x86_64.rpm
 
 #### SUSE Linux
 
-Enable the [Science](https://en.opensuse.org/openSUSE:Science_Repositories) repository (SLES 12 only):
+Enable the Python backports repository (SLES 12 only):
 ```bash
 # SLES 12
-sudo zypper --gpg-auto-import-keys addrepo https://download.opensuse.org/repositories/science/SLE_12/science.repo
+VERSION="SLE_$(grep "^VERSION=" /etc/os-release | sed -e 's/VERSION=//' -e 's/"//g' -e 's/-/_/')"
+sudo zypper --gpg-auto-import-keys addrepo https://download.opensuse.org/repositories/devel:/languages:/python:/backports/$VERSION/devel:languages:python:backports.repo
 ```
 
 Download the rpm package:
diff --git a/install.sh b/install.sh
index f2c7a25..7de8dd7 100755
--- a/install.sh
+++ b/install.sh
@@ -291,7 +291,7 @@ install_pre () {
       install_epel "${ver}"
       ;;
     "SLES12")
-      install_sci
+      install_python_backports
       ;;
     "LEAP12" | "LEAP15" | "SLES15")
       ;;
@@ -317,9 +317,10 @@ install_epel () {
   esac
 }
 
-# Installs the Science repository for SLES 12
-install_sci () {
-  ${SUDO} zypper --gpg-auto-import-keys addrepo https://download.opensuse.org/repositories/science/SLE_12/science.repo
+# Installs the Python backports repository for SLES 12
+install_python_backports () {
+  SLE_VERSION="SLE_$(grep "^VERSION=" /etc/os-release | sed -e 's/VERSION=//' -e 's/"//g' -e 's/-/_/')"
+  ${SUDO} zypper --gpg-auto-import-keys addrepo https://download.opensuse.org/repositories/devel:/languages:/python:/backports/$SLE_VERSION/devel:languages:python:backports.repo
 }
 
 do_download () {