Merge pull request #10576 from Rmys/master

ntp rebuild

server/ntp/files/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch

@@ -0,0 +1,28 @@
+From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 31 Jul 2021 10:51:41 -0700
+Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc
+In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which
+could mean different stack sizes at runtime on different architectures
+and it also causes compile failure. Default glibc thread stack size
+or 64Kb set by ntp should be good in glibc these days.
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libntp/work_thread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/libntp/work_thread.c b/libntp/work_thread.c
+index 03a5647..3ddd751 100644
+--- a/libntp/work_thread.c
++++ b/libntp/work_thread.c
+@@ -41,7 +41,7 @@
+ #ifndef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE	(64U * 1024)
+ #endif
+-#ifndef __sun
++#if !defined(__sun) && !defined(__GLIBC__)
+ #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
+ # undef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
+-- 
+2.32.0

server/ntp/pspec.xml

@@ -28,9 +28,9 @@
             <Dependency>openssl-devel</Dependency>
             <Dependency>libevent-devel</Dependency>
         </BuildDependencies>
-        <!--<Patches>
+        <Patches>
-            <Patch level="1">fedora/ntp-4.2.6p1-sleep.patch</Patch>
+            <!--Patch level="1">fedora/ntp-4.2.6p1-sleep.patch</Patch>
-	   <Patch level="1">fedora/ntp-4.2.6p1-droproot.patch</Patch>
+            <Patch level="1">fedora/ntp-4.2.6p1-droproot.patch</Patch>
             <Patch level="1">fedora/ntp-4.2.6p1-bcast.patch</Patch>
             <Patch level="1">fedora/ntp-4.2.6p1-cmsgalign.patch</Patch>
             <Patch level="1">fedora/ntp-4.2.6p2-tentative.patch</Patch>
@@ -47,8 +47,9 @@
             <!--<Patch level="0">fedora/ntpstat-0.2-clksrc.patch</Patch>
             <Patch level="0">fedora/ntpstat-0.2-multipacket.patch</Patch>
             <Patch level="0">fedora/ntpstat-0.2-sysvars.patch</Patch>
-           <Patch level="0">fedora/ntpstat-0.2-maxerror.patch</Patch>
+           <Patch level="0">fedora/ntpstat-0.2-maxerror.patch</Patch-->
-            </Patches>-->
+            <Patch level="1">0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch</Patch>
+            </Patches>
     </Source>
 
     <Package>
@@ -125,7 +126,14 @@
     </Package>
 
     <History>
-	<Update release="9">
+        <Update release="10">
+            <Date>2022-07-30</Date>
+            <Version>4.2.8_p15</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="9">
             <Date>2022-07-02</Date>
             <Version>4.2.8_p15</Version>
             <Comment>Rebuild.</Comment>