Add openssl patch

3 files changed, 39 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b039a55207e3..9b09abd3f2c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rstudio-desktop-git
 	pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
-	pkgver = 1.1.55
+	pkgver = 1.1.215
 	pkgrel = 1
 	url = https://www.rstudio.com/products/rstudio/
 	install = rstudio-desktop-git.install
@@ -10,11 +10,10 @@ pkgbase = rstudio-desktop-git
 	makedepends = git
 	makedepends = cmake>=2.8
 	makedepends = boost>=1.5
-	makedepends = java-runtime=8
+	makedepends = java-environment
 	makedepends = apache-ant
 	makedepends = unzip
 	makedepends = openssl
-	makedepends = pango
 	makedepends = libcups
 	makedepends = pam
 	makedepends = wget
@@ -22,12 +21,18 @@ pkgbase = rstudio-desktop-git
 	depends = r>=2.11.1
 	depends = hicolor-icon-theme
 	depends = shared-mime-info
+	depends = pango
 	depends = hunspell-en
 	depends = mathjax
 	depends = pandoc
-	depends = qt5-webkit
-	depends = qt5-svg
 	depends = clang
+	depends = qt5-base
+	depends = qt5-declarative
+	depends = qt5-location
+	depends = qt5-sensors
+	depends = qt5-svg
+	depends = qt5-webkit
+	depends = qt5-xmlpatterns
 	optdepends = git: for git support
 	optdepends = subversion: for subversion suuport
 	optdepends = openssh-askpass: for a git ssh access
@@ -40,9 +45,11 @@ pkgbase = rstudio-desktop-git
 	source = git+https://github.com/rstudio/rstudio.git
 	source = https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip
 	source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip
+	source = socketproxy-openssl.patch
 	md5sums = SKIP
 	md5sums = 2409168cc18bf5f341e107e6887fe359
 	md5sums = a8f3704a597b392910ea060284f21a03
+	md5sums = d571313f511ad4a17014c4aef6d01bbc
 
 pkgname = rstudio-desktop-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ed0724ff1a23..fe4d8545db29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=rstudio-desktop-git
 _gitname=rstudio
-pkgver=1.1.74
+pkgver=1.1.215
 _gwtver=2.7.0
 _ginver=1.5
 _clangver=3.8.0
@@ -11,8 +11,8 @@ pkgdesc="A powerful and productive integrated development environment (IDE) for
 arch=('i686' 'x86_64')
 url="https://www.rstudio.com/products/rstudio/"
 license=('AGPL3')
-depends=('boost-libs>=1.5' 'r>=2.11.1' 'hicolor-icon-theme' 'shared-mime-info' 'hunspell-en' 'mathjax' 'pandoc'  'qt5-webkit' 'qt5-svg' 'clang')
-makedepends=('git' 'cmake>=2.8' 'boost>=1.5' 'java-runtime=8' 'apache-ant' 'unzip' 'openssl' 'pango' 'libcups' 'pam' 'wget')
+depends=('boost-libs>=1.5' 'r>=2.11.1' hicolor-icon-theme shared-mime-info pango hunspell-en mathjax pandoc clang qt5-base qt5-declarative qt5-location qt5-sensors qt5-svg qt5-webkit qt5-xmlpatterns)
+makedepends=(git 'cmake>=2.8' 'boost>=1.5' java-environment apache-ant unzip openssl libcups pam wget)
 optdepends=('git: for git support'
 	    'subversion: for subversion suuport'
 	    'openssh-askpass: for a git ssh access')
@@ -22,10 +22,12 @@ install="${pkgname}.install"
 
 source=("git+https://github.com/rstudio/rstudio.git"
         "https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip"
-        "https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip")
+        "https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip"
+        socketproxy-openssl.patch)
 md5sums=('SKIP'
          '2409168cc18bf5f341e107e6887fe359'
-         'a8f3704a597b392910ea060284f21a03')
+         'a8f3704a597b392910ea060284f21a03'
+         'd571313f511ad4a17014c4aef6d01bbc')
 
 pkgver() {
     cd "${srcdir}/${_gitname}"
@@ -33,7 +35,11 @@ pkgver() {
 }
 
 prepare() {
-    msg "Extracting dependencies"
+    msg "Apply socketproxy-openssl.patch..."
+    cd "${srcdir}/${_gitname}"
+    patch -p1 < ${srcdir}/socketproxy-openssl.patch
+
+    msg "Extracting dependencies..."
     cd "${srcdir}/${_gitname}/src/gwt"
     install -d lib/{gin,gwt}
     install -d lib/gin/${_ginver}
@@ -50,7 +56,7 @@ prepare() {
     ln -sfT "/usr/lib/libclang.so" libclang/3.5/libclang.so
     ln -sfT "/usr/lib/clang/$_clangver/include" libclang/builtin-headers/3.5
 
-    msg "Downloading and installing R packages"
+    msg "Downloading and installing R packages..."
     bash install-packages
 }
 
diff --git a/socketproxy-openssl.patch b/socketproxy-openssl.patch
new file mode 100644
index 000000000000..9d521eda2e27
--- /dev/null
+++ b/socketproxy-openssl.patch
@@ -0,0 +1,14 @@
+--- 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)