From patchwork Mon Dec 14 12:17:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1415920 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=benettiengineering.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aruba.it header.i=@aruba.it header.a=rsa-sha256 header.s=a1 header.b=d8xDV+la; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CvgYZ0MJFz9sRR for ; Mon, 14 Dec 2020 23:24:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 45DB487845; Mon, 14 Dec 2020 12:24:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GKNyaj+Zz45K; Mon, 14 Dec 2020 12:24:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 06D3787832; Mon, 14 Dec 2020 12:24:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 614B91BF3E9 for ; Mon, 14 Dec 2020 12:24:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5DF1487832 for ; Mon, 14 Dec 2020 12:24:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RMjRJCsqd5BZ for ; Mon, 14 Dec 2020 12:24:10 +0000 (UTC) X-Greylist: delayed 00:07:03 by SQLgrey-1.7.6 Received: from smtpcmd15176.aruba.it (smtpcmd0871.aruba.it [62.149.156.71]) by whitealder.osuosl.org (Postfix) with ESMTP id 54D66877E4 for ; Mon, 14 Dec 2020 12:24:10 +0000 (UTC) Received: from ubuntu.localdomain ([146.241.198.163]) by Aruba Outgoing Smtp with ESMTPSA id ommlk93xdir1jommlkdiRI; Mon, 14 Dec 2020 13:17:04 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1607948224; bh=qVyNDoHTOtWT7B6zHCFQDnJInt2c8H2299mJyv42ff8=; h=From:To:Subject:Date:MIME-Version; b=d8xDV+laNxCQVaJ1ABmFcqH6UYUKyo9NHXVeF/nE4bGRkSBuChoNXaQ4ElYeg8PM/ 54pRdPk0x+114XeyN9G3ySQvhDy4SC38C34sqp74nCz58C8RSYaA6HDHIWN4LA9Yoi FdEDXG8oaYAvDBwKyeduvn+Ey+iNwYHJqyXQYRWhInNVtzy0OuDYksCKTl9CWkdvtU VE/kT4FYfN++TQlDbZA1FEJZ8Zo0qtmUa5SqsW/R+oxkgD5E/7/vlwbBNWWrdccaZp Wq/ulONLhc/AdAO1VHeQcI0x0joiXIDHejxmseRzLqHJyPpvwvyY6Zno3T6ecXTNus R7OqPIDOFZpDw== From: Giulio Benetti To: buildroot@buildroot.org Date: Mon, 14 Dec 2020 13:17:03 +0100 Message-Id: <20201214121703.1189147-1-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfH2HQWwnjzxdMgDFJtOa4VOFE4IP7GuE8GdS1KTG9Wy/g1qvp0ma42H1D19UHbcGQXFE6qo/rf3vL7V/Vl0QLBqRlhtZKtqlxlqBCjsJGyzYIeQOIqdZ lTbebGCfIBuivYxRm6nkdDMif/6w24x3f7W3KjLmEOBUeRLC6D9YSOIvS4EMFYgEwmasAYOBHDN1rd+m0Fh2inkkH6qnoE7K4SM02+1kE0KDO0Qb9RzPY8cs UX6xF1TimLtAXBowe/jXlyeZ/Z7rufNEWf9g0grGyP4UYF9/h4GojfUX++tDokae Subject: [Buildroot] [PATCH] package/libnss: bump version to 3.60 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joseph Kogut , Giulio Benetti Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Bump version to 3.60 and remove local patch that has been upstreamed. Release Notes: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.60_release_notes Signed-off-by: Giulio Benetti --- package/libnss/0001-fix-old-abi-ppc.patch | 40 ----------------------- package/libnss/libnss.hash | 4 +-- package/libnss/libnss.mk | 2 +- 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 package/libnss/0001-fix-old-abi-ppc.patch diff --git a/package/libnss/0001-fix-old-abi-ppc.patch b/package/libnss/0001-fix-old-abi-ppc.patch deleted file mode 100644 index 202b4ad271..0000000000 --- a/package/libnss/0001-fix-old-abi-ppc.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001 -From: Lauri Kasanen -Date: Mon, 1 Jun 2020 12:11:45 +0300 -Subject: [PATCH v3] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o: - ABI version 2 is not compatible with ABI version 1 output - -Don't try to build the SHA-2 accelerated asm on old-ABI ppc. - -Currently make only, I don't have enough gyp-fu to do that side. -However, the reporters of 1642174 and 1635625 both used make, not gyp. - -Signed-off-by: Lauri Kasanen -[Fetch-from: https://bugzilla.mozilla.org/show_bug.cgi?id=1642174 - Manually modified paths to apply to nss subdirectory in release tarball.] -Signed-off-by: Joseph Kogut ---- - lib/freebl/Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 5f7384429..e0461c7d3 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm) - endif - ifeq ($(CPU_ARCH),ppc) - EXTRA_SRCS += gcm-ppc.c -- ASFILES += sha512-p8.s - ifdef USE_64 - DEFINES += -DNSS_NO_INIT_SUPPORT -+ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}') -+ ifeq ($(PPC_ABI),2) -+ ASFILES += sha512-p8.s -+ endif - endif # USE_64 - endif # ppc - endif # Linux --- -2.19.1 - diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 02593c7dde..16a2e5c521 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_58_RTM/src/SHA256SUMS -sha256 9f73cf789b5f109b978e5239551b609b0cafa88d18f0bc8ce3f976cb629353c0 nss-3.58.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_60_RTM/src/SHA256SUMS +sha256 84abd5575ab874c53ae511bd461e5d0868d1a1b384ee40753154cdd1d590fe3d nss-3.60.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 8e6a77d2cb..d762ac6f64 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.58 +LIBNSS_VERSION = 3.60 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist