From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- dev-libs/libgit2/Manifest | 9 +-- ...libgit2-0.26.8-disable-oom-tests-on-32bit.patch | 64 ----------------- dev-libs/libgit2/libgit2-0.26.8.ebuild | 82 ---------------------- dev-libs/libgit2/libgit2-0.28.2.ebuild | 72 ------------------- dev-libs/libgit2/libgit2-0.28.3.ebuild | 2 +- dev-libs/libgit2/metadata.xml | 2 - 6 files changed, 3 insertions(+), 228 deletions(-) delete mode 100644 dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch delete mode 100644 dev-libs/libgit2/libgit2-0.26.8.ebuild delete mode 100644 dev-libs/libgit2/libgit2-0.28.2.ebuild (limited to 'dev-libs/libgit2') diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest index 968992a451fd..15555b02237b 100644 --- a/dev-libs/libgit2/Manifest +++ b/dev-libs/libgit2/Manifest @@ -1,9 +1,4 @@ -AUX libgit2-0.26.8-disable-oom-tests-on-32bit.patch 1775 BLAKE2B 4c3df3edfa76a57f2c14433b7be1cec2afadcaffa30f2f2559ba9f1e0cf915f6ccba43abc038cf3a42949f12e78e532d29a25ae74e41f303838c839036d6e3a4 SHA512 db77d1cd4876ed45a579c9dcec67e7fa0feff2d98db4635257961588734497b5818efcf4ce748742018c6775bb65f2394515fc2854c691194b93b6d9c65c6cf2 -DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e -DIST libgit2-0.28.2.tar.gz 4987586 BLAKE2B cf791adb173050b4b153062ff5fdc923289462677ce34af1077d228a95c4d9d7e9b836aee44dc79f079f42c910c4b4548241ec7ff16665ce49e319ccd38d4c7a SHA512 0879c162e2e1dc00eadfbda22cd1f9d3a95b4ec2b653c108983f37c2f695140882de4d50d7cbc04ced247125a4e9fe6df16130e1267891aecdb2411d920db5c6 DIST libgit2-0.28.3.tar.gz 4988580 BLAKE2B 93d87792b0aef6383845230880d749fa77f28ac8ece4564abf041ccbb672d17e6efb1ef9503879d45cf5f78b6f1e54dd2b2ab9eac0fb09ddb445310484bbd7fc SHA512 15444823b7d4885f7b8c3982f8905efc4a75913de016a9b2e0a24d5ce9746e6a549dffd5469036529557feff2ce7ece9328266eb312c80b96091ce0f65ee97ee -EBUILD libgit2-0.26.8.ebuild 2050 BLAKE2B 29ba7bdeb65ca0d274b97240ca81c732e8f5505b64856d61124a8726791ae6c4bfe1fdba88c62dec9a35a4f9ac0d43df3884f978814e7bab9ce1f8a573f7c1ad SHA512 ce1746610579ddb076cd7d8c4f97596142bc73e9d454f7188962a940693dba7e0f8814a551b9512502c0c1ece2d1392e963747208a3bcaa5f1af6d9d376f1a0a -EBUILD libgit2-0.28.2.ebuild 1687 BLAKE2B 1776bfc14b35eb1593e6d9159f58c3c9ccdac6c25419e1d57028ef6ef832fc638fd8782e5fdf46b9e65f4caaa744660f2b87c73ae421c4db3924514c476068d0 SHA512 46079c16b630c677bd97592bfe3244c1d6943178da84ea9d862c1e58552b8267f0185102fbca573d831de67098027ffb95ba82e4f944a42d6391ecdca4031da2 -EBUILD libgit2-0.28.3.ebuild 1685 BLAKE2B e7f2859e215e7dab9517d81d44d97f1c3c415771e10692c94108442aa4497e3a396134064b819abe23079088d32a03595c768a8cfbf37fe4e2b27e7146de8125 SHA512 e5b2cccfa6bfcb0da2a951e4417946d9c69bc9f40455f43089c73f30c7eef0ce3040676cdbcd8d0ea90b047d145c9fe85de1f7cee05f6a21e5facd335cdea1dc +EBUILD libgit2-0.28.3.ebuild 1684 BLAKE2B c13c366277f3e4b8f8b0fc074eaef7e3932483a2d2fe52aa43919457ecbba28676e0e08ca549c5e1d70701a5c55d06d32c3e460e5e6ee2e0bd71d9ef904731e2 SHA512 9a03f48114b70cb5b59a5c71c705dc0626d264173a1086ad5290d4d91f7ac52d886b5c926438caeddc9633cd9c19b5f6bf52785fd316c7682da7c69a56a68590 EBUILD libgit2-9999.ebuild 1664 BLAKE2B ca592e3b60a50ee0ad16da964b1e9df3095e235d78aeec683582b38fd2b70395311778e453e59bbee913c2976e341f5bc947487ed58defc60d78ca63307ebd18 SHA512 ca41454b876cc379a6aac038b00ab48e01cd2fc728ba79e9164e144a1cd5b2fa7f563b9243d0af4c8d7f1538baece44cff31db260b137f265bee8ebc35050aca -MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867 +MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35 diff --git a/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch b/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch deleted file mode 100644 index 40be2aee8fdc..000000000000 --- a/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 16b5a7baf67169ff12a9a2de9c2853c6f921317c Mon Sep 17 00:00:00 2001 -From: Edward Thomson -Date: Thu, 13 Sep 2018 13:27:07 +0100 -Subject: [PATCH] tests: don't run buf::oom on 32-bit systems - -On a 32-bit Linux systems, the value large enough to make malloc -guarantee a failure is also large enough that valgrind considers it -"fishy". Skip this test on those systems entirely. - -[rebased for v0.26.8] ---- - tests/buf/oom.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/tests/buf/oom.c b/tests/buf/oom.c -index 16a03cc1a..86f5e7239 100644 ---- a/tests/buf/oom.c -+++ b/tests/buf/oom.c -@@ -11,12 +11,8 @@ - */ - #if defined(GIT_ARCH_64) && defined(__linux__) - # define TOOBIG 0x0fffffffffffffff --#elif defined(__linux__) --# define TOOBIG 0x0fffffff - #elif defined(GIT_ARCH_64) - # define TOOBIG 0xffffffffffffff00 --#else --# define TOOBIG 0xffffff00 - #endif - - /** -@@ -25,13 +21,18 @@ - * will fail. And because the git_buf_grow() wrapper always - * sets mark_oom, the code in git_buf_try_grow() will free - * the internal buffer and set it to git_buf__oom. -- * -+ * - * We initialized the internal buffer to (the static variable) - * git_buf__initbuf. The purpose of this test is to make sure - * that we don't try to free the static buffer. -+ * -+ * Skip this test entirely on 32-bit platforms; a buffer large enough -+ * to guarantee malloc failures is so large that valgrind considers -+ * it likely to be an error. - */ - void test_buf_oom__grow(void) - { -+#ifdef GIT_ARCH_64 - git_buf buf = GIT_BUF_INIT; - - git_buf_clear(&buf); -@@ -40,6 +41,9 @@ void test_buf_oom__grow(void) - cl_assert(git_buf_oom(&buf)); - - git_buf_free(&buf); -+#else -+ cl_skip(); -+#endif - } - - void test_buf_oom__grow_by(void) --- -2.19.1 - diff --git a/dev-libs/libgit2/libgit2-0.26.8.ebuild b/dev-libs/libgit2/libgit2-0.26.8.ebuild deleted file mode 100644 index 715f0172be33..000000000000 --- a/dev-libs/libgit2/libgit2-0.26.8.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils python-any-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~ppc-macos" -fi - -DESCRIPTION="A linkable library for Git" -HOMEPAGE="https://libgit2.github.com/" - -LICENSE="GPL-2-with-linking-exception" -SLOT="0/26" -IUSE="+curl examples gssapi libressl +ssh test +threads trace" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib - net-libs/http-parser:= - curl? ( - !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) - libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) - ) - gssapi? ( virtual/krb5 ) - ssh? ( net-libs/libssh2 ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig -" - -DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md ) - -PATCHES=( - # skip OOM tests on 32-bit systems - # https://bugs.gentoo.org/669892 - # https://github.com/libgit2/libgit2/commit/415a8ae9c9b6ac18f0524b6af8e58408b426457d - "${FILESDIR}"/libgit2-0.26.8-disable-oom-tests-on-32bit.patch -) - -src_configure() { - local mycmakeargs=( - -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" - -DBUILD_CLAR=$(usex test) - -DENABLE_TRACE=$(usex trace) - -DUSE_GSSAPI=$(usex gssapi) - -DUSE_SSH=$(usex ssh) - -DTHREADSAFE=$(usex threads) - -DCURL=$(usex curl) - ) - cmake-utils_src_configure -} - -src_test() { - if [[ ${EUID} -eq 0 ]] ; then - # repo::iterator::fs_preserves_error fails if run as root - # since root can still access dirs with 0000 perms - ewarn "Skipping tests: non-root privileges are required for all tests to pass" - else - local TEST_VERBOSE=1 - cmake-utils_src_test -R offline - fi -} - -src_install() { - cmake-utils_src_install - - if use examples ; then - find examples -name '.gitignore' -delete || die - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-libs/libgit2/libgit2-0.28.2.ebuild b/dev-libs/libgit2/libgit2-0.28.2.ebuild deleted file mode 100644 index 89a49f8ac99d..000000000000 --- a/dev-libs/libgit2/libgit2-0.28.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils python-any-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos" -fi - -DESCRIPTION="A linkable library for Git" -HOMEPAGE="https://libgit2.github.com/" - -LICENSE="GPL-2-with-linking-exception" -SLOT="0/28" -IUSE="examples gssapi libressl +ssh test +threads trace" -RESTRICT="!test? ( test )" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib - net-libs/http-parser:= - gssapi? ( virtual/krb5 ) - ssh? ( net-libs/libssh2 ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig -" - -S=${WORKDIR}/${P/_/-} - -src_configure() { - local mycmakeargs=( - -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" - -DBUILD_CLAR=$(usex test) - -DENABLE_TRACE=$(usex trace) - -DUSE_GSSAPI=$(usex gssapi) - -DUSE_SSH=$(usex ssh) - -DTHREADSAFE=$(usex threads) - ) - cmake-utils_src_configure -} - -src_test() { - if [[ ${EUID} -eq 0 ]] ; then - # repo::iterator::fs_preserves_error fails if run as root - # since root can still access dirs with 0000 perms - ewarn "Skipping tests: non-root privileges are required for all tests to pass" - else - local TEST_VERBOSE=1 - cmake-utils_src_test -R offline - fi -} - -src_install() { - cmake-utils_src_install - dodoc docs/*.{md,txt} - - if use examples ; then - find examples -name '.gitignore' -delete || die - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-libs/libgit2/libgit2-0.28.3.ebuild b/dev-libs/libgit2/libgit2-0.28.3.ebuild index adf461f51e8f..84b9ad2b9c54 100644 --- a/dev-libs/libgit2/libgit2-0.28.3.ebuild +++ b/dev-libs/libgit2/libgit2-0.28.3.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm arm64 ~ppc x86 ~ppc-macos" + KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~ppc-macos" fi DESCRIPTION="A linkable library for Git" diff --git a/dev-libs/libgit2/metadata.xml b/dev-libs/libgit2/metadata.xml index e090ecb97fe2..341b4d4cf6d8 100644 --- a/dev-libs/libgit2/metadata.xml +++ b/dev-libs/libgit2/metadata.xml @@ -15,8 +15,6 @@ speed custom Git applications in any language which supports C bindings. - Use net-misc/curl for HTTP support - (otherwise, limited built-in implementation will be used) Enable GSSAPI support for SPNEGO auth Enable SSH transport support Enable tracing support -- cgit v1.2.3