diff mbox series

package/libnss: bump version to 3.80

Message ID 20220624000216.85808-1-giulio.benetti@benettiengineering.com
State Accepted
Headers show
Series package/libnss: bump version to 3.80 | expand

Commit Message

Giulio Benetti June 24, 2022, 12:02 a.m. UTC 
Let's drop local patch that has been upstreamed:
https://hg.mozilla.org/projects/nss/rev/190801f7f1fb25490098487abacb1fd2ca5ef1e8

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
 ...36-Fix-build-failure-on-Aarch64-host.patch | 37 -------------------
 package/libnss/libnss.hash                    |  4 +-
 package/libnss/libnss.mk                      |  2 +-
 3 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 package/libnss/0001-Bug-1771036-Fix-build-failure-on-Aarch64-host.patch

Comments

Thomas Petazzoni July 6, 2022, 10:01 p.m. UTC | #1 
On Fri, 24 Jun 2022 02:02:16 +0200
Giulio Benetti <giulio.benetti@benettiengineering.com> wrote:

> Let's drop local patch that has been upstreamed:
> https://hg.mozilla.org/projects/nss/rev/190801f7f1fb25490098487abacb1fd2ca5ef1e8
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
>  ...36-Fix-build-failure-on-Aarch64-host.patch | 37 -------------------
>  package/libnss/libnss.hash                    |  4 +-
>  package/libnss/libnss.mk                      |  2 +-
>  3 files changed, 3 insertions(+), 40 deletions(-)
>  delete mode 100644 package/libnss/0001-Bug-1771036-Fix-build-failure-on-Aarch64-host.patch

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/libnss/0001-Bug-1771036-Fix-build-failure-on-Aarch64-host.patch b/package/libnss/0001-Bug-1771036-Fix-build-failure-on-Aarch64-host.patch
deleted file mode 100644
index 12b376744e..0000000000
--- a/package/libnss/0001-Bug-1771036-Fix-build-failure-on-Aarch64-host.patch
+++ /dev/null
@@ -1,37 +0,0 @@ 
-From 9d5900c1ee9000906a90923e861b0fd7f1061cde Mon Sep 17 00:00:00 2001
-From: Giulio Benetti <giulio.benetti@benettiengineering.com>
-Date: Tue, 24 May 2022 23:40:45 +0200
-Subject: [PATCH] Bug 1771036 - Fix build failure on Aarch64 host
-
-If trying to build on Aarch64 host for powerpc64 target we can't override
-the LDFLAGS leading to this build failure:
-gcc: error: unrecognized command-line option '-m64'
-
-So let's add NATIVE_LDFLAGS check and use it to link nsinstall. This way
-any build environment can pass LDFLAGS that fits better for host
-architecture.
-
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
-[upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1771036]
----
- coreconf/nsinstall/Makefile | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile
-index 08dfbc2fe..5061789ff 100644
---- a/nss/coreconf/nsinstall/Makefile
-+++ b/nss/coreconf/nsinstall/Makefile
-@@ -34,6 +34,10 @@ ifdef NATIVE_FLAGS
- OS_CFLAGS=$(NATIVE_FLAGS)
- endif
- 
-+ifdef NATIVE_LDFLAGS
-+LDFLAGS=$(NATIVE_LDFLAGS)
-+endif
-+
- include $(DEPTH)/coreconf/rules.mk
- 
- # Redefine MAKE_OBJDIR for just this directory
--- 
-2.34.1
-
diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash
index f7da9ccfdc..0f4c3cabe6 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_79_RTM/src/SHA256SUMS
-sha256  ebdf2d6a96613b6fe70ad579e9f983e0e94e0110171cfb2999db633d3394a514  nss-3.79.tar.gz
+# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_80_RTM/src/SHA256SUMS
+sha256  c0bf1fd2c7e29a6b02b309622baafc443eec90c8934bb155da4bb98988784b6a  nss-3.80.tar.gz
 # Locally calculated
 sha256  a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4  nss/COPYING
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 70f53a9140..e7aa730435 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-LIBNSS_VERSION = 3.79
+LIBNSS_VERSION = 3.80
 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