From f65628136faa35d0c4d3b5e7332275c7b35fcd96 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Nov 2018 08:36:22 +0000 Subject: gentoo resync : 03.11.2018 --- dev-libs/libgit2/Manifest | 9 +-- ...libgit2-0.26.8-disable-oom-tests-on-32bit.patch | 64 +++++++++++++++++ dev-libs/libgit2/libgit2-0.26.7.ebuild | 82 ---------------------- dev-libs/libgit2/libgit2-0.26.8.ebuild | 9 ++- dev-libs/libgit2/libgit2-0.27.5.ebuild | 82 ---------------------- dev-libs/libgit2/libgit2-0.27.7.ebuild | 7 ++ 6 files changed, 82 insertions(+), 171 deletions(-) create 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.7.ebuild delete mode 100644 dev-libs/libgit2/libgit2-0.27.5.ebuild (limited to 'dev-libs/libgit2') diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest index 320f3fcc31f1..471d2928e2df 100644 --- a/dev-libs/libgit2/Manifest +++ b/dev-libs/libgit2/Manifest @@ -1,10 +1,7 @@ -DIST libgit2-0.26.7.tar.gz 4737641 BLAKE2B dd87ab3048dec361619ff0e42d19161e4b20a07d334ad42aa077b77202bf5e84b85e33a6d6668afef36a7ff23f85a68f28049e08dd7502b241e40a730a78bb44 SHA512 5ad0c514b6c1c58031029f4ada278a164cc112f25c36745973df27711f12888000c054816b65889576124e93b71ec9a1c4f4cc0b538f177d93a57bc145fea1e1 +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.27.5.tar.gz 4775158 BLAKE2B 118af462a4969bc802451b887386e87da0f855641a774ce7460d6fe7ad9c62ce71a4b35a7461a95c7c4a96c59143c9c1acc78c5a1b21143a651491713f4fa15b SHA512 318b981456d55f60f8aa1897f1f70274329e48f09769b661eb4bbe76399071eca0fbc7deacb3191db16bc89dba8cc69a64adaf8cbc65e34a65b6e72ca122e21f DIST libgit2-0.27.7.tar.gz 4782856 BLAKE2B c844eca24b5053b3391ace6ebeea047bbba4fd429786e08144151109bfbd22f5c1b2609a176816a5d7eff63f1fe91122f88d89d3613dc4c770051cf095ae5ac3 SHA512 de2e266939bd40bc580603539e1156906b97299523336ddc6a66c3bec26729495bef2daa2d240b83b7e011e93852381e95a4407132b0440a5aa1e1b7642c0011 -EBUILD libgit2-0.26.7.ebuild 1943 BLAKE2B 1b307186052d51167fa1cc022aac4f847de31e36398c8ba58b178399e2aa527e0619a09bbcca20414f122008a4e7f8344ffd8f67b0948b605ce42d3c95c4fba9 SHA512 11a0a56558a263784838c185f6967a9fba0f2206591cc1bce6f18be73ea2a990c6012cde6c370fcb7ceace0433a07353735a6d0cb0d0580cf27005f090581fb1 -EBUILD libgit2-0.26.8.ebuild 1823 BLAKE2B 3cab4e9d924618f0ae65fc074087c4db0d3b2c73b57e7196083d9194101ff67b8d91b68ec78e45275984eec1d94ee9d2e34fc8180f7b30ddd8ae8f42a8f0e67f SHA512 6adac344bac4a817955037e60b42caf18d2eb95e6c91fe15995f7f8591cf3e193e773c1fdb40b7264d6195ebf2e6b79b6af1d116834e49d193ceab3d20f65798 -EBUILD libgit2-0.27.5.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6 -EBUILD libgit2-0.27.7.ebuild 1823 BLAKE2B 4a34b7c5f15e9191bfb2b236166fb1e68e8908b30c2fccffb7f80ccfbc32607f6ac03314a2d2ace2b43496cbb4f76b180ec4692ee47b91ad63870418c1c18c0b SHA512 e9c84a0e241c83359a8fd04d9374e94f6be46345b942c6344f655ce955fdd815dd9ca08c6c7bcb9aa15f5befdc5898457236f280b078a892419e1d31a143a430 +EBUILD libgit2-0.26.8.ebuild 2053 BLAKE2B 1de5648ae2d9500af644cb1e8519962a463497f25bed279e6148d14dcc0235b4c388f9c94a53f7c0075896f46ba395ed6030d8a577061284c4ab11fe68a566c9 SHA512 2afea3b4bcd0bcf9602ae226762d4c7de609cf97408ea9ac560646d3c001467578adb6512df0c63eb9ed618606355f7087a041b0c2b12e549ac93dc23d1faa84 +EBUILD libgit2-0.27.7.ebuild 2055 BLAKE2B 1fc9de00757bce342fc97176725cd608244d6c22acb3517249cd6bd6df4aed15737345f42a76dd7ac76dccbe100a858e7bc92a23863f7bdc16ab578a6b03cf8f SHA512 5a40ae4d935ce482df78558d7aff2fec2368ad0286121bfd6b02433a4e5889dd8cc9a521696bfe5b0f753a3c61fa3092d89ad991160fb1d4f039e6d91f67c632 EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867 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 new file mode 100644 index 000000000000..40be2aee8fdc --- /dev/null +++ b/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch @@ -0,0 +1,64 @@ +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.7.ebuild b/dev-libs/libgit2/libgit2-0.26.7.ebuild deleted file mode 100644 index 4b2a77205814..000000000000 --- a/dev-libs/libgit2/libgit2-0.26.7.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{4,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 ) - -src_prepare() { - # skip online tests - sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die - - cmake-utils_src_prepare -} - -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 - 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.26.8.ebuild b/dev-libs/libgit2/libgit2-0.26.8.ebuild index 5936e8a00286..34bc03ffb55f 100644 --- a/dev-libs/libgit2/libgit2-0.26.8.ebuild +++ b/dev-libs/libgit2/libgit2-0.26.8.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" @@ -40,6 +40,13 @@ DEPEND="${RDEPEND} 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)" diff --git a/dev-libs/libgit2/libgit2-0.27.5.ebuild b/dev-libs/libgit2/libgit2-0.27.5.ebuild deleted file mode 100644 index d10065358a4f..000000000000 --- a/dev-libs/libgit2/libgit2-0.27.5.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{4,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/27" -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 ) - -src_prepare() { - # skip online tests - sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die - - cmake-utils_src_prepare -} - -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 - 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.27.7.ebuild b/dev-libs/libgit2/libgit2-0.27.7.ebuild index d39c0a7a0268..3815701da066 100644 --- a/dev-libs/libgit2/libgit2-0.27.7.ebuild +++ b/dev-libs/libgit2/libgit2-0.27.7.ebuild @@ -40,6 +40,13 @@ DEPEND="${RDEPEND} 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)" -- cgit v1.2.3