pool/mozilla-nss
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 587801 from mozilla:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/587801
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mozilla-nss?expand=0&rev=134
This commit is contained in:
Dominique Leuenberger 2018-03-24 15:05:07 +00:00 committed by Git OBS Bridge
commit f33a4145a2
12 changed files with 97 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bmo-1400603.patch
View File

@ -4,10 +4,8 @@ Date: Mon, 18 Sep 2017 11:24:00 +0200
Subject: [PATCH] freebl: Reorganize AES-GCM source code based on hw/sw
implementation
diff --git a/lib/freebl/gcm-hw.c b/lib/freebl/gcm-hw.c
new file mode 100644
index 0000000..df77d1e
--- /dev/null
+++ b/lib/freebl/gcm-hw.c
@@ -0,0 +1,151 @@
@ -164,7 +162,6 @@ index 0000000..df77d1e
+
diff --git a/lib/freebl/rijndael-hw.c b/lib/freebl/rijndael-hw.c
new file mode 100644
index 0000000..b9c4b22
--- /dev/null
+++ b/lib/freebl/rijndael-hw.c
@@ -0,0 +1,170 @@

17
malloc.patch
View File

@ -1,11 +1,19 @@
# HG changeset patch
# Parent 032e1235ede0393863f4720ba6746baa24cb68e4
Index: security/nss/tests/ssl/ssl.sh
===================================================================
RCS file: /cvsroot/mozilla/security/nss/tests/ssl/ssl.sh,v
retrieving revision 1.100
diff -u -r1.100 ssl.sh
--- security/nss/tests/ssl/ssl.sh 26 Mar 2009 23:14:34 -0000 1.100
+++ nss/tests/ssl/ssl.sh 6 Jun 2009 06:21:07 -0000
@@ -974,6 +974,7 @@
diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh
--- a/tests/ssl/ssl.sh
+++ b/tests/ssl/ssl.sh
@@ -1354,12 +1354,13 @@ ssl_run_tests()
fi
;;
esac
done
}
################################# main #################################
@ -13,3 +21,4 @@ diff -u -r1.100 ssl.sh
ssl_init
ssl_run_tests
ssl_cleanup

12
mozilla-nss.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Mar 15 18:13:38 UTC 2018 - cgrobertson@suse.com
- update to NSS 3.36
New functionality
* Experimental APIs for TLS session cache handling
Notable Changes
* Replaces existing vectorized ChaCha20 code with verified
HACL* implementation.
- Removed patch as no longer needed: renegotiate-transitional.patch
upstream fix
-------------------------------------------------------------------
Thu Feb 8 06:11:12 UTC 2018 - wr@rosenauer.org

14
mozilla-nss.spec
View File

@ -17,15 +17,15 @@
#
%global nss_softokn_fips_version 3.35
%global nss_softokn_fips_version 3.36
Name: mozilla-nss
BuildRequires: gcc-c++
BuildRequires: mozilla-nspr-devel >= 4.18
BuildRequires: mozilla-nspr-devel >= 4.19
BuildRequires: pkg-config
BuildRequires: sqlite-devel
BuildRequires: zlib-devel
Version: 3.35
Version: 3.36
Release: 0
# bug437293
%ifarch ppc64
@ -36,8 +36,8 @@ Summary: Network Security Services
License: MPL-2.0
Group: System/Libraries
Url: http://www.mozilla.org/projects/security/pki/nss/
Source: https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_35_RTM/src/nss-%{version}.tar.gz
# hg clone https://hg.mozilla.org/projects/nss nss-3.35/nss ; cd nss-3.35/nss ; hg up NSS_3_35_RTM
Source: https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_36_RTM/src/nss-%{version}.tar.gz
# hg clone https://hg.mozilla.org/projects/nss nss-3.36/nss ; cd nss-3.36/nss ; hg up NSS_3_36_RTM
#Source: nss-%{version}.tar.gz
Source1: nss.pc.in
Source3: nss-config.in
@ -52,7 +52,6 @@ Source99: %{name}.changes
Patch1: nss-opt.patch
Patch2: system-nspr.patch
Patch3: nss-no-rpath.patch
Patch4: renegotiate-transitional.patch
Patch5: malloc.patch
Patch6: nss-disable-ocsp-test.patch
Patch7: nss-sqlitename.patch
@ -88,7 +87,7 @@ Summary: Network (Netscape) Security Services development files
Group: Development/Libraries/C and C++
Requires: libfreebl3
Requires: libsoftokn3
Requires: mozilla-nspr-devel >= 4.18
Requires: mozilla-nspr-devel >= 4.19
Requires: mozilla-nss = %{version}-%{release}
# bug437293
%ifarch ppc64
@ -171,7 +170,6 @@ cd nss
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%if %suse_version > 1110
%patch5 -p1
%endif

3
nss-3.35.tar.gz
View File

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

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

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

5
nss-disable-ocsp-test.patch
View File

@ -1,7 +1,10 @@
# HG changeset patch
# Parent 487d452261dc8de3ff4446be102ea5c41685f253
diff --git a/tests/chains/scenarios/scenarios b/tests/chains/scenarios/scenarios
--- a/tests/chains/scenarios/scenarios
+++ b/tests/chains/scenarios/scenarios
@@ -45,12 +45,11 @@ mapping.cfg
@@ -13,12 +13,11 @@ mapping.cfg
mapping2.cfg
aia.cfg
bridgewithaia.cfg

15
nss-no-rpath.patch
View File

@ -1,11 +1,16 @@
# HG changeset patch
# Parent 796f0564feb6df3081b8ff7cb3a0d354053b3d2c
Index: security/nss/cmd/platlibs.mk
===================================================================
RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
retrieving revision 1.71
diff -u -p -6 -r1.71 platlibs.mk
--- security/nss/cmd/platlibs.mk 17 Jul 2012 15:22:42 -0000 1.71
+++ nss/cmd/platlibs.mk 25 Oct 2012 12:07:35 -0000
@@ -15,15 +15,15 @@ else
diff --git a/cmd/platlibs.mk b/cmd/platlibs.mk
--- a/cmd/platlibs.mk
+++ b/cmd/platlibs.mk
@@ -13,19 +13,19 @@ ifeq ($(USE_64), 1)
EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
else
EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps'
endif
endif
@ -23,3 +28,5 @@ diff -u -p -6 -r1.71 platlibs.mk
endif # BUILD_SUN_PKG
ifdef NSS_DISABLE_DBM
DBMLIB = $(NULL)
else

21
nss-opt.patch
View File

@ -1,11 +1,19 @@
# HG changeset patch
# Parent 33317adf00d6bc6c3e3499e4b32fca6b899c4b77
Index: security/coreconf/Linux.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
retrieving revision 1.45.2.1
diff -u -r1.45.2.1 Linux.mk
--- security/coreconf/Linux.mk 31 Jul 2010 04:23:37 -0000 1.45.2.1
+++ nss/coreconf/Linux.mk 5 Aug 2010 07:35:06 -0000
@@ -112,11 +112,7 @@
diff --git a/coreconf/Linux.mk b/coreconf/Linux.mk
--- a/coreconf/Linux.mk
+++ b/coreconf/Linux.mk
@@ -102,21 +102,17 @@ endif
endif
ifneq ($(OS_TARGET),Android)
LIBC_TAG = _glibc
endif
ifdef BUILD_OPT
@ -18,3 +26,8 @@ diff -u -r1.45.2.1 Linux.mk
ifdef MOZ_DEBUG_SYMBOLS
ifdef MOZ_DEBUG_FLAGS
OPTIMIZER += $(MOZ_DEBUG_FLAGS)
else
OPTIMIZER += -gdwarf-2
endif
endif
endif

21
nss-sqlitename.patch
View File

@ -1,11 +1,19 @@
# HG changeset patch
# Parent b96f2a8d5f606fd982a8fe3655c4b71e282c3976
Index: security/nss/lib/sqlite/manifest.mn
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v
retrieving revision 1.5
diff -u -r1.5 manifest.mn
--- security/nss/lib/sqlite/manifest.mn 25 Apr 2012 14:50:11 -0000 1.5
+++ nss/lib/sqlite/manifest.mn 28 Jan 2013 20:48:22 -0000
@@ -6,9 +6,10 @@
diff --git a/lib/sqlite/manifest.mn b/lib/sqlite/manifest.mn
--- a/lib/sqlite/manifest.mn
+++ b/lib/sqlite/manifest.mn
@@ -1,19 +1,20 @@
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
CORE_DEPTH = ../..
MODULE = nss
@ -17,3 +25,8 @@ diff -u -r1.5 manifest.mn
DEFINES += -DSQLITE_THREADSAFE=1
EXPORTS = \
$(NULL)
PRIVATE_EXPORTS = \
sqlite3.h \
$(NULL)

13
renegotiate-transitional.patch
View File

@ -1,13 +0,0 @@
diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c
index dc83219..276f4a8 100644
--- a/lib/ssl/sslsock.c
+++ b/lib/ssl/sslsock.c
@@ -72,7 +72,7 @@ static sslOptions ssl_defaults = {
PR_FALSE, /* noLocks */
PR_FALSE, /* enableSessionTickets */
PR_FALSE, /* enableDeflate */
- 2, /* enableRenegotiation (default: requires extension) */
+ 3, /* enableRenegotiation (default: requires extension) */
PR_FALSE, /* requireSafeNegotiation */
PR_FALSE, /* enableFalseStart */
PR_TRUE, /* cbcRandomIV */

16
system-nspr.patch
View File

@ -1,8 +1,15 @@
# HG changeset patch
# Parent bbf8e741ac966df6cf513ea042d1351eb279c122
diff --git a/Makefile b/Makefile
index c824ba2..a5abe7b 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
@@ -42,17 +42,17 @@ include $(CORE_DEPTH)/coreconf/rules.mk
#######################################################################
#######################################################################
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
@ -11,3 +18,8 @@ index c824ba2..a5abe7b 100644
nss_clean_all: clobber_nspr clobber
NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
NSPR_CONFIGURE = $(CORE_DEPTH)/../nspr/configure
#
# Translate coreconf build options to NSPR configure options.