- use const args in PK11_FindSlotBy* to avoid invalid casts.

- release 2.

Changed files:
    nss-pk11_const.patch -> 1.1
    nss.spec -> 1.51

diff --git a/nss-pk11_const.patch b/nss-pk11_const.patch
new file mode 100644 (file)
index 0000000..20a8068
--- /dev/null
+++ b/nss-pk11_const.patch
@@ -0,0 +1,35 @@
+diff -uNr nss-3.9.2/mozilla/security/nss/lib/pk11wrap.orig/pk11func.h nss-3.9.2/mozilla/security/nss/lib/pk11wrap/pk11func.h
+--- nss-3.9.2/mozilla/security/nss/lib/pk11wrap.orig/pk11func.h        2004-06-22 00:53:18.000000000 +0200
++++ nss-3.9.2/mozilla/security/nss/lib/pk11wrap/pk11func.h     2004-11-30 23:53:18.647970312 +0100
+@@ -137,8 +137,8 @@
+ /******************************************************************
+  *           Slot info functions
+  ******************************************************************/
+-PK11SlotInfo *PK11_FindSlotByName(char *name);
+-PK11SlotInfo *PK11_FindSlotBySerial(char *serial);
++PK11SlotInfo *PK11_FindSlotByName(const char *name);
++PK11SlotInfo *PK11_FindSlotBySerial(const char *serial);
+ /******************************************************************
+  * PK11_FindSlotsByNames searches for a PK11SlotInfo using one or
+  * more criteria : dllName, slotName and tokenName . In addition, if
+diff -uNr nss-3.9.2/mozilla/security/nss/lib/pk11wrap.orig/pk11slot.c nss-3.9.2/mozilla/security/nss/lib/pk11wrap/pk11slot.c
+--- nss-3.9.2/mozilla/security/nss/lib/pk11wrap.orig/pk11slot.c        2004-06-22 00:53:19.000000000 +0200
++++ nss-3.9.2/mozilla/security/nss/lib/pk11wrap/pk11slot.c     2004-11-30 23:53:37.963033976 +0100
+@@ -638,7 +638,7 @@
+ }
+ 
+ PK11SlotInfo *
+-PK11_FindSlotByName(char *name)
++PK11_FindSlotByName(const char *name)
+ {
+    SECMODModuleList *mlp;
+    SECMODModuleList *modules = SECMOD_GetDefaultModuleList();
+@@ -675,7 +675,7 @@
+ 
+ 
+ PK11SlotInfo *
+-PK11_FindSlotBySerial(char *serial)
++PK11_FindSlotBySerial(const char *serial)
+ {
+    SECMODModuleList *mlp;
+    SECMODModuleList *modules = SECMOD_GetDefaultModuleList();

diff --git a/nss.spec b/nss.spec
index 55d6e00d6722d3650f44b65c70b8ad9bd9935083..14544e7f7c56e6b1ba50c1f0f8f210db128f6280 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -3,7 +3,7 @@ Summary(pl):    NSS - Network Security Services
 Name:          nss
 Version:       3.9.2
 %define        foover  %(echo %{version} | tr . _)
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL
 Group:         Libraries
@@ -11,6 +11,7 @@ Source0:      http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foov
 # Source0-md5: c10b5100510dab1e3c94b76a4d7b1f23
 Patch0:                %{name}-Makefile.patch
 Patch1:                %{name}-system-zlib.patch
+Patch2:                %{name}-pk11_const.patch
 BuildRequires: nspr-devel >= 4.4.1
 BuildRequires: zip >= 2.1
 BuildConflicts:        mozilla < 0.9.6-3
@@ -71,6 +72,7 @@ Statyczne wersje bibliotek z NSS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cd mozilla/security/nss