proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-20 06:05:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates to patches according to current upstream

Browse Source
This commit is contained in:
Raju Devidas 2018-12-27 11:06:11 +05:30
parent 7838d95547
commit 105f5b6eae
2 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
debian/patches/disable-online-tests.patch vendored
View File

@ -2,18 +2,12 @@ Skip tests that needs an active internet connection
--- a/tests/CMakeLists.txt --- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt
@@ -53,11 +53,11 @@ @@ -52,8 +52,3 @@ IF (MSVC_IDE)
SET_SOURCE_FILES_PROPERTIES("precompiled.c" COMPILE_FLAGS "/Ycprecompiled.h")
ENDIF () ENDIF ()
IF (USE_HTTPS) -ADD_TEST(offline "${libgit2_BINARY_DIR}/libgit2_clar" -v -xonline)
- ADD_TEST(libgit2_clar "${libgit2_BINARY_DIR}/libgit2_clar" -ionline -xclone::local::git_style_unc_paths -xclone::local::standard_unc_paths_are_written_git_style) -ADD_TEST(online "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline)
+ ADD_TEST(libgit2_clar "${libgit2_BINARY_DIR}/libgit2_clar" -xonline -xclone::local::git_style_unc_paths -xclone::local::standard_unc_paths_are_written_git_style) -ADD_TEST(gitdaemon "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline::push)
ELSE () -ADD_TEST(ssh "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths)
ADD_TEST(libgit2_clar "${libgit2_BINARY_DIR}/libgit2_clar" -v -xclone::local::git_style_unc_paths -xclone::local::standard_unc_paths_are_written_git_style) -ADD_TEST(proxy "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline::clone::proxy_credentials_in_url -sonline::clone::proxy_credentials_request)
ENDIF ()
# Add additional test targets that require special setup
-ADD_TEST(libgit2_clar-proxy_credentials "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline::clone::proxy_credentials_in_url -sonline::clone::proxy_credentials_request)
-ADD_TEST(libgit2_clar-ssh "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths)
+ADD_TEST(libgit2_clar-proxy_credentials "${libgit2_BINARY_DIR}/libgit2_clar" -v -xonline::clone::proxy_credentials_in_url -xonline::clone::proxy_credentials_request)
+ADD_TEST(libgit2_clar-ssh "${libgit2_BINARY_DIR}/libgit2_clar" -v -xonline::push -xonline::clone::ssh_cert -xonline::clone::ssh_with_paths)

31
debian/patches/use-mbedtls.patch vendored
View File

@ -114,7 +114,7 @@ Subject: [PATCH 01/15] mbedtls: initial support
+) +)
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -133,6 +133,9 @@ @@ -138,6 +138,9 @@
ENDIF() ENDIF()
IF (USE_HTTPS) IF (USE_HTTPS)
@ -124,7 +124,7 @@ Subject: [PATCH 01/15] mbedtls: initial support
IF (CMAKE_SYSTEM_NAME MATCHES "Darwin") IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
FIND_PACKAGE(Security) FIND_PACKAGE(Security)
FIND_PACKAGE(CoreFoundation) FIND_PACKAGE(CoreFoundation)
@@ -149,8 +152,13 @@ @@ -154,8 +157,13 @@
ENDIF() ENDIF()
ELSEIF (WINHTTP) ELSEIF (WINHTTP)
SET(HTTPS_BACKEND "WinHTTP") SET(HTTPS_BACKEND "WinHTTP")
@ -139,7 +139,7 @@ Subject: [PATCH 01/15] mbedtls: initial support
ENDIF() ENDIF()
ELSE() ELSE()
# Backend was explicitly set # Backend was explicitly set
@@ -174,8 +182,6 @@ @@ -179,8 +187,6 @@
LIST(APPEND LIBGIT2_LIBS ${COREFOUNDATION_LIBRARIES} ${SECURITY_LIBRARIES}) LIST(APPEND LIBGIT2_LIBS ${COREFOUNDATION_LIBRARIES} ${SECURITY_LIBRARIES})
LIST(APPEND LIBGIT2_PC_LIBS ${COREFOUNDATION_LDFLAGS} ${SECURITY_LDFLAGS}) LIST(APPEND LIBGIT2_PC_LIBS ${COREFOUNDATION_LDFLAGS} ${SECURITY_LDFLAGS})
ELSEIF (HTTPS_BACKEND STREQUAL "OpenSSL") ELSEIF (HTTPS_BACKEND STREQUAL "OpenSSL")
@ -148,7 +148,7 @@ Subject: [PATCH 01/15] mbedtls: initial support
IF (NOT OPENSSL_FOUND) IF (NOT OPENSSL_FOUND)
MESSAGE(FATAL_ERROR "Asked for OpenSSL TLS backend, but it wasn't found") MESSAGE(FATAL_ERROR "Asked for OpenSSL TLS backend, but it wasn't found")
ENDIF() ENDIF()
@@ -185,6 +191,53 @@ @@ -190,6 +196,53 @@
LIST(APPEND LIBGIT2_LIBS ${OPENSSL_LIBRARIES}) LIST(APPEND LIBGIT2_LIBS ${OPENSSL_LIBRARIES})
LIST(APPEND LIBGIT2_PC_LIBS ${OPENSSL_LDFLAGS}) LIST(APPEND LIBGIT2_PC_LIBS ${OPENSSL_LDFLAGS})
LIST(APPEND LIBGIT2_PC_REQUIRES "openssl") LIST(APPEND LIBGIT2_PC_REQUIRES "openssl")
@ -202,7 +202,7 @@ Subject: [PATCH 01/15] mbedtls: initial support
ELSEIF (HTTPS_BACKEND STREQUAL "WinHTTP") ELSEIF (HTTPS_BACKEND STREQUAL "WinHTTP")
# WinHTTP setup was handled in the WinHTTP-specific block above # WinHTTP setup was handled in the WinHTTP-specific block above
ELSE() ELSE()
@@ -230,6 +283,11 @@ @@ -235,6 +288,11 @@
ELSEIF(SHA1_BACKEND STREQUAL "CommonCrypto") ELSEIF(SHA1_BACKEND STREQUAL "CommonCrypto")
ADD_FEATURE_INFO(SHA ON "using CommonCrypto") ADD_FEATURE_INFO(SHA ON "using CommonCrypto")
SET(GIT_SHA1_COMMON_CRYPTO 1) SET(GIT_SHA1_COMMON_CRYPTO 1)
@ -774,7 +774,7 @@ Subject: [PATCH 01/15] mbedtls: initial support
GIT_UNUSED(host); GIT_UNUSED(host);
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ @@ -49,7 +49,7 @@
OPTION( ENABLE_TRACE "Enables tracing support" OFF ) OPTION( ENABLE_TRACE "Enables tracing support" OFF )
OPTION( LIBGIT2_FILENAME "Name of the produced binary" OFF ) OPTION( LIBGIT2_FILENAME "Name of the produced binary" OFF )
@ -878,25 +878,6 @@ Subject: [PATCH 01/15] mbedtls: initial support
ret = git_mwindow_global_init(); ret = git_mwindow_global_init();
GIT_MEMORY_BARRIER; GIT_MEMORY_BARRIER;
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,6 +55,16 @@
OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DDEBUG_POOL=ON -DCMAKE_BUILD_TYPE=Debug"
os: linux
dist: trusty
+ - compiler: gcc
+ env:
+ MBEDTLS=1
+ OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release -DUSE_HTTPS=mbedTLS -DMBEDTLS_ROOT_DIR=../deps/mbedtls"
+ os: linux
+ - compiler: gcc
+ env:
+ MBEDTLS=1
+ OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON -DUSE_HTTPS=mbedTLS -DMBEDTLS_ROOT_DIR=../deps/mbedtls"
+ os: linux
allow_failures:
- env: COVERITY=1
--- /dev/null --- /dev/null
+++ b/script/install-deps-linux.sh +++ b/script/install-deps-linux.sh
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@