diff options
| author | Stephen Martin | 2017-10-06 02:11:17 -0500 |
|---|---|---|
| committer | Stephen Martin | 2017-10-06 02:11:17 -0500 |
| commit | d42cd74e4eae3d9f5915e2e141acc27b4ae7d4cf (patch) | |
| tree | 30813bd722b812d290e876b25470924e14fc38b6 | |
| parent | 7d86583e5020c88b42d22443f19c89f32c014d59 (diff) | |
| download | aur-d42cd74e4eae3d9f5915e2e141acc27b4ae7d4cf.tar.gz | |
Modified ssl patch to use Crypto instead of PosixCrypto
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | ssl.patch | 34 |
3 files changed, 22 insertions, 22 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Sep 25 17:42:44 UTC 2017 +# Fri Oct 6 07:11:00 UTC 2017 pkgbase = rstudio-server-git pkgdesc = A new integrated development environment (IDE) for R programming language - pkgver = v1.1.371.r116.g7da421da88 + pkgver = v1.1.371.r181.g47545b0a1c pkgrel = 1 url = http://www.rstudio.org/ install = rstudio-server-git.install @@ -38,7 +38,7 @@ pkgbase = rstudio-server-git md5sums = 2409168cc18bf5f341e107e6887fe359 md5sums = ddd572887957fd5cdfde3469bd8c1102 md5sums = d571313f511ad4a17014c4aef6d01bbc - md5sums = 1d253e9f6c2700d257de1ccc30958c7d + md5sums = 57fcbdd42207d978e405fd5072d59189 pkgname = rstudio-server-git @@ -8,7 +8,7 @@ # pkgname=rstudio-server-git _gitname="rstudio" -pkgver=v1.1.371.r116.g7da421da88 +pkgver=v1.1.371.r181.g47545b0a1c _gwtver=2.8.1 _ginver=1.5 _clangver=3.8.0 @@ -33,7 +33,7 @@ md5sums=('SKIP' '2409168cc18bf5f341e107e6887fe359' 'ddd572887957fd5cdfde3469bd8c1102' 'd571313f511ad4a17014c4aef6d01bbc' - '1d253e9f6c2700d257de1ccc30958c7d') + '57fcbdd42207d978e405fd5072d59189') pkgver() { diff --git a/ssl.patch b/ssl.patch index e7101f79a8d4..b1ef69503586 100644 --- a/ssl.patch +++ b/ssl.patch @@ -1,25 +1,25 @@ diff --git a/src/cpp/core/CMakeLists.txt b/src/cpp/core/CMakeLists.txt -index 5803988968..eb8d4d5efd 100644 +index 3990f893d3..d5b390dacf 100644 --- a/src/cpp/core/CMakeLists.txt +++ b/src/cpp/core/CMakeLists.txt -@@ -201,8 +201,12 @@ if (UNIX) +@@ -202,8 +202,12 @@ if (UNIX) endif() if(RSTUDIO_SERVER) - find_package(OpenSSL REQUIRED QUIET) -+ #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(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 +diff --git a/src/cpp/core/system/Crypto.cpp b/src/cpp/core/system/Crypto.cpp +index da286d2950..4569e8ba07 100644 +--- a/src/cpp/core/system/Crypto.cpp ++++ b/src/cpp/core/system/Crypto.cpp @@ -18,14 +18,14 @@ #include <fcntl.h> @@ -32,14 +32,14 @@ index 2e4c01bb12..9653edb244 100644 -#include <openssl/pem.h> -#include <openssl/rand.h> -#include <openssl/rsa.h> -+#include <openssl-1.0/openssl/err.h> -+#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 <openssl-1.0/openssl//err.h> ++#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> |