From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1462243-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id B2144158020
	for <garchives@archives.gentoo.org>; Thu,  1 Dec 2022 05:17:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id BE7BFE07C7;
	Thu,  1 Dec 2022 05:17:56 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id A2C2CE07C7
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Dec 2022 05:17:56 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id D994D340F75
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Dec 2022 05:17:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 4AAB6756
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Dec 2022 05:17:54 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1669871579.56ef5ce33891feec34cd0c39a0a774a81a587dc7.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch net-misc/ntp/ntp-4.2.8_p15-r3.ebuild net-misc/ntp/ntp-4.2.8_p15-r4.ebuild
X-VCS-Directories: net-misc/ntp/ net-misc/ntp/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 56ef5ce33891feec34cd0c39a0a774a81a587dc7
X-VCS-Branch: master
Date: Thu,  1 Dec 2022 05:17:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 45bbbdfe-3903-4397-9209-37e2e774e5bd
X-Archives-Hash: 695e88ab7db697d35cf90ae2dd2f59ca

commit:     56ef5ce33891feec34cd0c39a0a774a81a587dc7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 05:12:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 05:12:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ef5ce3

net-misc/ntp: another pthread configure fix

Closes: https://bugs.gentoo.org/871372
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../ntp/files/ntp-4.2.8_p15-configure-clang16.patch    | 18 ++++++++++++++++++
 ...ntp-4.2.8_p15-r3.ebuild => ntp-4.2.8_p15-r4.ebuild} |  0
 2 files changed, 18 insertions(+)

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
similarity index 100%
rename from net-misc/ntp/ntp-4.2.8_p15-r3.ebuild
rename to net-misc/ntp/ntp-4.2.8_p15-r4.ebuild