gentoo auto-resync : 01:12:2022 - 20:53:45

3 files changed, 20 insertions, 2 deletions

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 25ceb7f21b02..c95c1553ce5f 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -4,7 +4,7 @@ AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f1
 AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d463b3b1c686bbdc71a225bdb97ad03703513b112b9509958c687f046df3153baab1d26d019a988c94ede796a8 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f
 AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4
 AUX ntp-4.2.8_p14-add_cap_ipc_lock.patch 474 BLAKE2B 5045ea1d6b07de0bd3ea46e0dc63a424f01f34241414f192cd73cb09ff080864ca1b94600d0f494772b06df87db1e7adc32c5bfc3c88c57efb2b04fd2cafee41 SHA512 8a852794095c650ce75707d2fb5ded1e575b7d2167d5c0ef79c1007a3bb45f6b21f8a5bd4deb0e966b7ed9b8941e5c7746eef73b1f0f6e5fd4f7d8e32a6b007f
-AUX ntp-4.2.8_p15-configure-clang16.patch 17951 BLAKE2B 18ae5fd4de77a9019942d5e46ed9cc9a6830ad640f63825dafdab43ca1d09db2f8798b353fb75f004a4c88b896f21b82750b603c259834edffada49b5f2b929e SHA512 2bc83e239ff8413b8571f9b9cb1ac169ee65887072632e82984b17f0967bf7144e27d6324018bb3efc862bdbdeb81a5280323627b35fc41c21a315e87911ddf7
+AUX ntp-4.2.8_p15-configure-clang16.patch 18493 BLAKE2B bb0a0b4bc77b8e7ad3a56e208629be039bc91e8c7767ef025cb8678ee3a8ccb503071c571c858721e3a7f108cbd75760f8a6800eee29e8f3482ead96f87f5974 SHA512 48490ff44515586179b606be3ce4f9d5085641e6f96edd0234a00b48a4ceb7399a305dbd9ea8df496d92cd624bfea8e5d448f2d52b4207a05fa700e67aa05ef7
 AUX ntp-4.2.8_p15-gcc10.patch 2019 BLAKE2B df64e28c70d7aa1cf2513b594dc5f79f0be862c6dd0ba3e3e75e6bce394eeaff2bd994e65ad4435d212bd1b2c406e49e587c72a6c8f9fc1f63fa166dac717844 SHA512 15f2756c1ac370f4896ffc1d8bd340bb7c09869c47a78edc66da855855c9dca0adeef0e03d262ace9c7ae408c2bcb080d6e01e4fc32783518fb8db28b08200b7
 AUX ntp-4.2.8_p15-glibc-2.34.patch 928 BLAKE2B 993f2c6ab2b4e6242811d553e0021911bbae37ba5febbbf9914bef5481c3b1472c273fc04a6d6f1e420bed2b4eb3193bc4a9532faa6b23e9f2a2802b1664e187 SHA512 474f50f92b105cbd3e9b3700418114ea65c3998e28ddb7a11d45602a7865bdcad07ee251176bf2e4012e3a15792a4334ee85aca198cbb98c757fc12cdd09747d
 AUX ntp-client.confd 776 BLAKE2B 7c65232560d4443f21bea7e5e0e8183f8397e092b6c489faa18188b9df9f8678244cd816e6d8d6e12b8d89a2b33873b9d0a2173957217879320db20744b3876c SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6
@@ -23,6 +23,6 @@ AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be6
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
 EBUILD ntp-4.2.8_p15-r1.ebuild 4450 BLAKE2B 34b68eee801e53e02e4189bb28a090783ddd47d4944e71919600714bd3821ec78a11b5a63e7e36a09c08b20a04aadc06f2d6159e902a78c6ec24e59c98b41c83 SHA512 1af93194fe8de8524f4bad2a0b93df1e626468d59f8fadda5916443352c77e6b12c60e3652ab8804a7612f2cb1fa83b78742b809493798d169ad842843d4544e
-EBUILD ntp-4.2.8_p15-r3.ebuild 4512 BLAKE2B c4a34f6772a262e9d8b339d28e5724a7ed1e6ed99d18d10b52369eae3d473a731dee01ebe63fd6a21e9bc60bbd59cc0a7e3948f9315f8741b197b8fa5ecc268d SHA512 1f2f22571ff97214b6197626821f372a120548db7590bdb6f87ff9006a0c3cfdbc616a7c29951b169e9c2e8fceba8ac9996303449c5d3fc5382c5982700e96a9
+EBUILD ntp-4.2.8_p15-r4.ebuild 4512 BLAKE2B c4a34f6772a262e9d8b339d28e5724a7ed1e6ed99d18d10b52369eae3d473a731dee01ebe63fd6a21e9bc60bbd59cc0a7e3948f9315f8741b197b8fa5ecc268d SHA512 1f2f22571ff97214b6197626821f372a120548db7590bdb6f87ff9006a0c3cfdbc616a7c29951b169e9c2e8fceba8ac9996303449c5d3fc5382c5982700e96a9
 EBUILD ntp-4.2.8_p15.ebuild 4442 BLAKE2B f6cfbc92981ced0abad90d0d20366949e4c41580236c0fe92b05dd0f79092ac136087bc95fd56a223d2dc6ff0d3ec81c244b380a5747bbc52ae8a43166f40e2a SHA512 0718ee4bea75e8f2d6378a0a882757adc75e49d67d62c265d2ff6414af73f7f0ee37b61205e0306aaa9f3bee5aaedaa3430ee34f4158dde3cd13e3339b08a6a9
 MISC metadata.xml 1023 BLAKE2B 58da2b7578162aa1650d5a0bba7f3384a36dcfcdb4c52003b2aa3fd2ee89a1d01239a4e462b874dfa96b0913597cf0384f78d4da79148ca1e52e8aca29b583c3 SHA512 510fbd0761a097d214225640c0a60da8c77b06af41cb77748cd73c7c04add5e4651dd07f0eef9f083343570a6fe5f0bdcf84b38b5b65df815abd8bbaea048791
diff --git a/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch
index d0dc2ad014b4..4b52248bde8f 100644
--- a/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch
+++ b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch
@@ -1,6 +1,21 @@
 Sync with OpenLDAP. Uses Arsen's patch from https://bugs.gentoo.org/871288.
 
 https://bugs.gentoo.org/871372
+--- a/sntp/m4/openldap-thread-check.m4
++++ b/sntp/m4/openldap-thread-check.m4
+@@ -262,10 +262,8 @@ pthread_rwlock_t rwlock;
+ 				dnl save the flags
+ 				AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <pthread.h>
+-#ifndef NULL
+-#define NULL (void*)0
+-#endif
+-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
++pthread_t thread;
++]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
+ 			])
+ 
+ 			if test $ol_cv_func_pthread_detach = no ; then
 --- a/sntp/m4/openldap.m4
 +++ b/sntp/m4/openldap.m4
 @@ -1,16 +1,16 @@
@@ -590,3 +605,6 @@ https://bugs.gentoo.org/871372
 -#endif
 -	], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
 -])
+-- 
+2.38.1
+
diff --git a/net-misc/ntp/ntp-4.2.8_p15-r3.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild
index 5bfcc0767728..5bfcc0767728 100644
--- a/net-misc/ntp/ntp-4.2.8_p15-r3.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild