Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 May 2018 17:34:13 +0000 (UTC)
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r469927 - in head/devel/libgit2: . files
Message-ID:  <201805141734.w4EHYDmi053551@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Mon May 14 17:34:13 2018
New Revision: 469927
URL: https://svnweb.freebsd.org/changeset/ports/469927

Log:
  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

Added:
  head/devel/libgit2/files/patch-src_streams_openssl.c   (contents, props changed)
  head/devel/libgit2/files/patch-src_streams_openssl.h   (contents, props changed)
Deleted:
  head/devel/libgit2/files/patch-src_openssl__stream.c
  head/devel/libgit2/files/patch-src_openssl__stream.h
Modified:
  head/devel/libgit2/Makefile
  head/devel/libgit2/distinfo
  head/devel/libgit2/pkg-plist

Modified: head/devel/libgit2/Makefile
==============================================================================
--- head/devel/libgit2/Makefile	Mon May 14 17:31:45 2018	(r469926)
+++ head/devel/libgit2/Makefile	Mon May 14 17:34:13 2018	(r469927)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libgit2
-PORTVERSION=	0.26.0
+PORTVERSION=	0.27.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 

Modified: head/devel/libgit2/distinfo
==============================================================================
--- head/devel/libgit2/distinfo	Mon May 14 17:31:45 2018	(r469926)
+++ head/devel/libgit2/distinfo	Mon May 14 17:34:13 2018	(r469927)
@@ -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

Added: head/devel/libgit2/files/patch-src_streams_openssl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libgit2/files/patch-src_streams_openssl.c	Mon May 14 17:34:13 2018	(r469927)
@@ -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

Added: head/devel/libgit2/files/patch-src_streams_openssl.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libgit2/files/patch-src_streams_openssl.h	Mon May 14 17:34:13 2018	(r469927)
@@ -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: head/devel/libgit2/pkg-plist
==============================================================================
--- head/devel/libgit2/pkg-plist	Mon May 14 17:31:45 2018	(r469926)
+++ head/devel/libgit2/pkg-plist	Mon May 14 17:34:13 2018	(r469927)
@@ -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?201805141734.w4EHYDmi053551>