aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2018-06-17 15:42:31 +0200
committerJakub Jirutka <jakub@jirutka.cz>2018-06-17 15:35:57 +0200
commitc45742214175a0666b4169053401adfdc9a2d31e (patch)
tree749e9a39afbff32ac01a8656ea1840d8c7bbee11
parentd9caae9c5219bb034ae8a7e3d04e9485b9d5cd15 (diff)
downloadalpine_aports-c45742214175a0666b4169053401adfdc9a2d31e.tar.bz2
alpine_aports-c45742214175a0666b4169053401adfdc9a2d31e.tar.xz
alpine_aports-c45742214175a0666b4169053401adfdc9a2d31e.zip
main/libgit2: upgrade to 0.27.2
Diffstat
-rw-r--r--main/libgit2/APKBUILD8
-rw-r--r--main/libgit2/build-both-static-dynamic.patch6
-rw-r--r--main/libgit2/libressl-2.7.patch11
3 files changed, 6 insertions, 19 deletions
diff --git a/main/libgit2/APKBUILD b/main/libgit2/APKBUILD
index e3333029df..5ad7f210da 100644
--- a/main/libgit2/APKBUILD
+++ b/main/libgit2/APKBUILD
@@ -3,7 +3,7 @@
3# Contributor: Pierre-Gilas MILLON <pgmillon@gmail.com> 3# Contributor: Pierre-Gilas MILLON <pgmillon@gmail.com>
4# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 4# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
5pkgname=libgit2 5pkgname=libgit2
6pkgver=0.27.0 6pkgver=0.27.2
7pkgrel=0 7pkgrel=0
8pkgdesc="A linkable library for Git" 8pkgdesc="A linkable library for Git"
9url="https://libgit2.github.com/" 9url="https://libgit2.github.com/"
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-tests::noarch"
15provides="$pkgname-libs" # for backward compatibility with v3.4 15provides="$pkgname-libs" # for backward compatibility with v3.4
16replaces="$pkgname-libs" # for backward compatibility with v3.4 16replaces="$pkgname-libs" # for backward compatibility with v3.4
17source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz 17source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
18 libressl-2.7.patch
19 build-both-static-dynamic.patch 18 build-both-static-dynamic.patch
20 " 19 "
21options="!check" # FIXME some tests fails 20options="!check" # FIXME some tests fails
@@ -58,6 +57,5 @@ tests() {
58 cp -a "$builddir"/tests "$subpkgdir"/usr/src/$pkgname/ 57 cp -a "$builddir"/tests "$subpkgdir"/usr/src/$pkgname/
59} 58}
60 59
61sha512sums="1304f0b6182e1e6e7fccbec1a568aefb662e144a1aea4fff5901f3c012ff0f3d28720f17d19b9a1bc6c892c32fe602766fe98a15538a94a468d65d3e4a1680ca libgit2-0.27.0.tar.gz 60sha512sums="4fa2b6c1bb340d5dbc3106ababb630a4634cee2415d478be986d315ef9c659d772574a56f0b8fa77d26bd793aea92893fddf64b5f21d7c965069f928b9ce5cff libgit2-0.27.2.tar.gz
62274746c3ba20309a1d4a53e9843fd411abb06e7dbc5a16c179757522c395f11f54d49358e73513be3fe7e857b5b547cf6c4cfaf79963518e75c8849a41f2cfef libressl-2.7.patch 61268e24554282666900a2179a368dc2569cb3bce60ffea187fd53de1bc119a85abc02cddd8be2ab607d44db793c4807acdbb49fc5d1badfc08bf382fa511d7b3e build-both-static-dynamic.patch"
63dab2acb9a2e8a2d372ed3819edf939445a7ed626a17eec613aeb827835703f37311c4136863605b547960d10844a753a3106f5ad22a20e0aee9f2b14f4ddf5eb build-both-static-dynamic.patch"
diff --git a/main/libgit2/build-both-static-dynamic.patch b/main/libgit2/build-both-static-dynamic.patch
index 210054ed45..9912727a6b 100644
--- a/main/libgit2/build-both-static-dynamic.patch
+++ b/main/libgit2/build-both-static-dynamic.patch
@@ -24,10 +24,10 @@ This is very hack-ish, it makes option BUILD_SHARED_LIBS unusable.
24 OPTION( ENABLE_REPRODUCIBLE_BUILDS "Enable reproducible builds" OFF ) 24 OPTION( ENABLE_REPRODUCIBLE_BUILDS "Enable reproducible builds" OFF )
25--- a/src/CMakeLists.txt 25--- a/src/CMakeLists.txt
26+++ b/src/CMakeLists.txt 26+++ b/src/CMakeLists.txt
27@@ -415,9 +415,12 @@ 27@@ -407,9 +407,12 @@
28 ENDIF()
28 29
29 # Compile and link libgit2 30 # Compile and link libgit2
30 LINK_DIRECTORIES(${LIBGIT2_LIBDIRS})
31-ADD_LIBRARY(git2 ${WIN_RC} ${LIBGIT2_OBJECTS}) 31-ADD_LIBRARY(git2 ${WIN_RC} ${LIBGIT2_OBJECTS})
32+ADD_LIBRARY(git2 SHARED ${WIN_RC} ${LIBGIT2_OBJECTS}) 32+ADD_LIBRARY(git2 SHARED ${WIN_RC} ${LIBGIT2_OBJECTS})
33 TARGET_LINK_LIBRARIES(git2 ${LIBGIT2_LIBS}) 33 TARGET_LINK_LIBRARIES(git2 ${LIBGIT2_LIBS})
@@ -38,7 +38,7 @@ This is very hack-ish, it makes option BUILD_SHARED_LIBS unusable.
38 SET_TARGET_PROPERTIES(git2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR}) 38 SET_TARGET_PROPERTIES(git2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
39 SET_TARGET_PROPERTIES(git2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR}) 39 SET_TARGET_PROPERTIES(git2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
40 SET_TARGET_PROPERTIES(git2 PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR}) 40 SET_TARGET_PROPERTIES(git2 PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
41@@ -453,7 +457,7 @@ 41@@ -445,7 +448,7 @@
42 ENDIF () 42 ENDIF ()
43 43
44 # Install 44 # Install
diff --git a/main/libgit2/libressl-2.7.patch b/main/libgit2/libressl-2.7.patch
deleted file mode 100644
index 6bf1af1eb4..0000000000
--- a/main/libgit2/libressl-2.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- a/src/streams/openssl.h
2+++ b/src/streams/openssl.h
3@@ -31,7 +31,7 @@
4
5
6
7-# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
8+# if OPENSSL_VERSION_NUMBER < 0x10100000L
9
10 GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
11 {
© 2015 Mike Crute