Fixed compile error; updated SSL patch; updated gwt

3 files changed, 36 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 705cd81b22f4..530bc2fac4b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Jun 15 20:11:20 UTC 2017
+# Mon Sep 25 17:42:44 UTC 2017
 pkgbase = rstudio-server-git
 	pkgdesc = A new integrated development environment (IDE) for R programming language
-	pkgver = v1.1.271.r0.ge631e32417
+	pkgver = v1.1.371.r116.g7da421da88
 	pkgrel = 1
 	url = http://www.rstudio.org/
 	install = rstudio-server-git.install
@@ -12,7 +12,7 @@ pkgbase = rstudio-server-git
 	makedepends = git
 	makedepends = cmake>=2.8
 	makedepends = boost>=1.5
-	makedepends = java-runtime
+	makedepends = jre8-openjdk
 	makedepends = apache-ant
 	makedepends = unzip
 	makedepends = bzip2
@@ -30,15 +30,15 @@ pkgbase = rstudio-server-git
 	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/gwt-2.7.0.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 = a8f3704a597b392910ea060284f21a03
+	md5sums = ddd572887957fd5cdfde3469bd8c1102
 	md5sums = d571313f511ad4a17014c4aef6d01bbc
-	md5sums = 9012aeab620b45aa74f6f4db3f192b44
+	md5sums = 1d253e9f6c2700d257de1ccc30958c7d
 
 pkgname = rstudio-server-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 89994a3d6429..606951839f4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 #
 pkgname=rstudio-server-git
 _gitname="rstudio"
-pkgver=v1.1.271.r0.ge631e32417
-_gwtver=2.7.0
+pkgver=v1.1.371.r116.g7da421da88
+_gwtver=2.8.1
 _ginver=1.5
 _clangver=3.8.0
 pkgrel=1
@@ -18,7 +18,7 @@ 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')
-makedepends=('git' 'cmake>=2.8' 'boost>=1.5' 'java-runtime' 'apache-ant' 'unzip' 'bzip2' 'pango' 'pam' 'zlib' 'wget')
+makedepends=('git' 'cmake>=2.8' 'boost>=1.5' 'jre8-openjdk' 'apache-ant' 'unzip' 'bzip2' 'pango' 'pam' 'zlib' 'wget')
 install="${pkgname}.install"
 conflicts=('rstudio-server')
 source=('git://github.com/rstudio/rstudio.git'
@@ -26,13 +26,14 @@ 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')
+	'ssl.patch'
+)
 md5sums=('SKIP'
          'eea28f7865720f6c8d5de12f3f631880'
          '2409168cc18bf5f341e107e6887fe359'
-         'a8f3704a597b392910ea060284f21a03'
+         'ddd572887957fd5cdfde3469bd8c1102'
          'd571313f511ad4a17014c4aef6d01bbc'
-         '9012aeab620b45aa74f6f4db3f192b44')
+         '1d253e9f6c2700d257de1ccc30958c7d')
          
 
 pkgver() {
diff --git a/ssl.patch b/ssl.patch
index 003540200d77..e7101f79a8d4 100644
--- a/ssl.patch
+++ b/ssl.patch
@@ -1,6 +1,26 @@
+diff --git a/src/cpp/core/CMakeLists.txt b/src/cpp/core/CMakeLists.txt
+index 5803988968..eb8d4d5efd 100644
+--- a/src/cpp/core/CMakeLists.txt
++++ b/src/cpp/core/CMakeLists.txt
+@@ -201,8 +201,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/PosixCrypto.cpp b/src/cpp/core/system/PosixCrypto.cpp
+index 2e4c01bb12..9653edb244 100644
 --- a/src/cpp/core/system/PosixCrypto.cpp
 +++ b/src/cpp/core/system/PosixCrypto.cpp
-@@ -18,13 +18,13 @@
+@@ -18,14 +18,14 @@
  
  #include <fcntl.h>
  
@@ -8,6 +28,7 @@
 -#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>
@@ -15,26 +36,10 @@
 +#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>
-
---- a/src/cpp/core/CMakeLists.txt
-+++ b/src/cpp/core/CMakeLists.txt
-@@ -200,7 +200,12 @@ if (UNIX)
-    endif()
- 
-    if(RSTUDIO_SERVER)
--      find_package(OpenSSL REQUIRED QUIET)
-+          #     find_package(OpenSSL REQUIRED QUIET)
-+      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 ${SSL} ${CRYPTO} )
-+      set(OPENSSL_LIBRARIES /usr/lib/openssl-1.0/libssl.so /usr/lib/openssl-1.0/libcrypto.so)
-       find_package(PAM REQUIRED)
-       set(CORE_SYSTEM_LIBRARIES
-          ${CORE_SYSTEM_LIBRARIES}