rpms/openldap
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix annocheck bind-now issue

Browse Source 
Fix vlvResult comment

Resolves: RHEL-33514, RHEL-36474
This commit is contained in:
Simon Pichugin 2024-07-03 21:00:41 -07:00
parent 5010c3fe72
commit 4cb1f6f80f
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
openldap-ITS-9921-fix-vlvResult-comment.patch Normal file
View File

@ -0,0 +1,25 @@
From 0b4098ca9080e78436cbd9f383047a9583888376 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
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

15
openldap.spec
View File

@ -17,7 +17,7 @@
Name: openldap Name: openldap
Version: 2.6.7 Version: 2.6.7
Release: 3%{?dist} Release: 4%{?dist}
Summary: LDAP support libraries Summary: LDAP support libraries
License: OLDAP-2.8 License: OLDAP-2.8
URL: http://www.openldap.org/ URL: http://www.openldap.org/
@ -53,6 +53,7 @@ Patch8: openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch
Patch9: openldap-explicitly-cast-private-values.patch Patch9: openldap-explicitly-cast-private-values.patch
# Needed for openldap-servers build # Needed for openldap-servers build
Patch10: openldap-slapi-fix-plugin-plugin_pblock_new-usage.patch Patch10: openldap-slapi-fix-plugin-plugin_pblock_new-usage.patch
Patch11: openldap-ITS-9921-fix-vlvResult-comment.patch
# check-password module specific patches # check-password module specific patches
Patch90: check-password-makefile.patch 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 # 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) # 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 \ 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 \ 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 \ 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} %if %{with servers}
gcc -shared -o "%{buildroot}%{_libdir}/libslapi-2.4.so.${so_ver_short_2_4}" -Wl,--no-as-needed \ 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}} ln -s libslapi-2.4.so.{${so_ver_short_2_4},${so_ver_full_2_4}}
%endif %endif
ln -s libldap-2.4.so.{${so_ver_short_2_4},${so_ver_full_2_4}} ln -s libldap-2.4.so.{${so_ver_short_2_4},${so_ver_full_2_4}}
@ -566,6 +567,10 @@ exit 0
%endif %endif
%changelog %changelog
* Thu Jul 4 2024 Troy Dawson <tdawson@redhat.com> - 2.6.7-4
- Fix annocheck bind-now issue (RHEL-33514)
- Fix vlvResult comment (RHEL-36474)
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.6.7-3 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.6.7-3
- Bump release for June 2024 mass rebuild - Bump release for June 2024 mass rebuild