1 |
commit: 6e20675c7a5e1678d4720581a0582b9a949e04bd |
2 |
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Feb 28 23:31:34 2019 +0000 |
4 |
Commit: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Feb 28 23:31:34 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=6e20675c |
7 |
|
8 |
dev-libs/libgit2: drop; fixed upstream and in gentoo.git |
9 |
|
10 |
Upstream patch for LibreSSL >=2.7.0: |
11 |
https://github.com/libgit2/libgit2/commit/7490d449b518115a1ae86b01397e95c38e39cff1 |
12 |
|
13 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
14 |
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com> |
15 |
|
16 |
dev-libs/libgit2/Manifest | 1 - |
17 |
.../files/libgit2-libressl27-backport26.patch | 28 -------- |
18 |
dev-libs/libgit2/libgit2-0.26.5.ebuild | 82 ---------------------- |
19 |
dev-libs/libgit2/metadata.xml | 27 ------- |
20 |
4 files changed, 138 deletions(-) |
21 |
|
22 |
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest |
23 |
deleted file mode 100644 |
24 |
index 94baede..0000000 |
25 |
--- a/dev-libs/libgit2/Manifest |
26 |
+++ /dev/null |
27 |
@@ -1 +0,0 @@ |
28 |
-DIST libgit2-0.26.5.tar.gz 4734075 BLAKE2B cdc34a5792576d97d8bc8a8c998e610e9c2caab4899f55bfd11da382d73d3061277ac068edd20c8e31d7cf5c3b26ca688fd67eb43ca7b9e0b82413fb04d04b3f SHA512 7dd7c567ad776db76b3514e6532f52841a4279b58dc51b44d39ab53b6911220cb60ee8f37b4c6ad6f369edbbd43a2591cf5f46aca354282f56735c8b215d533b |
29 |
|
30 |
diff --git a/dev-libs/libgit2/files/libgit2-libressl27-backport26.patch b/dev-libs/libgit2/files/libgit2-libressl27-backport26.patch |
31 |
deleted file mode 100644 |
32 |
index 26dc964..0000000 |
33 |
--- a/dev-libs/libgit2/files/libgit2-libressl27-backport26.patch |
34 |
+++ /dev/null |
35 |
@@ -1,28 +0,0 @@ |
36 |
-diff --git a/src/openssl_stream.c b/src/openssl_stream.c |
37 |
-index 6bab6b54a..f6f908a76 100644 |
38 |
---- a/src/openssl_stream.c |
39 |
-+++ b/src/openssl_stream.c |
40 |
-@@ -103,7 +103,8 @@ int git_openssl_stream_global_init(void) |
41 |
- ssl_opts |= SSL_OP_NO_COMPRESSION; |
42 |
- #endif |
43 |
- |
44 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
45 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
46 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) |
47 |
- SSL_load_error_strings(); |
48 |
- OpenSSL_add_ssl_algorithms(); |
49 |
- #else |
50 |
-diff --git a/src/openssl_stream.h b/src/openssl_stream.h |
51 |
-index f5e59dab1..75bea07cf 100644 |
52 |
---- a/src/openssl_stream.h |
53 |
-+++ b/src/openssl_stream.h |
54 |
-@@ -27,7 +27,8 @@ extern int git_openssl_stream_new(git_stream **out, const char *host, const char |
55 |
- |
56 |
- |
57 |
- |
58 |
--# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
59 |
-+# if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
60 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
61 |
- |
62 |
- GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) |
63 |
- { |
64 |
|
65 |
diff --git a/dev-libs/libgit2/libgit2-0.26.5.ebuild b/dev-libs/libgit2/libgit2-0.26.5.ebuild |
66 |
deleted file mode 100644 |
67 |
index 0aebcf7..0000000 |
68 |
--- a/dev-libs/libgit2/libgit2-0.26.5.ebuild |
69 |
+++ /dev/null |
70 |
@@ -1,82 +0,0 @@ |
71 |
-# Copyright 1999-2018 Gentoo Foundation |
72 |
-# Distributed under the terms of the GNU General Public License v2 |
73 |
- |
74 |
-EAPI=6 |
75 |
- |
76 |
-inherit cmake-utils |
77 |
- |
78 |
-if [[ ${PV} == "9999" ]] ; then |
79 |
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" |
80 |
- inherit git-r3 |
81 |
-else |
82 |
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
83 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos" |
84 |
-fi |
85 |
- |
86 |
-DESCRIPTION="A linkable library for Git" |
87 |
-HOMEPAGE="https://libgit2.github.com/" |
88 |
- |
89 |
-LICENSE="GPL-2-with-linking-exception" |
90 |
-SLOT="0/26" |
91 |
-IUSE="+curl examples gssapi libressl +ssh test +threads trace" |
92 |
- |
93 |
-RDEPEND=" |
94 |
- !libressl? ( dev-libs/openssl:0= ) |
95 |
- libressl? ( dev-libs/libressl:0= ) |
96 |
- sys-libs/zlib |
97 |
- net-libs/http-parser:= |
98 |
- curl? ( |
99 |
- !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) |
100 |
- libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) |
101 |
- ) |
102 |
- gssapi? ( virtual/krb5 ) |
103 |
- ssh? ( net-libs/libssh2 ) |
104 |
-" |
105 |
-DEPEND="${RDEPEND} |
106 |
- virtual/pkgconfig |
107 |
-" |
108 |
- |
109 |
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md ) |
110 |
- |
111 |
-PATCHES=( "${FILESDIR}/libgit2-libressl27-backport26.patch" ) |
112 |
- |
113 |
-src_prepare() { |
114 |
- # skip online tests |
115 |
- sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die |
116 |
- |
117 |
- cmake-utils_src_prepare |
118 |
-} |
119 |
- |
120 |
-src_configure() { |
121 |
- local mycmakeargs=( |
122 |
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" |
123 |
- -DBUILD_CLAR=$(usex test) |
124 |
- -DENABLE_TRACE=$(usex trace) |
125 |
- -DUSE_GSSAPI=$(usex gssapi) |
126 |
- -DUSE_SSH=$(usex ssh) |
127 |
- -DTHREADSAFE=$(usex threads) |
128 |
- -DCURL=$(usex curl) |
129 |
- ) |
130 |
- cmake-utils_src_configure |
131 |
-} |
132 |
- |
133 |
-src_test() { |
134 |
- if [[ ${EUID} -eq 0 ]] ; then |
135 |
- # repo::iterator::fs_preserves_error fails if run as root |
136 |
- # since root can still access dirs with 0000 perms |
137 |
- ewarn "Skipping tests: non-root privileges are required for all tests to pass" |
138 |
- else |
139 |
- local TEST_VERBOSE=1 |
140 |
- cmake-utils_src_test |
141 |
- fi |
142 |
-} |
143 |
- |
144 |
-src_install() { |
145 |
- cmake-utils_src_install |
146 |
- |
147 |
- if use examples ; then |
148 |
- find examples -name '.gitignore' -delete || die |
149 |
- dodoc -r examples |
150 |
- docompress -x /usr/share/doc/${PF}/examples |
151 |
- fi |
152 |
-} |
153 |
|
154 |
diff --git a/dev-libs/libgit2/metadata.xml b/dev-libs/libgit2/metadata.xml |
155 |
deleted file mode 100644 |
156 |
index e090ecb..0000000 |
157 |
--- a/dev-libs/libgit2/metadata.xml |
158 |
+++ /dev/null |
159 |
@@ -1,27 +0,0 @@ |
160 |
-<?xml version="1.0" encoding="UTF-8"?> |
161 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
162 |
-<pkgmetadata> |
163 |
- <maintainer type="person"> |
164 |
- <email>mgorny@g.o</email> |
165 |
- <name>Michał Górny</name> |
166 |
- </maintainer> |
167 |
- <maintainer type="project"> |
168 |
- <email>gnome@g.o</email> |
169 |
- <name>Gentoo GNOME Desktop</name> |
170 |
- </maintainer> |
171 |
- <longdescription lang="en"> |
172 |
- libgit2 is a portable, pure C implementation of the Git core methods provided |
173 |
- as a re-entrant linkable library with a solid API, allowing you to write native |
174 |
- speed custom Git applications in any language which supports C bindings. |
175 |
- </longdescription> |
176 |
- <use> |
177 |
- <flag name="curl">Use <pkg>net-misc/curl</pkg> for HTTP support |
178 |
- (otherwise, limited built-in implementation will be used)</flag> |
179 |
- <flag name="gssapi">Enable GSSAPI support for SPNEGO auth</flag> |
180 |
- <flag name="ssh">Enable SSH transport support</flag> |
181 |
- <flag name="trace">Enable tracing support</flag> |
182 |
- </use> |
183 |
- <upstream> |
184 |
- <remote-id type="github">libgit2/libgit2</remote-id> |
185 |
- </upstream> |
186 |
-</pkgmetadata> |