updated builtin roots
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=36
This commit is contained in:
parent
6b72de2270
commit
299409744b
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 14 07:56:26 CET 2009 - wr@rosenauer.org
|
||||||
|
|
||||||
|
- updated builtin certs (version 1.77)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Nov 23 17:19:43 CET 2009 - wr@rosenauer.org
|
||||||
|
|
||||||
|
- rebased patches to apply w/o fuzz
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Aug 14 08:51:00 CEST 2009 - wr@rosenauer.org
|
Fri Aug 14 08:51:00 CEST 2009 - wr@rosenauer.org
|
||||||
|
|
||||||
|
@ -27,9 +27,9 @@ BuildRequires: sqlite-devel
|
|||||||
%if %suse_version > 1030
|
%if %suse_version > 1030
|
||||||
BuildRequires: sqlite3-devel
|
BuildRequires: sqlite3-devel
|
||||||
%endif
|
%endif
|
||||||
License: GPL v2 or later ; LGPL v2.1 or later ; MPL
|
License: GPLv2+ ; LGPLv2.1+ ; MPL
|
||||||
Version: 3.12.4
|
Version: 3.12.4
|
||||||
Release: 1
|
Release: 2
|
||||||
# bug437293
|
# bug437293
|
||||||
%ifarch ppc64
|
%ifarch ppc64
|
||||||
Obsoletes: mozilla-nss-64bit
|
Obsoletes: mozilla-nss-64bit
|
||||||
@ -48,6 +48,7 @@ Patch2: nss-sqlitename.patch
|
|||||||
Patch3: system-nspr.patch
|
Patch3: system-nspr.patch
|
||||||
Patch4: char.patch
|
Patch4: char.patch
|
||||||
Patch5: nss-no-rpath.patch
|
Patch5: nss-no-rpath.patch
|
||||||
|
Patch6: nss-ckbi-1_77.patch.bz2
|
||||||
Patch9: malloc.patch
|
Patch9: malloc.patch
|
||||||
# Remove remnant traces from the package split.
|
# Remove remnant traces from the package split.
|
||||||
Provides: libnss3 = %{version}-%{release}
|
Provides: libnss3 = %{version}-%{release}
|
||||||
@ -68,12 +69,8 @@ TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
|
|||||||
certificates, and other security standards.
|
certificates, and other security standards.
|
||||||
|
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Mozilla Foundation
|
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
License: GPL v2 or later ; LGPL v2.1 or later ; MPL
|
License: GPLv2+ ; LGPLv2.1+ ; MPL
|
||||||
Summary: Network (Netscape) Security Services development files
|
Summary: Network (Netscape) Security Services development files
|
||||||
Group: Development/Libraries/Other
|
Group: Development/Libraries/Other
|
||||||
Requires: mozilla-nspr-devel
|
Requires: mozilla-nspr-devel
|
||||||
@ -92,13 +89,8 @@ TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
|
|||||||
certificates, and other security standards.
|
certificates, and other security standards.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Mozilla Foundation <drivers@mozilla.org>
|
|
||||||
|
|
||||||
%package tools
|
%package tools
|
||||||
License: GPL v2 or later ; LGPL v2.1 or later ; MPL
|
License: GPLv2+ ; LGPLv2.1+ ; MPL
|
||||||
Summary: Tools for developing, debugging, and managing applications that use NSS
|
Summary: Tools for developing, debugging, and managing applications that use NSS
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
PreReq: mozilla-nss >= %{version}
|
PreReq: mozilla-nss >= %{version}
|
||||||
@ -108,13 +100,8 @@ The NSS Security Tools allow developers to test, debug, and manage
|
|||||||
applications that use NSS.
|
applications that use NSS.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Mozilla Foundation <drivers@mozilla.org>
|
|
||||||
|
|
||||||
%package -n libfreebl3
|
%package -n libfreebl3
|
||||||
License: GPL v2 or later ; LGPL v2.1 or later ; MPL
|
License: GPLv2+ ; LGPLv2.1+ ; MPL
|
||||||
Summary: Freebl library for the Network Security Services
|
Summary: Freebl library for the Network Security Services
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
|
|
||||||
@ -128,10 +115,6 @@ certificates, and other security standards.
|
|||||||
This package installs the freebl library from NSS.
|
This package installs the freebl library from NSS.
|
||||||
|
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Mozilla Foundation
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -n nss-%{version} -q
|
%setup -n nss-%{version} -q
|
||||||
cd mozilla
|
cd mozilla
|
||||||
@ -140,6 +123,7 @@ cd mozilla
|
|||||||
%patch3
|
%patch3
|
||||||
%patch4
|
%patch4
|
||||||
%patch5
|
%patch5
|
||||||
|
%patch6 -p1
|
||||||
%if %suse_version > 1110
|
%if %suse_version > 1110
|
||||||
%patch9
|
%patch9
|
||||||
%endif
|
%endif
|
||||||
|
3
nss-ckbi-1_77.patch.bz2
Normal file
3
nss-ckbi-1_77.patch.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2efe4e5ce35b302beed328dc1a9c7996fc5bf620151125da7875ef58715df481
|
||||||
|
size 26449
|
@ -1,38 +1,32 @@
|
|||||||
Index: security/nss/lib/sqlite/manifest.mn
|
Index: security/nss/cmd/platlibs.mk
|
||||||
===================================================================
|
===================================================================
|
||||||
RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v
|
RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
|
||||||
retrieving revision 1.3
|
retrieving revision 1.64
|
||||||
diff -u -p -6 -r1.3 manifest.mn
|
diff -u -p -r1.64 platlibs.mk
|
||||||
--- security/nss/lib/sqlite/manifest.mn 15 Aug 2007 15:30:05 -0000 1.3
|
--- security/nss/cmd/platlibs.mk 17 Jun 2009 23:01:48 -0000 1.64
|
||||||
+++ security/nss/lib/sqlite/manifest.mn 23 Jan 2008 08:39:29 -0000
|
+++ security/nss/cmd/platlibs.mk 23 Nov 2009 16:08:54 -0000
|
||||||
@@ -35,15 +35,16 @@
|
@@ -80,7 +80,11 @@ endif
|
||||||
#
|
endif
|
||||||
# ***** END LICENSE BLOCK *****
|
endif
|
||||||
CORE_DEPTH = ../../..
|
|
||||||
|
|
||||||
MODULE = nss
|
+ifdef NSS_USE_SYSTEM_SQLITE
|
||||||
|
SQLITE=-lsqlite3
|
||||||
|
+else
|
||||||
|
+SQLITE=-lnsssqlite3
|
||||||
|
+endif
|
||||||
|
|
||||||
-LIBRARY_NAME = sqlite
|
ifdef NSS_DISABLE_DBM
|
||||||
+LIBRARY_NAME = nsssqlite
|
DBMLIB = $(NULL)
|
||||||
LIBRARY_VERSION = 3
|
|
||||||
MAPFILE = $(OBJDIR)/sqlite.def
|
|
||||||
+MAPFILE_SOURCE = sqlite.def
|
|
||||||
DEFINES += -DTHREADSAFE=1
|
|
||||||
|
|
||||||
EXPORTS = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
PRIVATE_EXPORTS = \
|
|
||||||
Index: security/nss/lib/softoken/config.mk
|
Index: security/nss/lib/softoken/config.mk
|
||||||
===================================================================
|
===================================================================
|
||||||
RCS file: /cvsroot/mozilla/security/nss/lib/softoken/config.mk,v
|
RCS file: /cvsroot/mozilla/security/nss/lib/softoken/config.mk,v
|
||||||
retrieving revision 1.23
|
retrieving revision 1.29
|
||||||
diff -u -p -r1.23 config.mk
|
diff -u -p -r1.29 config.mk
|
||||||
--- security/nss/lib/softoken/config.mk 5 Feb 2008 05:33:37 -0000 1.23
|
--- security/nss/lib/softoken/config.mk 11 Jun 2009 00:55:48 -0000 1.29
|
||||||
+++ security/nss/lib/softoken/config.mk 19 Feb 2008 11:50:02 -0000
|
+++ security/nss/lib/softoken/config.mk 23 Nov 2009 16:08:55 -0000
|
||||||
@@ -86,12 +86,16 @@ else
|
@@ -83,12 +83,16 @@ EXTRA_SHARED_LIBS += \
|
||||||
EXTRA_SHARED_LIBS += \
|
|
||||||
-L$(DIST)/lib \
|
-L$(DIST)/lib \
|
||||||
|
-L$(NSSUTIL_LIB_DIR) \
|
||||||
-lnssutil3 \
|
-lnssutil3 \
|
||||||
- -lsqlite3 \
|
- -lsqlite3 \
|
||||||
-L$(NSPR_LIB_DIR) \
|
-L$(NSPR_LIB_DIR) \
|
||||||
@ -48,28 +42,22 @@ diff -u -p -r1.23 config.mk
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS_TARGET),AIX)
|
ifeq ($(OS_TARGET),AIX)
|
||||||
Index: security/nss/cmd/platlibs.mk
|
Index: security/nss/lib/sqlite/manifest.mn
|
||||||
===================================================================
|
===================================================================
|
||||||
RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
|
RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v
|
||||||
retrieving revision 1.59
|
retrieving revision 1.3
|
||||||
diff -u -p -6 -r1.59 platlibs.mk
|
diff -u -p -r1.3 manifest.mn
|
||||||
--- security/nss/cmd/platlibs.mk 2 Dec 2008 23:24:46 -0000 1.59
|
--- security/nss/lib/sqlite/manifest.mn 15 Aug 2007 15:30:05 -0000 1.3
|
||||||
+++ security/nss/cmd/platlibs.mk 14 Apr 2009 11:07:52 -0000
|
+++ security/nss/lib/sqlite/manifest.mn 23 Nov 2009 16:08:55 -0000
|
||||||
@@ -69,13 +69,17 @@ EXTRA_SHARED_LIBS += \
|
@@ -38,9 +38,10 @@ CORE_DEPTH = ../../..
|
||||||
else
|
|
||||||
EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
+ifdef NSS_USE_SYSTEM_SQLITE
|
MODULE = nss
|
||||||
SQLITE=-lsqlite3
|
|
||||||
+else
|
|
||||||
+SQLITE=-lnsssqlite3
|
|
||||||
+endif
|
|
||||||
|
|
||||||
ifdef NSS_DISABLE_DBM
|
-LIBRARY_NAME = sqlite
|
||||||
DBMLIB = $(NULL)
|
+LIBRARY_NAME = nsssqlite
|
||||||
else
|
LIBRARY_VERSION = 3
|
||||||
DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX)
|
MAPFILE = $(OBJDIR)/sqlite.def
|
||||||
endif
|
+MAPFILE_SOURCE = sqlite.def
|
||||||
|
DEFINES += -DTHREADSAFE=1
|
||||||
|
|
||||||
|
EXPORTS = \
|
||||||
|
@ -1,11 +1,16 @@
|
|||||||
--- mozilla/security/nss/Makefile
|
Index: security/nss/Makefile
|
||||||
+++ security/nss/Makefile
|
===================================================================
|
||||||
@@ -78,7 +78,7 @@
|
RCS file: /cvsroot/mozilla/security/nss/Makefile,v
|
||||||
|
retrieving revision 1.36
|
||||||
|
diff -u -p -r1.36 Makefile
|
||||||
|
--- security/nss/Makefile 2 Dec 2008 23:24:39 -0000 1.36
|
||||||
|
+++ security/nss/Makefile 23 Nov 2009 16:19:04 -0000
|
||||||
|
@@ -78,7 +78,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
||||||
# (7) Execute "local" rules. (OPTIONAL). #
|
# (7) Execute "local" rules. (OPTIONAL). #
|
||||||
#######################################################################
|
#######################################################################
|
||||||
|
|
||||||
-nss_build_all: build_coreconf build_nspr build_dbm all
|
-nss_build_all: build_coreconf build_nspr build_dbm all
|
||||||
+nss_build_all: build_coreconf build_dbm all
|
+nss_build_all: build_coreconf build_dbm all
|
||||||
|
|
||||||
build_coreconf:
|
nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
|
||||||
cd $(CORE_DEPTH)/coreconf ; $(MAKE)
|
|
||||||
|
Loading…
Reference in New Issue
Block a user