checked in

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=35

mozilla-nss.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-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
 

mozilla-nss.spec

@@ -68,6 +68,10 @@ TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
 certificates, and other security standards.
 
 
+Authors:
+--------
+    Mozilla Foundation
+
 %package devel
 License:        GPL v2 or later ; LGPL v2.1 or later ; MPL
 Summary:        Network (Netscape) Security Services development files
@@ -88,6 +92,11 @@ TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
 certificates, and other security standards.
 
 
+
+Authors:
+--------
+    Mozilla Foundation <drivers@mozilla.org>
+
 %package tools
 License:        GPL v2 or later ; LGPL v2.1 or later ; MPL
 Summary:        Tools for developing, debugging, and managing applications that use NSS
@@ -99,6 +108,11 @@ The NSS Security Tools allow developers to test, debug, and manage
 applications that use NSS.
 
 
+
+Authors:
+--------
+    Mozilla Foundation <drivers@mozilla.org>
+
 %package -n libfreebl3
 License:        GPL v2 or later ; LGPL v2.1 or later ; MPL
 Summary:        Freebl library for the Network Security Services
@@ -114,6 +128,10 @@ certificates, and other security standards.
 This package installs the freebl library from NSS.
 
 
+Authors:
+--------
+    Mozilla Foundation
+
 %prep
 %setup -n nss-%{version} -q
 cd mozilla

nss-sqlitename.patch

@@ -1,32 +1,38 @@
-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.64
+retrieving revision 1.3
-diff -u -p -r1.64 platlibs.mk
+diff -u -p -6 -r1.3 manifest.mn
---- security/nss/cmd/platlibs.mk	17 Jun 2009 23:01:48 -0000	1.64
+--- security/nss/lib/sqlite/manifest.mn	15 Aug 2007 15:30:05 -0000	1.3
-+++ security/nss/cmd/platlibs.mk	23 Nov 2009 16:08:54 -0000
++++ security/nss/lib/sqlite/manifest.mn	23 Jan 2008 08:39:29 -0000
-@@ -80,7 +80,11 @@ endif
+@@ -35,15 +35,16 @@
- endif
+ #
- endif
+ # ***** END LICENSE BLOCK *****
+ CORE_DEPTH = ../../..
  
-+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
+ 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
 ===================================================================
 RCS file: /cvsroot/mozilla/security/nss/lib/softoken/config.mk,v
-retrieving revision 1.29
+retrieving revision 1.23
-diff -u -p -r1.29 config.mk
+diff -u -p -r1.23 config.mk
---- security/nss/lib/softoken/config.mk	11 Jun 2009 00:55:48 -0000	1.29
+--- security/nss/lib/softoken/config.mk	5 Feb 2008 05:33:37 -0000	1.23
-+++ security/nss/lib/softoken/config.mk	23 Nov 2009 16:08:55 -0000
++++ security/nss/lib/softoken/config.mk	19 Feb 2008 11:50:02 -0000
-@@ -83,12 +83,16 @@ EXTRA_SHARED_LIBS += \
+@@ -86,12 +86,16 @@ else
+ EXTRA_SHARED_LIBS += \
  	-L$(DIST)/lib \
- 	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
 -	-lsqlite3 \
  	-L$(NSPR_LIB_DIR) \
@@ -42,22 +48,28 @@ diff -u -p -r1.29 config.mk
  endif
  
  ifeq ($(OS_TARGET),AIX)
-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.59
-diff -u -p -r1.3 manifest.mn
+diff -u -p -6 -r1.59 platlibs.mk
---- security/nss/lib/sqlite/manifest.mn	15 Aug 2007 15:30:05 -0000	1.3
+--- security/nss/cmd/platlibs.mk	2 Dec 2008 23:24:46 -0000	1.59
-+++ security/nss/lib/sqlite/manifest.mn	23 Nov 2009 16:08:55 -0000
++++ security/nss/cmd/platlibs.mk	14 Apr 2009 11:07:52 -0000
-@@ -38,9 +38,10 @@ CORE_DEPTH = ../../..
+@@ -69,13 +69,17 @@ EXTRA_SHARED_LIBS += \
+ else
+ EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
+ endif
+ endif
+ endif
  
- 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
+ else
- MAPFILE = $(OBJDIR)/sqlite.def
+ DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) 
-+MAPFILE_SOURCE = sqlite.def
+ endif
- DEFINES += -DTHREADSAFE=1
- 
- EXPORTS = \

system-nspr.patch

@@ -1,16 +1,11 @@
-Index: security/nss/Makefile
+--- mozilla/security/nss/Makefile
-===================================================================
++++ security/nss/Makefile
-RCS file: /cvsroot/mozilla/security/nss/Makefile,v
+@@ -78,7 +78,7 @@
-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).                              #
  #######################################################################
  
 -nss_build_all: build_coreconf build_nspr build_dbm all
 +nss_build_all: build_coreconf build_dbm all
  
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
+ build_coreconf:
- 
+ 	cd $(CORE_DEPTH)/coreconf ;  $(MAKE)