Skip to contentSkip to conversation

libnspr: bump to version 4.11

PATCH New Gustavo Zacarias 3 participants 5 messages Nov 20, 2015 – Nov 21, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libnspr: bump to version 4.11

---
 package/libnspr/libnspr.hash | 4 ++--
 package/libnspr/libnspr.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/libnspr/libnspr.hash +2 -2
index 0a5ee87..87f6d4f 100644
@@ -1,2 +1,2 @@
-# From https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.10/src/SHA256SUMS
-sha256	343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107	nspr-4.10.10.tar.gz
+# From https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.11/src/SHA256SUMS
+sha256	cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2	nspr-4.11.tar.gz
package/libnspr/libnspr.mk +1 -1
index 9124ce0..207da4e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNSPR_VERSION = 4.10.10
+LIBNSPR_VERSION = 4.11
 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz
 LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src
 LIBNSPR_SUBDIR = nspr
Signature · 1 line
2.4.10
#1 lore raw

PATCH 2/2 libnss: bump to version 3.21

Disable gtests since they require C++ support.

---
 package/libnss/libnss.hash | 4 ++--
 package/libnss/libnss.mk   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
package/libnss/libnss.hash +2 -2
index 68f50ea..4fa5897 100644
@@ -1,2 +1,2 @@
-# From https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_1_RTM/src/SHA256SUMS
-sha256	ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97	nss-3.20.1.tar.gz
+# From https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/SHA256SUMS
+sha256	3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239	nss-3.21.tar.gz
package/libnss/libnss.mk +2 -1
index a15fab2..10879e2 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNSS_VERSION = 3.20.1
+LIBNSS_VERSION = 3.21
 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
@@ -19,6 +19,7 @@ LIBNSS_BUILD_VARS = \
 	NSPR_LIB_DIR=$(STAGING_DIR)/usr/lib \
 	BUILD_OPT=1 \
 	NS_USE_GCC=1 \
+	NSS_DISABLE_GTESTS=1 \
 	NSS_USE_SYSTEM_SQLITE=1 \
 	NSS_ENABLE_ECC=1 \
 	NATIVE_CC="$(HOSTCC)" \
Signature · 1 line
2.4.10
#2 lore raw

PATCH 2/2 libnss: bump to version 3.21

Dear Gustavo Zacarias,

Quoted 7 lines · Gustavo Zacarias

Disable gtests since they require C++ support.

---
 package/libnss/libnss.hash | 4 ++--
 package/libnss/libnss.mk   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

I've applied to next. However, there was a conflict since you based your patch on master where libnss has been bumped to 3.20.1. But in next, the libnss version is still 3.20. I've fixed that up when applying.

Peter: this means you will get a conflict when merging back next into master, but it is trivial to resolve (hash file conflict and <pkg>_VERSION conflict).

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 2/2 libnss: bump to version 3.21

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hi,

Quoted 3 lines

Peter: this means you will get a conflict when merging back next into master, but it is trivial to resolve (hash file conflict and <pkg>_VERSION conflict).

Yes, no problem - Thanks for handling the patch!

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/2 libnspr: bump to version 4.11

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 5 lines · Gustavo Zacarias
---
 package/libnspr/libnspr.hash | 4 ++--
 package/libnspr/libnspr.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com