From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 08 Apr 2022 10:18:03 +0200 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 1ncjoi-00Be7P-Jl for lore@lore.pengutronix.de; Fri, 08 Apr 2022 10:18:03 +0200 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 1ncjog-0000F9-Jn; Fri, 08 Apr 2022 10:18:02 +0200 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 1ncjoY-0000Ez-ON; Fri, 08 Apr 2022 10:17:54 +0200 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 1ncjoZ-001la3-ES; Fri, 08 Apr 2022 10:17:54 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ncjoX-001jW2-6D; Fri, 08 Apr 2022 10:17:53 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 8 Apr 2022 10:17:53 +0200 Message-Id: <20220408081753.413243-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220329190724.4084168-1-christian.melki@t2data.com> References: <20220329190724.4084168-1-christian.melki@t2data.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] zlib: Version bump. 1.2.11 -> 1.2.12 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 1dda448a6bc87290fbd8e4b01d219d0eaf024b5b. Michael [sent from post-receive hook] On Fri, 08 Apr 2022 10:17:52 +0200, Christian Melki wrote: > 5 years worth of changes. > Notable changes. Fix for CVE-2018-25032, crc32 speedups and > crc32 using aarch64 native crc32 insns. > https://github.com/madler/zlib/blob/master/ChangeLog > > * Add patch from develop branch to fix last minute makefile bug. > Makefile introduced functionality just before the release of > 1.2.12 which broke CC handling. > * README copyright year changes. > * README legal disclaimer added. No license change. > > Signed-off-by: Christian Melki > Message-Id: <20220329190724.4084168-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch b/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch > new file mode 100644 > index 000000000000..63bdb67c0225 > --- /dev/null > +++ b/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch > @@ -0,0 +1,23 @@ > +From: Mark Adler > +Date: Mon, 28 Mar 2022 18:34:10 -0700 > +Subject: [PATCH] Fix configure issue that discarded provided CC definition. > + > +--- > + configure | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/configure b/configure > +index 52ff4a04ea89..3fa3e8618f9c 100755 > +--- a/configure > ++++ b/configure > +@@ -174,7 +174,10 @@ if test -z "$CC"; then > + else > + cc=${CROSS_PREFIX}cc > + fi > ++else > ++ cc=${CC} > + fi > ++ > + cflags=${CFLAGS-"-O3"} > + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure > + case "$cc" in > diff --git a/patches/zlib-1.2.12/series b/patches/zlib-1.2.12/series > new file mode 100644 > index 000000000000..ac92b3ba7f39 > --- /dev/null > +++ b/patches/zlib-1.2.12/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch > +# 5dfc5088b94416c3eb59b1a207bdec70 - git-ptx-patches magic > diff --git a/rules/zlib.make b/rules/zlib.make > index 96ef3396611b..dcfca75af018 100644 > --- a/rules/zlib.make > +++ b/rules/zlib.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ZLIB) += zlib > # > # Paths and names > # > -ZLIB_VERSION := 1.2.11 > -ZLIB_MD5 := 85adef240c5f370b308da8c938951a68 > +ZLIB_VERSION := 1.2.12 > +ZLIB_MD5 := 28687d676c04e7103bb6ff2b9694c471 > ZLIB := zlib-$(ZLIB_VERSION) > ZLIB_SUFFIX := tar.xz > ZLIB_URL := \ > @@ -25,7 +25,7 @@ ZLIB_URL := \ > ZLIB_SOURCE := $(SRCDIR)/$(ZLIB).$(ZLIB_SUFFIX) > ZLIB_DIR := $(BUILDDIR)/$(ZLIB) > ZLIB_LICENSE := Zlib > -ZLIB_LICENSE_FILES := file://README;md5=0ff45db88393c3152e458a047bba0ff1 > +ZLIB_LICENSE_FILES := file://README;md5=7ae390a32824ef4d6316800962e5c66f > > # ---------------------------------------------------------------------------- > # Prepare _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de