Bumped gwt; removed patches

3 files changed, 10 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c08ccc8a42f..8c834fda78d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon Jan  8 00:00:53 UTC 2018
 pkgbase = rstudio-server-git
 	pkgdesc = A new integrated development environment (IDE) for R programming language
-	pkgver = v1.1.371.r458.g7755310ae8
+	pkgver = v1.2.1330.r329.g7747ad37e6
 	pkgrel = 1
 	url = http://www.rstudio.org/
 	install = rstudio-server-git.install
@@ -30,13 +28,13 @@ pkgbase = rstudio-server-git
 	source = git://github.com/rstudio/rstudio.git
 	source = rstudio-server.service
 	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 = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.2.zip
 	md5sums = SKIP
 	md5sums = eea28f7865720f6c8d5de12f3f631880
 	md5sums = e2617189fe5c138945b8cc95f26bd476
-	md5sums = ddd572887957fd5cdfde3469bd8c1102
+	md5sums = c295406d68c5ef364e445068599aa6d4
 	md5sums = d571313f511ad4a17014c4aef6d01bbc
+	md5sums = 6b9a2c3bec71132cca676f64c7b8db53
 
 pkgname = rstudio-server-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 70b9fce5dabf..917c67456c71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 #
 pkgname=rstudio-server-git
 _gitname="rstudio"
-pkgver=v1.1.371.r458.g7755310ae8
-_gwtver=2.8.1
+pkgver=v1.2.1330.r329.g7747ad37e6
+_gwtver=2.8.2
 _ginver=2.1.2
 _clangver=3.8.0
 pkgrel=1
@@ -25,13 +25,13 @@ source=('git://github.com/rstudio/rstudio.git'
 	'rstudio-server.service'
 	"https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip"
 	"https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip"
-	'socketproxy-openssl.patch'
 )
 md5sums=('SKIP'
          'eea28f7865720f6c8d5de12f3f631880'
          'e2617189fe5c138945b8cc95f26bd476'
-         'ddd572887957fd5cdfde3469bd8c1102'
-         'd571313f511ad4a17014c4aef6d01bbc')
+         'c295406d68c5ef364e445068599aa6d4'
+         'd571313f511ad4a17014c4aef6d01bbc'
+         '6b9a2c3bec71132cca676f64c7b8db53')
          
 
 pkgver() {
@@ -40,9 +40,7 @@ pkgver() {
 }
 
 prepare () {
-	#msg "Apply socketproxy-openssl.patch"
-	#cd ${srcdir}/$_gitname
-	#patch -p1 < ${srcdir}/socketproxy-openssl.patch
+	cd ${srcdir}/$_gitname
 
 	msg "Extracting dependencies..."
 	    cd "${srcdir}/${_gitname}/src/gwt"
diff --git a/socketproxy-openssl.patch b/socketproxy-openssl.patch
deleted file mode 100644
index 9d521eda2e27..000000000000
--- a/socketproxy-openssl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/cpp/core/http/SocketProxy.cpp.orig	2017-04-28 09:07:11.342017929 +0800
-+++ b/src/cpp/core/http/SocketProxy.cpp	2017-04-28 09:12:35.662573281 +0800
-@@ -148,8 +148,9 @@
- #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);
-+   //return error.code().category() == boost::asio::error::get_ssl_category() &&
-+   //       error.code().value() == ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ);
-+   return error.code() == boost::asio::ssl::error::stream_truncated;
- }
- #else
- bool isSslShutdownError(const core::Error& error)