gentoo auto-resync : 26:08:2024 - 12:00:09

8 files changed, 158 insertions, 16 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 7e0a7284d453..20c548f721cd 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 53ab2bf23aa3..eb41a98573a0 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -24,6 +24,8 @@ AUX openldap-2.6.3-slapd-conf 2059 BLAKE2B 3a9a5f22e450c37625f9718dd7467f721fb90
 AUX openldap-2.6.4-clang16.patch 6953 BLAKE2B f347857252d857c4d1d54a0be3a1d68fc33c3ab78645c29161e212976cc9e28aa0d46812ac87a0aa23a55612c30fe49f72cfe9c31c71e6ba7ed84c80cc202018 SHA512 7c84fe7841440d00925fcf08ffb9e6ef10d5626aeb9d24b794e59281a15e5a6da0d4a9939db860011402b8aef8bc34bc6a9c643806098f2453da64fb62e74e70
 AUX openldap-2.6.4-libressl.patch 1590 BLAKE2B 3af178ceb4d6eb5792f4fe160d42b2fa2e662d8158ff98e93bd91fa0aaa73cca20277da907129e4c2124ae4e11021a0cbc53de1cd5308ef76c8e2ac26850a5df SHA512 674b08b5e4db1216b94d51b2c973f5cd8607c5a8aefcbdf5f25b6e210a071089ea9896deb59151e0cad5a73d002f88a75179f381a8b611473035a7207fe0bbee
 AUX openldap-2.6.6-fix-type-mismatch-lloadd.patch 1257 BLAKE2B 863ff388cd149953048a8ca6c1c82cde1ed72ce08b534ba8503ca83f85fb80af6510b6e6e97a0082cd6480283c650a550e1b3bc8e27f47658c73d0007223d142 SHA512 e4d2583a3948c6b8474692c3adb4404c35423f82af692c5e7ea762ffbcf8b8d9c35468fe05f54f0d4f9dc6ac47de6838335a514a85a89f87f14ed700661538bb
+AUX openldap-2.6.x-gnutls-pointer-error.patch 1776 BLAKE2B 5be8d7a9f492d8c8019fabd81373823f16f5438c2ba2be1ecc8dd48f6f8610e5cac03de7e5ddc4350c0262187daac454d7eb1d5f34fc08fb02e5b04f5883721a SHA512 75c41a6180ab8a5cf22f63efd637728dad90c772b57f8e7744416fdaba1bcc8e6f14938c6d49839e6ea6f5e8acd4d8b4debde451e269cbec55a12791c64d33a0
+AUX openldap-2.6.x-slapd-pointer-types.patch 2628 BLAKE2B 28eb35a0b6a02f4a272da0f93aa5f656b4d071a1d1db7b64c1100a838da59d5a5a292702b594e5ecf561c1a5ebbf8a86d333de47db7972dc7a4dc5de10334b7f SHA512 3c49c88d22b3d1c43219bc07d7538cb391d7a47e958959e900126ca3f3f40986e690496c12780a080c8833ff78c6f95ab74f7e4cb08e5b796ef5c1cee0f2c776
 AUX slapd-2.6.1.service 300 BLAKE2B 2d634f91f7f7c69894641b145bb280a1df8ac05d23eae64100c21470065c1347c7a7c8ab72f93083ff1151fe69b75be2a5f93bdc1a9a0776582fecf2b8169039 SHA512 c3833a61be028ddb9de8dbc66cff5651cbc2ed88e1b414965476862b6a223b91d20b773c9323f0c62cd690ecb9b0e6314f3eb37b2255f89f20d303a5025323b5
 AUX slapd-confd-2.4.28-r1 1072 BLAKE2B 9d4cef3614164e09e27cc681a2d37c126da6666715b1f3092751d036b42c70bb73f3b6cc51defac791c3f8e63e250d8c9d946ef0b84bc8e38c1504ac7ea239a4 SHA512 7426c04ee689bcfb29a9a3956367c571eac6bc9620efda938591d09382a05527454458f7a25bdc2fa2ac920f93bae516121e085408ffefbe8ace0c7d8c5da315
 AUX slapd-confd-2.6.1 1060 BLAKE2B 06f5f0e7b87eb4962f8413f3f5ea21a29b4e8174c016420c5f8c00bf6deb1b27929175a5cb8dc2db272147154ddb6006a2cf7ac5ee07a9652e047f23603923c7 SHA512 79d332fec5e6539106ae9f457194c31ede99e682f6cac89512d76c0f5831a7cbd01de5ea05ced4228f581ba1327091eaf5209fdbeeddb5048c6ca6ba7c5b38d5
@@ -40,11 +42,11 @@ DIST openldap-OPENLDAP_REL_ENG_2_6_6.tar.bz2 5040213 BLAKE2B 2497b6698344674a9e8
 DIST openldap-OPENLDAP_REL_ENG_2_6_8.tar.bz2 5065637 BLAKE2B d55345c11bd8892a594c3f7114cd1368e017c2e29997da7a80bdd915308d498f62dfb5cc3a3360b50df78ef5f90a48a566a8ce3ace85ebf9aa6b288a37c4eff2 SHA512 556d1377afc73a84ee325c4d7bcc8446def936b67d3f07df4bd2a243ff30f268c5c0c298977482df1e1a86b2b7a0cd7846fc1f51d706748d39f67f5d621ccc04
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 EBUILD openldap-2.4.59-r2.ebuild 29118 BLAKE2B eda45a2b90d59a9745741ae97fb3ebb00df9df95e3764300660cef82cf03bb0a3485b11a00ee156613a7ae8593feb71f7c4bc18e4172fe38c418ce3e75e2f568 SHA512 1449560ceee8075e51706be91963d8c168c4e29a4d7790550f1a6703e726e1383fdf72f6e630206af9917dfdebcaa573823fff19cee40f2599a27321c3f6cdb6
-EBUILD openldap-2.4.59-r3.ebuild 30100 BLAKE2B 7768b6e9a6746c29e66f25a8ff83ba1108753244ca4b9f2abf1421e5c36269c157bbba624ca38663afa67f2d1442f41bfb83e79d6ce49359d1602c2103906fef SHA512 cea1cde9f975d44c10fd38ed349b28b2edff6a7db37990455b4b46773f1b38c3545a8917c718232aca13ad55feb185ba356aaad8da04a08318c817f1252a5079
+EBUILD openldap-2.4.59-r3.ebuild 30192 BLAKE2B 8b56a13e35ed2402a790d7227168af9c37080f1717e9b7d8dacc7e3aa69669343584af25f1028dc391d01b4851829ceef50e5bfb449a868176a5d59f307f7abc SHA512 7418fb9d33140e1e1c1b36d27ba96529a8c373aee2fc6b287587fa12cb551312e3af88709c382e369cb948c2e6d84bc133d12e895ceef0872bab709ea3aed158
 EBUILD openldap-2.5.14.ebuild 27660 BLAKE2B 7eded8c3ba589d534edf0583520657ff76f01c6f4288ae2bb2562dd8df221d738a5d4b8231ebd0a459b007af6ea6e5ba99028bc494315da6f313293393ab3bf5 SHA512 313fc2b62a336f964f46b4845a86b6dba5edd8d60f908a270cc55d36ea9d8e3b9167b0b01e2379fefab9cbb044d7f2e6b6d1fc4dccdb673346cde3de866bc3a0
 EBUILD openldap-2.5.16.ebuild 27580 BLAKE2B 31f442072a93c19c266ee76da2bc07c3d3ceca7934e2986511c1a6e13343ef74578cdb5935f405892ec15d1346da49814bbd3049f863c3381ef8d01faee95cd9 SHA512 38dfd14fdf2ef6a2ca5d50106ab4ac7fad5855ddb53268008f4a2be1cffab716fb115dff201221c64900227ffbf28aece4956906e06340b056fe2d45b6ea46b8
-EBUILD openldap-2.5.18.ebuild 28192 BLAKE2B 219b5010730ceef7286cd393ea36d7aaa9d5a2184511f0bcc11bbdbaa0994603b357bf3af9a3097f6a0360b4cb1a3e86a66af6e6f3f77b75fff5cc41fbbd5c1f SHA512 fbf2a195efcbf1043ad6ebe2ab11cb00c502340b0e81f55a1fd9aea739556cbfc6742e3f6fc44c4e5ad1f5f642399ebf78ac7648d503ddaf81638a5409bbdb49
+EBUILD openldap-2.5.18.ebuild 28318 BLAKE2B 1756c48fe9d3c8e8d3d4b8b008619470776cbaef48c1f444ae57c2b86afd5ee37b7d51c3b00064676a7b1604a9a88055e1a5089db404cff601431807ed18af39 SHA512 8b8d3c856b42b0a601b1b098d2c59d3b35543291d01da76ebfa3a752b729b198613972c102e120b682cf908e47951eee2ba4e24f2775fa057d22cef72f57cbdc
 EBUILD openldap-2.6.4-r3.ebuild 27825 BLAKE2B 6fc558d5d18ec396bbdb3786f43af9c5cdf85fa12eff5dc48a931e7250809e44c7295cd848138ec61af3e0e311fa54f0c8be5654e2c4efdba274579dd33483d8 SHA512 648948dcae60c53eac6b64b33b1261a99679b2a0910e9496b972fb1cc0891dbbd8d660e8cafd2bdb981d3ab3474c29b05888af2f9db17dbca45d947b113d0a1f
-EBUILD openldap-2.6.6-r2.ebuild 27815 BLAKE2B 3c69472570456eaad673fa4f384952b8bf6c327e4ad89017bbe1cd114ab05324e79b0f3c5960225fa384e237ece740c2c8b04ef3b3d850c34e4175cfc95a963c SHA512 1d9d131266db7d12b5ccac215122a5957b79fa82b5c1bb226ef54d0ce79c0a4df474ae49eac422861ec41b071734b138184fc8ef6afec0f66a71ba84844fec16
-EBUILD openldap-2.6.8.ebuild 28068 BLAKE2B 03aae44e8f2b8dae9849ff985e4542442aacd825abdeded350c253e33d4fd0d08dd0a06dace2c0f24df2bced8b3449c56fbde612bc59b00093cd26476ba5ea93 SHA512 fa4fada5532cbe2d1aa4274aac36527ab126b7b7fc1454fa34ed138a96047e63ce520bb6f1b4bf295c9a7961ae6221d1b494d31dbb74d1ff49bd627d6719f4ee
+EBUILD openldap-2.6.6-r2.ebuild 28015 BLAKE2B 649a2b0465ea0ca15e22b926a46c39b1dc38a66c2295d759ffac5cb54e68e5db1ede9d3b23012fd4d8153955c83cb0176d44f176804654c0471132d3868f3a41 SHA512 cec44a397fb2d18b34160ffd29ce5f5b1786ac3c4a237bf26b2ab1c736fb0d905e0e9f49d9c47a6a1a04433208203415c42a38d1b54e0c44f506f29e066e54f1
+EBUILD openldap-2.6.8.ebuild 28458 BLAKE2B 2273ed9ad4712f3ff1b1ee58488501bdb48aa2426eaacc5e5f026a3a7270a4feb1f19eec13e385791e575cbbe957054b064074481e51de48657991b61d476a3c SHA512 8034c63b36fcc581e1ac985d998eb33d71fe2b05c78e0552eb63319929708120543feb3989478f48f6e6d0459a59dbd5fd55fa63041981e9ed135d79ed38631f
 MISC metadata.xml 1316 BLAKE2B 0635123aab1a5bed9a0da918501fc5e43affe0fbd0f83f8a7e42b0292f4d5ce8231bb9d5c343c67c1011c916e78d475398c1a744b11d6f7e041ac0caed35900e SHA512 818c412cd17d1c49c7f68452fb9e2715f4441a5ff85a4e27dcb7f264c1b4d89cfa46c9d9e506b087376224cd9839e040fe63ea4149323be5c7777b54ef81716d
diff --git a/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch b/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch
new file mode 100644
index 000000000000..e6ab4e5a46cb
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch
@@ -0,0 +1,40 @@
+From 634017950c1c920d0de63fffa5c52e621de1d603 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@fujitsu.com>
+Date: Wed, 26 Jun 2024 07:41:01 +0000
+Subject: Fix incompatible pointer type error with gcc option
+ -Wincompatible-pointer-types
+
+lib32-openldap do_compile failure with gcc-14:
+| tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types]
+|   971 |                                         keyhash.bv_val, &keyhash.bv_len ) < 0 ) {
+|       |                                                         ^~~~~~~~~~~~~~~
+|       |                                                         |
+|       |                                                         ber_len_t * {aka long unsigned int *}
+| In file included from tls_g.c:44:
+| /usr/include/gnutls/gnutls.h:2406:32: note: expected 'size_t *' {aka 'unsigned int *'} but argument is of type 'ber_len_t *' {aka 'long unsigned int *'}
+|  2406 |                        size_t *result_size);
+|       |                        ^~~
+
+Upstream-Status: Submitted
+
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+---
+ libraries/libldap/tls_g.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
+index 7c23875..b4b487d 100644
+--- a/libraries/libldap/tls_g.c
++++ b/libraries/libldap/tls_g.c
+@@ -968,7 +968,7 @@ tlsg_session_pinning( LDAP *ld, tls_session *sess, char *hashalg, struct berval
+ 		keyhash.bv_len = gnutls_hash_get_len( alg );
+ 		keyhash.bv_val = LDAP_MALLOC( keyhash.bv_len );
+ 		if ( !keyhash.bv_val || gnutls_fingerprint( alg, &key,
+-					keyhash.bv_val, &keyhash.bv_len ) < 0 ) {
++					keyhash.bv_val, (size_t *)&keyhash.bv_len ) < 0 ) {
+ 			goto done;
+ 		}
+ 	} else {
+-- 
+2.34.1
+
diff --git a/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch b/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch
new file mode 100644
index 000000000000..9f79048645d6
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch
@@ -0,0 +1,71 @@
+# https://git.openldap.org/openldap/openldap/-/commit/fb9e6a81bbee880549e7ec18f0a74ddddbd2d1ab.patch
+From fb9e6a81bbee880549e7ec18f0a74ddddbd2d1ab Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh@redhat.com>
+Date: Tue, 6 Feb 2024 21:38:24 -0500
+Subject: [PATCH] ITS#10171 - Explicitly cast private values
+
+Fixes issues with -Werror=incompatible-pointer-types
+
+Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
+---
+ servers/slapd/config.c              | 2 +-
+ servers/slapd/overlays/constraint.c | 2 +-
+ servers/slapd/overlays/dyngroup.c   | 2 +-
+ servers/slapd/overlays/valsort.c    | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/servers/slapd/config.c b/servers/slapd/config.c
+index 80333f359c..987c862d91 100644
+--- a/servers/slapd/config.c
++++ b/servers/slapd/config.c
+@@ -151,7 +151,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
+ 	int rc, arg_user, arg_type, arg_syn, iarg;
+ 	unsigned uiarg;
+ 	long larg;
+-	size_t ularg;
++	unsigned long ularg;
+ 	ber_len_t barg;
+ 	
+ 	if(Conf->arg_type == ARG_IGNORED) {
+diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c
+index f939b37762..0d6156af4d 100644
+--- a/servers/slapd/overlays/constraint.c
++++ b/servers/slapd/overlays/constraint.c
+@@ -557,7 +557,7 @@ done:;
+ 				a2->restrict_filter = ap.restrict_filter;
+ 				a2->restrict_val = ap.restrict_val;
+ 
+-				for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
++				for ( app = (constraint **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
+ 					/* Get to the end */ ;
+ 
+ 				a2->ap_next = *app;
+diff --git a/servers/slapd/overlays/dyngroup.c b/servers/slapd/overlays/dyngroup.c
+index 5d890d6650..e0e70af2d9 100644
+--- a/servers/slapd/overlays/dyngroup.c
++++ b/servers/slapd/overlays/dyngroup.c
+@@ -111,7 +111,7 @@ static int dgroup_cf( ConfigArgs *c )
+ 		 */
+ 		a2 = ch_malloc( sizeof(adpair) );
+ 
+-		for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
++		for ( app = (adpair **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
+ 			/* Get to the end */ ;
+ 
+ 		a2->ap_mem = ap.ap_mem;
+diff --git a/servers/slapd/overlays/valsort.c b/servers/slapd/overlays/valsort.c
+index 3d998e2fcb..e251500d0b 100644
+--- a/servers/slapd/overlays/valsort.c
++++ b/servers/slapd/overlays/valsort.c
+@@ -201,7 +201,7 @@ valsort_cf_func(ConfigArgs *c) {
+ 		return(1);
+ 	}
+ 
+-	for ( vip = &on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
++	for ( vip = (valsort_info **)&on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
+ 		/* Get to the end */ ;
+ 
+ 	vi = ch_malloc( sizeof(valsort_info) );
+-- 
+GitLab
+
diff --git a/net-nds/openldap/openldap-2.4.59-r3.ebuild b/net-nds/openldap/openldap-2.4.59-r3.ebuild
index 9de40ce840dd..367fb900d9bf 100644
--- a/net-nds/openldap/openldap-2.4.59-r3.ebuild
+++ b/net-nds/openldap/openldap-2.4.59-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -383,8 +383,12 @@ src_prepare() {
 		-e 's|/bin/sh|/bin/bash|g' \
 		-i tests/scripts/* || die "sed failed"
 
+	if test -e configure.in -a ! -e configure.ac ; then
+		mv -f configure.in configure.ac
+	fi
+
 	# Required for autoconf-2.70 #765043
-	sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.in || die
+	sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.ac || die
 	AT_NOEAUTOMAKE=yes eautoreconf
 }
 
diff --git a/net-nds/openldap/openldap-2.5.18.ebuild b/net-nds/openldap/openldap-2.5.18.ebuild
index 150d0a95e6ca..48748317f4b5 100644
--- a/net-nds/openldap/openldap-2.5.18.ebuild
+++ b/net-nds/openldap/openldap-2.5.18.ebuild
@@ -140,6 +140,8 @@ 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.6.x-gnutls-pointer-error.patch
+	#"${FILESDIR}"/${PN}-2.6.x-slapd-pointer-types.patch # needs backport
 )
 
 openldap_filecount() {
@@ -417,7 +419,7 @@ multilib_src_configure() {
 	# error: passing argument 3 of ‘ldap_bv2rdn’ from incompatible pointer type
 	# [-Wincompatible-pointer-types]
 	# expected ‘char **’ but argument is of type ‘const char **’
-	append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+	#append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
 
 	if use experimental ; then
 		# connectionless ldap per bug #342439
diff --git a/net-nds/openldap/openldap-2.6.6-r2.ebuild b/net-nds/openldap/openldap-2.6.6-r2.ebuild
index e748df009fdf..fd2f6205da49 100644
--- a/net-nds/openldap/openldap-2.6.6-r2.ebuild
+++ b/net-nds/openldap/openldap-2.6.6-r2.ebuild
@@ -149,6 +149,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.1-flags.patch
 	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
 	"${FILESDIR}"/${PN}-2.6.6-fix-type-mismatch-lloadd.patch
+	"${FILESDIR}"/${PN}-2.6.x-gnutls-pointer-error.patch
+	"${FILESDIR}"/${PN}-2.6.x-slapd-pointer-types.patch
 )
 
 openldap_filecount() {
@@ -815,6 +817,7 @@ multilib_src_install() {
 multilib_src_install_all() {
 	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
 	docinto rfc ; dodoc doc/rfc/*.txt
+	rmdir -p "${D}"/var/openldap-lloadd # Created but not used by any part of current codebase.
 }
 
 pkg_preinst() {
diff --git a/net-nds/openldap/openldap-2.6.8.ebuild b/net-nds/openldap/openldap-2.6.8.ebuild
index 61f2eedf6751..250d4ce0b66e 100644
--- a/net-nds/openldap/openldap-2.6.8.ebuild
+++ b/net-nds/openldap/openldap-2.6.8.ebuild
@@ -149,6 +149,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.1-flags.patch
 	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
 	#"${FILESDIR}"/${PN}-2.6.6-fix-type-mismatch-lloadd.patch
+	"${FILESDIR}"/${PN}-2.6.x-gnutls-pointer-error.patch
+	#"${FILESDIR}"/${PN}-2.6.x-slapd-pointer-types.patch # included upstream
 )
 
 openldap_filecount() {
@@ -392,8 +394,11 @@ build_contrib_module() {
 	einfo "Compiling contrib-module: $1"
 	local target="${2:-all}"
 	emake \
-		LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \
-		CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+		CC="${CC}" \
+		LDAP_BUILD="${BUILD_DIR}" \
+		libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+		prefix="${EPREFIX}/usr" \
+		STRIP=/bin/true \
 		"${target}"
 	popd &>/dev/null || die
 }
@@ -417,7 +422,7 @@ multilib_src_configure() {
 
 	# error: passing argument 3 of ‘ldap_bv2rdn’ from incompatible pointer type [-Wincompatible-pointer-types]
 	# expected ‘char **’ but argument is of type ‘const char **’
-	append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+	#append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
 
 	if use experimental ; then
 		# connectionless ldap per bug #342439
@@ -532,7 +537,9 @@ multilib_src_configure() {
 
 	tc-export AR CC CXX
 
-	ECONF_SOURCE="${S}" econf \
+	ECONF_SOURCE="${S}" \
+	STRIP=/bin/true \
+		econf \
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
 		--localstatedir="${EPREFIX}"/var \
 		--runstatedir="${EPREFIX}"/run \
@@ -568,13 +575,19 @@ src_configure_cxx() {
 	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs -L"${BUILD_DIR}"/libraries/libldap/.libs
 	append-cppflags -I"${BUILD_DIR}"/include
 
-	ECONF_SOURCE="${S}"/contrib/ldapc++ econf "${myconf_ldapcpp[@]}"
+	ECONF_SOURCE="${S}"/contrib/ldapc++ \
+	STRIP=/bin/true \
+		econf \
+		"${myconf_ldapcpp[@]}"
 	popd &>/dev/null || die "popd contrib/ldapc++"
 }
 
 multilib_src_compile() {
 	tc-export AR CC CXX
-	emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh
+	emake \
+		CC="$(tc-getCC)" \
+		SHELL="${EPREFIX}"/bin/sh \
+		STRIP="/bin/true"
 
 	if ! use minimal && multilib_is_native_abi ; then
 		if use cxx ; then
@@ -612,8 +625,10 @@ multilib_src_compile() {
 			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
 
 			emake \
+				CC="$(tc-getCC)" \
 				LDAP_BUILD="${BUILD_DIR}" \
-				CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+				STRIP=/bin/true
 			popd &>/dev/null || die
 		fi
 
@@ -693,8 +708,12 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-	emake CC="$(tc-getCC)" \
-		DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
+	emake \
+		CC="$(tc-getCC)" \
+		DESTDIR="${D}" \
+		SHELL="${EPREFIX}"/bin/sh \
+		STRIP=/bin/true \
+		install
 
 	if ! use minimal && multilib_is_native_abi; then
 		# openldap modules go here
@@ -819,6 +838,7 @@ multilib_src_install() {
 multilib_src_install_all() {
 	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
 	docinto rfc ; dodoc doc/rfc/*.txt
+	rmdir -p "${D}"/var/openldap-lloadd # Created but not used by any part of current codebase.
 }
 
 pkg_preinst() {