[ptxdist] [PATCH v2] ntp: Version bump. 4.2.8p15 -> 4.2.8p17

[ptxdist] [PATCH v2] ntp: Version bump. 4.2.8p15 -> 4.2.8p17

[Christian Melki]

Bugfix releases.
A few security related but mostly just fixes.
OpenSSL 3.0 support and other bumps.
https://www.ntp.org/support/securitynotice/4_2_8-series-changelog/#428p16
https://www.ntp.org/support/securitynotice/4_2_8-series-changelog/#428p17

* License file changed. A lot of changes to dates, authors and contributors,
but none to the actual license texts.
* Remove patch set. Bug fix is now included in this release.
* Remove obsolete option.
* Enable new bugfixes as configure options.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 ...o-not-use-PTHREAD_STACK_MIN-on-glibc.patch | 29 -------------------
 patches/ntp-4.2.8p15/series                   |  4 ---
 rules/ntp.make                                |  9 +++---
 3 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
 delete mode 100644 patches/ntp-4.2.8p15/series

diff --git a/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch b/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
deleted file mode 100644
index 017b4d41f..000000000
--- a/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-[Copied from https://github.com/openembedded/meta-openembedded/blob/master/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch]
-Signed-off-by: Alexey Brodkin <abrokdin@synopsys.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 03a5647bea36..3ddd751557e0 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
diff --git a/patches/ntp-4.2.8p15/series b/patches/ntp-4.2.8p15/series
deleted file mode 100644
index 7a2de77a2..000000000
--- a/patches/ntp-4.2.8p15/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
-# e85ebd807ca50b5d07918a17d9595773  - git-ptx-patches magic
diff --git a/rules/ntp.make b/rules/ntp.make
index 9bbf9ef49..b813df9db 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NTP) += ntp
 #
 # Paths and names
 #
-NTP_VERSION	:= 4.2.8p15
-NTP_MD5		:= e1e6b23d2fc75cced41801dbcd6c2561
+NTP_VERSION	:= 4.2.8p17
+NTP_MD5		:= a15558df580bd1b955a105a8b91c078f
 NTP		:= ntp-$(NTP_VERSION)
 NTP_SUFFIX	:= tar.gz
 NTP_URL		:= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$(NTP).$(NTP_SUFFIX)
 NTP_SOURCE	:= $(SRCDIR)/$(NTP).$(NTP_SUFFIX)
 NTP_DIR		:= $(BUILDDIR)/$(NTP)
 NTP_LICENSE	:= ntp
-NTP_LICENSE_FILES	:= file://COPYRIGHT;md5=4190b39435611e92a4da74e682623f19
+NTP_LICENSE_FILES	:= file://COPYRIGHT;md5=3a8ffebbcad335abf2c39fec38671eec
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -136,6 +136,8 @@ NTP_CONF_OPT	:= \
 	--disable-kernel-fll-bug \
 	--enable-bug1243-fix \
 	--enable-bug3020-fix \
+	--enable-bug3527-fix \
+	--enable-bug3767-fix \
 	--$(call ptx/endis, PTXCONF_NTP_IRIG_SAWTOOTH)-irig-sawtooth \
 	--$(call ptx/endis, PTXCONF_NTP_NIST)-nist \
 	--disable-ntp-signd \
@@ -145,7 +147,6 @@ NTP_CONF_OPT	:= \
 	--disable-saveconfig \
 	--disable-leap-smear \
 	--disable-dynamic-interleave \
-	--without-gtest \
 	--disable-problem-tests
 
 # ----------------------------------------------------------------------------
-- 
2.34.1

Re: [ptxdist] [APPLIED] ntp: Version bump. 4.2.8p15 -> 4.2.8p17

[Michael Olbrich]

Thanks, applied as c930514745eb75ef6b3c9c2dd9dca8d9e58d0acb.

Michael

[sent from post-receive hook]

On Wed, 21 Jun 2023 10:51:07 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Bugfix releases.
> A few security related but mostly just fixes.
> OpenSSL 3.0 support and other bumps.
> https://www.ntp.org/support/securitynotice/4_2_8-series-changelog/#428p16
> https://www.ntp.org/support/securitynotice/4_2_8-series-changelog/#428p17
> 
> * License file changed. A lot of changes to dates, authors and contributors,
> but none to the actual license texts.
> * Remove patch set. Bug fix is now included in this release.
> * Remove obsolete option.
> * Enable new bugfixes as configure options.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230607183146.3584386-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch b/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
> deleted file mode 100644
> index 017b4d41fac9..000000000000
> --- a/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -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.
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -[Copied from https://github.com/openembedded/meta-openembedded/blob/master/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch]
> -Signed-off-by: Alexey Brodkin <abrokdin@synopsys.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 03a5647bea36..3ddd751557e0 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
> diff --git a/patches/ntp-4.2.8p15/series b/patches/ntp-4.2.8p15/series
> deleted file mode 100644
> index 7a2de77a2a9c..000000000000
> --- a/patches/ntp-4.2.8p15/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
> -# e85ebd807ca50b5d07918a17d9595773  - git-ptx-patches magic
> diff --git a/rules/ntp.make b/rules/ntp.make
> index 9bbf9ef490a9..b813df9dbf7c 100644
> --- a/rules/ntp.make
> +++ b/rules/ntp.make
> @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NTP) += ntp
>  #
>  # Paths and names
>  #
> -NTP_VERSION	:= 4.2.8p15
> -NTP_MD5		:= e1e6b23d2fc75cced41801dbcd6c2561
> +NTP_VERSION	:= 4.2.8p17
> +NTP_MD5		:= a15558df580bd1b955a105a8b91c078f
>  NTP		:= ntp-$(NTP_VERSION)
>  NTP_SUFFIX	:= tar.gz
>  NTP_URL		:= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$(NTP).$(NTP_SUFFIX)
>  NTP_SOURCE	:= $(SRCDIR)/$(NTP).$(NTP_SUFFIX)
>  NTP_DIR		:= $(BUILDDIR)/$(NTP)
>  NTP_LICENSE	:= ntp
> -NTP_LICENSE_FILES	:= file://COPYRIGHT;md5=4190b39435611e92a4da74e682623f19
> +NTP_LICENSE_FILES	:= file://COPYRIGHT;md5=3a8ffebbcad335abf2c39fec38671eec
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -136,6 +136,8 @@ NTP_CONF_OPT	:= \
>  	--disable-kernel-fll-bug \
>  	--enable-bug1243-fix \
>  	--enable-bug3020-fix \
> +	--enable-bug3527-fix \
> +	--enable-bug3767-fix \
>  	--$(call ptx/endis, PTXCONF_NTP_IRIG_SAWTOOTH)-irig-sawtooth \
>  	--$(call ptx/endis, PTXCONF_NTP_NIST)-nist \
>  	--disable-ntp-signd \
> @@ -145,7 +147,6 @@ NTP_CONF_OPT	:= \
>  	--disable-saveconfig \
>  	--disable-leap-smear \
>  	--disable-dynamic-interleave \
> -	--without-gtest \
>  	--disable-problem-tests
>  
>  # ----------------------------------------------------------------------------