Index: branches/2018Q2/devel/libgit2/Makefile =================================================================== --- branches/2018Q2/devel/libgit2/Makefile (revision 471762) +++ branches/2018Q2/devel/libgit2/Makefile (revision 471763) @@ -1,44 +1,44 @@ # $FreeBSD$ PORTNAME= libgit2 -PORTVERSION= 0.26.0 +PORTVERSION= 0.27.0 DISTVERSIONPREFIX= v CATEGORIES= devel MAINTAINER= wg@FreeBSD.org COMMENT= Portable, pure C implementation of the Git core LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= libgit2 USES= cmake pathfix pkgconfig python:build ssl USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R:E} OPTIONS_DEFINE= SSH THREADS CURL OPTIONS_DEFAULT=SSH THREADS CURL SSH_DESC= Enable SSH support through libssh2 CURL_DESC= Enable HTTP support through cURL SSH_LIB_DEPENDS= libssh2.so:security/libssh2 SSH_CMAKE_ON= -DUSE_SSH=ON SSH_CMAKE_OFF= -DUSE_SSH=OFF THREADS_CMAKE_ON= -DTHREADSAFE=ON THREADS_CMAKE_OFF= -DTHREADSAFE=OFF CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CMAKE_ON= -DCURL=ON CURL_CMAKE_OFF= -DCURL=OFF .include post-patch: @${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt .if ${SSL_DEFAULT} == base @${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \ ${WRKSRC}/CMakeLists.txt .endif .include Index: branches/2018Q2/devel/libgit2/distinfo =================================================================== --- branches/2018Q2/devel/libgit2/distinfo (revision 471762) +++ branches/2018Q2/devel/libgit2/distinfo (revision 471763) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510679233 -SHA256 (libgit2-libgit2-v0.26.0_GH0.tar.gz) = 6a62393e0ceb37d02fe0d5707713f504e7acac9006ef33da1e88960bd78b6eac -SIZE (libgit2-libgit2-v0.26.0_GH0.tar.gz) = 4697156 +TIMESTAMP = 1524466383 +SHA256 (libgit2-libgit2-v0.27.0_GH0.tar.gz) = 545b0458292c786aba334f1bf1c8f73600ae73dd7205a7bb791a187ee48ab8d2 +SIZE (libgit2-libgit2-v0.27.0_GH0.tar.gz) = 4761312 Index: branches/2018Q2/devel/libgit2/files/patch-src_openssl__stream.c =================================================================== --- branches/2018Q2/devel/libgit2/files/patch-src_openssl__stream.c (revision 471762) +++ branches/2018Q2/devel/libgit2/files/patch-src_openssl__stream.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/openssl_stream.c.orig 2017-06-14 11:31:20 UTC -+++ src/openssl_stream.c -@@ -103,7 +103,7 @@ int git_openssl_stream_global_init(void) - ssl_opts |= SSL_OP_NO_COMPRESSION; - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - SSL_load_error_strings(); - OpenSSL_add_ssl_algorithms(); - #else Property changes on: branches/2018Q2/devel/libgit2/files/patch-src_openssl__stream.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q2/devel/libgit2/files/patch-src_openssl__stream.h =================================================================== --- branches/2018Q2/devel/libgit2/files/patch-src_openssl__stream.h (revision 471762) +++ branches/2018Q2/devel/libgit2/files/patch-src_openssl__stream.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/openssl_stream.h.orig 2017-06-14 11:31:20 UTC -+++ src/openssl_stream.h -@@ -27,7 +27,7 @@ extern int git_openssl_stream_new(git_st - - - --# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+# if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - - GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) - { Property changes on: branches/2018Q2/devel/libgit2/files/patch-src_openssl__stream.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.c =================================================================== --- branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.c (nonexistent) +++ branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.c (revision 471763) @@ -0,0 +1,11 @@ +--- src/streams/openssl.c.orig 2018-04-23 07:00:42 UTC ++++ src/streams/openssl.c +@@ -104,7 +104,7 @@ int git_openssl_stream_global_init(void) + ssl_opts |= SSL_OP_NO_COMPRESSION; + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + SSL_load_error_strings(); + OpenSSL_add_ssl_algorithms(); + #else Property changes on: branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.h =================================================================== --- branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.h (nonexistent) +++ branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.h (revision 471763) @@ -0,0 +1,11 @@ +--- src/streams/openssl.h.orig 2018-04-23 07:00:52 UTC ++++ src/streams/openssl.h +@@ -31,7 +31,7 @@ extern int git_openssl__set_cert_locatio + + + +-# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++# if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + + GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) + { Property changes on: branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q2/devel/libgit2/pkg-plist =================================================================== --- branches/2018Q2/devel/libgit2/pkg-plist (revision 471762) +++ branches/2018Q2/devel/libgit2/pkg-plist (revision 471763) @@ -1,84 +1,83 @@ include/git2.h include/git2/annotated_commit.h include/git2/attr.h include/git2/blame.h include/git2/blob.h include/git2/branch.h include/git2/buffer.h include/git2/checkout.h include/git2/cherrypick.h include/git2/clone.h include/git2/commit.h include/git2/common.h include/git2/config.h include/git2/cred_helpers.h include/git2/describe.h include/git2/diff.h include/git2/errors.h include/git2/filter.h include/git2/global.h include/git2/graph.h include/git2/ignore.h include/git2/index.h include/git2/indexer.h include/git2/inttypes.h include/git2/merge.h include/git2/message.h include/git2/net.h include/git2/notes.h include/git2/object.h include/git2/odb.h include/git2/odb_backend.h include/git2/oid.h include/git2/oidarray.h include/git2/pack.h include/git2/patch.h include/git2/pathspec.h include/git2/proxy.h include/git2/rebase.h include/git2/refdb.h include/git2/reflog.h include/git2/refs.h include/git2/refspec.h include/git2/remote.h include/git2/repository.h include/git2/reset.h include/git2/revert.h include/git2/revparse.h include/git2/revwalk.h include/git2/signature.h include/git2/stash.h include/git2/status.h include/git2/stdint.h include/git2/strarray.h include/git2/submodule.h include/git2/sys/commit.h include/git2/sys/config.h include/git2/sys/diff.h include/git2/sys/filter.h include/git2/sys/hashsig.h include/git2/sys/index.h include/git2/sys/mempack.h include/git2/sys/merge.h include/git2/sys/odb_backend.h include/git2/sys/openssl.h include/git2/sys/refdb_backend.h include/git2/sys/reflog.h include/git2/sys/refs.h -include/git2/sys/remote.h include/git2/sys/repository.h include/git2/sys/stream.h include/git2/sys/time.h include/git2/sys/transport.h include/git2/tag.h include/git2/trace.h include/git2/transaction.h include/git2/transport.h include/git2/tree.h include/git2/types.h include/git2/version.h include/git2/worktree.h lib/libgit2.so lib/libgit2.so.%%PORTVERSION%% lib/libgit2.so.%%SHLIB_VER%% libdata/pkgconfig/libgit2.pc Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 471762) +++ branches/2018Q2 (revision 471763) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r469927