[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/, net-nds/openldap/files/

["Sam James" <sam@gentoo.org>]

commit:     ebf52f19f7d27d8ed019a06fa49944cb56605780
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 04:03:14 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 04:05:06 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf52f19

net-nds/openldap: fix another Modern C issue

Closes: https://bugs.gentoo.org/938581
Thanks-to: Attila Tóth <atoth <AT> atoth.sote.hu>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/openldap-2.5.19-gcc14-SDWORD-vs-SQLINTEGER.patch   | 12 ++++++++++++
 net-nds/openldap/openldap-2.5.19.ebuild                      |  1 +
 net-nds/openldap/openldap-2.6.8-r1.ebuild                    |  1 +
 net-nds/openldap/openldap-2.6.9.ebuild                       |  1 +
 4 files changed, 15 insertions(+)

diff --git a/net-nds/openldap/files/openldap-2.5.19-gcc14-SDWORD-vs-SQLINTEGER.patch b/net-nds/openldap/files/openldap-2.5.19-gcc14-SDWORD-vs-SQLINTEGER.patch
new file mode 100644
index 000000000000..8f369d3b22a4
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.5.19-gcc14-SDWORD-vs-SQLINTEGER.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/938581#c5
+--- a/servers/slapd/back-sql/sql-wrap.c
++++ b/servers/slapd/back-sql/sql-wrap.c
+@@ -37,7 +37,7 @@ backsql_PrintErrors( SQLHENV henv, SQLHD
+ {
+ 	SQLCHAR	msg[SQL_MAX_MESSAGE_LENGTH];		/* msg. buffer    */
+ 	SQLCHAR	state[SQL_SQLSTATE_SIZE];		/* statement buf. */
+-	SDWORD	iSqlCode;				/* return code    */
++	SQLINTEGER	iSqlCode;			/* return code    */
+ 	SWORD	len = SQL_MAX_MESSAGE_LENGTH - 1;	/* return length  */ 
+ 
+ 	Debug( LDAP_DEBUG_TRACE, "Return code: %d\n", rc );

diff --git a/net-nds/openldap/openldap-2.5.19.ebuild b/net-nds/openldap/openldap-2.5.19.ebuild
index 12f3fe5fecbb..350620e9508e 100644
--- a/net-nds/openldap/openldap-2.5.19.ebuild
+++ b/net-nds/openldap/openldap-2.5.19.ebuild
@@ -148,6 +148,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.1-system-mdb.patch
 	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
 	"${FILESDIR}"/${PN}-2.6.1-flags.patch
+	"${FILESDIR}"/${PN}-2.5.19-gcc14-SDWORD-vs-SQLINTEGER.patch
 	#"${FILESDIR}"/${PN}-2.6.x-slapd-pointer-types.patch # needs backport
 )
 

diff --git a/net-nds/openldap/openldap-2.6.8-r1.ebuild b/net-nds/openldap/openldap-2.6.8-r1.ebuild
index 684b983b7614..a001cc4d9e3f 100644
--- a/net-nds/openldap/openldap-2.6.8-r1.ebuild
+++ b/net-nds/openldap/openldap-2.6.8-r1.ebuild
@@ -149,6 +149,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.1-flags.patch
 	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.v2.patch
 	"${FILESDIR}"/${PN}-2.6.x-gnutls-pointer-error.patch
+	"${FILESDIR}"/${PN}-2.5.19-gcc14-SDWORD-vs-SQLINTEGER.patch
 )
 
 openldap_filecount() {

diff --git a/net-nds/openldap/openldap-2.6.9.ebuild b/net-nds/openldap/openldap-2.6.9.ebuild
index 7a273c10f7f3..b6bac7149c3e 100644
--- a/net-nds/openldap/openldap-2.6.9.ebuild
+++ b/net-nds/openldap/openldap-2.6.9.ebuild
@@ -151,6 +151,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
 	"${FILESDIR}"/${PN}-2.6.1-flags.patch
 	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.v2.patch
+	"${FILESDIR}"/${PN}-2.5.19-gcc14-SDWORD-vs-SQLINTEGER.patch
 )
 
 openldap_filecount() {