From 2a3b7437f89527a3dc7b893704b6d6e7ea101bcd Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 5 Jun 2024 03:21:30 +0000
Subject: [PATCH] extra/ntp to 4.2.8.p18-1

---
 extra/ntp/.SRCINFO                      | 27 +++++++++++++++++++++++++
 extra/ntp/PKGBUILD                      | 14 ++++++++++---
 extra/ntp/ntp-4.2.8.p18-fix-build.patch | 16 +++++++++++++++
 3 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 extra/ntp/.SRCINFO
 create mode 100644 extra/ntp/ntp-4.2.8.p18-fix-build.patch

diff --git a/extra/ntp/.SRCINFO b/extra/ntp/.SRCINFO
new file mode 100644
index 000000000..4b31739b7
--- /dev/null
+++ b/extra/ntp/.SRCINFO
@@ -0,0 +1,27 @@
+pkgbase = ntp
+	pkgdesc = Network Time Protocol reference implementation
+	pkgver = 4.2.8.p18
+	pkgrel = 1
+	url = https://www.ntp.org/
+	arch = x86_64
+	license = custom
+	depends = openssl
+	depends = perl
+	depends = libcap
+	depends = libedit
+	options = !emptydirs
+	backup = etc/ntp.conf
+	source = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p18.tar.gz
+	source = ntp-4.2.8.p18-fix-build.patch
+	source = ntp.conf
+	source = ntpd.service
+	source = ntpdate.service
+	source = ntp.sysusers
+	sha256sums = cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5
+	sha256sums = 9c4afa0daed5fd3cc9544ec808b2bb1dd959e5d40c4cae307b7025b16885903c
+	sha256sums = abccefe0b3a65cd375d5071ce780be8d2d205439aa6d34bcd3c56de6e80ba821
+	sha256sums = 1edd7e7916766b4aebb4d96a5da4b0a1086f43d3e0e4ffc90c2e4f92bd13ce7e
+	sha256sums = 63b0f8c03905daecad3f901664db70a608519b6ca4f4e7b159ab2c971cffacf4
+	sha256sums = f839a3b6d8e64fcd9332274131b4d5aa0b2c272db072dc310af1735ef286746a
+
+pkgname = ntp
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index df8e57f08..2b7dc1f86 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -1,4 +1,6 @@
-# Maintainer: Lukas Fleischer <lfleischer@archlinux.org>
+# Maintainer:
+# Contributor: Lukas Fleischer <lfleischer@archlinux.org>
+# Contributor: Christian Heusel <gromit@archlinux.org>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 
@@ -7,7 +9,7 @@
 
 pkgname=ntp
 _pkgname=ntp #-dev
-_pkgver=4.2.8p17
+_pkgver=4.2.8p18
 pkgver=${_pkgver/p/.p}
 pkgrel=1
 pkgdesc='Network Time Protocol reference implementation'
@@ -17,12 +19,14 @@ arch=('x86_64')
 depends=('openssl' 'perl' 'libcap' 'libedit')
 backup=('etc/ntp.conf')
 source=("https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${_pkgname}-${_pkgver}.tar.gz"
+        ntp-4.2.8.p18-fix-build.patch
         '0001-disable-pthread-warmup-on-ARM.patch'
         'ntp.conf'
         'ntpd.service'
         'ntpdate.service'
         'ntp.sysusers')
-sha256sums=('103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866'
+sha256sums=('cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5'
+            '9c4afa0daed5fd3cc9544ec808b2bb1dd959e5d40c4cae307b7025b16885903c'
             'a8d4480095bef3a5d01ac5233c3fc3758913a5c3c64ed9dbb5ea5c3f3f5bb8cd'
             'abccefe0b3a65cd375d5071ce780be8d2d205439aa6d34bcd3c56de6e80ba821'
             '1edd7e7916766b4aebb4d96a5da4b0a1086f43d3e0e4ffc90c2e4f92bd13ce7e'
@@ -32,7 +36,11 @@ options=('!emptydirs')
 
 prepare() {
 	cd "${_pkgname}-${_pkgver}"
+
 	patch -p1 -i ../0001-disable-pthread-warmup-on-ARM.patch
+	patch -Np1 < ../ntp-4.2.8.p18-fix-build.patch
+	autoreconf -fiv
+	cd "${_pkgname}-${_pkgver}"
 }
 
 build() {
diff --git a/extra/ntp/ntp-4.2.8.p18-fix-build.patch b/extra/ntp/ntp-4.2.8.p18-fix-build.patch
new file mode 100644
index 000000000..1fc2df26b
--- /dev/null
+++ b/extra/ntp/ntp-4.2.8.p18-fix-build.patch
@@ -0,0 +1,16 @@
+diff -Nru a/sntp/m4/openldap-thread-check.m4 b/sntp/m4/openldap-thread-check.m4
+--- a/sntp/m4/openldap-thread-check.m4	2024-05-19 18:38:30 +0000
++++ b/sntp/m4/openldap-thread-check.m4	2024-05-19 18:38:30 +0000
+@@ -262,10 +262,8 @@
+ 				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