pyrox.dev
1From fbc2ea65406236a740b8734dd41dc5ddbc24f8c9 Mon Sep 17 00:00:00 2001
2From: mulrich <mulrich@entwicklerheld.local>
3Date: Mon, 8 Aug 2016 15:36:07 +0200
4Subject: [PATCH] disable security.framework
5
6---
7 CMakeLists.txt | 7 +++----
8 src/curl_stream.c | 9 ++++++++-
9 2 files changed, 11 insertions(+), 5 deletions(-)
10
11diff --git a/CMakeLists.txt b/CMakeLists.txt
12index 93a9e47..331e148 100644
13--- a/CMakeLists.txt
14+++ b/CMakeLists.txt
15@@ -49,7 +49,8 @@ ENDIF()
16
17 IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
18 SET( USE_ICONV ON )
19- FIND_PACKAGE(Security)
20+ # FIND_PACKAGE(Security)
21+ SET(SECURITY_FOUND "NO")
22 FIND_PACKAGE(CoreFoundation REQUIRED)
23 ENDIF()
24
25@@ -87,9 +88,7 @@ IF(MSVC)
26 OPTION(MSVC_CRTDBG "Enable CRTDBG memory leak reporting" OFF)
27 ENDIF()
28
29-IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
30- OPTION( USE_OPENSSL "Link with and use openssl library" ON )
31-ENDIF()
32+OPTION( USE_OPENSSL "Link with and use openssl library" ON )
33
34 CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtim "sys/types.h;sys/stat.h"
35 HAVE_STRUCT_STAT_ST_MTIM LANGUAGE C)
36diff --git a/src/curl_stream.c b/src/curl_stream.c
37index 98de187..a8a9f4c 100644
38--- a/src/curl_stream.c
39+++ b/src/curl_stream.c
40@@ -309,7 +309,14 @@ int git_curl_stream_new(git_stream **out, const char *host, const char *port)
41 curl_easy_setopt(handle, CURLOPT_HTTPPROXYTUNNEL, 1);
42 curl_easy_setopt(handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
43
44- /* curl_easy_setopt(handle, CURLOPT_VERBOSE, 1); */
45+ const char* cainfo = getenv("SSL_CERT_FILE");
46+ if(cainfo != NULL) {
47+ curl_easy_setopt(handle, CURLOPT_CAINFO, cainfo);
48+ }
49+
50+ /*
51+ curl_easy_setopt(handle, CURLOPT_VERBOSE, 1);
52+ */
53
54 st->parent.version = GIT_STREAM_VERSION;
55 st->parent.encrypted = 0; /* we don't encrypt ourselves */
56--
572.3.8 (Apple Git-58)
58