Thanks, applied as 54ff91a31246f806f6a28c99b50bb29689e1b574. Michael
[sent from post-receive hook] On Fri, 22 Apr 2022 07:35:24 +0200, Christian Melki <[email protected]> wrote: > Almost 4 years worth of bugfixes. > https://fossies.org/linux/ntp/ChangeLog > Fixes CVE-2020-15025, CVE-2020-13817, > CVE-2020-11868, CVE-2019-11331 and CVE-2019-8936 > > * Drop old patchset, it was fixed in p14. > * Add new patch to circumvent issues with glibc-2.34+. > * License file hash changed. Copyright year, whitespace, > contributors. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/patches/ntp-4.2.8p12/0001-make-the-build-reproducible.patch > b/patches/ntp-4.2.8p12/0001-make-the-build-reproducible.patch > deleted file mode 100644 > index 5c70b10a2ac8..000000000000 > --- a/patches/ntp-4.2.8p12/0001-make-the-build-reproducible.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From: Michael Olbrich <[email protected]> > -Date: Tue, 23 Oct 2018 00:21:54 +0200 > -Subject: [PATCH] make the build reproducible > - > -Don't include the current date / time into the build. > - > -Original patch from Debian. > - > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - scripts/build/mkver.in | 2 -- > - 1 file changed, 2 deletions(-) > - > -diff --git a/scripts/build/mkver.in b/scripts/build/mkver.in > -index 3aef1c816a7f..badd2cda8c1f 100644 > ---- a/scripts/build/mkver.in > -+++ b/scripts/build/mkver.in > -@@ -15,8 +15,6 @@ case "@VER_SUFFIX@" in > - *) ConfStr="${ConfStr}-@VER_SUFFIX@" ;; > - esac > - > --ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`" > -- > - if [ ! -f .version ]; then > - echo 0 > .version > - fi > diff --git a/patches/ntp-4.2.8p12/series b/patches/ntp-4.2.8p12/series > deleted file mode 100644 > index 6b9bdfd27cf4..000000000000 > --- a/patches/ntp-4.2.8p12/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-make-the-build-reproducible.patch > -# a698708e9f96ed91827a81d376db1955 - git-ptx-patches magic > 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 > new file mode 100644 > index 000000000000..017b4d41fac9 > --- /dev/null > +++ > b/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch > @@ -0,0 +1,29 @@ > +From: Khem Raj <[email protected]> > +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 <[email protected]> > +[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 <[email protected]> > +--- > + 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 > new file mode 100644 > index 000000000000..7a2de77a2a9c > --- /dev/null > +++ b/patches/ntp-4.2.8p15/series > @@ -0,0 +1,4 @@ > +# 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 168cfc2c4656..9bbf9ef490a9 100644 > --- a/rules/ntp.make > +++ b/rules/ntp.make > @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NTP) += ntp > # > # Paths and names > # > -NTP_VERSION := 4.2.8p12 > -NTP_MD5 := 1522d66574bae14abb2622746dad2bdc > +NTP_VERSION := 4.2.8p15 > +NTP_MD5 := e1e6b23d2fc75cced41801dbcd6c2561 > 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=e877a1d567a6a58996d2b66e3e387003 > +NTP_LICENSE_FILES := file://COPYRIGHT;md5=4190b39435611e92a4da74e682623f19 > > # > ---------------------------------------------------------------------------- > # Prepare _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
