Bug#890506: stretch-pu: package ntp/1:4.2.8p10+dfsg-3+deb9u2
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
I'd like to update ntp in Stretch to fix Bug#887385. There have been numerous
reports about ntpd segfaulting with the libc6 update from
stretch-proposed-updates or in sid. It does not happen on all machines (I for
one did not see it once).
There has been an upstream bug and an upstream patch to increase the
stack size. This patch has been part of sid/buster for some weeks now and
one of the reporters on the bug confirmed it being fixed.
Debdiff attached.
Thanks,
Bernhard
diff -Nru ntp-4.2.8p10+dfsg/debian/changelog ntp-4.2.8p10+dfsg/debian/changelog
--- ntp-4.2.8p10+dfsg/debian/changelog 2017-08-08 22:44:37.000000000 +0200
+++ ntp-4.2.8p10+dfsg/debian/changelog 2018-02-15 12:45:57.000000000 +0100
@@ -1,3 +1,11 @@
+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)
diff -Nru ntp-4.2.8p10+dfsg/debian/gbp.conf ntp-4.2.8p10+dfsg/debian/gbp.conf
--- ntp-4.2.8p10+dfsg/debian/gbp.conf 1970-01-01 01:00:00.000000000 +0100
+++ ntp-4.2.8p10+dfsg/debian/gbp.conf 2018-02-15 12:45:57.000000000 +0100
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch = stretch
diff -Nru ntp-4.2.8p10+dfsg/debian/patches/ntpd-increase-stack-size.patch ntp-4.2.8p10+dfsg/debian/patches/ntpd-increase-stack-size.patch
--- ntp-4.2.8p10+dfsg/debian/patches/ntpd-increase-stack-size.patch 1970-01-01 01:00:00.000000000 +0100
+++ ntp-4.2.8p10+dfsg/debian/patches/ntpd-increase-stack-size.patch 2018-02-15 12:45:57.000000000 +0100
@@ -0,0 +1,30 @@
+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);
diff -Nru ntp-4.2.8p10+dfsg/debian/patches/series ntp-4.2.8p10+dfsg/debian/patches/series
--- ntp-4.2.8p10+dfsg/debian/patches/series 2017-08-08 22:44:37.000000000 +0200
+++ ntp-4.2.8p10+dfsg/debian/patches/series 2018-02-15 12:45:57.000000000 +0100
@@ -6,3 +6,4 @@
openssl-disable-check.patch
libedit.patch
sntp-sysexits.patch
+ntpd-increase-stack-size.patch
Reply to: