From 79bf6c1c6ea64a8636302f535bd28e90317647c5 Mon Sep 17 00:00:00 2001 From: Kai Engert Date: Tue, 14 Apr 2009 15:21:19 +0000 Subject: [PATCH] - Update to NSS 3.12.3 --- .cvsignore | 2 +- nss-nolocalsql.patch | 21 ++++++++++----------- nss.spec | 8 +++++--- sources | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index f27822d..095444a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ nss-pem-20080124.tar.bz2 -nss-3.12.2.99.3-stripped.tar.bz2 +nss-3.12.3-stripped.tar.bz2 diff --git a/nss-nolocalsql.patch b/nss-nolocalsql.patch index b72cc66..21101fa 100644 --- a/nss-nolocalsql.patch +++ b/nss-nolocalsql.patch @@ -1,6 +1,6 @@ -diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/Makefile ---- mozilla/security/nss/lib/Makefile.nolocalsql 2007-11-06 15:12:37.000000000 +0100 -+++ mozilla/security/nss/lib/Makefile 2007-11-06 15:13:35.000000000 +0100 +diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile +--- ./mozilla/security/nss/lib/Makefile.nolocalsql 2007-07-19 23:36:49.000000000 +0200 ++++ ./mozilla/security/nss/lib/Makefile 2009-04-14 17:07:40.000000000 +0200 @@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE) DIRS := $(filter-out fortcrypt,$(DIRS)) endif @@ -18,9 +18,9 @@ diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/M ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # -diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/legacydb/manifest.mn ---- mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2007-11-06 15:10:59.000000000 +0100 -+++ mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2007-11-06 15:11:07.000000000 +0100 +diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn +--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2007-07-19 23:36:50.000000000 +0200 ++++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2009-04-14 17:07:40.000000000 +0200 @@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" @@ -34,9 +34,9 @@ diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozil CSRCS = \ dbmshim.c \ -diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/manifest.mn ---- mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2007-11-06 15:08:14.000000000 +0100 -+++ mozilla/security/nss/lib/softoken/manifest.mn 2007-11-06 15:10:21.000000000 +0100 +diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn +--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2009-03-25 17:21:37.000000000 +0100 ++++ ./mozilla/security/nss/lib/softoken/manifest.mn 2009-04-14 17:07:40.000000000 +0200 @@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" @@ -49,5 +49,4 @@ diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/securi +#endif EXPORTS = \ - pkcs11.h \ -diff -up mozilla/security/nss/lib/softoken/config.mk.nolocalsql mozilla/security/nss/lib/softoken/config.mk + secmodt.h \ diff --git a/nss.spec b/nss.spec index 0e3b186..7e116c3 100644 --- a/nss.spec +++ b/nss.spec @@ -3,8 +3,8 @@ Summary: Network Security Services Name: nss -Version: 3.12.2.99.3 -Release: 7%{?dist} +Version: 3.12.3 +Release: 2%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -404,6 +404,7 @@ done %{_includedir}/nss3/nsspem.h %{_includedir}/nss3/nssrwlk.h %{_includedir}/nss3/nssrwlkt.h +%{_includedir}/nss3/nssutil.h %{_includedir}/nss3/ocsp.h %{_includedir}/nss3/ocspt.h %{_includedir}/nss3/p12.h @@ -450,7 +451,6 @@ done %{_includedir}/nss3/sslproto.h %{_includedir}/nss3/sslt.h %{_includedir}/nss3/utilrename.h -%{_includedir}/nss3/watcomfx.h %files pkcs11-devel @@ -470,6 +470,8 @@ done %changelog +* Tue Apr 14 2009 Kai Engert - 3.12.3-2 +- Update to NSS 3.12.3 * Mon Apr 06 2009 Kai Engert - 3.12.2.99.3-7 - temporarily disable the test suite because of bug 494266 * Mon Apr 06 2009 Kai Engert - 3.12.2.99.3-6 diff --git a/sources b/sources index 4910435..d08b592 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 084675e4f793ed82e1ba78f76745ada8 nss-pem-20080124.tar.bz2 -92af643ed959c78e2de765b9cf63fe8c nss-3.12.2.99.3-stripped.tar.bz2 +de43077b1fb888bccf155506ec12e40a nss-3.12.3-stripped.tar.bz2