Accepting request 867003 from mozilla:Factory

- update to NSS 3.60.1
  Notable changes in NSS 3.60:
  * TLS 1.3 Encrypted Client Hello (draft-ietf-tls-esni-08) support
    has been added, replacing the previous ESNI (draft-ietf-tls-esni-01)
    implementation. See bmo#1654332 for more information.
  * December 2020 batch of Root CA changes, builtins library updated
    to version 2.46. See bmo#1678189, bmo#1678166, and bmo#1670769
    for more information.
- removed obsolete ppc-old-abi-v3.patch

OBS-URL: https://build.opensuse.org/request/show/867003
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mozilla-nss?expand=0&rev=170
This commit is contained in:
Dominique Leuenberger 2021-01-29 13:55:23 +00:00 committed by Git OBS Bridge
commit 3cea36e7ac
5 changed files with 21 additions and 47 deletions

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sun Jan 24 09:55:03 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
- update to NSS 3.60.1
Notable changes in NSS 3.60:
* TLS 1.3 Encrypted Client Hello (draft-ietf-tls-esni-08) support
has been added, replacing the previous ESNI (draft-ietf-tls-esni-01)
implementation. See bmo#1654332 for more information.
* December 2020 batch of Root CA changes, builtins library updated
to version 2.46. See bmo#1678189, bmo#1678166, and bmo#1670769
for more information.
- removed obsolete ppc-old-abi-v3.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Dec 27 10:46:57 UTC 2020 - Wolfgang Rosenauer <wr@rosenauer.org> Sun Dec 27 10:46:57 UTC 2020 - Wolfgang Rosenauer <wr@rosenauer.org>

View File

@ -1,8 +1,8 @@
# #
# spec file for package mozilla-nss # spec file for package mozilla-nss
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# Copyright (c) 2006-2020 Wolfgang Rosenauer # Copyright (c) 2006-2021 Wolfgang Rosenauer
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,14 +17,14 @@
# #
%global nss_softokn_fips_version 3.59 %global nss_softokn_fips_version 3.60
%define NSPR_min_version 4.29 %define NSPR_min_version 4.29
%define nspr_ver %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr) %define nspr_ver %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr)
%define nssdbdir %{_sysconfdir}/pki/nssdb %define nssdbdir %{_sysconfdir}/pki/nssdb
Name: mozilla-nss Name: mozilla-nss
Version: 3.59.1 Version: 3.60.1
Release: 0 Release: 0
%define underscore_version 3_59_1 %define underscore_version 3_60_1
Summary: Network Security Services Summary: Network Security Services
License: MPL-2.0 License: MPL-2.0
Group: System/Libraries Group: System/Libraries
@ -49,7 +49,6 @@ Patch4: add-relro-linker-option.patch
Patch5: malloc.patch Patch5: malloc.patch
Patch6: bmo-1400603.patch Patch6: bmo-1400603.patch
Patch7: nss-sqlitename.patch Patch7: nss-sqlitename.patch
Patch8: ppc-old-abi-v3.patch
Patch9: nss-fips-use-getrandom.patch Patch9: nss-fips-use-getrandom.patch
Patch10: nss-fips-dsa-kat.patch Patch10: nss-fips-dsa-kat.patch
Patch11: nss-fips-pairwise-consistency-check.patch Patch11: nss-fips-pairwise-consistency-check.patch
@ -204,7 +203,6 @@ cd nss
%endif %endif
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1
# FIPS patches # FIPS patches
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb655669533d81fd0d7de46da210645b87c4c2fd4046ccc4f60f3b0d64ce2ecf
size 82024539

3
nss-3.60.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2051c20b61112df24bad533ac37f6c66c1bc0d6ea70bb9d9cad102d20324279d
size 82036869

View File

@ -1,37 +0,0 @@
From a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001
From: Lauri Kasanen <cand@gmx.com>
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 <cand@gmx.com>
---
lib/freebl/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
index 5f7384429..e0461c7d3 100644
--- a/lib/freebl/Makefile
+++ b/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