diff options
| -rw-r--r-- | user/libgit2/APKBUILD | 17 | ||||
| -rw-r--r-- | user/libgit2/build-both-static-dynamic.patch | 53 |
2 files changed, 9 insertions, 61 deletions
diff --git a/user/libgit2/APKBUILD b/user/libgit2/APKBUILD index e7e4bbfad..11f1995af 100644 --- a/user/libgit2/APKBUILD +++ b/user/libgit2/APKBUILD @@ -1,24 +1,26 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Pierre-Gilas MILLON <pgmillon@gmail.com> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgit2 -pkgver=0.26.0 +pkgver=0.27.3 pkgrel=0 -pkgdesc="A linkable library for Git" +pkgdesc="Pure C re-entrant library for custom Git applications" url="https://libgit2.github.com/" arch="all" -license="GPL-2.0" +license="GPL-2.0-only" depends="" depends_dev="curl-dev libssh2-dev" makedepends="$depends_dev python3 cmake zlib-dev openssl-dev" subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz - build-both-static-dynamic.patch " -builddir="$srcdir/$pkgname-$pkgver" # secfixes: +# 0.27.3-r0: +# - CVE-2018-10887 +# - CVE-2018-10888 +# - CVE-2018-11235 # 0.25.1-r0: # - CVE-2016-10128 # - CVE-2016-10129 @@ -48,5 +50,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b6e51f2216c7c23f352572b780ea1325a25a517396709f036bb573295c2bd02aa505ba616846ac7e07863e99e640e7d47fefc5727478a257b283da99060ee47c libgit2-0.26.0.tar.gz -39534d10f38f394446f93df810233464807fca3b0e903ee40067971ecbe1d78102bbe04283435032f757f970e6846ecf279eb727ab137c01e84427bd16913ee6 build-both-static-dynamic.patch" +sha512sums="e470050b89289908ec64dafaa954ad9bfc8f557ba7dafcab440d9efde474f736c025d8202bfd81a508070d9cf678f3fb1f3687d72a849ce86edd1ee90ad13c3b libgit2-0.27.3.tar.gz" diff --git a/user/libgit2/build-both-static-dynamic.patch b/user/libgit2/build-both-static-dynamic.patch deleted file mode 100644 index eeb179a1e..000000000 --- a/user/libgit2/build-both-static-dynamic.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Mon, 11 Apr 2017 3:23:00 +0200 -Subject: [PATCH] Build both static and dynamic library - -This is very hack-ish, it makes option BUILD_SHARED_LIBS unusable. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -28,7 +28,6 @@ - # Build options - # - OPTION( SONAME "Set the (SO)VERSION of the target" ON ) --OPTION( BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" ON ) - OPTION( THREADSAFE "Build libgit2 as threadsafe" ON ) - OPTION( BUILD_CLAR "Build Tests using the Clar suite" ON ) - OPTION( BUILD_EXAMPLES "Build library usage example apps" OFF ) -@@ -44,6 +43,8 @@ - OPTION( CURL "Use curl for HTTP if available" ON) - OPTION( DEBUG_POOL "Enable debug pool allocator" OFF ) - -+SET( BUILD_SHARED_LIBS ON ) -+ - IF(DEBUG_POOL) - ADD_DEFINITIONS(-DGIT_DEBUG_POOL) - ENDIF() -@@ -602,7 +603,8 @@ - ENDIF() - - # Compile and link libgit2 --ADD_LIBRARY(git2 ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1} ${WIN_RC}) -+ADD_LIBRARY(objlib OBJECT ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1} ${WIN_RC}) -+ADD_LIBRARY(git2 SHARED $<TARGET_OBJECTS:objlib>) - TARGET_LINK_LIBRARIES(git2 ${SECURITY_DIRS}) - TARGET_LINK_LIBRARIES(git2 ${COREFOUNDATION_DIRS}) - TARGET_LINK_LIBRARIES(git2 ${SSL_LIBRARIES}) -@@ -611,6 +613,9 @@ - TARGET_LINK_LIBRARIES(git2 ${ICONV_LIBRARIES}) - TARGET_OS_LIBRARIES(git2) - -+ADD_LIBRARY(git2_static STATIC $<TARGET_OBJECTS:objlib>) -+SET_TARGET_PROPERTIES(git2_static PROPERTIES OUTPUT_NAME git2 CLEAN_DIRECT_OUTPUT 1) -+ - # Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240) - # Win64+MSVC+static libs = linker error - IF(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS) -@@ -639,7 +644,7 @@ - ENDIF () - - # Install --INSTALL(TARGETS git2 -+INSTALL(TARGETS git2 git2_static - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} |