mirror of
https://github.com/void-linux/void-packages.git
synced 2025-09-03 02:23:11 +02:00
ntp: update to 4.2.8p18.
This commit is contained in:
parent
6cbda5c07b
commit
a20de1f580
2 changed files with 2 additions and 57 deletions
|
@ -1,55 +0,0 @@
|
|||
diff -Nru a/libntp/work_thread.c b/libntp/work_thread.c
|
||||
--- a/libntp/work_thread.c 2022-01-16 11:35:17.290791372 +0100
|
||||
+++ b/libntp/work_thread.c 2022-01-16 11:35:17.290791372 +0100
|
||||
@@ -41,20 +41,10 @@
|
||||
#ifndef THREAD_MINSTACKSIZE
|
||||
# define THREAD_MINSTACKSIZE (64U * 1024)
|
||||
#endif
|
||||
-#ifndef __sun
|
||||
-#if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
|
||||
-# undef THREAD_MINSTACKSIZE
|
||||
-# define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
|
||||
-#endif
|
||||
-#endif
|
||||
|
||||
#ifndef THREAD_MAXSTACKSIZE
|
||||
# define THREAD_MAXSTACKSIZE (256U * 1024)
|
||||
#endif
|
||||
-#if THREAD_MAXSTACKSIZE < THREAD_MINSTACKSIZE
|
||||
-# undef THREAD_MAXSTACKSIZE
|
||||
-# define THREAD_MAXSTACKSIZE THREAD_MINSTACKSIZE
|
||||
-#endif
|
||||
|
||||
/* need a good integer to store a pointer... */
|
||||
#ifndef UINTPTR_T
|
||||
@@ -594,12 +584,25 @@
|
||||
"start_blocking_thread: pthread_attr_getstacksize() -> %s",
|
||||
strerror(rc));
|
||||
} else {
|
||||
- if (ostacksize < THREAD_MINSTACKSIZE)
|
||||
- nstacksize = THREAD_MINSTACKSIZE;
|
||||
- else if (ostacksize > THREAD_MAXSTACKSIZE)
|
||||
+ nstacksize = ostacksize;
|
||||
+ /* order is important here: first clamp on upper limit,
|
||||
+ * and the PTHREAD min stack size is ultimate override!
|
||||
+ */
|
||||
+ if (nstacksize > THREAD_MAXSTACKSIZE)
|
||||
nstacksize = THREAD_MAXSTACKSIZE;
|
||||
- else
|
||||
- nstacksize = ostacksize;
|
||||
+# ifdef PTHREAD_STACK_MAX
|
||||
+ if (nstacksize > PTHREAD_STACK_MAX)
|
||||
+ nstacksize = PTHREAD_STACK_MAX;
|
||||
+# endif
|
||||
+
|
||||
+ /* now clamp on lower stack limit. */
|
||||
+ if (nstacksize < THREAD_MINSTACKSIZE)
|
||||
+ nstacksize = THREAD_MINSTACKSIZE;
|
||||
+# ifdef PTHREAD_STACK_MIN
|
||||
+ if (nstacksize < PTHREAD_STACK_MIN)
|
||||
+ nstacksize = PTHREAD_STACK_MIN;
|
||||
+# endif
|
||||
+
|
||||
if (nstacksize != ostacksize)
|
||||
rc = pthread_attr_setstacksize(&thr_attr, nstacksize);
|
||||
if (0 != rc)
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'ntp'
|
||||
pkgname=ntp
|
||||
version=4.2.8p15
|
||||
version=4.2.8p18
|
||||
revision=7
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
|
||||
|
@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
|||
license="NTP"
|
||||
homepage="http://www.ntp.org/"
|
||||
distfiles="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${version}.tar.gz"
|
||||
checksum=f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19
|
||||
checksum=cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5
|
||||
|
||||
make_dirs="/var/db/ntpd 0755 ntpd ntpd"
|
||||
conf_files="/etc/ntp.conf"
|
||||
|
|
Loading…
Add table
Reference in a new issue