From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 14 Feb 2022 13:45:20 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nJajI-00G9aj-U5 for lore@lore.pengutronix.de; Mon, 14 Feb 2022 13:45:20 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nJajH-0003r0-Sz; Mon, 14 Feb 2022 13:45:19 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nJahb-0002Pp-N2; Mon, 14 Feb 2022 13:43:35 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nJahb-00GY6a-MC; Mon, 14 Feb 2022 13:43:34 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nJahZ-003WPm-VA; Mon, 14 Feb 2022 13:43:34 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 14 Feb 2022 13:43:33 +0100 Message-Id: <20220214124333.839542-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220205230718.2518022-1-christian.melki@t2data.com> References: <20220205230718.2518022-1-christian.melki@t2data.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] zstd: Version bump. 1.5.1 -> 1.5.2 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as d27181cb59920a0e96d3954ae356946bd28821a9. Michael [sent from post-receive hook] On Mon, 14 Feb 2022 13:43:33 +0100, Christian Melki wrote: > Mostly a bugfix release. > https://github.com/facebook/zstd/releases/tag/v1.5.2 > * Drop patches for noexecstack. Fixed in 1.5.2 > > Signed-off-by: Christian Melki > Message-Id: <20220205230718.2518022-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/zstd-1.5.1/0001-Mark-Huffman-Decoder-Assembly-noexecstack-on-All-Arc.patch b/patches/zstd-1.5.1/0001-Mark-Huffman-Decoder-Assembly-noexecstack-on-All-Arc.patch > deleted file mode 100644 > index d28baf8d3117..000000000000 > --- a/patches/zstd-1.5.1/0001-Mark-Huffman-Decoder-Assembly-noexecstack-on-All-Arc.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -From: "W. Felix Handte" > -Date: Wed, 29 Dec 2021 17:47:12 -0800 > -Subject: [PATCH] Mark Huffman Decoder Assembly `noexecstack` on All > - Architectures > - > -Apparently, even when the assembly file is empty (because > -`ZSTD_ENABLE_ASM_X86_64_BMI2` is false), it still is marked as possibly > -needing an executable stack and so the whole library is marked as such. This > -commit applies a simple patch for this problem by moving the noexecstack > -indication outside the macro guard. > - > -This commit builds on #2857. > - > -This commit addresses #2963. > ---- > - lib/decompress/huf_decompress_amd64.S | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/lib/decompress/huf_decompress_amd64.S b/lib/decompress/huf_decompress_amd64.S > -index 98173cce863d..706786bb0db0 100644 > ---- a/lib/decompress/huf_decompress_amd64.S > -+++ b/lib/decompress/huf_decompress_amd64.S > -@@ -1,7 +1,5 @@ > - #include "../common/portability_macros.h" > - > --#if ZSTD_ENABLE_ASM_X86_64_BMI2 > -- > - /* Stack marking > - * ref: https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart > - */ > -@@ -9,6 +7,8 @@ > - .section .note.GNU-stack,"",%progbits > - #endif > - > -+#if ZSTD_ENABLE_ASM_X86_64_BMI2 > -+ > - /* Calling convention: > - * > - * %rdi contains the first argument: HUF_DecompressAsmArgs*. > diff --git a/patches/zstd-1.5.1/0002-Makefiles-Add-noexecstack-Options-to-Compilation-and.patch b/patches/zstd-1.5.1/0002-Makefiles-Add-noexecstack-Options-to-Compilation-and.patch > deleted file mode 100644 > index 81afe8442ca1..000000000000 > --- a/patches/zstd-1.5.1/0002-Makefiles-Add-noexecstack-Options-to-Compilation-and.patch > +++ /dev/null > @@ -1,71 +0,0 @@ > -From: "W. Felix Handte" > -Date: Wed, 5 Jan 2022 14:53:22 -0500 > -Subject: [PATCH] Makefiles: Add `noexecstack` Options to Compilation and > - Linking > - > -Hopefully this marks the binary artifacts `noexecstack` even on platforms > -where binaries default to true. > ---- > - lib/libzstd.mk | 28 ++++++++++++++++++++++++++++ > - programs/Makefile | 2 -- > - 2 files changed, 28 insertions(+), 2 deletions(-) > - > -diff --git a/lib/libzstd.mk b/lib/libzstd.mk > -index af12daffe128..5432198ed481 100644 > ---- a/lib/libzstd.mk > -+++ b/lib/libzstd.mk > -@@ -34,6 +34,8 @@ ZSTD_NO_ASM ?= 0 > - # libzstd helpers > - ################################################################## > - > -+VOID ?= /dev/null > -+ > - # Make 4.3 doesn't support '\#' anymore (https://lwn.net/Articles/810071/) > - NUM_SYMBOL := \# > - > -@@ -96,6 +98,32 @@ CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) > - LDFLAGS += $(MOREFLAGS) > - FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) > - > -+ifndef ALREADY_APPENDED_NOEXECSTACK > -+export ALREADY_APPENDED_NOEXECSTACK := 1 > -+ifeq ($(shell echo "int main(int argc, char* argv[]) { (void)argc; (void)argv; return 0; }" | $(CC) $(FLAGS) -z noexecstack -x c -Werror - -o $(VOID) 2>$(VOID) && echo 1 || echo 0),1) > -+$(info Supports noexecstack linker flag!) > -+$(info $(LDFLAGS)) > -+LDFLAGS += -z noexecstack > -+$(info $(LDFLAGS)) > -+else > -+$(info Doesn't support noexecstack linker flag!) > -+endif > -+ifeq ($(shell echo | $(CC) $(FLAGS) -Wa,--noexecstack -x assembler -Werror -c - -o $(VOID) 2>$(VOID) && echo 1 || echo 0),1) > -+$(info Supports noexecstack assembler flag!) > -+$(info $(CFLAGS)) > -+CFLAGS += -Wa,--noexecstack > -+$(info $(CFLAGS)) > -+else ifeq ($(shell echo | $(CC) $(FLAGS) -Qunused-arguments -Wa,--noexecstack -x assembler -Werror -c - -o $(VOID) 2>$(VOID) && echo 1 || echo 0),1) > -+# See e.g.: https://github.com/android/ndk/issues/171 > -+$(info Supports noexecstack assembler flag with unused arg suppression!) > -+$(info $(CFLAGS)) > -+CFLAGS += -Qunused-arguments -Wa,--noexecstack > -+$(info $(CFLAGS)) > -+else > -+$(info Doesn't support noexecstack assembler flag!) > -+endif > -+endif > -+ > - HAVE_COLORNEVER = $(shell echo a | grep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0) > - GREP_OPTIONS ?= > - ifeq ($HAVE_COLORNEVER, 1) > -diff --git a/programs/Makefile b/programs/Makefile > -index a54900cc1e9d..da848eb66bc0 100644 > ---- a/programs/Makefile > -+++ b/programs/Makefile > -@@ -62,8 +62,6 @@ else > - EXT = > - endif > - > --VOID = /dev/null > -- > - # thread detection > - NO_THREAD_MSG := ==> no threads, building without multithreading support > - HAVE_PTHREAD := $(shell printf '$(NUM_SYMBOL)include \nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c) > diff --git a/patches/zstd-1.5.1/series b/patches/zstd-1.5.1/series > deleted file mode 100644 > index 29b488d4b2fd..000000000000 > --- a/patches/zstd-1.5.1/series > +++ /dev/null > @@ -1,5 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-Mark-Huffman-Decoder-Assembly-noexecstack-on-All-Arc.patch > -0002-Makefiles-Add-noexecstack-Options-to-Compilation-and.patch > -# f2f3753627f3109aedeb7a6d245daf7a - git-ptx-patches magic > diff --git a/rules/zstd.make b/rules/zstd.make > index da2cf75a381e..7198117c3720 100644 > --- a/rules/zstd.make > +++ b/rules/zstd.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ZSTD) += zstd > # > # Paths and names > # > -ZSTD_VERSION := 1.5.1 > -ZSTD_MD5 := 120d77140ad538e8bd3a7dae6a38c4c9 > +ZSTD_VERSION := 1.5.2 > +ZSTD_MD5 := 6dc24b78e32e7c99f80c9441e40ff8bc > ZSTD := zstd-$(ZSTD_VERSION) > ZSTD_SUFFIX := tar.gz > ZSTD_URL := https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX) _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de