From 86c28471827ef3fee0f7cb7922b5b8213d9695b7 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Wed, 23 Dec 2015 15:23:26 +0300 Subject: [PATCH] libgit2: Verbose output error --- mingw-w64-libgit2/PKGBUILD | 10 ++++++---- mingw-w64-libgit2/libgit2-error-string.patch | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 mingw-w64-libgit2/libgit2-error-string.patch diff --git a/mingw-w64-libgit2/PKGBUILD b/mingw-w64-libgit2/PKGBUILD index 8dce9708d6..2428a72d0b 100644 --- a/mingw-w64-libgit2/PKGBUILD +++ b/mingw-w64-libgit2/PKGBUILD @@ -4,7 +4,7 @@ _realname=libgit2 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.23.4 -pkgrel=1 +pkgrel=2 pkgdesc='A linkable library for Git (mingw-w64)' arch=('any') url='https://github.com/libgit2/libgit2' @@ -16,12 +16,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-curl" "${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") -source=(${_realname}-${pkgver}.tar.gz::"https://github.com/libgit2/libgit2/archive/v${pkgver}.tar.gz") -md5sums=('b7db3ab71dfa19fe1dc7fef76d6af216') +source=(${_realname}-${pkgver}.tar.gz::"https://github.com/libgit2/libgit2/archive/v${pkgver}.tar.gz" + libgit2-error-string.patch) +md5sums=('b7db3ab71dfa19fe1dc7fef76d6af216' + '3ba35235bca627b630df75304b506ff8') prepare() { cd ${_realname}-${pkgver} - #patch -p1 -i ${srcdir}/001-fix-pkg-config.patch + patch -p1 -i ${srcdir}/libgit2-error-string.patch } build() { diff --git a/mingw-w64-libgit2/libgit2-error-string.patch b/mingw-w64-libgit2/libgit2-error-string.patch new file mode 100644 index 0000000000..2d7e1c2bc5 --- /dev/null +++ b/mingw-w64-libgit2/libgit2-error-string.patch @@ -0,0 +1,14 @@ +diff --git a/src/openssl_stream.c b/src/openssl_stream.c +index 54dd761..1e2edee 100644 +--- a/src/openssl_stream.c ++++ b/src/openssl_stream.c +@@ -446,7 +446,8 @@ int git_openssl_stream_new(git_stream **out, const char *host, const char *port) + + st->ssl = SSL_new(git__ssl_ctx); + if (st->ssl == NULL) { +- giterr_set(GITERR_SSL, "failed to create ssl object"); ++ giterr_set(GITERR_SSL, "failed to create ssl object: %s", ++ ERR_error_string(ERR_get_error(), NULL)); + return -1; + } +