[pkg-ntp-maintainers] [Git][pkg-ntp-team/ntp][stretch] 2 commits: Cherry-pick patch from upstream to increase stack size

[Bernhard Schmidt]

Bernhard Schmidt pushed to branch stretch at NTP Maintainers / ntp


Commits:
b5efe382 by Bernhard Schmidt at 2018-02-15T12:36:13+01:00
Cherry-pick patch from upstream to increase stack size

Hopefully fixes random segfaults on startup on some machines

Thanks: Frederic Endner-Dühr for testing
Closes: #887385

- - - - -
229e0c47 by Bernhard Schmidt at 2018-02-24T22:18:15+01:00
Changelog for 1:4.2.8p10+dfsg-3+deb9u2

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/ntpd-increase-stack-size.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at 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)


=====================================
debian/patches/ntpd-increase-stack-size.patch
=====================================
--- /dev/null
+++ b/debian/patches/ntpd-increase-stack-size.patch
@@ -0,0 +1,30 @@
+From: Juergen Perlinger <perlinger at 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);


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ ntpd-linux-caps-runtime.patch
 openssl-disable-check.patch
 libedit.patch
 sntp-sysexits.patch
+ntpd-increase-stack-size.patch



View it on GitLab: https://salsa.debian.org/pkg-ntp-team/ntp/compare/f650ceb55e63a846c383c946e6dfc099ee949829...229e0c47839a4d3ea9c254288e9cd54278f2465a

---
View it on GitLab: https://salsa.debian.org/pkg-ntp-team/ntp/compare/f650ceb55e63a846c383c946e6dfc099ee949829...229e0c47839a4d3ea9c254288e9cd54278f2465a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-ntp-maintainers/attachments/20180224/873bfc3a/attachment-0001.html>