1
0
Marcus Meissner 2016-03-31 11:53:45 +00:00 committed by Git OBS Bridge
parent 3359c3f6b9
commit 69428b71d6
3 changed files with 2608 additions and 3695 deletions

View File

@ -1,7 +1,7 @@
#
# spec file for package ca-certificates-mozilla
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,7 +26,7 @@ BuildRequires: python
Name: ca-certificates-mozilla
# Version number is NSS_BUILTINS_LIBRARY_VERSION in this file:
# http://hg.mozilla.org/projects/nss/file/default/lib/ckfw/builtins/nssckbi.h
Version: 2.2
Version: 2.6
Release: 0
Summary: CA certificates for OpenSSL
License: MPL-2.0
@ -50,7 +50,8 @@ Source11: %{name}.COPYING
Source12: compareoldnew
# temporary legacy patch
Patch0: diff-from-upstream-2.2.patch
# openssl 1.0.2 should not need it anymore.
# Patch0: diff-from-upstream-2.2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -71,7 +72,7 @@ from MozillaFirefox
%setup -qcT
/bin/cp %{SOURCE0} .
patch <%{PATCH0}
#patch <%{PATCH0}
install -m 644 %{SOURCE11} COPYING
ver=`sed -ne '/NSS_BUILTINS_LIBRARY_VERSION /s/.*"\(.*\)"/\1/p' < "%{SOURCE1}"`

File diff suppressed because it is too large Load Diff

View File

@ -18,7 +18,7 @@
#define NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR 2
#define NSS_BUILTINS_CRYPTOKI_VERSION_MINOR 20
/* These version numbers detail the changes
/* These version numbers detail the changes
* to the list of trusted certificates.
*
* The NSS_BUILTINS_LIBRARY_VERSION_MINOR macro needs to be bumped
@ -45,14 +45,14 @@
* of the comment in the CK_VERSION type definition.
*/
#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2
#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 2
#define NSS_BUILTINS_LIBRARY_VERSION "2.2"
#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 7
#define NSS_BUILTINS_LIBRARY_VERSION "2.7"
/* These version numbers detail the semantic changes to the ckfw engine. */
#define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
#define NSS_BUILTINS_HARDWARE_VERSION_MINOR 0
/* These version numbers detail the semantic changes to ckbi itself
/* These version numbers detail the semantic changes to ckbi itself
* (new PKCS #11 objects), etc. */
#define NSS_BUILTINS_FIRMWARE_VERSION_MAJOR 1
#define NSS_BUILTINS_FIRMWARE_VERSION_MINOR 0