Date: Tue, 5 Jun 2018 14:39:51 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r471763 - in branches/2018Q2/devel/libgit2: . files Message-ID: <201806051439.w55EdpP1007794@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Tue Jun 5 14:39:51 2018 New Revision: 471763 URL: https://svnweb.freebsd.org/changeset/ports/471763 Log: MFH: r469927 Update devel/libgit2 to 0.27.0 required for gitlab 10.7.x Updated patches to match new file locations. Reviewed by: swills (mentor), wg (maintainer) Approved by: swills (mentor), wg (maintainer) Differential Revision: https://reviews.freebsd.org/D15320 Approved by: ports-secteam (eadler) Added: branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.c - copied unchanged from r469927, head/devel/libgit2/files/patch-src_streams_openssl.c branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.h - copied unchanged from r469927, head/devel/libgit2/files/patch-src_streams_openssl.h Deleted: branches/2018Q2/devel/libgit2/files/patch-src_openssl__stream.c branches/2018Q2/devel/libgit2/files/patch-src_openssl__stream.h Modified: branches/2018Q2/devel/libgit2/Makefile branches/2018Q2/devel/libgit2/distinfo branches/2018Q2/devel/libgit2/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/devel/libgit2/Makefile ============================================================================== --- branches/2018Q2/devel/libgit2/Makefile Tue Jun 5 14:38:14 2018 (r471762) +++ branches/2018Q2/devel/libgit2/Makefile Tue Jun 5 14:39:51 2018 (r471763) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libgit2 -PORTVERSION= 0.26.0 +PORTVERSION= 0.27.0 DISTVERSIONPREFIX= v CATEGORIES= devel Modified: branches/2018Q2/devel/libgit2/distinfo ============================================================================== --- branches/2018Q2/devel/libgit2/distinfo Tue Jun 5 14:38:14 2018 (r471762) +++ branches/2018Q2/devel/libgit2/distinfo Tue Jun 5 14:39:51 2018 (r471763) @@ -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 Copied: branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.c (from r469927, head/devel/libgit2/files/patch-src_streams_openssl.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.c Tue Jun 5 14:39:51 2018 (r471763, copy of r469927, head/devel/libgit2/files/patch-src_streams_openssl.c) @@ -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 Copied: branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.h (from r469927, head/devel/libgit2/files/patch-src_streams_openssl.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/devel/libgit2/files/patch-src_streams_openssl.h Tue Jun 5 14:39:51 2018 (r471763, copy of r469927, head/devel/libgit2/files/patch-src_streams_openssl.h) @@ -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) + { Modified: branches/2018Q2/devel/libgit2/pkg-plist ============================================================================== --- branches/2018Q2/devel/libgit2/pkg-plist Tue Jun 5 14:38:14 2018 (r471762) +++ branches/2018Q2/devel/libgit2/pkg-plist Tue Jun 5 14:39:51 2018 (r471763) @@ -65,7 +65,6 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806051439.w55EdpP1007794>