- dbm patch (from nss 3.3.1): at least dbm headers are needed

- system-zlib patch: never use included copy of zlib
- more updates in Makefile patch (builds now)

Changed files:
    nss-Makefile.patch -> 1.6
    nss-system-zlib.patch -> 1.1
    nss.spec -> 1.20

diff --git a/nss-Makefile.patch b/nss-Makefile.patch
index 4321923f52f18e9063327d3c15d850bab2ac3c25..54770cacbd7a02da024d4e09272772dd99afdeb3 100644 (file)
--- a/nss-Makefile.patch
+++ b/nss-Makefile.patch
@@ -54,6 +54,21 @@ diff -Nur nss-3.4.rc1.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.4.rc1/mozi
        $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
        $(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
        $(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
+@@ -104,11 +104,11 @@
+       $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
+-      $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
++      $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
+-      $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
++      $(DIST)/lib/$(LIB_PREFIX)softokn3.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
+-      $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
++      $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)swfci.$(LIB_SUFFIX) \
 diff -Nur nss-3.4.rc1.orig/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile nss-3.4.rc1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
 --- nss-3.4.rc1.orig/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile Fri Feb 15 23:53:46 2002
 +++ nss-3.4.rc1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile      Thu Apr 11 20:46:45 2002
@@ -75,3 +90,42 @@ diff -Nur nss-3.4.rc1.orig/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Make
  CRYPTO_LIB += $(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  endif
  
+@@ -73,11 +73,11 @@
+ 
+ EXTRA_LIBS += \
+       $(DIST)/lib/$(LIB_PREFIX)swfci.$(LIB_SUFFIX) \
+-      $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
++      -L$(DIST)/lib -lsoftokn3 \
+       $(CRYPTO_LIB) \
+       $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
+-      $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+-      $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
++      -lplc4 \
++      -lplds4 \
+       $(NULL)
+ 
+ endif
+--- nss-3.4.rc1.orig/mozilla/security/nss/lib/softoken/config.mk       Sun Mar  3 03:34:32 2002
++++ nss-3.4.rc1/mozilla/security/nss/lib/softoken/config.mk    Thu Apr 11 22:13:48 2002
+@@ -37,7 +37,7 @@
+ endif
+ 
+ # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
+-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
++CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl_3.$(LIB_SUFFIX)
+ CRYPTODIR=../freebl
+ ifdef MOZILLA_SECURITY_BUILD
+       CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
+--- nss-3.4.rc1.orig/mozilla/security/nss/lib/ckfw/builtins/Makefile   Fri Feb 15 23:53:42 2002
++++ nss-3.4.rc1/mozilla/security/nss/lib/ckfw/builtins/Makefile        Thu Apr 11 22:17:58 2002
+@@ -54,8 +54,8 @@
+ else
+ 
+ EXTRA_LIBS += \
+-      $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+-      $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
++      -lplc4 \
++      -lplds4 \
+       $(NULL)
+ 
+ endif

diff --git a/nss-system-zlib.patch b/nss-system-zlib.patch
new file mode 100644 (file)
index 0000000..de68514
--- /dev/null
+++ b/nss-system-zlib.patch
@@ -0,0 +1,38 @@
+--- nss-3.4.rc1/mozilla/security/nss/cmd/manifest.mn.orig      Thu Dec  6 00:35:55 2001
++++ nss-3.4.rc1/mozilla/security/nss/cmd/manifest.mn   Thu Apr 11 22:56:51 2002
+@@ -37,7 +37,6 @@
+ REQUIRES = security nspr libdbm
+ 
+ DIRS = lib  \
+- zlib \
+  atob  \
+  bltest \
+  btoa  \
+--- nss-3.4.rc1/mozilla/security/nss/cmd/platlibs.mk.orig      Thu Apr 11 22:58:28 2002
++++ nss-3.4.rc1/mozilla/security/nss/cmd/platlibs.mk   Thu Apr 11 22:58:49 2002
+@@ -94,7 +94,6 @@
+       $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
+-      $(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
+--- nss-3.4.rc1/mozilla/security/nss/cmd/signtool/manifest.mn.orig     Fri Dec 22 18:09:00 2000
++++ nss-3.4.rc1/mozilla/security/nss/cmd/signtool/manifest.mn  Thu Apr 11 23:07:13 2002
+@@ -53,3 +53,6 @@
+ DEFINES += -DNSPR20
+ 
+ USE_STATIC_LIBS = 1
++
++EXTRA_LIBS += -lz \
++      $(NULL)
+--- nss-3.4.rc1/mozilla/security/nss/cmd/modutil/manifest.mn.orig      Thu Nov  8 01:14:18 2001
++++ nss-3.4.rc1/mozilla/security/nss/cmd/modutil/manifest.mn   Thu Apr 11 23:12:39 2002
+@@ -58,3 +58,6 @@
+ INCLUDES += -I$(CORE_DEPTH)/nss/lib/pk11wrap
+ 
+ USE_STATIC_LIBS = 1 
++
++EXTRA_LIBS += -lz \
++      $(NULL)

diff --git a/nss.spec b/nss.spec
index 8c55535cf21247f0421deef3579c1553bcd09e70..49e9874a392343c690749ff36ff0b1ea8ef654cc 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -1,4 +1,4 @@
-# $Revision: 1.19 $ $Date: 2002-04-11 19:43:58 $
+# $Revision: 1.20 $ $Date: 2002-04-11 22:42:23 $
 Summary:       NSS - Network Security Services
 Summary(pl):   NSS - Network Security Services
 Name:          nss
@@ -8,8 +8,9 @@ License:        GPL
 Group:         Libraries
 Source0:       ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_4_RC1/src/%{name}-%{version}.tar.gz
 Patch0:                %{name}-Makefile.patch
+Patch1:                %{name}-dbm.patch.bz2
+Patch2:                %{name}-system-zlib.patch
 BuildRequires: nspr-devel
-BuildRequires: zip
 BuildConflicts:        mozilla < 0.9.6-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libnss3
@@ -66,6 +67,8 @@ Statyczne wersje bibliotek z NSS.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 cd mozilla/security/nss
@@ -113,8 +116,8 @@ install mozilla/dist/pld/lib/*              $RPM_BUILD_ROOT%{_libdir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)