From b8c11747a39494b4ecc4070f6b751754cf235097 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2020 23:01:41 +0000 Subject: import lmdb-0.9.23-5.el8 --- diff --git a/SOURCES/lmdb-covscan.patch b/SOURCES/lmdb-covscan.patch new file mode 100644 index 0000000..2d11cbd --- /dev/null +++ b/SOURCES/lmdb-covscan.patch @@ -0,0 +1,37 @@ +diff -up ./libraries/liblmdb/midl.c.fix ./libraries/liblmdb/midl.c +--- ./libraries/liblmdb/midl.c.fix 2019-06-19 11:10:07.791337785 +0200 ++++ ./libraries/liblmdb/midl.c 2019-06-19 11:16:04.005166705 +0200 +@@ -120,9 +120,15 @@ void mdb_midl_free(MDB_IDL ids) + void mdb_midl_shrink( MDB_IDL *idp ) + { + MDB_IDL ids = *idp; +- if (*(--ids) > MDB_IDL_UM_MAX && +- (ids = realloc(ids, (MDB_IDL_UM_MAX+2) * sizeof(MDB_ID)))) ++ MDB_IDL res = NULL; ++ if (*(--ids) > MDB_IDL_UM_MAX) + { ++ res = realloc(ids, (MDB_IDL_UM_MAX+2) * sizeof(MDB_ID)); ++ if (res) ++ ids = res; ++ else ++ return; ++ + *ids++ = MDB_IDL_UM_MAX; + *idp = ids; + } +@@ -131,10 +137,13 @@ void mdb_midl_shrink( MDB_IDL *idp ) + static int mdb_midl_grow( MDB_IDL *idp, int num ) + { + MDB_IDL idn = *idp-1; ++ MDB_IDL res = NULL; + /* grow it */ +- idn = realloc(idn, (*idn + num + 2) * sizeof(MDB_ID)); +- if (!idn) ++ res = realloc(idn, (*idn + num + 2) * sizeof(MDB_ID)); ++ if (!res) + return ENOMEM; ++ else ++ idn = res; + *idn++ += num; + *idp = idn; + return 0; diff --git a/SPECS/lmdb.spec b/SPECS/lmdb.spec index cb15fe5..96b5612 100644 --- a/SPECS/lmdb.spec +++ b/SPECS/lmdb.spec @@ -3,21 +3,25 @@ Name: lmdb Version: 0.9.23 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Memory-mapped key-value database License: OpenLDAP URL: http://symas.com/mdb/ Source0: https://github.com/LMDB/lmdb/archive/LMDB_%{version}.tar.gz Source1: lmdb.pc.in -# Patch description in the corresponding file -Patch0: lmdb-make.patch -Patch1: lmdb-s390-check.patch BuildRequires: make BuildRequires: gcc BuildRequires: doxygen +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +# Patch description in the corresponding file +Patch0: lmdb-make.patch +Patch1: lmdb-s390-check.patch +Patch2: lmdb-covscan.patch + %description LMDB is an ultra-fast, ultra-compact key-value embedded data store developed by Symas for the OpenLDAP Project. By using memory-mapped files, @@ -52,7 +56,7 @@ The %{name}-doc package contains automatically generated documentation for %{nam %setup -q -n %{name}-LMDB_%{version} %patch0 -p1 -b .make %patch1 -p1 -b .s390-check - +%patch2 -p1 -b .covscan %build pushd %{archive_path} @@ -118,6 +122,10 @@ popd %changelog +* Tue Jun 18 2019 Radovan Sroka - 0.9.23-5 +- fixed resolves from RPMDIFF +- fixed some covscan issues + * Wed Jun 12 2019 Radovan Sroka - 0.9.23-4 - propagate ldflags for makefile - added explicit Requires for -libs