gentoo auto-resync : 25:11:2022 - 13:12:41

4 files changed, 41 insertions, 11 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index a30b3381f068..f30be5ba6f09 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index a87e5035f083..6cf877d9eb2c 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -18,7 +18,7 @@ AUX openldap-2.6.1-fix-bashism-configure.patch 419 BLAKE2B 2910734bd9e8a0e53efb0
 AUX openldap-2.6.1-fix-missing-mapping.patch 458 BLAKE2B f0137f614b7fe07f80ae5ec7f2be8c08643166fe69358cba174e9d4c8c0c3e94e6901e1a75eb2d85ad62876234223b877ca1a2f689dc154985c591a8bb2f8872 SHA512 4083b99cb97f8511a9f44c8e0b6c63cffb351b20d50e5ebecb1e73b0a1441e6449db21c1af2f43112db365d193d4395a814cf7afcac730ae7a04f260370c9d0c
 AUX openldap-2.6.1-flags.patch 10275 BLAKE2B 0c851a90dd2befe44d0671782676b8692ccb027ccbee2e52989a409b70fa8e917f26452bc6838e04111c6479bfa49fa138140cccec82026b53c6a0a23aac7f73 SHA512 a068987ee75de99e442d279bd3789f401e31342cac0cd699b0b06f9c3ccb51381ff7f947b339db1ee2330ed7d00e4ba5d1f56ba12824eac31e0d4cb8a605ae9a
 AUX openldap-2.6.1-system-mdb.patch 3679 BLAKE2B 9d9eb3dad904564cb453424743091c471ba52ea8fa6c98b4138f068d2b6d57eb7a3ce903df1ee9eb7bae0219cc762cff8dc1f10515c376c40e2ff9b7d25d44a2 SHA512 fc1d17e57b9596b4e744272f0e28400fbaeafe6fe6de8e050be8b934f4e4f977637e6b8ca9f43255f2b59f9640a70b4c9ff91b2f741850c5f1d04d5c34cdc34c
-AUX openldap-2.6.3-clang16.patch 3655 BLAKE2B b2a61d1df31b3d336163a3c42d7a655ac50f2c2251b9866abd77af931c1f695e84aede57683a688afce706afe002a3adb379f67af49cc52b71cd0f5d7eee3b85 SHA512 6444844f38f893bc458e55920c1f6cbff7a40b0497301105a07327468898870be1e1ace90039475a2bcf804c41e4339b5a58764874b1e885b454e5293f5bb34f
+AUX openldap-2.6.3-clang16.patch 4839 BLAKE2B d6f27fc65ff8e972bd91c64df7c5508bd5faef06fa140714fa5b5c9b04636667ca332568d599708f1ca85b3a45dae7f8e27f3fb74f1bf61a8dbc217ae5bb9dd0 SHA512 ef10032fb336d0e0057c81506350f1f1d3af3f79bcabbccd240859c3a7abc06baffb7dfce3b4deb486d07d5ff00f47029c299bb58c53b8aff5d01d04b245c75f
 AUX slapd-2.6.1.service 283 BLAKE2B 47f0d19eecc4ab3f026853f0a1aa75b3691db7e064cd721751e74acdd932464347e919285536b01eea64bf596761755034a7e281216bad9baad2541a2bb708f3 SHA512 cb619ca423cac1fc71e553c0633d45babb4a138a9bd791a874851c2afc92c9388543cc7ce3fb9f8c553d8db9fb01464939bfd224f8b78aeed0d47c4ccb29b46f
 AUX slapd-confd-2.4.28-r1 1072 BLAKE2B 9d4cef3614164e09e27cc681a2d37c126da6666715b1f3092751d036b42c70bb73f3b6cc51defac791c3f8e63e250d8c9d946ef0b84bc8e38c1504ac7ea239a4 SHA512 7426c04ee689bcfb29a9a3956367c571eac6bc9620efda938591d09382a05527454458f7a25bdc2fa2ac920f93bae516121e085408ffefbe8ace0c7d8c5da315
 AUX slapd-confd-2.6.1 1060 BLAKE2B 06f5f0e7b87eb4962f8413f3f5ea21a29b4e8174c016420c5f8c00bf6deb1b27929175a5cb8dc2db272147154ddb6006a2cf7ac5ee07a9652e047f23603923c7 SHA512 79d332fec5e6539106ae9f457194c31ede99e682f6cac89512d76c0f5831a7cbd01de5ea05ced4228f581ba1327091eaf5209fdbeeddb5048c6ca6ba7c5b38d5
@@ -34,6 +34,6 @@ DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8
 EBUILD openldap-2.4.57-r2.ebuild 28993 BLAKE2B 1a8cc1442324cb4cb5708a3a7d4a10057d3d392e943855889a6c77efcd82884311628ff2dd1ccddd705a956f7d9003691b526742f5e757ae4833417314d955e5 SHA512 4fccfe8bc3c13cfca0699479327885c73e136cfd8665cecfce0db97dcdb0b45f1f5fc798bde625688ada6aaaa9e53f7b9b050a115c815e7291dfb14eb3a97f78
 EBUILD openldap-2.4.58-r2.ebuild 28994 BLAKE2B 179e823c1ba9ca6a590fc309591248d4b138317898b7ecd8b882947be483cf7036dc6596dbdf24f1afb0a3302be9ee41db3539d4af1317ccc99fc8e8efcdeb60 SHA512 f670763c53817d0b09a1c10a4e119221604905d9ee84ea4f81a936b5b116505888af1869b0040807cfbc28cacb803f1add1464317b831dbcdf6c87a7fccbf035
 EBUILD openldap-2.4.59-r2.ebuild 29000 BLAKE2B 624b8ea29396c285254883a987348f88cc2d1c94b8d50db2fb3fb7c9a3ff31b6ba692f76f5621c9c0fa831e655a7cf258c73a8532c5fa721e465d9f9f02378d2 SHA512 688270a628b20c682646d3dae1b78929fd8c3ece1cdb9a7b25d6b6325c0866b700f762f1395c652a0b743fdcb92bad6c15efd1fbd2261bce672186ecb2149ca9
-EBUILD openldap-2.6.3-r1.ebuild 25174 BLAKE2B acb38b7a83eda722782b8068f9216eef1b2e1bc55edfc947c05bdbb97ed646fa8639c96ec92f3cc828cfc655c7abcbe77361d98bb082bed769da47dae04b6b2e SHA512 c0922328fe40e865880b747b40b1cfd3eb645ccd2d0e71e9172793be73ea3c24b5722b6267ceec6cc66cb96665e7fbefe6389d48ecf574cddaa79a882ffa562d
+EBUILD openldap-2.6.3-r2.ebuild 25174 BLAKE2B acb38b7a83eda722782b8068f9216eef1b2e1bc55edfc947c05bdbb97ed646fa8639c96ec92f3cc828cfc655c7abcbe77361d98bb082bed769da47dae04b6b2e SHA512 c0922328fe40e865880b747b40b1cfd3eb645ccd2d0e71e9172793be73ea3c24b5722b6267ceec6cc66cb96665e7fbefe6389d48ecf574cddaa79a882ffa562d
 EBUILD openldap-2.6.3.ebuild 25133 BLAKE2B 602e628abe7f56840dc3c8b92a3809e42836f6759b7c58fac18b2967deba3e193680aba750de50f22eeb1050de0a3d023bdb72a107548f9077392ea0c5764405 SHA512 075d3e95c5c65f2952847ca68d30e2b53cc0b5efc7b76a8383b04bf7c2293603c91a389e66fbc46e72e05529f2428f62ae1f61db9211e3582497e6b30525ac22
 MISC metadata.xml 1424 BLAKE2B 94c94afd10ba84eee90e1e0b3d032813c273458012d00e82232ac861483d105ae5705fcbce56f1dcd4d130c9b7f15cd78909b21c538707cd9a3c79cf6083997c SHA512 545e86d5cfaafe614e1d46ce95137b1a4e381ba91dd8d13c17101106661135c5f0a8c34b85f99e4cd066f1575e36c29fa362e47c015c1e6a842d56df90437d21
diff --git a/net-nds/openldap/files/openldap-2.6.3-clang16.patch b/net-nds/openldap/files/openldap-2.6.3-clang16.patch
index 4d9210b1f0fe..216d567329c5 100644
--- a/net-nds/openldap/files/openldap-2.6.3-clang16.patch
+++ b/net-nds/openldap/files/openldap-2.6.3-clang16.patch
@@ -1,6 +1,3 @@
-https://bugs.gentoo.org/871288
-https://bugs.gentoo.org/871372
-
 From ee4983302d6f052e77ab0332d2a128d169c2eacb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
 Date: Tue, 15 Nov 2022 21:45:27 +0100
@@ -16,9 +13,18 @@ This covers all the instances I could find by grepping around the
 codebase, and gets OpenLDAP building on my system.
 
 Bug: https://bugs.gentoo.org/871288
+Bug: https://bugs.gentoo.org/871372
 --- a/build/openldap.m4
 +++ b/build/openldap.m4
-@@ -360,9 +360,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
+@@ -154,6 +154,7 @@ fi
+ if test $ol_cv_header_stdc = yes; then
+   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <ctype.h>
++#include <stdlib.h>
+ #ifndef HAVE_EBCDIC
+ #	define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #	define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -394,9 +395,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
  AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
  [AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
  
@@ -29,7 +35,7 @@ Bug: https://bugs.gentoo.org/871288
  {
  OL_PTHREAD_TEST_FUNCTION
  }
-@@ -484,7 +482,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[
+@@ -518,7 +517,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[
  #include <sys/types.h>
  #include <regex.h>
  static char *pattern, *string;
@@ -38,16 +44,17 @@ Bug: https://bugs.gentoo.org/871288
  {
  	int rc;
  	regex_t re;
-@@ -511,7 +509,7 @@ AC_DEFUN([OL_C_UPPER_LOWER],
+@@ -545,7 +544,8 @@ AC_DEFUN([OL_C_UPPER_LOWER],
  [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[
  	AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include <ctype.h>
 -main()
++#include <stdlib.h>
 +int main(void)
  {
  	if ('C' == toupper('C'))
  		exit(0);
-@@ -569,7 +567,7 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R],
+@@ -603,7 +603,7 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R],
  			]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no])
  	else
  		AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -58,7 +65,30 @@ Bug: https://bugs.gentoo.org/871288
  				strerror_r( 1, buf, sizeof buf );
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1547,8 +1547,7 @@ dnl			esac
+@@ -1031,7 +1031,11 @@ dnl ----------------------------------------------------------------
+ AC_CHECK_HEADERS( sys/epoll.h )
+ if test "${ac_cv_header_sys_epoll_h}" = yes; then
+ 	AC_MSG_CHECKING(for epoll system call)
+-	AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(int argc, char **argv)
++	AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
++#ifdef HAVE_SYS_POLL_H
++#include <sys/epoll.h>
++#endif
++int main(int argc, char **argv)
+ {
+ 	int epfd = epoll_create(256);
+ 	exit (epfd == -1 ? 1 : 0);
+@@ -1551,6 +1555,9 @@ dnl			esac
+ 				AC_CACHE_CHECK([if select yields when using pthreads],
+ 					ol_cv_pthread_select_yields,[
+ 				AC_RUN_IFELSE([AC_LANG_SOURCE([[
++#define _XOPEN_SOURCE 500               /* For pthread_setconcurrency() on glibc */
++#include <stdlib.h>
++#include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+@@ -1561,8 +1568,7 @@ dnl			esac
  
  static int fildes[2];
  
@@ -68,7 +98,7 @@ Bug: https://bugs.gentoo.org/871288
  {
  	int i;
  	struct timeval tv;
-@@ -1572,9 +1571,7 @@ static void *task(p)
+@@ -1586,9 +1592,7 @@ static void *task(p)
  	exit(0); /* if we exit here, the select blocked the whole process */
  }
  
diff --git a/net-nds/openldap/openldap-2.6.3-r1.ebuild b/net-nds/openldap/openldap-2.6.3-r2.ebuild
index 98e863435dae..98e863435dae 100644
--- a/net-nds/openldap/openldap-2.6.3-r1.ebuild
+++ b/net-nds/openldap/openldap-2.6.3-r2.ebuild