v1.1.383

5 files changed, 31 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99271507b650..1c973828b1cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rstudio-desktop
 	pkgdesc = Open source and enterprise-ready professional software for the R community
-	pkgver = 1.0.153
-	pkgrel = 2
+	pkgver = 1.1.383
+	pkgrel = 1
 	url = http://www.rstudio.com/
 	arch = i686
 	arch = x86_64
@@ -31,20 +31,16 @@ pkgbase = rstudio-desktop
 	conflicts = rstudio-desktop-preview-bin
 	noextract = core-dictionaries.zip
 	noextract = gin-1.5.zip
-	source = rstudio-1.0.153.tar.gz::https://github.com/rstudio/rstudio/tarball/v1.0.153
+	source = rstudio-1.1.383.tar.gz::https://github.com/rstudio/rstudio/tarball/v1.1.383
 	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 = rroutines-style.patch
 	source = socketproxy-openssl.patch
-	source = trace-cerr.patch
-	sha256sums = 099ceec1480c7605285782ba5ecbf96eb6191d6f9a90e988c151578eb8bde9df
+	sha256sums = 0647140dc5f527b4b5c184e4280e967c3ce381596e317423d4e940d6da03c388
 	sha256sums = f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94
 	sha256sums = aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3
 	sha256sums = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
-	sha256sums = b953527f46320d64425f7de257f774d7f354199b7c6a71f126ed467b6e6dd52b
-	sha256sums = 65b9f9b1f159bbfbcb1544f444e210e58549c0d1c0c6421cf750ce3517088134
-	sha256sums = 42705a30c704d1e36ef7a9b3790e64aea868115ba102c6d1b3d87e0ba0c7f928
+	sha256sums = 794f7a1eff009d2ff5576bb9ace50f6fedc96cf7c2709680c7531b426037bfe7
 
 pkgname = rstudio-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index 80a9e468c478..f2e9edcf7196 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
 # Maintainer: Philipp A. <flying-sheep@web.de>
 pkgname=rstudio-desktop
-pkgver=1.0.153
+pkgver=1.1.383
 _gwtver=2.7.0
 _ginver=1.5
 _clangver=3.6.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Open source and enterprise-ready professional software for the R community"
 arch=(i686 x86_64)
 url="http://www.rstudio.com/"
@@ -23,19 +23,15 @@ 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'
-	'rroutines-style.patch'
 	'socketproxy-openssl.patch'
-	'trace-cerr.patch'
 )
 noextract=('core-dictionaries.zip' "gin-$_ginver.zip")
 sha256sums=(
-	'099ceec1480c7605285782ba5ecbf96eb6191d6f9a90e988c151578eb8bde9df'
+	'0647140dc5f527b4b5c184e4280e967c3ce381596e317423d4e940d6da03c388'
 	'f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94'
 	'aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3'
 	'4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494'
-	'b953527f46320d64425f7de257f774d7f354199b7c6a71f126ed467b6e6dd52b'
-	'65b9f9b1f159bbfbcb1544f444e210e58549c0d1c0c6421cf750ce3517088134'
-	'42705a30c704d1e36ef7a9b3790e64aea868115ba102c6d1b3d87e0ba0c7f928'
+	'794f7a1eff009d2ff5576bb9ace50f6fedc96cf7c2709680c7531b426037bfe7'
 )
 
 _pkgname=rstudio
@@ -63,12 +59,10 @@ prepare() {
 build() {
 	cd "$srcdir/$_pkgname-$_pkgname-"*
 	
-	patch -p 1 -i "$srcdir/rroutines-style.patch"
-	# problem with openssl-1.1.0. fixed in rstudio-1.1.x:
-	# https://github.com/rstudio/rstudio/pull/1063/commits/e8c9a7783f3ff44dea2e2464b4bf2904325c72cd
-	# replicating upstream patch
+	# 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"
-	patch -p 1 -i "$srcdir/trace-cerr.patch"
 	
 	install -d src/gwt/lib/{gin/$_ginver,gwt/$_gwtver}
 	
diff --git a/rroutines-style.patch b/rroutines-style.patch
deleted file mode 100644
index 522e8bcc755b..000000000000
--- a/rroutines-style.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/cpp/r/RRoutines.cpp
-+++ b/src/cpp/r/RRoutines.cpp
-@@ -59,7 +59,6 @@
-       nullMethodDef.fun = NULL ;
-       nullMethodDef.numArgs = 0 ;
-       nullMethodDef.types = NULL;
--      nullMethodDef.styles = NULL;
-       s_cMethods.push_back(nullMethodDef);
-       pCMethods = &s_cMethods[0];
-    }
diff --git a/socketproxy-openssl.patch b/socketproxy-openssl.patch
index 7a406b559c39..25429af2deee 100644
--- a/socketproxy-openssl.patch
+++ b/socketproxy-openssl.patch
@@ -1,12 +1,28 @@
+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,7 @@
+@@ -148,8 +148,14 @@ namespace {
  #ifndef _WIN32
  bool isSslShutdownError(const core::Error& error)
  {
--   return error.code().category() == boost::asio::error::get_ssl_category() &&
--          error.code().value() == ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ);
++#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)
diff --git a/trace-cerr.patch b/trace-cerr.patch
deleted file mode 100644
index c0e71938f819..000000000000
--- a/trace-cerr.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/cpp/core/Trace.cpp
-+++ b/src/cpp/core/Trace.cpp
-@@ -16,6 +16,7 @@
- 
- #include <core/Trace.hpp>
- 
-+#include <iostream>
- #include <map>
- 
- #include <boost/utility.hpp>