commit: 2bba4156bcf48edc838a0e452d3bea1a82d42ea9 Author: Eray Aslan <eras <AT> gentoo <DOT> org> AuthorDate: Thu Feb 11 14:39:55 2021 +0000 Commit: Eray Aslan <eras <AT> gentoo <DOT> org> CommitDate: Thu Feb 11 14:40:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bba4156
dev-db/lmdb: bump to 0.9.28 and fix cursor delete bug introduced with 0.9.27 Closes: https://bugs.gentoo.org/768948 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Eray Aslan <eras <AT> gentoo.org> dev-db/lmdb/Manifest | 1 + dev-db/lmdb/files/lmdb-fix-cursor-delete.patch | 48 ++++++++++++++++ dev-db/lmdb/lmdb-0.9.28.ebuild | 79 ++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest index 5adf3f05340..2708a563787 100644 --- a/dev-db/lmdb/Manifest +++ b/dev-db/lmdb/Manifest @@ -2,3 +2,4 @@ DIST LMDB_0.9.23.tar.gz 143813 BLAKE2B 252acad974a7ed528fe0e52b8332845bc0b607659 DIST LMDB_0.9.24.tar.gz 143916 BLAKE2B f075ec5f4dfb77685188229e20f12c4febe8295c7d35ed15c3db492b68af68cc7f76741078e9bb524d2c38587839f542e964af1e5d6d984bb28bd602caabbb8d SHA512 c3a96c27f13c072ef5861bcea045d82f0a220dbd938579411ea6c38ac0696b3620c71f1e2cc56d31db5105f3533da95aba1ac34653d8bdcfa4f2f1fb831cccb1 DIST openldap-LMDB_0.9.26.tar.gz 144029 BLAKE2B 07fe81cdaed7a402aaf485a2aa41d12c2c8cc8813d39d5304d8a1f5c8920f4695021eb586b4366a5f55010284227c7ac16487a8799c60f251ea97cd745b1261a SHA512 d7826f6d1a3144feb71eef65f843e8bcddf6cec384014bab3fc1d32a7f1b9316bcbb5b3a915b166cbdae2ffbd15f14b4eb783acd7eddbd2e321607f750efe94d DIST openldap-LMDB_0.9.27.tar.gz 144104 BLAKE2B 76b7b66ca455f61f71b7c010de0b5437d02a245a5129184cf45bf5684a745888c88012fb73a219076b6c47adfda0804e6c7f603e4631c98034c01efda99ad3a9 SHA512 a27c0d26c801b172f3c207666940f86ecaae9d223843b72823d064f0ea0629a855150d049cb143981783710d3ca791c7f0f65df9d91732b2709e6107af403854 +DIST openldap-LMDB_0.9.28.tar.gz 144520 BLAKE2B 3466da1ffde7350056fb3b16fc0068d78139c578fdf79cd6456ca0d98e2d7b3d899849ae42a7224335a4680e52b5f0feb2c4233eaf00ee3d9ee648ae10c3114a SHA512 0cdf9a2ce35617a3135cde96491fbbb73be9362de2b94d23eda44b65ce48362ff9dbdfe921c3255ed486aceb385fcb62b81f560b1037476f4741291b29ba0dce diff --git a/dev-db/lmdb/files/lmdb-fix-cursor-delete.patch b/dev-db/lmdb/files/lmdb-fix-cursor-delete.patch new file mode 100644 index 00000000000..fd76be1bb79 --- /dev/null +++ b/dev-db/lmdb/files/lmdb-fix-cursor-delete.patch @@ -0,0 +1,48 @@ +From 40585b483976d9062e6c971df285f911512ecd5e Mon Sep 17 00:00:00 2001 +From: Howard Chu <[email protected]> +Date: Tue, 9 Feb 2021 23:38:06 +0000 +Subject: [PATCH] ITS#9461 refix ITS#9376 + +Was setting C_DEL flag gratuitously +--- + libraries/liblmdb/mdb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c +index 621cbcfa..e6cae8ed 100644 +--- a/mdb.c ++++ b/mdb.c +@@ -8527,10 +8527,10 @@ mdb_cursor_del0(MDB_cursor *mc) + } + m3->mc_xcursor->mx_cursor.mc_flags |= C_DEL; + } +- m3->mc_flags |= C_DEL; + } + } + } ++ m3->mc_flags |= C_DEL; + + fail: + if (rc) +From f9c5b46651c4ecd699643c4d90bb3ab7725a6167 Mon Sep 17 00:00:00 2001 +From: Howard Chu <[email protected]> +Date: Thu, 11 Feb 2021 11:34:57 +0000 +Subject: [PATCH] ITS#9461 fix typo + +--- + libraries/liblmdb/mdb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c +index e6cae8ed..4062664b 100644 +--- a/mdb.c ++++ b/mdb.c +@@ -8530,7 +8530,7 @@ mdb_cursor_del0(MDB_cursor *mc) + } + } + } +- m3->mc_flags |= C_DEL; ++ mc->mc_flags |= C_DEL; + + fail: + if (rc) diff --git a/dev-db/lmdb/lmdb-0.9.28.ebuild b/dev-db/lmdb/lmdb-0.9.28.ebuild new file mode 100644 index 00000000000..9f7ae6e24fd --- /dev/null +++ b/dev-db/lmdb/lmdb-0.9.28.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic multilib-minimal toolchain-funcs + +MY_P="${PN^^}_${PV}" + +DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store" +HOMEPAGE="https://symas.com/lmdb/technical/"; +SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-${MY_P}.tar.gz"; + +LICENSE="OPENLDAP" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +DEPEND="" +RDEPEND="" + +S="${WORKDIR}/openldap-${MY_P}/libraries/liblmdb" + +PATCHES=( + "${FILESDIR}/${PN}-fix-cursor-delete.patch" +) + +src_prepare() { + default + if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then + # posix_memalign isn't available before 10.6, but on OSX + # malloc is always aligned for any addressable type + sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die + fi + multilib_copy_sources +} + +multilib_src_configure() { + local soname="-Wl,-soname,liblmdb$(get_libname 0)" + if [[ ${CHOST} == *-darwin* ]] ; then + soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)" + replace-flags -O[123456789] -O1 + fi + sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \ + -e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \ + -e "s!^AR.*!AR = $(tc-getAR)!" \ + -e "s!^SOEXT.*!SOEXT = $(get_libname)!" \ + -e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \ + -e "/^libdir/s!lib\$!$(get_libdir)!" \ + -e "s!shared!shared ${soname}!" \ + "Makefile" || die + + if [[ ${CHOST} == *-solaris* ]] ; then + # fdatasync lives in -lrt on Solaris 10 + [[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt + fi +} + +multilib_src_compile() { + emake LDLIBS+=" -pthread" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + mv "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname) \ + "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname 0) || die + dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname) + + insinto /usr/$(get_libdir)/pkgconfig + doins "${FILESDIR}/lmdb.pc" + sed -i -e "s!@PACKAGE_VERSION@!${PV}!" \ + -e "s!@prefix@!${EPREFIX}/usr!g" \ + -e "s!@libdir@!$(get_libdir)!" \ + "${ED}"/usr/$(get_libdir)/pkgconfig/lmdb.pc || die + + if ! use static-libs; then + rm "${ED}"/usr/$(get_libdir)/liblmdb.a || die + fi +}
