From 4cb1f6f80f0f47f22b54c66a2c66d29d0bab0943 Mon Sep 17 00:00:00 2001 From: Simon Pichugin Date: Wed, 3 Jul 2024 21:00:41 -0700 Subject: [PATCH] Fix annocheck bind-now issue Fix vlvResult comment Resolves: RHEL-33514, RHEL-36474 --- openldap-ITS-9921-fix-vlvResult-comment.patch | 25 +++++++++++++++++++ openldap.spec | 15 +++++++---- 2 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 openldap-ITS-9921-fix-vlvResult-comment.patch diff --git a/openldap-ITS-9921-fix-vlvResult-comment.patch b/openldap-ITS-9921-fix-vlvResult-comment.patch new file mode 100644 index 0000000..ff059d7 --- /dev/null +++ b/openldap-ITS-9921-fix-vlvResult-comment.patch @@ -0,0 +1,25 @@ +From 0b4098ca9080e78436cbd9f383047a9583888376 Mon Sep 17 00:00:00 2001 +From: Howard Chu +Date: Mon, 26 Sep 2022 11:55:27 +0100 +Subject: [PATCH] ITS#9921 fix vlvResult comment + +--- + clients/tools/common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/clients/tools/common.c b/clients/tools/common.c +index b88f219b36..3135034ca0 100644 +--- a/clients/tools/common.c ++++ b/clients/tools/common.c +@@ -2210,7 +2210,7 @@ print_vlv( LDAP *ld, LDAPControl *ctrl ) + ber_memfree( bv.bv_val ); + + tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE, +- ldif ? "vlvResult" : "vlvResult", buf, rc ); ++ ldif ? "vlvResult: " : "vlvResult", buf, rc ); + } + + return rc; +-- +GitLab + diff --git a/openldap.spec b/openldap.spec index b6719e8..caef68e 100644 --- a/openldap.spec +++ b/openldap.spec @@ -17,7 +17,7 @@ Name: openldap Version: 2.6.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: LDAP support libraries License: OLDAP-2.8 URL: http://www.openldap.org/ @@ -53,6 +53,7 @@ Patch8: openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch Patch9: openldap-explicitly-cast-private-values.patch # Needed for openldap-servers build Patch10: openldap-slapi-fix-plugin-plugin_pblock_new-usage.patch +Patch11: openldap-ITS-9921-fix-vlvResult-comment.patch # check-password module specific patches Patch90: check-password-makefile.patch @@ -363,14 +364,14 @@ done # Provide only libldap and copy it to libldap_r for both 2.4 and 2.6+ versions, make a versioned lib link # We increase it by 2 because libldap-2.4 has the 'so.2' major version on 2.4.59 (one of the last versions which is EOF) gcc -shared -o "%{buildroot}%{_libdir}/libldap-2.4.so.${so_ver_short_2_4}" -Wl,--no-as-needed \ - -Wl,-soname -Wl,libldap-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -lldap + -Wl,-soname -Wl,libldap-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -Wl,-z,now -lldap gcc -shared -o "%{buildroot}%{_libdir}/libldap_r-2.4.so.${so_ver_short_2_4}" -Wl,--no-as-needed \ - -Wl,-soname -Wl,libldap_r-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -lldap + -Wl,-soname -Wl,libldap_r-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -Wl,-z,now -lldap gcc -shared -o "%{buildroot}%{_libdir}/liblber-2.4.so.${so_ver_short_2_4}" -Wl,--no-as-needed \ - -Wl,-soname -Wl,liblber-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -llber + -Wl,-soname -Wl,liblber-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -Wl,-z,now -llber %if %{with servers} gcc -shared -o "%{buildroot}%{_libdir}/libslapi-2.4.so.${so_ver_short_2_4}" -Wl,--no-as-needed \ - -Wl,-soname -Wl,libslapi-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -lslapi + -Wl,-soname -Wl,libslapi-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -Wl,-z,now -lslapi ln -s libslapi-2.4.so.{${so_ver_short_2_4},${so_ver_full_2_4}} %endif ln -s libldap-2.4.so.{${so_ver_short_2_4},${so_ver_full_2_4}} @@ -566,6 +567,10 @@ exit 0 %endif %changelog +* Thu Jul 4 2024 Troy Dawson - 2.6.7-4 +- Fix annocheck bind-now issue (RHEL-33514) +- Fix vlvResult comment (RHEL-36474) + * Mon Jun 24 2024 Troy Dawson - 2.6.7-3 - Bump release for June 2024 mass rebuild