...
 
Commits (4)
ntp (1:4.2.8p10+dfsg-3+deb9u2) stretch; urgency=medium
* Cherry-pick patch from upstream to increase stack size.
Thanks to Frederic Endner-Dühr for testing (Closes: #887385)
* Add d/gbp.conf for stretch branch
-- Bernhard Schmidt <berni@debian.org> Thu, 15 Feb 2018 12:45:57 +0100
ntp (1:4.2.8p10+dfsg-3+deb9u1) stretch; urgency=medium
* Build and install /usr/bin/sntp (Closes: #793837)
sntp (the successor of ntpdate as general purpose NTP client) has
been accidentally included in Jessie, dropped after Jessie,
reintroduced too late for Stretch and is now included in Buster.
Fix regression by building sntp and shipping it in ntp:any
-- Bernhard Schmidt <berni@debian.org> Tue, 08 Aug 2017 22:44:37 +0200
ntp (1:4.2.8p10+dfsg-3) unstable; urgency=medium
* No-change upload to supersede accidental upload of experimental
......
......@@ -2,6 +2,7 @@ debian/tmp/usr/bin/calc_tickadj
debian/tmp/usr/bin/ntpdc
debian/tmp/usr/bin/ntpq
debian/tmp/usr/bin/ntptrace
debian/tmp/usr/bin/sntp
debian/tmp/usr/bin/update-leap
debian/tmp/usr/sbin/ntp-keygen
debian/tmp/usr/sbin/ntp-wait
......
From: Juergen Perlinger <perlinger@ntp.org>
Subject: increase stack size to at least 32kB
Origin: upstream, http://bugs.ntp.org/show_bug.cgi?id=3391
Bug: http://bugs.ntp.org/show_bug.cgi?id=3391
Bug-Debian: https://bugs.debian.org/887385
diff -Nru a/ntpd/ntpd.c b/ntpd/ntpd.c
--- a/ntpd/ntpd.c 2017-03-27 08:33:16.690969527 +0200
+++ b/ntpd/ntpd.c 2017-03-27 08:33:16.690969527 +0200
@@ -313,11 +313,16 @@
#if defined(HAVE_PTHREAD_ATTR_GETSTACKSIZE) && \
defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE) && \
defined(PTHREAD_STACK_MIN)
- rc = pthread_attr_setstacksize(&thr_attr, PTHREAD_STACK_MIN);
- if (0 != rc)
- msyslog(LOG_ERR,
- "my_pthread_warmup: pthread_attr_setstacksize() -> %s",
- strerror(rc));
+ {
+ size_t ssmin = 32*1024; /* 32kB should be minimum */
+ if (ssmin < PTHREAD_STACK_MIN)
+ ssmin = PTHREAD_STACK_MIN;
+ rc = pthread_attr_setstacksize(&thr_attr, ssmin);
+ if (0 != rc)
+ msyslog(LOG_ERR,
+ "my_pthread_warmup: pthread_attr_setstacksize() -> %s",
+ strerror(rc));
+ }
#endif
rc = pthread_create(
&thread, &thr_attr, my_pthread_warmup_worker, NULL);
......@@ -5,3 +5,5 @@ ntpdate-ipv6.patch
ntpd-linux-caps-runtime.patch
openssl-disable-check.patch
libedit.patch
sntp-sysexits.patch
ntpd-increase-stack-size.patch
From: Miroslav Lichvar
Subject: Building 4.2.8p8 with disabled local libopts fails
Bug: http://bugs.ntp.org/show_bug.cgi?id=3132
When trying to build 4.2.8p8 with the --disable-local-libopts option on Fedora,
it fails with the following error:
main.c: In function ‘sntp_main’:
main.c:143:8: error: ‘EX_SOFTWARE’ undeclared (first use in this function)
exit(EX_SOFTWARE);
^~~~~~~~~~~
...
It seems the problem is that sntp/main.c is missing "#include <sysexits.h>".
The configure script detects that the system has sysexits.h, but then the sntp
code doesn't use it, expecting the local definitions of the EX_* macros.
The following patch fixes the problem for me:
--- ntp-4.2.8p8/sntp/main.c.orig 2016-10-19 10:18:41.690800420 +0200
+++ ntp-4.2.8p8/sntp/main.c 2016-10-19 10:19:31.900966925 +0200
@@ -8,6 +8,10 @@
# include <event2/thread.h>
#endif
+#ifdef HAVE_SYSEXITS_H
+#include <sysexits.h>
+#endif
+
#include "main.h"
#include "ntp_libopts.h"
#include "kod_management.h"
......@@ -21,7 +21,6 @@ endif
--prefix=/usr \
--enable-all-clocks --enable-parse-clocks --enable-SHM \
--disable-debugging --sysconfdir=/var/lib/ntp \
--with-sntp=no \
--with-lineeditlibs=edit \
--without-ntpsnmpd \
--disable-local-libopts \
......