Attachment #184248 for bug #220620

View | Details | Raw Unified | Return to bug 220620
Collapse All | Expand All

Lines 1-8 Link Here

(-)b/devel/libgit2/Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libgit2	3	PORTNAME= libgit2
4	PORTVERSION= 0.25.1	4	PORTVERSION= 0.26.0
5	PORTREVISION= 1
6	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
7	CATEGORIES= devel	6	CATEGORIES= devel
8		7

Lines 1-3 Link Here

(-)b/devel/libgit2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1488597111	1	TIMESTAMP = 1499752648
2	SHA256 (libgit2-libgit2-v0.25.1_GH0.tar.gz) = 7ae8e699ff7ff9a1fa702249140ee31ea6fd556bf7968e84e38165870667bcb1	2	SHA256 (libgit2-libgit2-v0.26.0_GH0.tar.gz) = 4ac70a2bbdf7a304ad2a9fb2c53ad3c8694be0dbec4f1fce0f3cd0cda14fb3b9
3	SIZE (libgit2-libgit2-v0.25.1_GH0.tar.gz) = 4252130	3	SIZE (libgit2-libgit2-v0.26.0_GH0.tar.gz) = 4697149




Fix build with LibreSSL

https://github.com/libgit2/libgit2/commit/42ad85e

--- src/openssl_stream.h.orig	2017-01-09 20:26:45 UTC
+++ src/openssl_stream.h
@@ -27,7 +27,7 @@ extern int git_openssl_stream_new(git_stream **out, co
 
 
 
-# if OPENSSL_VERSION_NUMBER < 0x10100000L
+# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 
 GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
 {

Lines 77-82 include/git2/transport.h Link Here

(-)b/devel/libgit2/pkg-plist (+1 lines)
77	include/git2/tree.h	77	include/git2/tree.h
78	include/git2/types.h	78	include/git2/types.h
79	include/git2/version.h	79	include/git2/version.h
		80	include/git2/worktree.h
80	lib/libgit2.so	81	lib/libgit2.so
81	lib/libgit2.so.%%PORTVERSION%%	82	lib/libgit2.so.%%PORTVERSION%%
82	lib/libgit2.so.%%SHLIB_VER%%	83	lib/libgit2.so.%%SHLIB_VER%%

Return to bug 220620

Removed Link Here

(-)a/devel/libgit2/files/patch-src_openssl__stream.h (-15 lines)
1	Fix build with LibreSSL
2
3	https://github.com/libgit2/libgit2/commit/42ad85e
4
5	--- src/openssl_stream.h.orig 2017-01-09 20:26:45 UTC
6	+++ src/openssl_stream.h
7	@@ -27,7 +27,7 @@ extern int git_openssl_stream_new(git_stream **out, co
8
9
10
11	-# if OPENSSL_VERSION_NUMBER < 0x10100000L
12	+# if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
13
14	GIT_INLINE(BIO_METHOD) BIO_meth_new(int type, const char name)
15	{