v1.1.419

3 files changed, 5 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c973828b1cf..779fdb52ebcb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rstudio-desktop
 	pkgdesc = Open source and enterprise-ready professional software for the R community
-	pkgver = 1.1.383
+	pkgver = 1.1.419
 	pkgrel = 1
 	url = http://www.rstudio.com/
 	arch = i686
@@ -31,16 +31,14 @@ pkgbase = rstudio-desktop
 	conflicts = rstudio-desktop-preview-bin
 	noextract = core-dictionaries.zip
 	noextract = gin-1.5.zip
-	source = rstudio-1.1.383.tar.gz::https://github.com/rstudio/rstudio/tarball/v1.1.383
+	source = rstudio-1.1.419.tar.gz::https://github.com/rstudio/rstudio/tarball/v1.1.419
 	source = https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip
 	source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip
 	source = https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-	source = socketproxy-openssl.patch
-	sha256sums = 0647140dc5f527b4b5c184e4280e967c3ce381596e317423d4e940d6da03c388
+	sha256sums = 597c373092ea3416da2e44fada07734e106b40f961784bf5d951641c18c29f3a
 	sha256sums = f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94
 	sha256sums = aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3
 	sha256sums = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
-	sha256sums = 794f7a1eff009d2ff5576bb9ace50f6fedc96cf7c2709680c7531b426037bfe7
 
 pkgname = rstudio-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index f2e9edcf7196..f7da94e38fce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
 # Maintainer: Philipp A. <flying-sheep@web.de>
 pkgname=rstudio-desktop
-pkgver=1.1.383
+pkgver=1.1.419
 _gwtver=2.7.0
 _ginver=1.5
 _clangver=3.6.1
@@ -23,15 +23,13 @@ source=(
 	"https://s3.amazonaws.com/rstudio-buildtools/gin-$_ginver.zip"
 	"https://s3.amazonaws.com/rstudio-buildtools/gwt-$_gwtver.zip"
 	'https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip'
-	'socketproxy-openssl.patch'
 )
 noextract=('core-dictionaries.zip' "gin-$_ginver.zip")
 sha256sums=(
-	'0647140dc5f527b4b5c184e4280e967c3ce381596e317423d4e940d6da03c388'
+	'597c373092ea3416da2e44fada07734e106b40f961784bf5d951641c18c29f3a'
 	'f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94'
 	'aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3'
 	'4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494'
-	'794f7a1eff009d2ff5576bb9ace50f6fedc96cf7c2709680c7531b426037bfe7'
 )
 
 _pkgname=rstudio
@@ -59,11 +57,6 @@ prepare() {
 build() {
 	cd "$srcdir/$_pkgname-$_pkgname-"*
 	
-	# problem with openssl-1.1.0. Fixed in some future rstudio-1.1.x:
-	# https://github.com/rstudio/rstudio/pull/1894
-	# adapted from upstream patch
-	patch -p 1 -i "$srcdir/socketproxy-openssl.patch"
-	
 	install -d src/gwt/lib/{gin/$_ginver,gwt/$_gwtver}
 	
 	cp -r "$srcdir/gin-$_ginver/"* "src/gwt/lib/gin/$_ginver"
diff --git a/socketproxy-openssl.patch b/socketproxy-openssl.patch
deleted file mode 100644
index 25429af2deee..000000000000
--- a/socketproxy-openssl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ea127f04e7d04ac049eb837d35588ec199b11226 Mon Sep 17 00:00:00 2001
-From: Kevin Ushey <kevinushey@gmail.com>
-Date: Tue, 2 Jan 2018 08:59:54 -0800
-Subject: [PATCH] compile with newer OpenSSL variants
-
----
- src/cpp/core/http/SocketProxy.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/cpp/core/http/SocketProxy.cpp b/src/cpp/core/http/SocketProxy.cpp
-index 6d352b6e3b..49c133c5cb 100644
---- a/src/cpp/core/http/SocketProxy.cpp
-+++ b/src/cpp/core/http/SocketProxy.cpp
-@@ -148,8 +148,14 @@ namespace {
- #ifndef _WIN32
- bool isSslShutdownError(const core::Error& error)
- {
-+#ifdef SSL_R_SHORT_READ
-+   // OpenSSL 1.0.0
-    return error.code().category() == boost::asio::error::get_ssl_category() &&
-           error.code().value() == ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ);
-+#else
-+   // OpenSSL 1.1.0
-+   return error.code() == boost::asio::ssl::error::stream_truncated;
-+#endif
- }
- #else
- bool isSslShutdownError(const core::Error& error)