Removed SSL-1.0 patch

- SSL-1.1 now supported by default
- Updated the gin version

3 files changed, 10 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3aa797830d67..aaa734c20499 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Oct  6 07:11:00 UTC 2017
+# Thu Nov  9 19:31:53 UTC 2017
 pkgbase = rstudio-server-git
 	pkgdesc = A new integrated development environment (IDE) for R programming language
-	pkgver = v1.1.371.r181.g47545b0a1c
+	pkgver = v1.1.371.r343.g267c8453e1
 	pkgrel = 1
 	url = http://www.rstudio.org/
 	install = rstudio-server-git.install
@@ -22,23 +22,21 @@ pkgbase = rstudio-server-git
 	makedepends = wget
 	depends = r>=2.11.1
 	depends = boost-libs>=1.5
-	depends = openssl-1.0
+	depends = openssl
 	depends = mathjax
 	depends = pandoc
 	depends = clang
 	conflicts = rstudio-server
 	source = git://github.com/rstudio/rstudio.git
 	source = rstudio-server.service
-	source = https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip
+	source = https://s3.amazonaws.com/rstudio-buildtools/gin-2.1.2.zip
 	source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.1.zip
 	source = socketproxy-openssl.patch
-	source = ssl.patch
 	md5sums = SKIP
 	md5sums = eea28f7865720f6c8d5de12f3f631880
-	md5sums = 2409168cc18bf5f341e107e6887fe359
+	md5sums = e2617189fe5c138945b8cc95f26bd476
 	md5sums = ddd572887957fd5cdfde3469bd8c1102
 	md5sums = d571313f511ad4a17014c4aef6d01bbc
-	md5sums = 57fcbdd42207d978e405fd5072d59189
 
 pkgname = rstudio-server-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6210e396ae7b..5774d795bf3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,16 +8,16 @@
 #
 pkgname=rstudio-server-git
 _gitname="rstudio"
-pkgver=v1.1.371.r181.g47545b0a1c
+pkgver=v1.1.371.r343.g267c8453e1
 _gwtver=2.8.1
-_ginver=1.5
+_ginver=2.1.2
 _clangver=3.8.0
 pkgrel=1
 pkgdesc="A new integrated development environment (IDE) for R programming language"
 arch=('i686' 'x86_64')
 url="http://www.rstudio.org/"
 license=('AGPL3')
-depends=('r>=2.11.1' 'boost-libs>=1.5' 'openssl-1.0' 'mathjax' 'pandoc' 'clang')
+depends=('r>=2.11.1' 'boost-libs>=1.5' 'openssl' 'mathjax' 'pandoc' 'clang')
 makedepends=('git' 'cmake>=2.8' 'boost>=1.5' 'jre8-openjdk' 'apache-ant' 'unzip' 'bzip2' 'pango' 'pam' 'zlib' 'wget')
 install="${pkgname}.install"
 conflicts=('rstudio-server')
@@ -26,14 +26,12 @@ source=('git://github.com/rstudio/rstudio.git'
 	"https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip"
 	"https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip"
 	'socketproxy-openssl.patch'
-	'ssl.patch'
 )
 md5sums=('SKIP'
          'eea28f7865720f6c8d5de12f3f631880'
-         '2409168cc18bf5f341e107e6887fe359'
+         'e2617189fe5c138945b8cc95f26bd476'
          'ddd572887957fd5cdfde3469bd8c1102'
-         'd571313f511ad4a17014c4aef6d01bbc'
-         '57fcbdd42207d978e405fd5072d59189')
+         'd571313f511ad4a17014c4aef6d01bbc')
          
 
 pkgver() {
@@ -45,8 +43,6 @@ prepare () {
 	msg "Apply socketproxy-openssl.patch"
 	cd ${srcdir}/$_gitname
 	patch -p1 < ${srcdir}/socketproxy-openssl.patch
-	msg "Apply SSL-1.0 patch"
-	patch -p1 < ${srcdir}/ssl.patch
 
 	msg "Extracting dependencies..."
 	    cd "${srcdir}/${_gitname}/src/gwt"
diff --git a/ssl.patch b/ssl.patch
deleted file mode 100644
index b1ef69503586..000000000000
--- a/ssl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/src/cpp/core/CMakeLists.txt b/src/cpp/core/CMakeLists.txt
-index 3990f893d3..d5b390dacf 100644
---- a/src/cpp/core/CMakeLists.txt
-+++ b/src/cpp/core/CMakeLists.txt
-@@ -202,8 +202,12 @@ if (UNIX)
-    endif()
- 
-    if(RSTUDIO_SERVER)
--      find_package(OpenSSL REQUIRED QUIET)
-+      #find_package(OpenSSL REQUIRED QUIET)
-       find_package(PAM REQUIRED)
-+      find_library(SSL ssl PATHS /usr/lib/openssl-1.0)
-+      find_library(CRYPTO crypto PATHS /usr/lib/openssl-1.0)
-+	set(OPENSSL_INCLUDE_DIRS /usr/include/openssl-1.0)
-+	set(OPENSSL_LIBRARIES /usr/lib/openssl-1.0/libssl.so /usr/lib/openssl-1.0/libcrypto.so)
-       set(CORE_SYSTEM_LIBRARIES
-          ${CORE_SYSTEM_LIBRARIES}
-          ${OPENSSL_LIBRARIES}
-diff --git a/src/cpp/core/system/Crypto.cpp b/src/cpp/core/system/Crypto.cpp
-index da286d2950..4569e8ba07 100644
---- a/src/cpp/core/system/Crypto.cpp
-+++ b/src/cpp/core/system/Crypto.cpp
-@@ -18,14 +18,14 @@
- 
- #include <fcntl.h>
- 
--#include <openssl/err.h>
--#include <openssl/hmac.h>
--#include <openssl/bio.h>
--#include <openssl/buffer.h>
--#include <openssl/evp.h>
--#include <openssl/pem.h>
--#include <openssl/rand.h>
--#include <openssl/rsa.h>
-+#include <openssl-1.0/openssl//err.h>
-+#include <openssl-1.0/openssl//hmac.h>
-+#include <openssl-1.0/openssl//bio.h>
-+#include <openssl-1.0/openssl//buffer.h>
-+#include <openssl-1.0/openssl//evp.h>
-+#include <openssl-1.0/openssl//pem.h>
-+#include <openssl-1.0/openssl//rand.h>
-+#include <openssl-1.0/openssl//rsa.h>
- 
- #include <algorithm>
-