Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 88063: JSS binary release must use NSPR and NSS binary releases.

Browse Source 
Patch written (and presumably reviewed) by wtc.


git-svn-id: svn://10.0.0.236/trunk@98121 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nicolson%netscape.com
2001-06-28 01:43:12 +00:00
parent 48ba2b292e
commit 780b011355
12 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/security/jss/Makefile
View File

@@ -85,3 +85,17 @@ else
@echo "The \"nss_release.pl\" script may ONLY be used on OPTimized builds!!!"
endif
#
# The public NSS headers from an NSS binary release are now unpacked in
# the mozilla/dist/public/nss directory; they were unpacked in the
# mozilla/dist/public/security directory before. If we build NSS from
# source, NSS still installs its headers in mozilla/dist/public/security.
# To allow JSS to work with either an NSS binary release or an NSS built
# from source, we rename mozilla/dist/public/nss to
# mozilla/dist/public/security after unpacking a binary release.
#
import::
rm -rf $(SOURCE_XP_DIR)/public/security
mv $(SOURCE_XP_DIR)/public/nss $(SOURCE_XP_DIR)/public/security

4
mozilla/security/jss/lib/config.mk
View File

@@ -43,10 +43,6 @@ SHARED_LIBRARY_DIRS = \
../org/mozilla/jss/util \
$(NULL)
EXTRA_LIBS += \
$(LIBDBM) \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll

5
mozilla/security/jss/manifest.mn
View File

@@ -35,9 +35,8 @@ CORE_DEPTH = ..
MODULE = jss
IMPORTS = security/NSS_3_2_RTM\
dbm/DBM_1_54 \
nspr20/v3.5.1 \
IMPORTS = nss/NSS_3_3_BETA \
nspr20/v4.1.2 \
$(NULL)
DIRS = org \

2
mozilla/security/jss/org/mozilla/jss/crypto/manifest.mn
View File

@@ -37,7 +37,7 @@ MODULE = jss
NS_USE_JDK = 1
REQUIRES = nspr20 dbm security
REQUIRES = nspr20 security
PACKAGE = org/mozilla/jss/crypto

14
mozilla/security/jss/org/mozilla/jss/manage/CryptoManager.c
View File

@@ -33,7 +33,6 @@
#include "_jni/org_mozilla_jss_CryptoManager.h"
#include <secitem.h>
#include <mcom_db.h>
#include <secmod.h>
#include <cert.h>
#include <certt.h>
@@ -57,19 +56,6 @@
#include <signal.h>
#endif
/* HACK
* Include this from cdbhdl.h since it's now a private export.
* We only do this because we need to allocate memory for this so
* we need its size.
*/
struct CERTCertDBHandleStr {
DB *permCertDB;
DB *tempCertDB;
void *spkDigestInfo;
CERTStatusConfig *statusConfig;
PZMonitor *dbMon;
};
/********************************************************************/
/* The following VERSION Strings should be updated in the following */
/* files everytime a new release of JSS is generated: */

2
mozilla/security/jss/org/mozilla/jss/manage/manifest.mn
View File

@@ -36,7 +36,7 @@ MODULE = jss
NS_USE_JDK = 1
REQUIRES = nspr20 svrcore dbm security
REQUIRES = nspr20 security
PACKAGE = org/mozilla/jss

1
mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Cert.c
View File

@@ -37,7 +37,6 @@
#include <plarena.h>
#include <seccomon.h>
#include <secmodt.h>
#include <mcom_db.h>
#include <certt.h>
#include <cert.h>
#include <pk11func.h>

2
mozilla/security/jss/org/mozilla/jss/pkcs11/manifest.mn
View File

@@ -37,7 +37,7 @@ MODULE = jss
NS_USE_JDK = 1
REQUIRES = nspr20 dbm security
REQUIRES = nspr20 security
PACKAGE = org/mozilla/jss/pkcs11

2
mozilla/security/jss/org/mozilla/jss/pkix/manifest.mn
View File

@@ -37,7 +37,7 @@ MODULE = jss
NS_USE_JDK = 1
REQUIRES = nspr20 dbm security
REQUIRES = nspr20 security
PACKAGE = org/mozilla/jss/pkix

2
mozilla/security/jss/org/mozilla/jss/provider/manifest.mn
View File

@@ -39,7 +39,7 @@ NS_USE_JDK = 1
PACKAGE = org/mozilla/jss/provider
REQUIRES = nspr20 dbm security
REQUIRES = nspr20 security
CLASSES = \
MD5MessageDigest \

2
mozilla/security/jss/org/mozilla/jss/tests/manifest.mn
View File

@@ -37,7 +37,7 @@ MODULE = jss
NS_USE_JDK = 1
REQUIRES = nspr20 dbm security
REQUIRES = nspr20 security
PRIVATE_CLASSES = \
DigestTest \

2
mozilla/security/jss/org/mozilla/jss/util/manifest.mn
View File

@@ -37,7 +37,7 @@ MODULE = jss
NS_USE_JDK = 1
REQUIRES = nspr20 dbm security
REQUIRES = nspr20 security
PACKAGE = org/mozilla/jss/util