From fb570926a8de6db1e104ef6f525138c8e26155ca Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Mon, 29 Jun 2026 21:59:49 +0200 Subject: [PATCH] Update to version 0.9.32 Resolves: RHEL-190310 --- .gitignore | 1 + lmdb-make.patch | 16 ++++++++++------ lmdb.spec | 34 ++++++++++++++++++++-------------- sources | 2 +- 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index a5b5163..d83dc3e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /LMDB_0.9.27.tar.gz /LMDB_0.9.28.tar.gz /LMDB_0.9.29.tar.gz +/openldap-LMDB_0.9.32.tar.gz diff --git a/lmdb-make.patch b/lmdb-make.patch index eca03ef..52cfd0f 100644 --- a/lmdb-make.patch +++ b/lmdb-make.patch @@ -1,6 +1,7 @@ -diff -up lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile.orig lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile ---- lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile.orig 2017-01-04 12:14:24.303344915 +0100 -+++ lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile 2017-01-04 12:19:20.190295319 +0100 +diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile +index 000f1f9..c533342 100644 +--- a/libraries/liblmdb/Makefile ++++ b/libraries/liblmdb/Makefile @@ -26,6 +26,7 @@ OPT = -O2 -g CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS) LDLIBS = @@ -37,7 +38,7 @@ diff -up lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile.orig lmdb-LMDB_0.9.19/libra test: all rm -rf testdb && mkdir testdb -@@ -64,20 +65,24 @@ test: all +@@ -64,21 +65,25 @@ test: all liblmdb.a: mdb.o midl.o $(AR) rs $@ mdb.o midl.o @@ -49,8 +50,7 @@ diff -up lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile.orig lmdb-LMDB_0.9.19/libra +liblmdb$(SOEXT).$(SOVERSION): mdb.lo midl.lo # $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS) - $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS) -+ $(CC) $(LDFLAGS) -pthread -shared -Wl,-soname,$@ -o $@ mdb.lo midl.lo $(SOLIBS) - +- -mdb_stat: mdb_stat.o liblmdb.a -mdb_copy: mdb_copy.o liblmdb.a -mdb_dump: mdb_dump.o liblmdb.a @@ -61,6 +61,9 @@ diff -up lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile.orig lmdb-LMDB_0.9.19/libra -mtest4: mtest4.o liblmdb.a -mtest5: mtest5.o liblmdb.a -mtest6: mtest6.o liblmdb.a +-mplay: mplay.o liblmdb.a ++ $(CC) $(LDFLAGS) -pthread -shared -Wl,-soname,$@ -o $@ mdb.lo midl.lo $(SOLIBS) ++ +mdb_stat: mdb_stat.o liblmdb.so +mdb_copy: mdb_copy.o liblmdb.so +mdb_dump: mdb_dump.o liblmdb.so @@ -71,6 +74,7 @@ diff -up lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile.orig lmdb-LMDB_0.9.19/libra +mtest4: mtest4.o liblmdb.so +mtest5: mtest5.o liblmdb.so +mtest6: mtest6.o liblmdb.so ++mplay: mplay.o liblmdb.so mdb.o: mdb.c lmdb.h midl.h $(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c diff --git a/lmdb.spec b/lmdb.spec index caf661c..ad2ee3d 100644 --- a/lmdb.spec +++ b/lmdb.spec @@ -1,23 +1,23 @@ Name: lmdb -Version: 0.9.29 -Release: 3%{?dist} +Version: 0.9.32 +Release: 1%{?dist} Summary: Memory-mapped key-value database -License: OpenLDAP -URL: http://symas.com/mdb +License: OLDAP-2.8 +URL: https://www.symas.com/lmdb # Main source is retrieved from OpenLDAP GitLab %global forgeurl https://git.openldap.org/openldap/openldap %global tag LMDB_%{version} -# Tag checkout includes commit in archive name -%global commit 8ad7be2510414b9506ec9f9e24f24d04d9b04a1a -# The files themselves are in several subdirectories and need to be prefixed wit this. -%global archive_path libraries/lib%{name} +%global archivename openldap-%{tag} +%global archiveext tar.gz +%global archiveurl %{forgeurl}/-/archive/%{tag}/%{archivename}.%{archiveext} +%forgemeta -Source0: %{forgeurl}/-/archive/%{tag}.tar.gz -Source1: lmdb.pc.in +Source: %{forgesource} +Source: lmdb.pc.in # Patch description in the corresponding file -Patch0: lmdb-make.patch -Patch1: lmdb-s390-check.patch +Patch: lmdb-make.patch +Patch: lmdb-s390-check.patch BuildRequires: make BuildRequires: gcc @@ -35,7 +35,7 @@ Summary: Shared libraries for %{name} %description libs The %{name}-libs package contains shared libraries necessary for running -applications that use %{name}. +applications that use the %{name} embedded database. %package devel Summary: Development files for %{name} @@ -54,8 +54,11 @@ The %{name}-doc package contains automatically generated documentation for %{nam %prep -%autosetup -p1 -n openldap-%{tag}-%{commit} +# forgeautosetup does not pass the -n argument +%autosetup -n %{archivename} -p1 +# The files themselves are in several subdirectories and need to be prefixed wit this. +%global archive_path libraries/lib%{name} %build pushd %{archive_path} @@ -122,6 +125,9 @@ popd %changelog +* Mon Jun 29 2026 Petr Lautrbach - 0.9.32-1 +- Upgrade to version 0.9.32 + * Mon Aug 09 2021 Mohan Boddu - 0.9.29-3 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/sources b/sources index 2a29eac..f06492b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (LMDB_0.9.29.tar.gz) = f75d5751ed97c1b7f982379988719f566efbf8df2d4c8894764f49c2eb926e3918844bc1e7d88e8b278e1c949ad75940f2404816ce345e74cf94d36645143b05 +SHA512 (openldap-LMDB_0.9.32.tar.gz) = b249e598e6e54e39d664525ecfef96b05b2ad7838530026edd2f3bb0069f4e7d8d058dbbb51ccd9bac5b6d7838adba31ae60639bbfe74cd370489adf394bca72