From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-libs/mimetic/Manifest | 5 +++-- .../mimetic/files/mimetic-0.9.8-build-mmap.patch | 22 ++++++++++++++++++++++ dev-libs/mimetic/metadata.xml | 3 +++ dev-libs/mimetic/mimetic-0.9.8.ebuild | 14 +++++++++----- 4 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch (limited to 'dev-libs/mimetic') diff --git a/dev-libs/mimetic/Manifest b/dev-libs/mimetic/Manifest index 54297f67651d..dc84ff7ed444 100644 --- a/dev-libs/mimetic/Manifest +++ b/dev-libs/mimetic/Manifest @@ -1,4 +1,5 @@ +AUX mimetic-0.9.8-build-mmap.patch 688 BLAKE2B ca85ba15a59d9581c14e5d04095988ea18c9e8ea5f6e55f085ce0796a7f0a84633a8506d503b55700155f5b5320ed9b9ae7aa32c9f26c95afdad9ed6e97bb605 SHA512 37bb61296c0f337ba670ab721360fcc22bbff375a7a5f8e612076e49545a34abe83e9c079bcd28c7735145b2f07a60e3b012eb55937999d9c3abab32d7e773d0 AUX signed-char.patch 1024 BLAKE2B 333955f24190ac0327cbc8ec786a91d62f431169aa157966ba592b1132681635bd231f893bdb7b70c849aed2d3910aa488a9813f7f00b8688d3bb46000076a10 SHA512 23f79103ff31d70d992a777118bc733f3fc52b5fc21b6827c19b0d40a099c11b74eda89feccad2690f83a4cc3f8e92d918d111cf9cef025b94481fdd75c3fb63 DIST mimetic-0.9.8.tar.gz 556716 BLAKE2B 16dcd2a869a5ec92f8aeffca52f41aa1773ad1446302cf827d25ac27c407bcb7e59ed3f8868a00102ec19ef874da440e72f80cb42150a20dfd962af5173901f8 SHA512 4157eecb3e26af314d475c91192a357d6da35271a07a07b037d5037e9af84952ce2636874e86df0e94e8887dcfdb8f594a1ba04e6448181e436b0e2675f48f58 -EBUILD mimetic-0.9.8.ebuild 951 BLAKE2B dea52f7d511ff1c0a11752477c2f94e7d547c3f425a64e46cb590efaf116f917d4d8a984035395da39a11959b1f844c3065a2c0a9f4c1cbff34fb5f4a5729922 SHA512 897f203937ee81452058c6acc1e2b703968a376a10d06b1fd0c9ef12502a13bd62ac63f9e005e757af383c3e197a00cc72f137b08c0b71053d9f7a589b601d7f -MISC metadata.xml 307 BLAKE2B e7b916fd70cef60506087b468d421ad3f2e4858de12815eed8865c4ef02af911c1e06621f81abde9cb88c50763d0cce7f210e9348dba5cb37dc850cff3817059 SHA512 7dc1a2417c2a4a7eb521af83ee15b9fbd50a6f28aa178c1c3bd78d34bc77006aaee58cc6994ede664b4873cff656ab63da5f852cca152f52c7307d9f5172ac9f +EBUILD mimetic-0.9.8.ebuild 997 BLAKE2B 98479848e22567504865a04b8304c22f3a148fe1affe5a89454fd2565cf1952454aaea876e8181024a195d8ed8a2dcf913f4310788937181ecaebae3ddccf8e6 SHA512 cfa349619b31bf205bcdd3ed640d73e411b0b38d1bb916b4da2c54d7897b0978bf4c8aff29dac4b1b74371927c1fb97d8f6228a8188ff8bc4a54a2cfda661593 +MISC metadata.xml 383 BLAKE2B e3a09c9f6570065172f26e62a088ae0458288176871e88ee9677fb3f4ae78d38814fd31ec864c4ac2211d540c26e9ae43fdfe5264e4c5f17cedc5e20c41e4572 SHA512 ff86c0a6b6b67f03673b8aa9b942913c806c2b7e7d93496d5c65b17122c2f41f0f370093b80280a3ad77f81136eadbf92049174f549715d1933a337bb3d07ecb diff --git a/dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch b/dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch new file mode 100644 index 000000000000..d6c6582cd42f --- /dev/null +++ b/dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch @@ -0,0 +1,22 @@ +From bf84940f9021950c80846e6b1a5f8b0b55991b00 Mon Sep 17 00:00:00 2001 +From: Stefano Barbato +Date: Sat, 27 Apr 2019 15:00:58 +0200 +Subject: [PATCH] better mmap error check + +--- + mimetic/os/mmfile.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mimetic/os/mmfile.cxx b/mimetic/os/mmfile.cxx +index dfc95b7..9627516 100644 +--- a/mimetic/os/mmfile.cxx ++++ b/mimetic/os/mmfile.cxx +@@ -57,7 +57,7 @@ bool MMFile::open(int mode) + bool MMFile::map() + { + m_beg = (char*) mmap(0, m_st.st_size, PROT_READ, MAP_SHARED,m_fd,0); +- if(m_beg > 0) ++ if(m_beg != MAP_FAILED) + { + m_end = m_beg + m_st.st_size; + #if HAVE_MADVISE diff --git a/dev-libs/mimetic/metadata.xml b/dev-libs/mimetic/metadata.xml index 0f8f01bc86f9..77dd42e18fd2 100644 --- a/dev-libs/mimetic/metadata.xml +++ b/dev-libs/mimetic/metadata.xml @@ -7,4 +7,7 @@ kensington@gentoo.org + + tat/mimetic + diff --git a/dev-libs/mimetic/mimetic-0.9.8.ebuild b/dev-libs/mimetic/mimetic-0.9.8.ebuild index 3f54ec09712e..1190360ea4df 100644 --- a/dev-libs/mimetic/mimetic-0.9.8.ebuild +++ b/dev-libs/mimetic/mimetic-0.9.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -14,9 +14,12 @@ SLOT="0" KEYWORDS="amd64 ~ppc64 x86" IUSE="doc examples" -DEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-doc/doxygen )" -PATCHES=( "${FILESDIR}/signed-char.patch" ) +PATCHES=( + "${FILESDIR}/signed-char.patch" + "${FILESDIR}/${P}-build-mmap.patch" +) src_prepare() { default @@ -46,5 +49,6 @@ src_install() { dodoc examples/{README,TODO,test.msg,*.cxx,*.h} fi - rm "${D}"/usr/$(get_libdir)/libmimetic.la || die + # bug #778887 + find "${ED}" -name '*.la' -delete || die } -- cgit v1.2.3