From d7226f5b802f8b9a1b3133429e3ca8c60512dd48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Mon, 29 Nov 2021 16:01:01 +0100 Subject: [PATCH] Rebase to version 2.4.1 resolves: rhbz#2013588 --- .gitignore | 2 ++ fixed-guidindexpackv1.ldb | Bin 65536 -> 0 bytes ldb-2.3.0-fix-tests-on-aarch64.patch | 39 --------------------------- ldb.keyring | Bin 0 -> 1509 bytes libldb.spec | 21 ++++++--------- sources | 5 ++-- 6 files changed, 12 insertions(+), 55 deletions(-) delete mode 100644 fixed-guidindexpackv1.ldb delete mode 100644 ldb-2.3.0-fix-tests-on-aarch64.patch create mode 100644 ldb.keyring diff --git a/.gitignore b/.gitignore index 05726b2..7ca3a22 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,5 @@ /ldb-2.2.0.tar.gz /ldb-2.3.0.tar.asc /ldb-2.3.0.tar.gz +/ldb-2.4.1.tar.asc +/ldb-2.4.1.tar.gz diff --git a/fixed-guidindexpackv1.ldb b/fixed-guidindexpackv1.ldb deleted file mode 100644 index 96d783cb0dc2031274113db2aa6ccfc9729fe282..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65536 zcmeI)OK4nG0LJl&?V?m#BR-&RELN%uA9vo9KqQYz>Oh^5%%m2p#ysw{l_pV>P@fxd zA#^8IDijQKW2qpbf(r#9=|UGJ;6|YcLUGert2S-pBYMttX1sUqxxJ4h%U){N~+G#zyv3pA=H@1CRM*sl? z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R&oAK>MdvlaqTR1Q!0@h*oJ60R#|0 z0D<}vxbjzh^@rXd&}af5@*QflA)~(tAb`M{1{D z2P1$00u3#&h4r(c$B)h<5L961O3<3rD+`?Xz5E+L5kLR|1pEkm@tdEko9Ei4Uz;aO zD<^4Z99wz#$&LU52q1s}0tmE>K=tX zE;W5b0wRC_0tg_000QeOu=w-3Hb-L!AbatsO3IPPxAn;VqTDkbs>i5>+>v0tg_000IagfB*sr zAbGo}A)?=8{o?V=nI<;?hrH{aXQ zwmY5e>ds`-{rmT3@`cbrab%M?YdX}ON$(#{XNUI;WzwNGac;9H#*REwIl5IGof>^k zADbDH7s_+FY`;-KRtk&axXqQ$d@g?8AXPRlA1L(a3(*JCeO>vU$9j9@FS)@z=Kjb&w2M;RQfP8yLN|JOvp8#NEHpK% zJS?tq-4;t%nDdOieSFF(PfVF79w1N5DNkITC+?a>UZBb|Km5!GPI(f_Jjnog5>9!N z>O9H7d3HT`|Bp_2Qp!9X0rI4r@^q;4bOg?G>RM>kDUYVi6Aq9^bIKD|=eglBP{~@J zZwumxCdy$^mM7lWBJ)(%t4_JZq_drtHNc)hM!iYY|8GU}SV=a$uYWL~$z>}mSkze4 zjNNwGFYA&dyXk2=U%JY?Hq6g`eb!;D^rCXCH2-6z7oEmRQ;(ImNQ&UE$^Te+TO>rT@>rR(eKtMb?Vc?WB%8gG|7_kCbW^t1#P8cg85HHhN1LB0 zXY1|B_h+&LIpdMQ_ySdq96h8@_8l6TJgAQwUx!;o)rc1E(BhG>770fpsfV;DL(}>T zv-;$io}HZ-)n7C&l+A>r;va|YcF#@RL-R> zcfR7DEfOS~y^{ZI-WF>SQPd+A;GZ1y$U zLpFOQ-`T`M?{QOQo85l>WA|+KXE_hq?3H|HD<(WftISFBeK!AtewWOqdZ!4>0P@wx z@;qVx8kyd49NsCyPWRb}`aT=+6iIcTUH)$IocmbW-y=MXmA#Vxv5I*LCN5IW!&9d( zx@WV$^LfZ-ujD_Qw?Q*yGta|M&ODrVnuk&4Jhb1c+~;A`X&%PZ^U&LHmFJ;+I=n@c z+eH~aaPHIcSoIVNgPGnT@j`AqIf%2NZqqTjZ)}g2ewtlwdwJ!UlS^FbVt-_EcZoZ> zB-Ae6mYlLnL97b*h-?={IlA}qmt~j#pIyYCMLMhhQlXf&s>@vF>74jX>wAe_wC)$R zs{L@)zIcwa{HY~cwI8e6k5}y{s`isr`=0N+B8ua7M6SGIGtZsrf%yfexsz1R9s8?< S``k%7&7G8b?s$tU=gz+l0 -Date: Thu, 22 Apr 2021 10:03:53 +0200 -Subject: [PATCH 1/2] lib:ldb: Use a 1MiB lmdb so the test also passes on - aarch64 CentOS stream - -Signed-off-by: Gary Lockyer -Reviewed-by: Andreas Schneider ---- - lib/ldb/tests/ldb_lmdb_free_list_test.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/ldb/tests/ldb_lmdb_free_list_test.c b/lib/ldb/tests/ldb_lmdb_free_list_test.c -index 9b295460730..c87620e7a87 100644 ---- a/tests/ldb_lmdb_free_list_test.c -+++ b/tests/ldb_lmdb_free_list_test.c -@@ -77,7 +77,7 @@ - #endif /* TEST_BE */ - - const int RECORD_SIZE = 6144; --const int ITERATIONS = 3; -+const int ITERATIONS = 192; - - struct test_ctx { - struct tevent_context *ev; -@@ -155,9 +155,9 @@ static int setup(void **state) - "@IDX_DN_GUID: GUID\n" - "\n"; - /* -- * Use a 64KiB DB for this test -+ * Use a 1MiB DB for this test - */ -- const char *options[] = {"lmdb_env_size:65536", NULL}; -+ const char *options[] = {"lmdb_env_size:1048576", NULL}; - - noconn_setup((void **)&test_ctx); - --- -2.31.1 diff --git a/ldb.keyring b/ldb.keyring new file mode 100644 index 0000000000000000000000000000000000000000..1e4891bed80113bffd80434e4d1244eab6a6541e GIT binary patch literal 1509 zcmZQzU{GLWWMJ}kib!Jsf;f%R10W1yLjdbhCPpx;j)8&In1P8wW}^FI%fhJ=?wN=-} z?`Jk8JodWYuCvslGUnl=tHsTm#P+X^6jU&=X`J|Er>`~Vy_fX`!qRM3={Gj_Jr4a^ z`|{zmudS1$n|zOXY6tcT)GG;8urJ^KI6Y7Eek0Qlf%SW>QgNQKf=QW^qYTW>RTM zW`3T6cWR}AO)*GbH>ote*a6Jc%P&f|+W?Fmp!rN-^BFoBgIR}IfCC|hlIsQts^wz90S9k-^K&MMJ!-t>6a^Os3UhYm3MX;x{lN$kA#qW<(T*0>X& z^csH#oVb=`_Hnh!U;gi>Ca7;x5~y{y-e@Yaq}eYpOE$dljpUOBQVlv+4$PhQ{=tcW zKXTo-82Xm-7q55p;rlu3<$3S_M=s4;tC+Roc{;*H*GD-Xa%U)^sC5jH&U# zQi~-e!hOs2PhRBwzhL*}#zn!aZwDA&&E5Fwx$eQDYnqIUvn*PbL+`#{t(RSUN&MG_ z-mbNuH?T1<1H+hMCn9a{Uw^&vT|>W#Z)}p!t*G6VdK+xA+Pp8F{2TP%`kLH!{b|u0 z{OWU3cx=T?)$eZdP7ps>wqSmW-30m66SA7|b0X#oX)D&rF?~MlrF{QGWbog0y^cP*y>E*e2n&o?h zMNXcX&kqJ==F@VgO1-q#sqSuhKV9+8T5#I#WVB(C0H!uICTSjg$*LBdtR5jJt7-e# z|2uNJpMN&HDQ0-HdhLq&TcmW#_S($<@3Cj^50%RMbN!@LWLEaxYI+yKsH<==drhfj zzH*{OKmSI(gLiVY&OHg}eLs!M_w@bNaHrL4_dk2w{^4Tg*@)fwhb~kUef%o_Mdg}s zlxSbm!wsE5?qWRb7uimn`KCN`f62da)|kMPY7tXr%DtR_W`Dx-K0B07Z~=1poj5 literal 0 HcmV?d00001 diff --git a/libldb.spec b/libldb.spec index 0f8ef83..59cd98e 100644 --- a/libldb.spec +++ b/libldb.spec @@ -19,13 +19,13 @@ %bcond_with python3 %endif -%global talloc_version 2.3.1 -%global tdb_version 1.4.3 -%global tevent_version 0.10.2 +%global talloc_version 2.3.3 +%global tdb_version 1.4.4 +%global tevent_version 0.11.0 Name: libldb -Version: 2.3.0 -Release: 6%{?dist} +Version: 2.4.1 +Release: 1%{?dist} Summary: A schema-less, ldap like, API and database Requires: libtalloc%{?_isa} >= %{talloc_version} Requires: libtdb%{?_isa} >= %{tdb_version} @@ -36,14 +36,9 @@ Source0: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.gz Source1: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.asc # gpg2 --no-default-keyring --keyring ./ldb.keyring --recv-keys 9147A339719518EE9011BCB54793916113084025 Source2: ldb.keyring -# binary diffs are not supported -# https://gitlab.com/samba-team/samba/-/merge_requests/1920 -Source3: fixed-guidindexpackv1.ldb # Patches Patch0001: 0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch -# https://gitlab.com/samba-team/samba/-/merge_requests/1920 -Patch0002: ldb-2.3.0-fix-tests-on-aarch64.patch BuildRequires: gcc BuildRequires: libtalloc-devel >= %{talloc_version} @@ -132,9 +127,6 @@ Development files for the Python bindings for the LDB library zcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} - %autosetup -n ldb-%{version} -p1 -# binary diffs are not supported -cp -f %{SOURCE3} tests/guidindexpackv1.ldb - %build # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1217376 export python_LDFLAGS="" @@ -230,6 +222,9 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_* %endif %changelog +* Mon Nov 29 2021 Pavel Filipenský - 2.4.1-1 +- resolves: rhbz#2013588 - Rebase to version 2.4.1 + * Mon Aug 09 2021 Mohan Boddu - 2.3.0-6 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/sources b/sources index 94892ef..8c03323 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (ldb.keyring) = dab8c56fad6555885ee05f26f1e6da8d4c95c0cd7bdba114422b31d33b95ce46e763946a4be17c651e2626c0511f087bc223773f74b4d43ffc3010528b270093 -SHA512 (ldb-2.3.0.tar.asc) = c903363bcc58c1c192a88588aa2a510374864c3c1bc7e96a82663028ee00de9379122012ad05a141dc892454b797f007aca855a02b0ad3e99f6d353a612605bc -SHA512 (ldb-2.3.0.tar.gz) = 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348 +SHA512 (ldb-2.4.1.tar.asc) = 3aa7a3cd5481668f8764f093856893dd3737a3d71092dc15bbeb88da9baf8c194843cc35eda543d3511c5cbec1ce03c6c16b3da87db53570fd18fc80d2c4273b +SHA512 (ldb-2.4.1.tar.gz) = 14ab5397d28c369142b2ccf55a2ab4e678a3fe6e018541cfce46241f8226400bc169360bbef254fae4410a6e15024ae986f02298d3d324e3d3a8b88801bf76d7