Request 23 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 23 (accepted)

Add to Kolab:Development

Created by vanmeeuwen about 11 years ago
In state accepted

Submit jss

Submit package home:vanmeeuwen:b...Kolab:Development / jss to package Kolab:Development / jss

mozilla-jss.changes Added

mozilla-jss.spec Added

@@ -0,0 +1,154 @@
+#
+# spec file for package mozilla-jss
+#
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+Name:           mozilla-jss
+Version:        4.3.2
+Release:        2%{?dist}
+Summary:        Java Security Services (JSS)
+Group:          Development/Libraries/Java
+License:        MPL-1.1 or GPL-2.0+ or LGPL-2.0+
+URL:            http://www.mozilla.org/projects/security/pki/jss/
+# The source for this package was pulled from upstream's cvs. Use the
+# following commands to generate the tarball:
+# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export -r JSS_4_3_2_RTM -d jss-4.3.2 -N mozilla/security/coreconf mozilla/security/jss
+# tar cjvf jss-4.3.2.tar.gz jss-4.3.2
+Source0:        jss-%{version}.tar.bz2
+Source1:        MPL-1.1.txt
+Source2:        gpl.txt
+Source3:        lgpl.txt
+BuildRequires:  pkg-config
+BuildRequires:  mozilla-nss-devel >= 3.12.3.99
+BuildRequires:  mozilla-nspr-devel >= 4.6.99
+BuildRequires:  java-devel
+Requires:       java
+Requires:       mozilla-nss >= 3.12.3.99
+Patch1:         jss-ipv6.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Java Security Services (JSS) is a java native interface which provides a bridge
+for java-based applications to use native Network Security Services (NSS).
+This only works with gcj. Other JREs require that JCE providers be signed.
+
+%package javadoc
+Summary:        Java Security Services (JSS) Javadocs
+Group:          Development/Libraries/Java
+Requires:       mozilla-jss = %{version}-%{release}
+
+%description javadoc
+This package contains the API documentation for JSS.
+
+%prep
+%setup -q -n jss-%{version}
+%patch1
+
+%build
+[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
+# Enable compiler optimizations and disable debugging code
+BUILD_OPT=1
+export BUILD_OPT
+# Generate symbolic info for debuggers
+XCFLAGS="-g $RPM_OPT_FLAGS"
+export XCFLAGS
+PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
+NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
+NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
+NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss | sed 's/-I//'`
+NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss | sed 's/-L//'`
+export NSPR_INCLUDE_DIR
+export NSPR_LIB_DIR
+export NSS_INCLUDE_DIR
+export NSS_LIB_DIR
+%ifarch x86_64 ppc64 ia64 s390x sparc64
+USE_64=1
+export USE_64
+%endif
+# Fix for Kernel >= 3 (autoget kernel version
+%if 0%{?suse_version} >= 1210
+%global majorrel `uname -r | cut -f1 -d.`
+%global minorrel `uname -r | cut -f2 -d.`
+cp -p mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux%{majorrel}.%{minorrel}.mk
+sed -i -e 's;LINUX2_1;LINUX{%minorrel}_%{minorrel};' mozilla/security/coreconf/Linux%{majorrel}.%{minorrel}.mk
+%endif
+# For some reason jss can't find nss on SUSE unless we do the following
+C_INCLUDE_PATH="/usr/include/nss3:/usr/include/nspr4"
+export C_INCLUDE_PATH
+# The Makefile is not thread-safe
+make -C mozilla/security/coreconf
+make -C mozilla/security/jss
+make -C mozilla/security/jss javadoc
+
+%install
+# Supress SUSE bytecode version error check
+export NO_BRP_CHECK_BYTECODE_VERSION=true
+# Copy the license files here so we can include them in %doc
+cp -p %{SOURCE1} .
+cp -p %{SOURCE2} .
+cp -p %{SOURCE3} .
+
+# There is no install target so we'll do it by hand
+# jars
+install -d -m 0755 $RPM_BUILD_ROOT%{_jnidir}
+install -m 644 mozilla/dist/xpclass.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4-%{version}.jar
+pushd  $RPM_BUILD_ROOT%{_jnidir}
+    ln -fs jss4-%{version}.jar jss4.jar
+popd
+
+# We have to use the name libjss4.so because this is dynamically
+# loaded by the jar file.
+install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}
+install -m 0755 mozilla/dist/Linux*.OBJ/lib/libjss4.so ${RPM_BUILD_ROOT}%{_libdir}/
+
+# FIXME - sign jss4.jar. In order to use JSS as a JCE provider it needs to be
+# signed with a Sun-issued certificate. Since we would need to make this
+# certificate and private key public to provide reproducability in the rpm
+# building we have to ship an unsigned jar.
+#
+# Instructions for getting a signing cert can be found here:
+# http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html#Step61
+#
+# This signing is not required by every JVM. gcj ignores the signature and does
+# not require one. The Sun and IBM JVMs both check and enforce the signature.
+# Behavior of other JVMs is not known but they probably enforce the signature
+# as well.
+
+# javadoc
+install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp mozilla/dist/jssdoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+rm $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/index.html.bak
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+# No ldconfig is required since this library is loaded by Java itself.
+%files
+%defattr(-,root,root,-)
+%doc mozilla/security/jss/jss.html MPL-1.1.txt gpl.txt lgpl.txt
+%{_jnidir}/*
+%{_libdir}/lib*.so
+
+%files javadoc
+%defattr(-,root,root,-)
+%dir %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}-%{version}/*
+
+%changelog
+

debian-patches-aggregate.patch Added

@@ -0,0 +1,1014 @@
+diff -ur jss-4.3.2.orig/mozilla/security/jss/lib/jss.def jss-4.3.2/mozilla/security/jss/lib/jss.def
+--- jss-4.3.2.orig/mozilla/security/jss/lib/jss.def	2009-09-25 17:38:04.000000000 +0100
++++ jss-4.3.2/mozilla/security/jss/lib/jss.def	2013-09-08 21:09:13.039701900 +0100
+@@ -175,6 +175,7 @@
+ Java_org_mozilla_jss_ssl_SSLSocket_forceHandshake;
+ Java_org_mozilla_jss_ssl_SSLSocket_getKeepAlive;
+ Java_org_mozilla_jss_ssl_SSLSocket_getLocalAddressNative;
++Java_org_mozilla_jss_ssl_SocketBase_getLocalAddressByteArrayNative;
+ Java_org_mozilla_jss_ssl_SSLSocket_getPort;
+ Java_org_mozilla_jss_ssl_SSLSocket_getReceiveBufferSize;
+ Java_org_mozilla_jss_ssl_SSLSocket_getSendBufferSize;
+@@ -199,6 +200,7 @@
+ Java_org_mozilla_jss_ssl_SSLSocket_socketWrite;
+ Java_org_mozilla_jss_ssl_SocketBase_getLocalPortNative;
+ Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressNative;
++Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressByteArrayNative;
+ Java_org_mozilla_jss_ssl_SocketBase_setClientCertNicknameNative;
+ Java_org_mozilla_jss_ssl_SocketBase_requestClientAuthNoExpiryCheckNative;
+ Java_org_mozilla_jss_ssl_SocketBase_setSSLOption;
+@@ -326,6 +328,10 @@
+ Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateECKeyPairWithOpFlags;
+ Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateRSAKeyPairWithOpFlags;
+ Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateDSAKeyPairWithOpFlags;
++Java_org_mozilla_jss_CryptoManager_OCSPCacheSettingsNative;
++Java_org_mozilla_jss_CryptoManager_setOCSPTimeoutNative;
++Java_org_mozilla_jss_CryptoManager_verifyCertificateNowNative;
++Java_org_mozilla_jss_CryptoManager_verifyCertificateNowCUNative;
+ ;+ local:
+ ;+ *;
+ ;+};
+diff -ur jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/CryptoManager.c jss-4.3.2/mozilla/security/jss/org/mozilla/jss/CryptoManager.c
+--- jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/CryptoManager.c	2008-05-22 05:28:09.000000000 +0100
++++ jss-4.3.2/mozilla/security/jss/org/mozilla/jss/CryptoManager.c	2013-09-08 21:08:17.729914864 +0100
+@@ -985,3 +985,45 @@
+ }
+ }
+ 
++
++/**********************************************************************
++* OCSPCacheSettingsNative
++*
++* Allows configuration of the OCSP responder cache during runtime.
++*/
++JNIEXPORT void JNICALL
++Java_org_mozilla_jss_CryptoManager_OCSPCacheSettingsNative(
++ JNIEnv *env, jobject this,
++ jint ocsp_cache_size,
++ jint ocsp_min_cache_entry_duration,
++ jint ocsp_max_cache_entry_duration)
++{
++ SECStatus rv = SECFailure;
++
++ rv = CERT_OCSPCacheSettings(
++ ocsp_cache_size, ocsp_min_cache_entry_duration,
++ ocsp_max_cache_entry_duration);
++
++ if (rv != SECSuccess) {
++ JSS_throwMsgPrErr(env,
++ GENERAL_SECURITY_EXCEPTION,
++ "Failed to set OCSP cache: error "+ PORT_GetError());
++ }
++}
++
++JNIEXPORT void JNICALL
++Java_org_mozilla_jss_CryptoManager_setOCSPTimeoutNative(
++ JNIEnv *env, jobject this,
++ jint ocsp_timeout )
++{
++ SECStatus rv = SECFailure;
++
++ rv = CERT_SetOCSPTimeout(ocsp_timeout);
++
++ if (rv != SECSuccess) {
++ JSS_throwMsgPrErr(env,
++ GENERAL_SECURITY_EXCEPTION,
++ "Failed to set OCSP timeout: error "+ PORT_GetError());
++ }
++}
++
+diff -ur jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/CryptoManager.java jss-4.3.2/mozilla/security/jss/org/mozilla/jss/CryptoManager.java
+--- jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/CryptoManager.java	2010-03-02 02:55:23.000000000 +0000
++++ jss-4.3.2/mozilla/security/jss/org/mozilla/jss/CryptoManager.java	2013-09-08 21:09:17.913683107 +0100
+@@ -61,6 +61,7 @@
+ public final class CryptoManager implements TokenSupplier
+ {
+ /**
++ * note: this is obsolete in NSS
+ * CertUsage options for validation
+ */
+ public final static class CertUsage {
+@@ -103,6 +104,76 @@
+ public static final CertUsage AnyCA = new CertUsage(11, "AnyCA");
+ }
+ 
++ /**
++ * CertificateUsage options for validation
++ */
++ public final static class CertificateUsage {
++ private int usage;
++ private String name;
++
++ // certificateUsage, these must be kept in sync with nss/lib/certdb/certt.h
++ private static final int certificateUsageCheckAllUsages = 0x0000;
++ private static final int certificateUsageSSLClient = 0x0001;
++ private static final int certificateUsageSSLServer = 0x0002;
++ private static final int certificateUsageSSLServerWithStepUp = 0x0004;
++ private static final int certificateUsageSSLCA = 0x0008;
++ private static final int certificateUsageEmailSigner = 0x0010;
++ private static final int certificateUsageEmailRecipient = 0x0020;
++ private static final int certificateUsageObjectSigner = 0x0040;
++ private static final int certificateUsageUserCertImport = 0x0080;
++ private static final int certificateUsageVerifyCA = 0x0100;
++ private static final int certificateUsageProtectedObjectSigner = 0x0200;
++ private static final int certificateUsageStatusResponder = 0x0400;
++ private static final int certificateUsageAnyCA = 0x0800;
++
++ static private ArrayList list = new ArrayList();
++ private CertificateUsage() {};
++ private CertificateUsage(int usage, String name) {
++ this.usage = usage;
++ this.name = name;
++ this.list.add(this);
++
++ }
++ public int getUsage() {
++ return usage;
++ }
++
++ static public Iterator getCertificateUsages() {
++ return list.iterator();
++
++ }
++ public String toString() {
++ return name;
++ }
++
++ public static final CertificateUsage CheckAllUsages = new CertificateUsage(certificateUsageCheckAllUsages, "CheckAllUsages");
++ public static final CertificateUsage SSLClient = new CertificateUsage(certificateUsageSSLClient, "SSLClient");
++ public static final CertificateUsage SSLServer = new CertificateUsage(certificateUsageSSLServer, "SSLServer");
++ public static final CertificateUsage SSLServerWithStepUp = new CertificateUsage(certificateUsageSSLServerWithStepUp, "SSLServerWithStepUp");
++ public static final CertificateUsage SSLCA = new CertificateUsage(certificateUsageSSLCA, "SSLCA");
++ public static final CertificateUsage EmailSigner = new CertificateUsage(certificateUsageEmailSigner, "EmailSigner");
++ public static final CertificateUsage EmailRecipient = new CertificateUsage(certificateUsageEmailRecipient, "EmailRecipient");
++ public static final CertificateUsage ObjectSigner = new CertificateUsage(certificateUsageObjectSigner, "ObjectSigner");
++ public static final CertificateUsage UserCertImport = new CertificateUsage(certificateUsageUserCertImport, "UserCertImport");
++ public static final CertificateUsage VerifyCA = new CertificateUsage(certificateUsageVerifyCA, "VerifyCA");
++ public static final CertificateUsage ProtectedObjectSigner = new CertificateUsage(certificateUsageProtectedObjectSigner, "ProtectedObjectSigner");
++ public static final CertificateUsage StatusResponder = new CertificateUsage(certificateUsageStatusResponder, "StatusResponder");
++ public static final CertificateUsage AnyCA = new CertificateUsage(certificateUsageAnyCA, "AnyCA");
++
++ /*
++ The folllowing usages cannot be verified:
++ certUsageAnyCA
++ certUsageProtectedObjectSigner
++ certUsageUserCertImport
++ certUsageVerifyCA
++ */
++ public static final int basicCertificateUsages = /*0x0b80;*/
++ certificateUsageUserCertImport |
++ certificateUsageVerifyCA |
++ certificateUsageProtectedObjectSigner |
++ certificateUsageAnyCA ;
++ }
++
+ public final static class NotInitializedException extends Exception {}
+ public final static class NicknameConflictException extends Exception {}
+ public final static class UserCertConflictException extends Exception {}
+@@ -1499,6 +1570,80 @@
+ * against Now.
+ * @param nickname The nickname of the certificate to verify.
+ * @param checkSig verify the signature of the certificate
++ * @return currCertificateUsage which contains current usage bit map as defined in CertificateUsage
++ *
++ * @exception InvalidNicknameException If the nickname is null
++ * @exception ObjectNotFoundException If no certificate could be found
++ * with the given nickname.
++ */
++ public int isCertValid(String nickname, boolean checkSig)
++ throws ObjectNotFoundException, InvalidNicknameException
++ {
++ if (nickname==null) {
++ throw new InvalidNicknameException("Nickname must be non-null");
++ }
++ int currCertificateUsage = 0x0000; // initialize it to 0
++ currCertificateUsage = verifyCertificateNowCUNative(nickname,
++ checkSig);
++ return currCertificateUsage;
++ }
++
++ private native int verifyCertificateNowCUNative(String nickname,
++ boolean checkSig) throws ObjectNotFoundException;
++
++ /////////////////////////////////////////////////////////////
++ // isCertValid
++ /////////////////////////////////////////////////////////////
++ /**
++ * Verify a certificate that exists in the given cert database,
++ * check if is valid and that we trust the issuer. Verify time
++ * against Now.
++ * @param nickname The nickname of the certificate to verify.
++ * @param checkSig verify the signature of the certificate
++ * @param certificateUsage see certificateUsage defined to verify Certificate; to retrieve current certificate usage, call the isCertValid() above
++ * @return true for success; false otherwise
++ *
++ * @exception InvalidNicknameException If the nickname is null
++ * @exception ObjectNotFoundException If no certificate could be found
++ * with the given nickname.
++ */
++ public boolean isCertValid(String nickname, boolean checkSig,
++ CertificateUsage certificateUsage)
++ throws ObjectNotFoundException, InvalidNicknameException
++ {
++ if (nickname==null) {
++ throw new InvalidNicknameException("Nickname must be non-null");
++ }
++ // 0 certificate usage will get current usage
++ // should call isCertValid() call above that returns certificate usage
++ if ((certificateUsage == null) ||
++ (certificateUsage == CertificateUsage.CheckAllUsages)){
++ int currCertificateUsage = 0x0000;
++ currCertificateUsage = verifyCertificateNowCUNative(nickname,
++ checkSig);
++
++ if (currCertificateUsage == CertificateUsage.basicCertificateUsages){ 
++ // cert is good for nothing
++ return false;
++ } else
++ return true;
++ } else {
++ return verifyCertificateNowNative(nickname, checkSig,
++ certificateUsage.getUsage());
++ }
++ }
++
++ private native boolean verifyCertificateNowNative(String nickname,
++ boolean checkSig, int certificateUsage) throws ObjectNotFoundException;
++
++ /**
++ * note: this method calls obsolete function in NSS
++ *
++ * Verify a certificate that exists in the given cert database,
++ * check if is valid and that we trust the issuer. Verify time
++ * against Now.
++ * @param nickname The nickname of the certificate to verify.
++ * @param checkSig verify the signature of the certificate
+ * @param certUsage see exposed certUsage defines to verify Certificate
+ * @return true for success; false otherwise
+ *
+@@ -1517,6 +1662,9 @@
+ return verifyCertNowNative(nickname, checkSig, certUsage.getUsage());
+ }
+ 
++ /*
++ * Obsolete in NSS
++ */
+ private native boolean verifyCertNowNative(String nickname,
+ boolean checkSig, int cUsage) throws ObjectNotFoundException;
+ 
+@@ -1583,4 +1731,41 @@
+ String ocspResponderCertNickname )
+ throws GeneralSecurityException;
+ 
++ /**
++ * change OCSP cache settings
++ * * @param ocsp_cache_size max cache entries
++ * * @param ocsp_min_cache_entry_duration minimum seconds to next fetch attempt
++ * * @param ocsp_max_cache_entry_duration maximum seconds to next fetch attempt
++ */
++ public void OCSPCacheSettings(
++ int ocsp_cache_size, 
++ int ocsp_min_cache_entry_duration,
++ int ocsp_max_cache_entry_duration)
++ throws GeneralSecurityException
++ {
++ OCSPCacheSettingsNative(ocsp_cache_size,
++ ocsp_min_cache_entry_duration,
++ ocsp_max_cache_entry_duration);
++ }
++
++ private native void OCSPCacheSettingsNative(
++ int ocsp_cache_size, 
++ int ocsp_min_cache_entry_duration,
++ int ocsp_max_cache_entry_duration)
++ throws GeneralSecurityException;
++
++ /**
++ * set OCSP timeout value
++ * * @param ocspTimeout OCSP timeout in seconds
++ */
++ public void setOCSPTimeout(
++ int ocsp_timeout )
++ throws GeneralSecurityException
++ {
++ setOCSPTimeoutNative( ocsp_timeout);
++ }
++
++ private native void setOCSPTimeoutNative(
++ int ocsp_timeout )
++ throws GeneralSecurityException;
+ }
+Only in jss-4.3.2/mozilla/security/jss/org/mozilla/jss: CryptoManager.java.orig
+diff -ur jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/PK11Finder.c jss-4.3.2/mozilla/security/jss/org/mozilla/jss/PK11Finder.c
+--- jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/PK11Finder.c	2009-07-14 23:30:56.000000000 +0100
++++ jss-4.3.2/mozilla/security/jss/org/mozilla/jss/PK11Finder.c	2013-09-08 21:09:23.219662644 +0100
+@@ -1574,9 +1574,116 @@
+ }
+ }
+ 
++
+ /***********************************************************************
+- * CryptoManager.verifyCertNowNative
++ * CryptoManager.verifyCertificateNow
++ */
++SECStatus verifyCertificateNow(JNIEnv *env, jobject self, jstring nickString,
++ jboolean checkSig, jint required_certificateUsage,
++ SECCertificateUsage *currUsage)
++{
++ SECStatus rv = SECFailure;
++ SECCertificateUsage certificateUsage;
++ CERTCertificate *cert=NULL;
++ char *nickname=NULL;
++
++ nickname = (char *) (*env)->GetStringUTFChars(env, nickString, NULL);
++ if( nickname == NULL ) {
++ goto finish;
++ }
++
++ certificateUsage = required_certificateUsage;
++
++ cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), nickname);
++
++ if (cert == NULL) {
++ JSS_throw(env, OBJECT_NOT_FOUND_EXCEPTION);
++ goto finish;
++ } else {
++ /* 0 for certificateUsage in call to CERT_VerifyCertificateNow will
++ * retrieve the current valid usage into currUsage
++ */
++ rv = CERT_VerifyCertificateNow(CERT_GetDefaultCertDB(), cert,
++ checkSig, certificateUsage, NULL, currUsage );
++ if ((rv == SECSuccess) && certificateUsage == 0x0000) {
++ if (*currUsage == 
++ ( certUsageUserCertImport |
++ certUsageVerifyCA |
++ certUsageProtectedObjectSigner |
++ certUsageAnyCA )) {
++
++ /* the cert is good for nothing 
++ The folllowing usages cannot be verified:
++ certUsageAnyCA
++ certUsageProtectedObjectSigner
++ certUsageUserCertImport
++ certUsageVerifyCA
++ (0x0b80) */
++ rv =SECFailure;
++ }
++ }
++ }
++
++finish:
++ if(nickname != NULL) {
++ (*env)->ReleaseStringUTFChars(env, nickString, nickname);
++ }
++ if(cert != NULL) {
++ CERT_DestroyCertificate(cert);
++ }
++
++ return rv;
++}
++
++/***********************************************************************
++ * CryptoManager.verifyCertificateNowCUNative
+ *
++ * Returns jint which contains bits in SECCertificateUsage that reflects
++ * the cert usage(s) that the cert is good for
++ * if the cert is good for nothing, returned value is
++ * (0x0b80):
++ * certUsageUserCertImport |
++ * certUsageVerifyCA |
++ * certUsageProtectedObjectSigner |
++ * certUsageAnyCA
++ */
++JNIEXPORT jint JNICALL
++Java_org_mozilla_jss_CryptoManager_verifyCertificateNowCUNative(JNIEnv *env,
++ jobject self, jstring nickString, jboolean checkSig)
++{
++ SECStatus rv = SECFailure;
++ SECCertificateUsage currUsage = 0x0000;
++
++ rv = verifyCertificateNow(env, self, nickString, checkSig, 0, &currUsage);
++ /* rv is ignored */
++
++ return currUsage;
++}
++
++/***********************************************************************
++ * CryptoManager.verifyCertificateNowNative
++ *
++ * Returns JNI_TRUE if success, JNI_FALSE otherwise
++ */
++JNIEXPORT jboolean JNICALL
++Java_org_mozilla_jss_CryptoManager_verifyCertificateNowNative(JNIEnv *env,
++ jobject self, jstring nickString, jboolean checkSig, jint required_certificateUsage)
++{
++ SECStatus rv = SECFailure;
++ SECCertificateUsage currUsage = 0x0000;
++
++ rv = verifyCertificateNow(env, self, nickString, checkSig, required_certificateUsage, &currUsage);
++
++ if( rv == SECSuccess) {
++ return JNI_TRUE;
++ } else {
++ return JNI_FALSE;
++ }
++}
++
++/***********************************************************************
++ * CryptoManager.verifyCertNowNative
++ * note: this calls obsolete NSS function
+ * Returns JNI_TRUE if success, JNI_FALSE otherwise
+ */
+ JNIEXPORT jboolean JNICALL
+diff -ur jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/common.c jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/common.c
+--- jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/common.c	2010-03-01 21:57:01.000000000 +0000
++++ jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/common.c	2013-09-08 21:07:41.270054939 +0100
+@@ -33,7 +33,6 @@
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+-
+ #include <nspr.h>
+ #include <jni.h>
+ #include <pk11func.h>
+@@ -51,6 +50,9 @@
+ #include <winsock.h>
+ #endif
+ 
++#define SSL_AF_INET 50
++#define SSL_AF_INET6 51
++
+ void
+ JSSL_throwSSLSocketException(JNIEnv *env, char *message)
+ {
+@@ -142,7 +144,7 @@
+ JNIEXPORT jbyteArray JNICALL
+ Java_org_mozilla_jss_ssl_SocketBase_socketCreate(JNIEnv *env, jobject self,
+ jobject sockObj, jobject certApprovalCallback,
+- jobject clientCertSelectionCallback, jobject javaSock, jstring host)
++ jobject clientCertSelectionCallback, jobject javaSock, jstring host,jint family)
+ {
+ jbyteArray sdArray = NULL;
+ JSSL_SocketData *sockdata = NULL;
+@@ -150,10 +152,21 @@
+ PRFileDesc *newFD;
+ PRFileDesc *tmpFD;
+ PRFilePrivate *priv = NULL;
++ int socketFamily = 0;
++
++ if (family != SSL_AF_INET6 && family != SSL_AF_INET) {
++ JSSL_throwSSLSocketException(env,
++ "socketCreate() Invalid family!");
++ goto finish;
++ }
++ if( family == SSL_AF_INET) 
++ socketFamily = PR_AF_INET;
++ else
++ socketFamily = PR_AF_INET6;
+ 
+ if( javaSock == NULL ) {
+ /* create a TCP socket */
+- newFD = PR_NewTCPSocket();
++ newFD = PR_OpenTCPSocket(socketFamily);
+ if( newFD == NULL ) {
+ JSSL_throwSSLSocketException(env,
+ "PR_NewTCPSocket() returned NULL");
+@@ -411,8 +424,13 @@
+ JSSL_SocketData *sock;
+ PRNetAddr addr;
+ jbyte *addrBAelems = NULL;
++ int addrBALen = 0;
+ PRStatus status;
+ 
++ jmethodID supportsIPV6ID;
++ jclass socketBaseClass;
++ jboolean supportsIPV6 = 0;
++
+ if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS) {
+ /* exception was thrown */
+ goto finish;
+@@ -421,19 +439,72 @@
+ /*
+ * setup the PRNetAddr structure
+ */
+- addr.inet.family = AF_INET;
+- addr.inet.port = htons(port);
++
++ /* 
++ * Do we support IPV6? 
++ */
++
++ socketBaseClass = (*env)->FindClass(env, SOCKET_BASE_NAME);
++ if( socketBaseClass == NULL ) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++ supportsIPV6ID = (*env)->GetStaticMethodID(env, socketBaseClass,
++ SUPPORTS_IPV6_NAME, SUPPORTS_IPV6_SIG);
++
++ if( supportsIPV6ID == NULL ) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++
++ supportsIPV6 = (*env)->CallStaticBooleanMethod(env, socketBaseClass,
++ supportsIPV6ID);
++
++ memset( &addr, 0, sizeof( PRNetAddr ));
++
+ if( addrBA != NULL ) {
+- PR_ASSERT(sizeof(addr.inet.ip) == 4);
+- PR_ASSERT( (*env)->GetArrayLength(env, addrBA) == 4);
+ addrBAelems = (*env)->GetByteArrayElements(env, addrBA, NULL);
++ addrBALen = (*env)->GetArrayLength(env, addrBA);
++
+ if( addrBAelems == NULL ) {
+ ASSERT_OUTOFMEM(env);
+ goto finish;
+ }
+- memcpy(&addr.inet.ip, addrBAelems, 4);
++
++ if(addrBALen != 4 && addrBALen != 16) {
++ JSS_throwMsgPrErr(env, BIND_EXCEPTION,
++ "Invalid address in bind!");
++ goto finish;
++ }
++
++ if( addrBALen == 4) {
++ addr.inet.family = PR_AF_INET;
++ addr.inet.port = PR_htons(port);
++ memcpy(&addr.inet.ip, addrBAelems, 4);
++
++ if(supportsIPV6) {
++ addr.inet.family = PR_AF_INET6;
++ addr.ipv6.port = PR_htons(port);
++ PR_ConvertIPv4AddrToIPv6(addr.inet.ip,&addr.ipv6.ip);
++ } 
++
++ } else { /* Must be 16 and ipv6 */
++ if(supportsIPV6) {
++ addr.ipv6.family = PR_AF_INET6;
++ addr.ipv6.port = PR_htons(port);
++ memcpy(&addr.ipv6.ip,addrBAelems, 16);
++ } else {
++ JSS_throwMsgPrErr(env, BIND_EXCEPTION,
++ "Invalid address in bind!");
++ goto finish;
++ }
++ }
+ } else {
+- addr.inet.ip = PR_htonl(INADDR_ANY);
++ if(supportsIPV6) {
++ status = PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr);
++ } else {
++ status = PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET, port, &addr);
++ }
+ }
+ 
+ /* do the bind() call */
+@@ -607,6 +678,78 @@
+ return status;
+ }
+ 
++JNIEXPORT jbyteArray JNICALL
++Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressByteArrayNative
++ (JNIEnv *env, jobject self)
++{
++ jbyteArray byteArray=NULL;
++ PRNetAddr addr;
++ jbyte *address=NULL;
++ int size=4;
++
++ if( JSSL_getSockAddr(env, self, &addr, PEER_SOCK) != PR_SUCCESS) { 
++ goto finish;
++ }
++
++ if( PR_NetAddrFamily(&addr) == PR_AF_INET6) {
++ size = 16;
++ address = (jbyte *) &addr.ipv6.ip;
++ } else {
++ address = (jbyte *) &addr.inet.ip;
++ }
++
++ byteArray = (*env)->NewByteArray(env,size);
++ if(byteArray == NULL) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++ (*env)->SetByteArrayRegion(env, byteArray, 0,size ,address);
++ if( (*env)->ExceptionOccurred(env) != NULL) {
++ PR_ASSERT(PR_FALSE);
++ goto finish;
++ }
++
++finish:
++ return byteArray;
++}
++
++JNIEXPORT jbyteArray JNICALL
++Java_org_mozilla_jss_ssl_SocketBase_getLocalAddressByteArrayNative
++ (JNIEnv *env, jobject self)
++{
++ jbyteArray byteArray=NULL;
++ PRNetAddr addr;
++ jbyte *address=NULL;
++ int size=4;
++
++ if( JSSL_getSockAddr(env, self, &addr, LOCAL_SOCK) != PR_SUCCESS) {
++ goto finish;
++ }
++
++ if( PR_NetAddrFamily(&addr) == PR_AF_INET6) {
++ size = 16;
++ address = (jbyte *) &addr.ipv6.ip; 
++ } else {
++ address = (jbyte *) &addr.inet.ip;
++ }
++ 
++ byteArray = (*env)->NewByteArray(env,size);
++ if(byteArray == NULL) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++ (*env)->SetByteArrayRegion(env, byteArray, 0,size,address);
++ if( (*env)->ExceptionOccurred(env) != NULL) {
++ PR_ASSERT(PR_FALSE);
++ goto finish;
++ }
++
++finish:
++ return byteArray;
++}
++
++/* Leave the original versions of these functions for compatibility */
++
+ JNIEXPORT jint JNICALL
+ Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressNative
+ (JNIEnv *env, jobject self)
+diff -ur jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c
+--- jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c	2007-04-24 19:34:58.000000000 +0100
++++ jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c	2013-09-08 21:07:41.270054939 +0100
+@@ -290,6 +290,7 @@
+ jobject inetAddress;
+ jbyteArray addrByteArray;
+ jint port;
++ int addrBALen = 0;
+ 
+ if( GET_ENV(fd->secret->javaVM, env) ) goto finish;
+ 
+@@ -377,8 +378,9 @@
+ 
+ memset(addr, 0, sizeof(PRNetAddr));
+ 
+- /* we only handle IPV4 */
+- PR_ASSERT( (*env)->GetArrayLength(env, addrByteArray) == 4 );
++ addrBALen = (*env)->GetArrayLength(env, addrByteArray);
++
++ PR_ASSERT( (addrBALen == 4) || (addrBALen == 16 ) );
+ 
+ /* make sure you release them later */
+ addrBytes = (*env)->GetByteArrayElements(env, addrByteArray, NULL);
+@@ -388,9 +390,16 @@
+ }
+ 
+ /* ip field is in network byte order */
+- memcpy( (void*) &addr->inet.ip, addrBytes, 4);
+- addr->inet.family = PR_AF_INET;
+- addr->inet.port = port;
++
++ if (addrBALen == 4) {
++ memcpy( (void*) &addr->inet.ip, addrBytes, 4);
++ addr->inet.family = PR_AF_INET;
++ addr->inet.port = port;
++ } else {
++ memcpy( (void*) &addr->ipv6.ip,addrBytes, 16);
++ addr->inet.family = PR_AF_INET6;
++ addr->inet.port = port;
++ }
+ 
+ (*env)->ReleaseByteArrayElements(env, addrByteArray, addrBytes,
+ JNI_ABORT);
+diff -ur jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java
+--- jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java	2010-03-01 21:57:01.000000000 +0000
++++ jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java	2013-09-08 21:07:41.269054942 +0100
+@@ -70,16 +70,16 @@
+ native byte[] socketCreate(Object socketObject,
+ SSLCertificateApprovalCallback certApprovalCallback,
+ SSLClientCertificateSelectionCallback clientCertSelectionCallback,
+- java.net.Socket javaSock, String host)
++ java.net.Socket javaSock, String host,int family)
+ throws SocketException;
+ 
+ byte[] socketCreate(Object socketObject,
+ SSLCertificateApprovalCallback certApprovalCallback,
+- SSLClientCertificateSelectionCallback clientCertSelectionCallback)
++ SSLClientCertificateSelectionCallback clientCertSelectionCallback,int family)
+ throws SocketException
+ {
+ return socketCreate(socketObject, certApprovalCallback,
+- clientCertSelectionCallback, null, null);
++ clientCertSelectionCallback, null, null,family);
+ }
+ 
+ native void socketBind(byte[] addrBA, int port) throws SocketException;
+@@ -122,6 +122,10 @@
+ static final int SSL_RENEGOTIATE_TRANSITIONAL = 27;
+ static final int SSL_REQUIRE_SAFE_NEGOTIATION = 28;
+ 
++
++ static final int SSL_AF_INET = 50;
++ static final int SSL_AF_INET6 = 51;
++
+ void close() throws IOException {
+ socketClose();
+ }
+@@ -327,13 +331,25 @@
+ return in;
+ }
+ 
++ private native byte[] getLocalAddressByteArrayNative() throws SocketException;
++ private native byte[] getPeerAddressByteArrayNative() throws SocketException;
+ /**
+ * @return the InetAddress of the peer end of the socket.
+ */
+ InetAddress getInetAddress()
+ {
+ try {
+- return convertIntToInetAddress( getPeerAddressNative() );
++ byte[] address = getPeerAddressByteArrayNative(); 
++
++ InetAddress iAddr = null;
++
++ try {
++
++ iAddr = InetAddress.getByAddress(address);
++ } catch(UnknownHostException e) {
++ }
++
++ return iAddr;
+ } catch(SocketException e) {
+ return null;
+ }
+@@ -345,7 +361,17 @@
+ */
+ InetAddress getLocalAddress() {
+ try {
+- return convertIntToInetAddress( getLocalAddressNative() );
++ byte[] address = getLocalAddressByteArrayNative();
++
++ InetAddress lAddr = null;
++
++ try {
++
++ lAddr = InetAddress.getByAddress(address);
++ } catch(UnknownHostException e) {
++ }
++
++ return lAddr;
+ } catch(SocketException e) {
+ return null;
+ }
+@@ -424,4 +450,45 @@
+ return topException;
+ }
+ }
++ 
++ static private int supportsIPV6 = -1;
++ static boolean supportsIPV6() {
++
++ if(supportsIPV6 >= 0) {
++ if(supportsIPV6 > 0) {
++ return true;
++ } else {
++ return false;
++ } 
++ }
++
++ Enumeration netInter;
++ try {
++ netInter = NetworkInterface.getNetworkInterfaces();
++ } catch (SocketException e) {
++
++ return false;
++ }
++ while ( netInter.hasMoreElements() )
++ {
++ NetworkInterface ni = (NetworkInterface)netInter.nextElement();
++ Enumeration addrs = ni.getInetAddresses();
++ while ( addrs.hasMoreElements() )
++ {
++ Object o = addrs.nextElement();
++ if ( o.getClass() == InetAddress.class ||
++ o.getClass() == Inet4Address.class ||
++ o.getClass() == Inet6Address.class )
++ {
++ InetAddress iaddr = (InetAddress) o;
++ if(o.getClass() == Inet6Address.class) {
++ supportsIPV6 = 1;
++ return true;
++ }
++ }
++ }
++ }
++ supportsIPV6 = 0;
++ return false;
++ }
+ }
+diff -ur jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java
+--- jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java	2010-03-01 21:57:01.000000000 +0000
++++ jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java	2013-09-08 21:07:41.266054954 +0100
+@@ -36,7 +36,8 @@
+ 
+ package org.mozilla.jss.ssl;
+ 
+-import java.net.InetAddress;
++import java.util.*;
++import java.net.*;
+ import java.io.IOException;
+ import java.net.Socket;
+ import java.net.SocketException;
+@@ -138,34 +139,34 @@
+ super.close();
+ 
+ // create the socket
++
++ int socketFamily = SocketBase.SSL_AF_INET;
++ if(SocketBase.supportsIPV6()) {
++ socketFamily = SocketBase.SSL_AF_INET6;
++ }
++
+ sockProxy = new SocketProxy(
+- base.socketCreate(this, certApprovalCallback, null) );
++ base.socketCreate(this, certApprovalCallback, null,socketFamily) );
+ 
+ base.setProxy(sockProxy);
+ 
+ setReuseAddress(reuseAddr);
+ 
+- // bind it to the local address and port
+- if( bindAddr == null ) {
+- bindAddr = anyLocalAddr;
+- }
+ byte[] bindAddrBA = null;
+ if( bindAddr != null ) {
+ bindAddrBA = bindAddr.getAddress();
+ }
+ base.socketBind(bindAddrBA, port);
++
++ String hostName = null;
++ if(bindAddr != null) {
++ hostName = bindAddr.getCanonicalHostName();
++ }
+ socketListen(backlog);
+ }
+ 
+ private native void socketListen(int backlog) throws SocketException;
+ 
+- private static InetAddress anyLocalAddr;
+- static {
+- try {
+- anyLocalAddr = InetAddress.getByName("0.0.0.0");
+- } catch (java.net.UnknownHostException e) { }
+- }
+-
+ /**
+ * Accepts a connection. This call will block until a connection is made
+ * or the timeout is reached.
+diff -ur jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c
+--- jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c	2007-05-09 02:40:14.000000000 +0100
++++ jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c	2013-09-08 21:07:41.267054950 +0100
+@@ -460,10 +460,15 @@
+ JSSL_SocketData *sock;
+ PRNetAddr addr;
+ jbyte *addrBAelems = NULL;
++ int addrBALen = 0; 
+ PRStatus status;
+ int stat;
+ const char *hostnameStr=NULL;
+ 
++ jmethodID supportsIPV6ID;
++ jclass socketBaseClass;
++ jboolean supportsIPV6 = 0;
++
+ if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS) {
+ /* exception was thrown */
+ goto finish;
+@@ -472,16 +477,32 @@
+ /*
+ * setup the PRNetAddr structure
+ */
+- addr.inet.family = AF_INET;
+- addr.inet.port = htons(port);
+- PR_ASSERT(sizeof(addr.inet.ip) == 4);
+- PR_ASSERT( (*env)->GetArrayLength(env, addrBA) == 4);
++
++ socketBaseClass = (*env)->FindClass(env, SOCKET_BASE_NAME);
++ if( socketBaseClass == NULL ) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++ supportsIPV6ID = (*env)->GetStaticMethodID(env, socketBaseClass,
++ SUPPORTS_IPV6_NAME, SUPPORTS_IPV6_SIG);
++
++ if( supportsIPV6ID == NULL ) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++
++ supportsIPV6 = (*env)->CallStaticBooleanMethod(env, socketBaseClass,
++ supportsIPV6ID);
++
+ addrBAelems = (*env)->GetByteArrayElements(env, addrBA, NULL);
++ addrBALen = (*env)->GetArrayLength(env, addrBA);
++
++ PR_ASSERT(addrBALen != 0);
++
+ if( addrBAelems == NULL ) {
+ ASSERT_OUTOFMEM(env);
+ goto finish;
+ }
+- memcpy(&addr.inet.ip, addrBAelems, 4);
+ 
+ /*
+ * Tell SSL the URL we think we want to connect to.
+@@ -495,6 +516,38 @@
+ goto finish;
+ }
+ 
++ if( addrBAelems == NULL ) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++
++ if(addrBALen != 4 && addrBALen != 16) {
++ JSSL_throwSSLSocketException(env, "Invalid address in connect!");
++ goto finish;
++ }
++
++ if( addrBALen == 4) {
++ addr.inet.family = AF_INET;
++ addr.inet.port = PR_htons(port);
++ memcpy(&addr.inet.ip, addrBAelems, 4);
++
++ if(supportsIPV6) {
++ addr.ipv6.family = AF_INET6;
++ addr.ipv6.port = PR_htons(port);
++ PR_ConvertIPv4AddrToIPv6(addr.inet.ip,&addr.ipv6.ip);
++ }
++
++ } else { /* Must be 16 and ipv6 */
++ if(supportsIPV6) {
++ addr.ipv6.family = AF_INET6;
++ addr.ipv6.port = PR_htons(port);
++ memcpy(&addr.ipv6.ip,addrBAelems, 16);
++ } else {
++ JSSL_throwSSLSocketException(env, "Invalid address in connect!");
++ goto finish;
++ }
++ }
++
+ /*
+ * make the connect call
+ */
+diff -ur jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java
+--- jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java	2010-03-01 21:57:01.000000000 +0000
++++ jss-4.3.2/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java	2013-09-08 21:07:41.268054946 +0100
+@@ -251,11 +251,16 @@
+ SSLClientCertificateSelectionCallback clientCertSelectionCallback)
+ throws IOException
+ {
++
++ int socketFamily = SocketBase.SSL_AF_INET;
++ if(SocketBase.supportsIPV6()) {
++ socketFamily = SocketBase.SSL_AF_INET6;
++ }
+ // create the socket
+ sockProxy =
+ new SocketProxy(
+ base.socketCreate(
+- this, certApprovalCallback, clientCertSelectionCallback) );
++ this, certApprovalCallback, clientCertSelectionCallback,socketFamily) );
+ 
+ base.setProxy(sockProxy);
+ 
+@@ -296,7 +301,7 @@
+ new SocketProxy(
+ base.socketCreate(
+ this, certApprovalCallback, clientCertSelectionCallback,
+- s, host ) );
++ s, host,SocketBase.SSL_AF_INET ) );
+ 
+ base.setProxy(sockProxy);
+ resetHandshake();
+diff -ur jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/util/java_ids.h jss-4.3.2/mozilla/security/jss/org/mozilla/jss/util/java_ids.h
+--- jss-4.3.2.orig/mozilla/security/jss/org/mozilla/jss/util/java_ids.h	2008-04-21 16:32:28.000000000 +0100
++++ jss-4.3.2/mozilla/security/jss/org/mozilla/jss/util/java_ids.h	2013-09-08 21:07:41.271054934 +0100
+@@ -312,6 +312,8 @@
+ #define SOCKET_BASE_NAME "org/mozilla/jss/ssl/SocketBase"
+ #define PROCESS_EXCEPTIONS_NAME "processExceptions"
+ #define PROCESS_EXCEPTIONS_SIG "(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;"
++#define SUPPORTS_IPV6_NAME "supportsIPV6"
++#define SUPPORTS_IPV6_SIG "()Z"
+ 
+ /*
+ * SSLCertificateApprovalCallback

jss-ECC-HSM-FIPS.patch Added

@@ -0,0 +1,68 @@
+Index: jss/security/jss/org/mozilla/jss/crypto/Algorithm.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/Algorithm.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/Algorithm.c	2011-10-04 21:28:51.810046501 +0300
+@@ -113,6 +113,7 @@
+ /* 50 */    {SEC_OID_HMAC_SHA256, SEC_OID_TAG},
+ /* 51 */    {SEC_OID_HMAC_SHA384, SEC_OID_TAG},
+-/* 52 */    {SEC_OID_HMAC_SHA512, SEC_OID_TAG}
++/* 52 */    {SEC_OID_HMAC_SHA512, SEC_OID_TAG},
++/* 53 */    {SEC_OID_ANSIX962_ECDSA_SIGNATURE_SPECIFIED_DIGEST, SEC_OID_TAG},
+ /* REMEMBER TO UPDATE NUM_ALGS!!! */
+ };
+ 
+Index: jss/security/jss/org/mozilla/jss/crypto/Algorithm.h
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/Algorithm.h	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/Algorithm.h	2011-10-04 21:29:22.378047472 +0300
+@@ -56,7 +56,7 @@
+     JSS_AlgType type;
+ } JSS_AlgInfo;
+ 
+-#define NUM_ALGS 53
++#define NUM_ALGS 54
+ 
+ extern JSS_AlgInfo JSS_AlgTable[];
+ extern CK_ULONG JSS_symkeyUsage[];
+Index: jss/security/jss/org/mozilla/jss/crypto/Algorithm.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/Algorithm.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/Algorithm.java	2011-10-04 21:32:14.706052947 +0300
+@@ -236,5 +236,6 @@
+     protected static final short SEC_OID_HMAC_SHA256=50;
+     protected static final short SEC_OID_HMAC_SHA384=51;
+     protected static final short SEC_OID_HMAC_SHA512=52;
++    protected static final short SEC_OID_ANSIX962_ECDSA_SIGNATURE_SPECIFIED_DIGEST=53;
+ 
+ }
+Index: jss/security/jss/org/mozilla/jss/crypto/KeyPairAlgorithm.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/KeyPairAlgorithm.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/KeyPairAlgorithm.java	2011-10-04 21:28:09.678045162 +0300
+@@ -94,7 +94,12 @@
+     DSAFamily = new Algorithm(SEC_OID_ANSIX9_DSA_SIGNATURE, "DSA");
+ 
+     public static final Algorithm
+-    ECFamily = new Algorithm(SEC_OID_ANSIX962_EC_PUBLIC_KEY, "EC");
++
++//    To support both ECDSA and ECDH, it is best to provide two EC Families;
++//    However, since there is no token that does only CKM_DERIVE to
++//    date, we will just do ECDSA for now as it is sufficient enough today.
++//    This fix will support tokens that do not do ECDH
++    ECFamily = new Algorithm(SEC_OID_ANSIX962_ECDSA_SIGNATURE_SPECIFIED_DIGEST, "EC");
+ 
+     public static final KeyPairAlgorithm
+     RSA = new KeyPairAlgorithm(CKM_RSA_PKCS_KEY_PAIR_GEN, "RSA", RSAFamily);
+Index: jss/security/jss/org/mozilla/jss/crypto/SignatureAlgorithm.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/SignatureAlgorithm.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/SignatureAlgorithm.java	2011-10-04 21:28:09.678045162 +0300
+@@ -124,7 +124,7 @@
+      * operates on its input, which should be a hash.
+      */
+     public static final SignatureAlgorithm
+-    ECSignature = new SignatureAlgorithm(SEC_OID_ANSIX962_EC_PUBLIC_KEY, 
++    ECSignature = new SignatureAlgorithm(SEC_OID_ANSIX962_ECDSA_SIGNATURE_SPECIFIED_DIGEST, 
+ 	"EC",
+         null, null, ANSI_X962_OID.subBranch(2).subBranch(1) );
+

jss-ECC_keygen_byCurveName.patch Added

@@ -0,0 +1,493 @@
+Index: jss/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java	2011-10-04 20:38:47.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java	2011-10-04 21:12:27.866015242 +0300
+@@ -99,4 +99,6 @@
+ */
+ public abstract void setKeyPairUsages(KeyPairGeneratorSpi.Usage[] usages,
+ KeyPairGeneratorSpi.Usage[] usages_mask);
++
++ public abstract int getCurveCodeByName(String curveName) throws InvalidParameterException;
+ }
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java	2011-10-04 20:38:47.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java	2011-10-04 21:12:27.866015242 +0300
+@@ -44,6 +44,7 @@
+ import java.security.SecureRandom;
+ import java.security.spec.AlgorithmParameterSpec;
+ import java.security.spec.DSAParameterSpec;
++import java.util.Hashtable;
+ 
+ 
+ /**
+@@ -55,6 +56,246 @@
+ extends org.mozilla.jss.crypto.KeyPairGeneratorSpi
+ {
+ 
++ // curve code for getting the actual EC curve
++ private enum ECCurve_Code {
++ // NIST, SEC2 Prime curves
++ secp521r1 , // == nistp521
++ nistp521 ,
++ secp384r1 , // == nistp384
++ nistp384 ,
++ secp256r1 , // == nistp256
++ nistp256 ,
++ secp256k1 ,
++ secp224r1 , // == nistp224
++ nistp224 ,
++ secp224k1 ,
++ secp192r1 , // == nistp192
++ nistp192 ,
++ secp192k1 ,
++ secp160r2 ,
++ secp160r1 ,
++ secp160k1 ,
++ secp128r2 ,
++ secp128r1 ,
++ secp112r2 ,
++ secp112r1 ,
++ // NIST, SEC2 Binary curves
++ sect571r1 , // == nistb571
++ nistb571 ,
++ sect571k1 , // == nistk571
++ nistk571 ,
++ sect409r1 , // == nistb409
++ nistb409 ,
++ sect409k1 , // == nistk409
++ nistk409 ,
++ sect283r1 , // == nistb283
++ nistb283 ,
++ sect283k1 , // == nistk283
++ nistk283 ,
++ sect239k1 ,
++ sect233r1 , // == nistb233
++ nistb233 ,
++ sect233k1 , // == nistk233
++ nistk233 ,
++ sect193r2 ,
++ sect193r1 ,
++ nistb163 ,
++ sect163r2 , // == nistb163
++ sect163r1 ,
++ sect163k1 , // == nistk163
++ nistk163 ,
++ sect131r2 ,
++ sect131r1 ,
++ sect113r2 ,
++ sect113r1 ,
++ // ANSI X9.62 Prime curves
++ prime239v3 ,
++ prime239v2 ,
++ prime239v1 ,
++ prime192v3 ,
++ prime192v2 ,
++ prime192v1 , // == nistp192
++ // prime256v1 == nistp256
++ // ANSI X9.62 Binary curves
++ c2pnb163v1 ,
++ c2pnb163v2 ,
++ c2pnb163v3 ,
++ c2pnb176v1 ,
++ c2tnb191v1 ,
++ c2tnb191v2 ,
++ c2tnb191v3 ,
++ //c2onb191v4 ,
++ //c2onb191v5 ,
++ c2pnb208w1 ,
++ c2tnb239v1 ,
++ c2tnb239v2 ,
++ c2tnb239v3 ,
++ //c2onb239v4 ,
++ //c2onb239v5 ,
++ c2pnb272w1 ,
++ c2pnb304w1 ,
++ c2tnb359v1 ,
++ c2pnb368w1 ,
++ c2tnb431r1
++ // no WTLS curves fo now
++ };
++
++ private static Hashtable ECCurve_NameToCode = new Hashtable();
++ static {
++ // NIST, SEC2 Prime curves
++ ECCurve_NameToCode.put(
++ "secp521r1", ECCurve_Code.secp521r1);
++ ECCurve_NameToCode.put(
++ "nistp521", ECCurve_Code.nistp521);
++ ECCurve_NameToCode.put(
++ "secp384r1", ECCurve_Code.secp384r1);
++ ECCurve_NameToCode.put(
++ "nistp384", ECCurve_Code.nistp384);
++ ECCurve_NameToCode.put(
++ "secp256r1", ECCurve_Code.secp256r1);
++ ECCurve_NameToCode.put(
++ "nistp256", ECCurve_Code.nistp256);
++ ECCurve_NameToCode.put(
++ "secp256k1", ECCurve_Code.secp256k1);
++ ECCurve_NameToCode.put(
++ "secp224r1", ECCurve_Code.secp224r1);
++ ECCurve_NameToCode.put(
++ "nistp224", ECCurve_Code.nistp224);
++ ECCurve_NameToCode.put(
++ "secp224k1", ECCurve_Code.secp224k1);
++ ECCurve_NameToCode.put(
++ "secp192r1", ECCurve_Code.secp192r1);
++ ECCurve_NameToCode.put(
++ "nistp192", ECCurve_Code.nistp192);
++ ECCurve_NameToCode.put(
++ "secp192k1", ECCurve_Code.secp192k1);
++ ECCurve_NameToCode.put(
++ "secp160r2", ECCurve_Code.secp160r2);
++ ECCurve_NameToCode.put(
++ "secp160r1", ECCurve_Code.secp160r1);
++ ECCurve_NameToCode.put(
++ "secp160k1", ECCurve_Code.secp160k1);
++ ECCurve_NameToCode.put(
++ "secp128r2", ECCurve_Code.secp128r2);
++ ECCurve_NameToCode.put(
++ "secp128r1", ECCurve_Code.secp128r1);
++ ECCurve_NameToCode.put(
++ "secp112r2", ECCurve_Code.secp112r2);
++ ECCurve_NameToCode.put(
++ "secp112r1", ECCurve_Code.secp112r1);
++ // NIST, SEC2 Binary curves
++ ECCurve_NameToCode.put(
++ "sect571r1", ECCurve_Code.sect571r1);
++ ECCurve_NameToCode.put(
++ "nistb571", ECCurve_Code.nistb571);
++ ECCurve_NameToCode.put(
++ "sect571k1", ECCurve_Code.sect571k1);
++ ECCurve_NameToCode.put(
++ "nistk571", ECCurve_Code.nistk571);
++ ECCurve_NameToCode.put(
++ "sect409r1", ECCurve_Code.sect409r1);
++ ECCurve_NameToCode.put(
++ "nistb409", ECCurve_Code.nistb409);
++ ECCurve_NameToCode.put(
++ "sect409k1", ECCurve_Code.sect409k1);
++ ECCurve_NameToCode.put(
++ "nistk409", ECCurve_Code.nistk409);
++ ECCurve_NameToCode.put(
++ "sect283r1", ECCurve_Code.sect283r1);
++ ECCurve_NameToCode.put(
++ "nistb283", ECCurve_Code.nistb283);
++ ECCurve_NameToCode.put(
++ "sect283k1", ECCurve_Code.sect283k1);
++ ECCurve_NameToCode.put(
++ "nistk283", ECCurve_Code.nistk283);
++ ECCurve_NameToCode.put(
++ "sect239k1", ECCurve_Code.sect239k1);
++ ECCurve_NameToCode.put(
++ "sect233r1", ECCurve_Code.sect233r1);
++ ECCurve_NameToCode.put(
++ "nistb233", ECCurve_Code.nistb233);
++ ECCurve_NameToCode.put(
++ "sect233k1", ECCurve_Code.sect233k1);
++ ECCurve_NameToCode.put(
++ "nistk233", ECCurve_Code.nistk233);
++ ECCurve_NameToCode.put(
++ "sect193r2", ECCurve_Code.sect193r2);
++ ECCurve_NameToCode.put(
++ "sect193r1", ECCurve_Code.sect193r1);
++ ECCurve_NameToCode.put(
++ "nistb163", ECCurve_Code.nistb163);
++ ECCurve_NameToCode.put(
++ "sect163r2", ECCurve_Code.sect163r2);
++ ECCurve_NameToCode.put(
++ "sect163r1", ECCurve_Code.sect163r1);
++ ECCurve_NameToCode.put(
++ "sect163k1", ECCurve_Code.sect163k1);
++ ECCurve_NameToCode.put(
++ "nistk163", ECCurve_Code.nistk163);
++ ECCurve_NameToCode.put(
++ "sect131r2", ECCurve_Code.sect131r2);
++ ECCurve_NameToCode.put(
++ "sect131r1", ECCurve_Code.sect131r1);
++ ECCurve_NameToCode.put(
++ "sect113r2", ECCurve_Code.sect113r2);
++ ECCurve_NameToCode.put(
++ "sect113r1", ECCurve_Code.sect113r1);
++ // ANSI Prime curves
++ ECCurve_NameToCode.put(
++ "prime239v3", ECCurve_Code.prime239v3);
++ ECCurve_NameToCode.put(
++ "prime239v2", ECCurve_Code.prime239v2);
++ ECCurve_NameToCode.put(
++ "prime239v1", ECCurve_Code.prime239v1);
++ ECCurve_NameToCode.put(
++ "prime192v3", ECCurve_Code.prime192v3);
++ ECCurve_NameToCode.put(
++ "prime192v2", ECCurve_Code.prime192v2);
++ ECCurve_NameToCode.put(
++ "prime192v1", ECCurve_Code.prime192v1);
++ // ANSI Binary curves
++ ECCurve_NameToCode.put(
++ "c2pnb163v1", ECCurve_Code.c2pnb163v1);
++ ECCurve_NameToCode.put(
++ "c2pnb163v2", ECCurve_Code.c2pnb163v2);
++ ECCurve_NameToCode.put(
++ "c2pnb163v3", ECCurve_Code.c2pnb163v3);
++ ECCurve_NameToCode.put(
++ "c2pnb176v1", ECCurve_Code.c2pnb176v1);
++ ECCurve_NameToCode.put(
++ "c2tnb191v1", ECCurve_Code.c2tnb191v1);
++ ECCurve_NameToCode.put(
++ "c2tnb191v2", ECCurve_Code.c2tnb191v2);
++ ECCurve_NameToCode.put(
++ "c2tnb191v3", ECCurve_Code.c2tnb191v3);
++ //ECCurve_NameToCode.put(
++ // "c2onb191v4", ECCurve_Code.c2onb191v4);
++ //ECCurve_NameToCode.put(
++ // "c2onb191v5", ECCurve_Code.c2onb191v5);
++ ECCurve_NameToCode.put(
++ "c2pnb208w1", ECCurve_Code.c2pnb208w1);
++ ECCurve_NameToCode.put(
++ "c2tnb239v1", ECCurve_Code.c2tnb239v1);
++ ECCurve_NameToCode.put(
++ "c2tnb239v2", ECCurve_Code.c2tnb239v2);
++ ECCurve_NameToCode.put(
++ "c2tnb239v3", ECCurve_Code.c2tnb239v3);
++ //ECCurve_NameToCode.put(
++ // "c2onb239v4", ECCurve_Code.c2onb239v4);
++ //ECCurve_NameToCode.put(
++ // "c2onb239v5", ECCurve_Code.c2onb239v5);
++ ECCurve_NameToCode.put(
++ "c2pnb272w1", ECCurve_Code.c2pnb272w1);
++ ECCurve_NameToCode.put(
++ "c2pnb304w1", ECCurve_Code.c2pnb304w1);
++ ECCurve_NameToCode.put(
++ "c2tnb359v1", ECCurve_Code.c2tnb359v1);
++ ECCurve_NameToCode.put(
++ "c2pnb368w1", ECCurve_Code.c2pnb368w1);
++ ECCurve_NameToCode.put(
++ "c2tnb431r1", ECCurve_Code.c2tnb431r1);
++ }
++
+ // opFlag constants: each of these flags specifies a crypto operation
+ // the key will support. Their values must match the same-named C
+ // preprocessor macros defined in the PKCS #11 header pkcs11t.h.
+@@ -167,7 +408,15 @@
+ }
+ } else {
+ Assert._assert( algorithm == KeyPairAlgorithm.EC );
+- params = getCurve(strength);
++ if (strength < 112) {
++ // for EC, "strength" is actually a code for curves defined in 
++ // ECCurve_Code
++ params = getECCurve(strength);
++ } else {
++ // this is the old method of strength to curve mapping,
++ // which is somewhat defective
++ params = getCurve(strength);
++ }
+ }
+ }
+ 
+@@ -646,6 +895,189 @@
+ static final OBJECT_IDENTIFIER CURVE_SECG_T571R1
+ 	= SECG_EC_CURVE.subBranch(39);
+ 
++ // the EC curvecode to oid hash table
++ private static Hashtable mECCurve_CodeToCurve = new Hashtable();
++ static {
++ // SEG Prime curves
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp521r1.ordinal(), (Object) CURVE_SECG_P521R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistp521.ordinal(), (Object) CURVE_SECG_P521R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp384r1.ordinal(), (Object) CURVE_SECG_P384R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistp384.ordinal(), (Object) CURVE_SECG_P384R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp256r1.ordinal(), (Object) CURVE_ANSI_P256V1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistp256.ordinal(), (Object) CURVE_ANSI_P256V1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp256k1.ordinal(), (Object) CURVE_SECG_P256K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp224r1.ordinal(), (Object) CURVE_SECG_P224R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistp224.ordinal(), (Object) CURVE_SECG_P224R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp224k1.ordinal(), (Object) CURVE_SECG_P224K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp192r1.ordinal(), (Object) CURVE_ANSI_P192V1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistp192.ordinal(), (Object) CURVE_ANSI_P192V1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp192k1.ordinal(), (Object) CURVE_SECG_P192K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp160r2.ordinal(), (Object) CURVE_SECG_P160R2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp160r1.ordinal(), (Object) CURVE_SECG_P160R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp160k1.ordinal(), (Object) CURVE_SECG_P160K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp128r2.ordinal(), (Object) CURVE_SECG_P128R2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp128r1.ordinal(), (Object) CURVE_SECG_P128R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp112r2.ordinal(), (Object) CURVE_SECG_P112R2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.secp112r1.ordinal(), (Object) CURVE_SECG_P112R1);
++ // SEG Binary curves
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect571r1.ordinal(), (Object) CURVE_SECG_T571R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistb571.ordinal(), (Object) CURVE_SECG_T571R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect571k1.ordinal(), (Object) CURVE_SECG_T571K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistk571.ordinal(), (Object) CURVE_SECG_T571K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect409r1.ordinal(), (Object) CURVE_SECG_T409R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistb409.ordinal(), (Object) CURVE_SECG_T409R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect409k1.ordinal(), (Object) CURVE_SECG_T409K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistk409.ordinal(), (Object) CURVE_SECG_T409K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect283r1.ordinal(), (Object) CURVE_SECG_T283R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistb283.ordinal(), (Object) CURVE_SECG_T283R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect283k1.ordinal(), (Object) CURVE_SECG_T283K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistk283.ordinal(), (Object) CURVE_SECG_T283K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect239k1.ordinal(), (Object) CURVE_SECG_T239K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect233r1.ordinal(), (Object) CURVE_SECG_T233R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistb233.ordinal(), (Object) CURVE_SECG_T233R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect233k1.ordinal(), (Object) CURVE_SECG_T233K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistk233.ordinal(), (Object) CURVE_SECG_T233K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect193r2.ordinal(), (Object) CURVE_SECG_T193R2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect193r1.ordinal(), (Object) CURVE_SECG_T193R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistb163.ordinal(), (Object) CURVE_SECG_T163K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect163r2.ordinal(), (Object) CURVE_SECG_T163R2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect163r1.ordinal(), (Object) CURVE_SECG_T163R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect163k1.ordinal(), (Object) CURVE_SECG_T163K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.nistk163.ordinal(), (Object) CURVE_SECG_T163K1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect131r2.ordinal(), (Object) CURVE_SECG_T131R2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect131r1.ordinal(), (Object) CURVE_SECG_T131R1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect113r2.ordinal(), (Object) CURVE_SECG_T113R2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.sect113r1.ordinal(), (Object) CURVE_SECG_T113R1);
++ // ANSI Prime curves
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.prime239v3.ordinal(), (Object) CURVE_ANSI_P239V3);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.prime239v2.ordinal(), (Object) CURVE_ANSI_P239V2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.prime239v1.ordinal(), (Object) CURVE_ANSI_P239V1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.prime192v3.ordinal(), (Object) CURVE_ANSI_P192V3);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.prime192v2.ordinal(), (Object) CURVE_ANSI_P192V2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.prime192v1.ordinal(), (Object) CURVE_ANSI_P192V1);
++ // ANSI Binary curves
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2pnb163v1.ordinal(), (Object) CURVE_ANSI_PNB163V1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2pnb163v2.ordinal(), (Object) CURVE_ANSI_PNB163V2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2pnb163v3.ordinal(), (Object) CURVE_ANSI_PNB163V3);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2pnb176v1.ordinal(), (Object) CURVE_ANSI_PNB176V1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2tnb191v1.ordinal(), (Object) CURVE_ANSI_TNB191V1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2tnb191v2.ordinal(), (Object) CURVE_ANSI_TNB191V2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2tnb191v3.ordinal(), (Object) CURVE_ANSI_TNB191V3);
++ //mECCurve_CodeToCurve.put(
++ // ECCurve_Code.c2onb191v4.ordinal(), (Object) CURVE_ANSI_ONB191V4);
++ //mECCurve_CodeToCurve.put(
++ // ECCurve_Code.c2onb191v5.ordinal(), (Object) CURVE_ANSI_ONB191V5);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2pnb208w1.ordinal(), (Object) CURVE_ANSI_PNB208W1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2tnb239v1.ordinal(), (Object) CURVE_ANSI_TNB239V1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2tnb239v2.ordinal(), (Object) CURVE_ANSI_TNB239V2);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2tnb239v3.ordinal(), (Object) CURVE_ANSI_TNB239V3);
++ //mECCurve_CodeToCurve.put(
++ // ECCurve_Code.c2onb239v4.ordinal(), (Object) CURVE_ANSI_ONB239V4);
++ //mECCurve_CodeToCurve.put(
++ // ECCurve_Code.c2onb239v5.ordinal(), (Object) CURVE_ANSI_ONB239V5);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2pnb272w1.ordinal(), (Object) CURVE_ANSI_PNB272W1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2pnb304w1.ordinal(), (Object) CURVE_ANSI_PNB304W1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2tnb359v1.ordinal(), (Object) CURVE_ANSI_TNB359V1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2pnb368w1.ordinal(), (Object) CURVE_ANSI_PNB368W1);
++ mECCurve_CodeToCurve.put(
++ ECCurve_Code.c2tnb431r1.ordinal(), (Object) CURVE_ANSI_TNB431R1);
++ }
++
++ public int getCurveCodeByName(String curveName)
++ throws InvalidParameterException {
++ if (curveName == null)
++ throw new InvalidParameterException();
++ ECCurve_Code c = (ECCurve_Code) ECCurve_NameToCode.get(curveName);
++ if (c == null)
++ throw new InvalidParameterException(curveName);
++ return c.ordinal();
++ }
++
++ /*
++ * getECCurve
++ * maps curvecode to the actual oid of the curve and
++ * returns the PK11ParameterSpec
++ */
++ private AlgorithmParameterSpec getECCurve(int curvecode)
++ throws InvalidParameterException
++ {
++ OBJECT_IDENTIFIER oid;
++
++ oid = (OBJECT_IDENTIFIER) mECCurve_CodeToCurve.get(curvecode);
++ if (oid == null)
++ throw new IllegalArgumentException("curvecode ="+curvecode);
++ return new PK11ParameterSpec(ASN1Util.encode(oid));
++ }
++
+ private AlgorithmParameterSpec getCurve(int strength) 
+ throws InvalidParameterException
+ {
+Index: jss/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java	2011-10-04 21:11:05.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java	2011-10-04 21:13:02.314016336 +0300
+@@ -199,6 +199,11 @@
+ engine.setKeyPairUsages(usages,usages_mask);
+ }
+ 
++ public int getCurveCodeByName(String curveName)
++ throws InvalidParameterException {
++ return engine.getCurveCodeByName(curveName);
++ }
++
+ 	protected KeyPairAlgorithm algorithm;
+ 	protected KeyPairGeneratorSpi engine;
+ }

jss-PBE-PKCS5-V2-secure-P12.patch Added

@@ -0,0 +1,323 @@
+Index: jss/security/jss/org/mozilla/jss/crypto/Algorithm.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/Algorithm.c	2012-02-18 12:35:05.000000000 +0200
++++ jss/security/jss/org/mozilla/jss/crypto/Algorithm.c	2012-02-18 12:40:31.899853750 +0200
+@@ -114,6 +114,9 @@
+ /* 51 */ {SEC_OID_HMAC_SHA384, SEC_OID_TAG},
+ /* 52 */ {SEC_OID_HMAC_SHA512, SEC_OID_TAG},
+ /* 53 */ {SEC_OID_ANSIX962_ECDSA_SIGNATURE_SPECIFIED_DIGEST, SEC_OID_TAG},
++/* 54 */ {SEC_OID_PKCS5_PBKDF2, SEC_OID_TAG},
++/* 55 */ {SEC_OID_PKCS5_PBES2, SEC_OID_TAG},
++/* 56 */ {SEC_OID_PKCS5_PBMAC1, SEC_OID_TAG},
+ /* REMEMBER TO UPDATE NUM_ALGS!!! */
+ };
+ 
+Index: jss/security/jss/org/mozilla/jss/crypto/Algorithm.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/Algorithm.java	2012-02-18 12:35:05.000000000 +0200
++++ jss/security/jss/org/mozilla/jss/crypto/Algorithm.java	2012-02-18 12:42:14.002917182 +0200
+@@ -237,5 +237,8 @@
+ protected static final short SEC_OID_HMAC_SHA384=51;
+ protected static final short SEC_OID_HMAC_SHA512=52;
+ protected static final short SEC_OID_ANSIX962_ECDSA_SIGNATURE_SPECIFIED_DIGEST=53;
++ protected static final short SEC_OID_PKCS5_PBKDF2=54;
++ protected static final short SEC_OID_PKCS5_PBES2=55;
++ protected static final short SEC_OID_PKCS5_PBMAC1=56;
+ 
+ }
+Index: jss/security/jss/org/mozilla/jss/crypto/PBEAlgorithm.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/PBEAlgorithm.java	2011-10-05 00:41:22.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/PBEAlgorithm.java	2012-02-18 12:39:53.438699572 +0200
+@@ -93,6 +93,27 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ //////////////////////////////////////////////////////////////
++ // PKCS 5 v2
++ public static final PBEAlgorithm
++ PBE_PKCS5_PBKDF2 = new PBEAlgorithm(
++ SEC_OID_PKCS5_PBKDF2, "PBKDF2", 128,
++ PKCS5.subBranch(12), EncryptionAlgorithm.AES_128_CBC, 8 );
++
++ //////////////////////////////////////////////////////////////
++ // PKCS 5 v2
++ public static final PBEAlgorithm
++ PBE_PKCS5_PBES2 = new PBEAlgorithm(
++ SEC_OID_PKCS5_PBES2, "PBES2", 128,
++ PKCS5.subBranch(13), EncryptionAlgorithm.AES_128_CBC, 8 );
++
++ //////////////////////////////////////////////////////////////
++ // PKCS 5 v2
++ public static final PBEAlgorithm
++ PBE_PKCS5_PBMAC1 = new PBEAlgorithm(
++ SEC_OID_PKCS5_PBMAC1, "PBMAC1", 128,
++ PKCS5.subBranch(14), EncryptionAlgorithm.AES_128_CBC, 8 );
++
++ //////////////////////////////////////////////////////////////
+ public static final PBEAlgorithm
+ PBE_MD2_DES_CBC = new PBEAlgorithm(
+ SEC_OID_PKCS5_PBE_WITH_MD2_AND_DES_CBC, "PBE/MD2/DES/CBC", 56,
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c	2012-02-18 12:35:05.774087090 +0200
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c	2012-02-18 12:39:53.438699572 +0200
+@@ -313,7 +313,6 @@
+ }
+ /* print_secitem(pwitem); */
+ 
+-
+ mech = JSS_getPK11MechFromAlg(env, alg);
+ 
+ if( mech == CKM_PBA_SHA1_WITH_SHA1_HMAC ) {
+@@ -333,7 +332,14 @@
+ PR_ASSERT(oidTag != SEC_OID_UNKNOWN);
+ 
+ /* create algid */
+- algid = PK11_CreatePBEAlgorithmID(oidTag, iterationCount, salt);
++ algid = PK11_CreatePBEV2AlgorithmID(
++ oidTag,
++ SEC_OID_DES_EDE3_CBC,
++ SEC_OID_HMAC_SHA1,
++ 168/8,
++ iterationCount,
++ salt);
++
+ if( algid == NULL ) {
+ JSS_throwMsg(env, TOKEN_EXCEPTION,
+ "Unable to process PBE parameters");
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c	2012-02-18 12:35:05.000000000 +0200
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c	2012-02-18 12:39:53.438699572 +0200
+@@ -324,14 +324,34 @@
+ SECItem *wrapped=NULL, *iv=NULL, *param=NULL, *pubValue=NULL;
+ SECItem label; /* empty secitem, doesn't need to be freed */
+ PRBool token;
+- CK_ATTRIBUTE_TYPE attribs[4];
+- int numAttribs;
++ CK_ATTRIBUTE_TYPE attribs[4] = {0, 0, 0, 0};
++ int numAttribs = 0;
++ CK_TOKEN_INFO tokenInfo;
++
++ PRBool isSensitive = PR_TRUE;
++ PRBool isExtractable = PR_FALSE;
++ /* special case nethsm*/
++ CK_UTF8CHAR nethsmLabel[4] = {'N','H','S','M'};
++ PRBool isNethsm = PR_TRUE;
+ 
+ if( JSS_PK11_getTokenSlotPtr(env, tokenObj, &slot) != PR_SUCCESS) {
+ /* exception was thrown */
+ goto finish;
+ }
+ 
++ if ( PK11_GetTokenInfo(slot, &tokenInfo) == PR_SUCCESS) {
++ int ix = 0;
++ for(ix=0; ix < 4; ix++) {
++ if (tokenInfo.label[ix] != nethsmLabel[ix]) {
++ isNethsm = PR_FALSE;
++ break;
++ }
++ }
++
++ } else {
++ isNethsm = PR_FALSE;
++ }
++
+ /* get unwrapping key */
+ if( JSS_PK11_getSymKeyPtr(env, unwrapperObj, &unwrappingKey)
+ != PR_SUCCESS) {
+@@ -392,14 +412,24 @@
+ }
+ keyType = PK11_GetKeyType(keyTypeMech, 0);
+ 
++ if( isNethsm ) {
++ isSensitive = PR_FALSE;
++ isExtractable = PR_FALSE;
++ }
++
++setAttrs:
+ /* figure out which operations to enable for this key */
+ switch (keyType) {
+ case CKK_RSA:
+ attribs[0] = CKA_SIGN;
+- attribs[1] = CKA_DECRYPT;
+- attribs[2] = CKA_SIGN_RECOVER;
+- attribs[3] = CKA_UNWRAP;
+- numAttribs = 4;
++ attribs[1] = CKA_SIGN_RECOVER;
++ attribs[2] = CKA_UNWRAP;
++ if (isExtractable) {
++ attribs[3] = CKA_EXTRACTABLE;
++ numAttribs = 4;
++ } else {
++ numAttribs = 3;
++ }
+ 	break;
+ case CKK_DSA:
+ attribs[0] = CKA_SIGN;
+@@ -426,7 +456,7 @@
+ 
+ /* perform the unwrap */
+ privk = PK11_UnwrapPrivKey(slot, unwrappingKey, wrapType, param, wrapped,
+- &label, pubValue, token, PR_TRUE /*sensitive*/, keyType,
++ &label, pubValue, token, isSensitive /*sensitive*/, keyType,
+ attribs, numAttribs, NULL /*wincx*/);
+ if( privk == NULL ) {
+ JSS_throwMsg(env, TOKEN_EXCEPTION, "Key Unwrap failed on token");
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java	2011-10-05 00:41:22.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java	2012-02-18 12:39:53.438699572 +0200
+@@ -190,21 +190,23 @@
+ if( key==null ) {
+ throw new InvalidKeyException("Key is null");
+ }
+- if( ! key.getOwningToken().equals(token) ) {
+- throw new InvalidKeyException("Key does not reside on the "+
+- "current token");
+- }
+- if( ! (key instanceof PK11SymKey) ) {
+- throw new InvalidKeyException("Key is not a PKCS #11 key");
+- }
+ try {
++ if( ! key.getOwningToken().equals(token) ) {
++ throw new InvalidKeyException("Key does not reside on the current token: key owning token="+
++ key.getOwningToken().getName());
++ }
++ if( ! (key instanceof PK11SymKey) ) {
++ throw new InvalidKeyException("Key is not a PKCS #11 key");
++ }
+ if( ((PK11SymKey)key).getKeyType() !=
+- KeyType.getKeyTypeFromAlgorithm(algorithm) ) {
+- throw new InvalidKeyException("Key is not the right type for"+
++ KeyType.getKeyTypeFromAlgorithm(algorithm) ) {
++ throw new InvalidKeyException("Key is not the right type for"+
+ " this algorithm");
+ }
+ } catch( NoSuchAlgorithmException e ) {
+ Assert.notReached("Unknown algorithm");
++ } catch (Exception e) {
++ Assert.notReached("Exception:"+ e.toString());
+ }
+ }
+ 
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11Token.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11Token.java	2012-02-18 12:35:05.000000000 +0200
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11Token.java	2012-02-18 12:39:53.438699572 +0200
+@@ -106,10 +106,13 @@
+ getKeyGenerator(KeyGenAlgorithm algorithm)
+ throws NoSuchAlgorithmException, TokenException
+ {
++/* NSS is capable of finding the right token to do algorithm,
++ so this call is prematurely bailing
+ if( ! doesAlgorithm(algorithm) ) {
+ throw new NoSuchAlgorithmException(
+ algorithm+" is not supported by this token");
+ }
++*/
+ return new PK11KeyGenerator(this, algorithm);
+ }
+ 
+Index: jss/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java	2011-10-05 00:41:22.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java	2012-02-18 12:39:53.438699572 +0200
+@@ -43,6 +43,7 @@
+ import java.security.*;
+ import org.mozilla.jss.CryptoManager;
+ import org.mozilla.jss.util.Password;
++import org.mozilla.jss.crypto.PrivateKey;
+ import java.security.spec.AlgorithmParameterSpec;
+ 
+ /**
+@@ -184,6 +185,89 @@
+ return null;
+ }
+ 
++
++ /**
++ * Creates a new EncryptedPrivateKeyInfo, where the data is encrypted
++ * with a password-based key- 
++ * with wrapping/unwrapping happening on token.
++ *
++ * @param keyGenAlg The algorithm for generating a symmetric key from
++ * a password, salt, and iteration count.
++ * @param password The password to use in generating the key.
++ * @param salt The salt to use in generating the key.
++ * @param iterationCount The number of hashing iterations to perform
++ * while generating the key.
++ * @param charToByteConverter The mechanism for converting the characters
++ * in the password into bytes. If null, the default mechanism
++ * will be used, which is UTF8.
++ * @param pri The PrivateKey to be encrypted and stored in the
++ * EncryptedContentInfo.
++ */
++ public static EncryptedPrivateKeyInfo
++ createPBE(PBEAlgorithm keyGenAlg, Password password, byte[] salt,
++ int iterationCount,
++ KeyGenerator.CharToByteConverter charToByteConverter,
++ PrivateKey pri, CryptoToken token)
++ throws CryptoManager.NotInitializedException, NoSuchAlgorithmException,
++ InvalidKeyException, InvalidAlgorithmParameterException, TokenException,
++ CharConversionException
++ {
++ try {
++
++ // check key gen algorithm
++
++ if( ! (keyGenAlg instanceof PBEAlgorithm) ) {
++ throw new NoSuchAlgorithmException("Key generation algorithm"+
++ " is not a PBE algorithm");
++ }
++
++ PBEAlgorithm pbeAlg = (PBEAlgorithm) keyGenAlg;
++
++ // generate key
++
++ KeyGenerator kg = token.getKeyGenerator( keyGenAlg );
++ PBEKeyGenParams pbekgParams = new PBEKeyGenParams(
++ password, salt, iterationCount);
++ if( charToByteConverter != null ) {
++ kg.setCharToByteConverter( charToByteConverter );
++ }
++ kg.initialize(pbekgParams);
++ kg.temporaryKeys(true);
++ SymmetricKey key = kg.generate();
++
++ // generate IV
++ EncryptionAlgorithm encAlg = pbeAlg.getEncryptionAlg();
++ AlgorithmParameterSpec params=null;
++ if( encAlg.getParameterClass().equals( IVParameterSpec.class ) ) {
++ params = new IVParameterSpec( kg.generatePBE_IV() );
++ }
++
++ KeyWrapper wrapper = token.getKeyWrapper(
++ KeyWrapAlgorithm.DES3_CBC);
++ wrapper.initWrap(key, params);
++ byte encrypted[] = wrapper.wrap(pri);
++
++ // make encryption algorithm identifier
++ PBEParameter pbeParam = new PBEParameter( salt, iterationCount );
++ AlgorithmIdentifier encAlgID = new AlgorithmIdentifier(
++ keyGenAlg.toOID(), pbeParam);
++
++ // create EncryptedPrivateKeyInfo
++ EncryptedPrivateKeyInfo epki = new EncryptedPrivateKeyInfo (
++ encAlgID,
++ new OCTET_STRING(encrypted) );
++
++ return epki;
++
++ } catch (Exception e) {
++ Assert.notReached("EncryptedPrivateKeyInfo exception:"
++ +".createPBE");
++ }
++
++ return null;
++ }
++
++
+ /**
+ * Decrypts an EncryptedPrivateKeyInfo that was encrypted with a PBE
+ * algorithm. The algorithm and its parameters are extracted from

jss-PKCS12-FIPS.patch Added

@@ -0,0 +1,81 @@
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c	2011-10-04 22:05:35.602116514 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c	2011-10-04 22:05:35.646116515 +0300
+@@ -228,40 +228,47 @@
+  *      TokenException if an error occurs.
+  */
+ static PK11SymKey*
+-constructSHA1PBAKey(JNIEnv *env, SECItem *pwitem, SECItem *salt,
++constructSHA1PBAKey(JNIEnv *env, PK11SlotInfo *slot, SECItem *pwitem, SECItem *salt,
+         int iterationCount)
+ {
+-    PBEBitGenContext* pbeCtxt=NULL;
+-    SECItem *keyBits=NULL;
+     PK11SymKey *key=NULL;
+ 
+-    pbeCtxt = PBE_CreateContext( SEC_OID_SHA1, pbeBitGenIntegrityKey,
+-                    pwitem, salt, 160 /* SHA1 key length */, iterationCount);
+-    if( pbeCtxt == NULL ) {
+-        JSS_throwMsg(env, TOKEN_EXCEPTION, "Failed to create PBE context");
++    unsigned char ivData[8];
++    SECItem mechItem;
++    CK_PBE_PARAMS pbe_params;
++
++    if( pwitem == NULL ) {
++        JSS_throwMsg(env, TOKEN_EXCEPTION,
++            "constructSHA1PAKey:"
++            " pwitem NULL");
+         goto finish;
+     }
+-
+-    keyBits = PBE_GenerateBits(pbeCtxt);
+-    if( keyBits == NULL ) {
+-        JSS_throwMsg(env, TOKEN_EXCEPTION, "Failed to generate bits from"
+-                "PBE context");
++    if( salt == NULL ) {
++        JSS_throwMsg(env, TOKEN_EXCEPTION,
++            "constructSHA1PAKey:"
++            " salt NULL");
+         goto finish;
+     }
+ 
+-    key = PK11_ImportSymKey( PK11_GetInternalSlot(), CKM_SHA_1,
+-                PK11_OriginGenerated, CKA_SIGN, keyBits, NULL);
++    pbe_params.pInitVector = ivData;
++    pbe_params.pPassword = pwitem->data;
++    pbe_params.ulPasswordLen = pwitem->len;
++    pbe_params.pSalt = salt->data;
++    pbe_params.ulSaltLen = salt->len;
++    pbe_params.ulIteration = iterationCount;
++    mechItem.data = (unsigned char *) &pbe_params;
++    mechItem.len = sizeof(pbe_params);
++
++    key = PK11_RawPBEKeyGen(slot, CKM_PBA_SHA1_WITH_SHA1_HMAC, &mechItem, pwitem, PR_FALSE, NULL);
++
+     if( key == NULL ) {
+-        JSS_throwMsg(env, TOKEN_EXCEPTION, "Failed to import PBA key from"
+-            " PBA-generated bits");
++        JSS_throwMsg(env, TOKEN_EXCEPTION,
++            "PK11_RawPBEKeyGen:"
++            " failed to generate key");
+         goto finish;
+     }
+ 
+ finish:
+-    if( pbeCtxt ) {
+-        PBE_DestroyContext(pbeCtxt);
+-    }
+-    /* keyBits == pbeCtxt, so we don't need to free it */
+     return key;
+ }
+ 
+@@ -313,7 +320,7 @@
+ 
+         /* special case, construct key by hand. Bug #336587 */
+ 
+-        skey = constructSHA1PBAKey(env, pwitem, salt, iterationCount);
++        skey = constructSHA1PBAKey(env, slot, pwitem, salt, iterationCount);
+         if( skey==NULL ) {
+             /* exception was thrown */
+             goto finish;

jss-VerifyCertificate.patch Added

@@ -0,0 +1,206 @@
+Index: jss/security/jss/lib/jss.def
+===================================================================
+--- jss.orig/security/jss/lib/jss.def	2011-10-04 21:18:14.642026259 +0300
++++ jss/security/jss/lib/jss.def	2011-10-04 21:18:14.674026260 +0300
+@@ -330,6 +330,7 @@
+ Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateDSAKeyPairWithOpFlags;
+ Java_org_mozilla_jss_CryptoManager_OCSPCacheSettingsNative;
+ Java_org_mozilla_jss_CryptoManager_setOCSPTimeoutNative;
++Java_org_mozilla_jss_CryptoManager_verifyCertificateNowNative;
+ ;+    local:
+ ;+       *;
+ ;+};
+Index: jss/security/jss/org/mozilla/jss/CryptoManager.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 21:18:14.642026259 +0300
++++ jss/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 21:18:14.674026260 +0300
+@@ -61,6 +61,7 @@
+ public final class CryptoManager implements TokenSupplier
+ {
+     /**
++     * note: this is obsolete in NSS
+      * CertUsage options for validation
+      */
+     public final static class CertUsage {
+@@ -103,6 +104,63 @@
+         public static final CertUsage AnyCA = new CertUsage(11, "AnyCA");
+     }
+ 
++    /**
++     * CertificateUsage options for validation
++     */
++    public final static class CertificateUsage {
++        private int usage;
++        private String name;
++
++        // certificateUsage, these must be kept in sync with nss/lib/certdb/certt.h
++        private static final int certificateUsageCheckAllUsages = 0x0000;
++        private static final int certificateUsageSSLClient = 0x0001;
++        private static final int certificateUsageSSLServer = 0x0002;
++        private static final int certificateUsageSSLServerWithStepUp = 0x0004;
++        private static final int certificateUsageSSLCA = 0x0008;
++        private static final int certificateUsageEmailSigner = 0x0010;
++        private static final int certificateUsageEmailRecipient = 0x0020;
++        private static final int certificateUsageObjectSigner = 0x0040;
++        private static final int certificateUsageUserCertImport = 0x0080;
++        private static final int certificateUsageVerifyCA = 0x0100;
++        private static final int certificateUsageProtectedObjectSigner = 0x0200;
++        private static final int certificateUsageStatusResponder = 0x0400;
++        private static final int certificateUsageAnyCA = 0x0800;
++
++        static private ArrayList list = new ArrayList();
++        private CertificateUsage() {};
++        private CertificateUsage(int usage, String name) {
++            this.usage = usage;
++            this.name =  name;
++            this.list.add(this);
++
++        }
++        public int getUsage() {
++            return usage;
++        }
++
++        static public Iterator getCertificateUsages() {
++            return list.iterator();
++
++        }
++        public String toString() {
++            return name;
++        }
++
++        public static final CertificateUsage CheckAllUsages = new CertificateUsage(certificateUsageCheckAllUsages, "CheckAllUsages");
++        public static final CertificateUsage SSLClient = new CertificateUsage(certificateUsageSSLClient, "SSLClient");
++        public static final CertificateUsage SSLServer = new CertificateUsage(certificateUsageSSLServer, "SSLServer");
++        public static final CertificateUsage SSLServerWithStepUp = new CertificateUsage(certificateUsageSSLServerWithStepUp, "SSLServerWithStepUp");
++        public static final CertificateUsage SSLCA = new CertificateUsage(certificateUsageSSLCA, "SSLCA");
++        public static final CertificateUsage EmailSigner = new CertificateUsage(certificateUsageEmailSigner, "EmailSigner");
++        public static final CertificateUsage EmailRecipient = new CertificateUsage(certificateUsageEmailRecipient, "EmailRecipient");
++        public static final CertificateUsage ObjectSigner = new CertificateUsage(certificateUsageObjectSigner, "ObjectSigner");
++        public static final CertificateUsage UserCertImport = new CertificateUsage(certificateUsageUserCertImport, "UserCertImport");
++        public static final CertificateUsage VerifyCA = new CertificateUsage(certificateUsageVerifyCA, "VerifyCA");
++        public static final CertificateUsage ProtectedObjectSigner = new CertificateUsage(certificateUsageProtectedObjectSigner, "ProtectedObjectSigner");
++        public static final CertificateUsage StatusResponder = new CertificateUsage(certificateUsageStatusResponder, "StatusResponder");
++        public static final CertificateUsage AnyCA = new CertificateUsage(certificateUsageAnyCA, "AnyCA");
++    }
++
+     public final static class NotInitializedException extends Exception {}
+     public final static class NicknameConflictException extends Exception {}
+     public final static class UserCertConflictException extends Exception {}
+@@ -1508,6 +1566,39 @@
+      * against Now.
+      * @param nickname The nickname of the certificate to verify.
+      * @param checkSig verify the signature of the certificate
++     * @param certificateUsage see exposed certificateUsage defines to verify Certificate; null will bypass usage check
++     * @return true for success; false otherwise
++     *
++     * @exception InvalidNicknameException If the nickname is null
++     * @exception ObjectNotFoundException If no certificate could be found
++     *      with the given nickname.
++     */
++
++    public boolean isCertValid(String nickname, boolean checkSig,
++            CertificateUsage certificateUsage)
++        throws ObjectNotFoundException, InvalidNicknameException
++    {
++        if (nickname==null) {
++            throw new InvalidNicknameException("Nickname must be non-null");
++        }
++        // 0 certificate usage was supposed to get current usage, however,
++        // it is not exposed at this point
++        return verifyCertificateNowNative(nickname,
++              checkSig,
++              (certificateUsage == null) ? 0:certificateUsage.getUsage());
++    }
++
++    private native boolean verifyCertificateNowNative(String nickname,
++        boolean checkSig, int certificateUsage) throws ObjectNotFoundException;
++
++    /**
++     * note: this method calls obsolete function in NSS
++     *
++     * Verify a certificate that exists in the given cert database,
++     * check if is valid and that we trust the issuer. Verify time
++     * against Now.
++     * @param nickname The nickname of the certificate to verify.
++     * @param checkSig verify the signature of the certificate
+      * @param certUsage see exposed certUsage defines to verify Certificate
+      * @return true for success; false otherwise
+      *
+@@ -1526,6 +1617,9 @@
+         return verifyCertNowNative(nickname, checkSig, certUsage.getUsage());
+     }
+ 
++    /*
++     * Obsolete in NSS
++     */
+     private native boolean verifyCertNowNative(String nickname,
+         boolean checkSig, int cUsage) throws ObjectNotFoundException;
+ 
+Index: jss/security/jss/org/mozilla/jss/PK11Finder.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/PK11Finder.c	2011-10-04 20:07:40.137891731 +0300
++++ jss/security/jss/org/mozilla/jss/PK11Finder.c	2011-10-04 21:18:14.674026260 +0300
+@@ -1575,11 +1575,62 @@
+ }
+ 
+ /***********************************************************************
+- * CryptoManager.verifyCertNowNative
++ * CryptoManager.verifyCertificateNowNative
+  *
+  * Returns JNI_TRUE if success, JNI_FALSE otherwise
+  */
+ JNIEXPORT jboolean JNICALL
++Java_org_mozilla_jss_CryptoManager_verifyCertificateNowNative(JNIEnv *env,
++        jobject self, jstring nickString, jboolean checkSig, jint required_certificateUsage)
++{
++    SECStatus         rv    = SECFailure;
++    SECCertificateUsage      certificateUsage;
++    SECCertificateUsage      currUsage;  /* unexposed for now */
++    CERTCertificate   *cert=NULL;
++    char *nickname=NULL;
++
++    nickname = (char *) (*env)->GetStringUTFChars(env, nickString, NULL);
++    if( nickname == NULL ) {
++         goto finish;
++    }
++
++    certificateUsage = required_certificateUsage;
++
++    cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), nickname);
++
++    if (cert == NULL) {
++        JSS_throw(env, OBJECT_NOT_FOUND_EXCEPTION);
++        goto finish;
++    } else {
++    /* 0 for certificateUsage in call to CERT_VerifyCertificateNow to
++     * just get the current usage (which we are not passing back for now
++     * but will bypass the certificate usage check
++     */
++        rv = CERT_VerifyCertificateNow(CERT_GetDefaultCertDB(), cert,
++            checkSig, certificateUsage, NULL, &currUsage );
++    }
++
++finish:
++    if(nickname != NULL) {
++      (*env)->ReleaseStringUTFChars(env, nickString, nickname);
++    }
++    if(cert != NULL) {
++       CERT_DestroyCertificate(cert);
++    }
++    if( rv == SECSuccess) {
++        return JNI_TRUE;
++    } else {
++        return JNI_FALSE;
++    }
++}
++
++
++/***********************************************************************
++ * CryptoManager.verifyCertNowNative
++ * note: this calls obsolete NSS function
++ * Returns JNI_TRUE if success, JNI_FALSE otherwise
++ */
++JNIEXPORT jboolean JNICALL
+ Java_org_mozilla_jss_CryptoManager_verifyCertNowNative(JNIEnv *env,
+         jobject self, jstring nickString, jboolean checkSig, jint cUsage)
+ {

jss-VerifyCertificateReturnCU.patch Added

@@ -0,0 +1,230 @@
+Index: jss/security/jss/lib/jss.def
+===================================================================
+--- jss.orig/security/jss/lib/jss.def	2011-10-04 21:21:38.754032743 +0300
++++ jss/security/jss/lib/jss.def	2011-10-04 21:21:38.782032744 +0300
+@@ -331,6 +331,7 @@
+ Java_org_mozilla_jss_CryptoManager_OCSPCacheSettingsNative;
+ Java_org_mozilla_jss_CryptoManager_setOCSPTimeoutNative;
+ Java_org_mozilla_jss_CryptoManager_verifyCertificateNowNative;
++Java_org_mozilla_jss_CryptoManager_verifyCertificateNowCUNative;
+ ;+    local:
+ ;+       *;
+ ;+};
+Index: jss/security/jss/org/mozilla/jss/CryptoManager.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 21:21:38.754032743 +0300
++++ jss/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 21:21:38.786032744 +0300
+@@ -159,6 +159,19 @@
+         public static final CertificateUsage ProtectedObjectSigner = new CertificateUsage(certificateUsageProtectedObjectSigner, "ProtectedObjectSigner");
+         public static final CertificateUsage StatusResponder = new CertificateUsage(certificateUsageStatusResponder, "StatusResponder");
+         public static final CertificateUsage AnyCA = new CertificateUsage(certificateUsageAnyCA, "AnyCA");
++
++        /*
++                 The folllowing usages cannot be verified:
++                   certUsageAnyCA
++                   certUsageProtectedObjectSigner
++                   certUsageUserCertImport
++                   certUsageVerifyCA
++        */
++        public static final int basicCertificateUsages = /*0x0b80;*/
++                certificateUsageUserCertImport |
++                certificateUsageVerifyCA |
++                certificateUsageProtectedObjectSigner |
++                certificateUsageAnyCA ;
+     }
+ 
+     public final static class NotInitializedException extends Exception {}
+@@ -1566,14 +1579,43 @@
+      * against Now.
+      * @param nickname The nickname of the certificate to verify.
+      * @param checkSig verify the signature of the certificate
+-     * @param certificateUsage see exposed certificateUsage defines to verify Certificate; null will bypass usage check
+-     * @return true for success; false otherwise
++     * @return currCertificateUsage which contains current usage bit map as defined in CertificateUsage
+      *
+      * @exception InvalidNicknameException If the nickname is null
+      * @exception ObjectNotFoundException If no certificate could be found
+      *      with the given nickname.
+      */
++    public int isCertValid(String nickname, boolean checkSig)
++        throws ObjectNotFoundException, InvalidNicknameException
++    {
++        if (nickname==null) {
++            throw new InvalidNicknameException("Nickname must be non-null");
++        }
++        int currCertificateUsage = 0x0000; // initialize it to 0
++        currCertificateUsage = verifyCertificateNowCUNative(nickname,
++                checkSig);
++        return currCertificateUsage;
++    }
++
++    private native int verifyCertificateNowCUNative(String nickname,
++        boolean checkSig) throws ObjectNotFoundException;
+ 
++    /////////////////////////////////////////////////////////////
++    // isCertValid
++    /////////////////////////////////////////////////////////////
++    /**
++     * Verify a certificate that exists in the given cert database,
++     * check if is valid and that we trust the issuer. Verify time
++     * against Now.
++     * @param nickname The nickname of the certificate to verify.
++     * @param checkSig verify the signature of the certificate
++     * @param certificateUsage see certificateUsage defined to verify Certificate; to retrieve current certificate usage, call the isCertValid() above
++     * @return true for success; false otherwise
++     *
++     * @exception InvalidNicknameException If the nickname is null
++     * @exception ObjectNotFoundException If no certificate could be found
++     *      with the given nickname.
++     */
+     public boolean isCertValid(String nickname, boolean checkSig,
+             CertificateUsage certificateUsage)
+         throws ObjectNotFoundException, InvalidNicknameException
+@@ -1581,11 +1623,23 @@
+         if (nickname==null) {
+             throw new InvalidNicknameException("Nickname must be non-null");
+         }
+-        // 0 certificate usage was supposed to get current usage, however,
+-        // it is not exposed at this point
+-        return verifyCertificateNowNative(nickname,
+-              checkSig,
+-              (certificateUsage == null) ? 0:certificateUsage.getUsage());
++        // 0 certificate usage will get current usage
++        // should call isCertValid() call above that returns certificate usage
++        if ((certificateUsage == null) ||
++                (certificateUsage == CertificateUsage.CheckAllUsages)){
++            int currCertificateUsage = 0x0000;
++            currCertificateUsage = verifyCertificateNowCUNative(nickname,
++                checkSig);
++
++            if (currCertificateUsage == CertificateUsage.basicCertificateUsages){ 
++                // cert is good for nothing
++                return false;
++            } else
++                return true;
++        } else {
++            return verifyCertificateNowNative(nickname, checkSig,
++              certificateUsage.getUsage());
++        }
+     }
+ 
+     private native boolean verifyCertificateNowNative(String nickname,
+Index: jss/security/jss/org/mozilla/jss/PK11Finder.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/PK11Finder.c	2011-10-04 21:21:38.754032743 +0300
++++ jss/security/jss/org/mozilla/jss/PK11Finder.c	2011-10-04 21:21:38.786032744 +0300
+@@ -1574,18 +1574,16 @@
+     }
+ }
+ 
++
+ /***********************************************************************
+- * CryptoManager.verifyCertificateNowNative
+- *
+- * Returns JNI_TRUE if success, JNI_FALSE otherwise
++ * CryptoManager.verifyCertificateNow
+  */
+-JNIEXPORT jboolean JNICALL
+-Java_org_mozilla_jss_CryptoManager_verifyCertificateNowNative(JNIEnv *env,
+-        jobject self, jstring nickString, jboolean checkSig, jint required_certificateUsage)
++SECStatus verifyCertificateNow(JNIEnv *env, jobject self, jstring nickString,
++        jboolean checkSig, jint required_certificateUsage,
++         SECCertificateUsage *currUsage)
+ {
+     SECStatus         rv    = SECFailure;
+     SECCertificateUsage      certificateUsage;
+-    SECCertificateUsage      currUsage;  /* unexposed for now */
+     CERTCertificate   *cert=NULL;
+     char *nickname=NULL;
+ 
+@@ -1602,12 +1600,28 @@
+         JSS_throw(env, OBJECT_NOT_FOUND_EXCEPTION);
+         goto finish;
+     } else {
+-    /* 0 for certificateUsage in call to CERT_VerifyCertificateNow to
+-     * just get the current usage (which we are not passing back for now
+-     * but will bypass the certificate usage check
++    /* 0 for certificateUsage in call to CERT_VerifyCertificateNow will
++     * retrieve the current valid usage into currUsage
+      */
+         rv = CERT_VerifyCertificateNow(CERT_GetDefaultCertDB(), cert,
+-            checkSig, certificateUsage, NULL, &currUsage );
++            checkSig, certificateUsage, NULL, currUsage );
++        if ((rv == SECSuccess) && certificateUsage == 0x0000) {
++            if (*currUsage == 
++                ( certUsageUserCertImport |
++                certUsageVerifyCA |
++                certUsageProtectedObjectSigner |
++                certUsageAnyCA )) {
++
++              /* the cert is good for nothing 
++                 The folllowing usages cannot be verified:
++                   certUsageAnyCA
++                   certUsageProtectedObjectSigner
++                   certUsageUserCertImport
++                   certUsageVerifyCA
++                    (0x0b80) */
++                rv =SECFailure;
++            }
++        }
+     }
+ 
+ finish:
+@@ -1617,6 +1631,49 @@
+     if(cert != NULL) {
+        CERT_DestroyCertificate(cert);
+     }
++
++    return rv;
++}
++
++/***********************************************************************
++ * CryptoManager.verifyCertificateNowCUNative
++ *
++ * Returns jint which contains bits in SECCertificateUsage that reflects
++ * the cert usage(s) that the cert is good for
++ * if the cert is good for nothing, returned value is
++ *                 (0x0b80):
++ *                 certUsageUserCertImport |
++ *                 certUsageVerifyCA |
++ *                 certUsageProtectedObjectSigner |
++ *                 certUsageAnyCA
++ */
++JNIEXPORT jint JNICALL
++Java_org_mozilla_jss_CryptoManager_verifyCertificateNowCUNative(JNIEnv *env,
++        jobject self, jstring nickString, jboolean checkSig)
++{
++    SECStatus         rv    = SECFailure;
++    SECCertificateUsage      currUsage = 0x0000;
++
++    rv = verifyCertificateNow(env, self, nickString, checkSig, 0, &currUsage);
++    /* rv is ignored */
++
++    return currUsage;
++}
++
++/***********************************************************************
++ * CryptoManager.verifyCertificateNowNative
++ *
++ * Returns JNI_TRUE if success, JNI_FALSE otherwise
++ */
++JNIEXPORT jboolean JNICALL
++Java_org_mozilla_jss_CryptoManager_verifyCertificateNowNative(JNIEnv *env,
++        jobject self, jstring nickString, jboolean checkSig, jint required_certificateUsage)
++{
++    SECStatus         rv    = SECFailure;
++    SECCertificateUsage      currUsage = 0x0000;
++
++    rv = verifyCertificateNow(env, self, nickString, checkSig, required_certificateUsage, &currUsage);
++
+     if( rv == SECSuccess) {
+         return JNI_TRUE;
+     } else {
+@@ -1624,7 +1681,6 @@
+     }
+ }
+ 
+-
+ /***********************************************************************
+  * CryptoManager.verifyCertNowNative
+  * note: this calls obsolete NSS function

jss-bad-error-string-pointer.patch Added

@@ -0,0 +1,27 @@
+--- jss-4.2.6.orig/security/jss/org/mozilla/jss/ssl/SSLServerSocket.c	2010-11-17 18:54:56.000000000 -0500
++++ jss-4.2.6/security/jss/org/mozilla/jss/ssl/SSLServerSocket.c	2010-11-18 09:46:34.000000000 -0500
+@@ -124,20 +124,16 @@
+             /* Clean up after PR_interrupt. */
+             PR_NT_CancelIo(sock->fd);
+ #endif
+-            JSSL_throwSSLSocketException(env, 
+-                "Accept operation interrupted with error code " + err);
++            JSSL_throwSSLSocketException(env, "Accept operation interrupted");
+         } else if( err == PR_IO_TIMEOUT_ERROR ) {
+ #ifdef WINNT
+             PR_NT_CancelIo(sock->fd);
+ #endif
+-            JSSL_throwSSLSocketException(env, 
+-                "Accept operation timed out with error code " + err);
++            JSSL_throwSSLSocketException(env, "Accept operation timed out");
+         } else if( err == PR_IO_ERROR ) {
+-            JSSL_throwSSLSocketException(env, 
+-                "Accept operation received IO error with error code " + err);
++            JSSL_throwSSLSocketException(env, "Accept operation received IO error");
+         } else {
+-            JSSL_throwSSLSocketException(env, 
+-                "Accept operation failed with error code " + err);
++            JSSL_throwSSLSocketException(env, "Accept operation failed");
+         }
+         goto finish;
+     }

jss-eliminate-java-compiler-warnings.patch Added

@@ -0,0 +1,565 @@
+Index: jss/security/jss/org/mozilla/jss/CryptoManager.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 21:41:14.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 22:00:46.978107345 +0300
+@@ -1231,7 +1231,7 @@
+ * Imports a single certificate into the permanent certificate
+ * database.
+ *
+- * @param derCert the certificate you want to add
++ * @param cert the certificate you want to add
+ * @param nickname the nickname you want to refer to the certificate as
+ * (must not be null)
+ */
+@@ -1497,11 +1497,11 @@
+ public static final String
+ JAR_JDK_VERSION = "JDK_VERSION = N/A";
+ public static final String
+- JAR_NSS_VERSION = "NSS_VERSION = NSS_3_12_RTM";
++ JAR_NSS_VERSION = "NSS_VERSION = N/A";
+ public static final String
+ JAR_DBM_VERSION = "DBM_VERSION = N/A";
+ public static final String
+- JAR_NSPR_VERSION = "NSPR_VERSION = NSPR_4_7_RTM";
++ JAR_NSPR_VERSION = "NSPR_VERSION = N/A";
+ 
+ /**
+ * Loads the JSS dynamic library if necessary.
+@@ -1539,8 +1539,8 @@
+ * this thread's token to <tt>null</tt> will also cause the
+ * InternalKeyStorageToken to be used.
+ *
+- * @param The token to use for crypto operations. Specifying <tt>null</tt>
+- * will cause the InternalKeyStorageToken to be used.
++ * @param token The token to use for crypto operations. Specifying
++ * <tt>null</tt> will cause the InternalKeyStorageToken to be used.
+ */
+ public void setThreadToken(CryptoToken token) {
+ if( token != null ) {
+@@ -1684,7 +1684,7 @@
+ * Verify a certificate in memory. Check if
+ * valid and that we trust the issuer. Verify time
+ * against Now.
+- * @param certificate in memory
++ * @param certPackage certificate in memory
+ * @param checkSig verify the signature of the certificate
+ * @param certUsage see exposed certUsage defines to verify Certificate
+ * @return true for success; false otherwise
+Index: jss/security/jss/org/mozilla/jss/crypto/Cipher.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/Cipher.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/Cipher.java	2011-10-04 22:00:46.978107345 +0300
+@@ -144,8 +144,8 @@
+ * B is the block size, the padding string consists of
+ * B - (M mod B) octets, each having the value
+ * B - (M mod B).
+- * @param The block size of the encryption algorithm. Must be greater
+- * than zero.
++ * @param blockSize The block size of the encryption algorithm.
++ * Must be greater than zero.
+ * @see #unPad
+ */
+ public static byte[]
+Index: jss/security/jss/org/mozilla/jss/crypto/CryptoToken.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/CryptoToken.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/CryptoToken.java	2011-10-04 22:00:46.978107345 +0300
+@@ -194,7 +194,7 @@
+ * Login to the token. If a token is logged in, it will not trigger
+ * password callbacks.
+ *
+- * @param password The password for this token.
++ * @param pwcb The password callback for this token.
+ * @exception IncorrectPasswordException If the supplied password is
+ * incorrect.
+ * @see #setLoginMode
+Index: jss/security/jss/org/mozilla/jss/crypto/JSSMessageDigest.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/JSSMessageDigest.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/JSSMessageDigest.java	2011-10-04 22:00:46.978107345 +0300
+@@ -88,7 +88,7 @@
+ * Completes digestion.
+ * 
+ * @return The, ahem, output of the digest operation.
+- * @param If an error occurs while digesting.
++ * @exception DigestException If an error occurs while digesting.
+ */
+ public byte[] digest() throws DigestException {
+ byte[] output = new byte[getOutputSize()];
+Index: jss/security/jss/org/mozilla/jss/crypto/PBEKeyGenParams.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/PBEKeyGenParams.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/PBEKeyGenParams.java	2011-10-04 22:00:46.978107345 +0300
+@@ -60,7 +60,7 @@
+ * Must not be null. It is the responsibility of the caller to
+ * use the right salt length for the algorithm. Most algorithms
+ * use 8 bytes of salt.
+- * @param The iteration count for the PBE algorithm.
++ * @param iterations The iteration count for the PBE algorithm.
+ */
+ public PBEKeyGenParams(Password pass, byte[] salt, int iterations) {
+ if(pass==null || salt==null) {
+@@ -80,7 +80,7 @@
+ * Must not be null. It is the responsibility of the caller to
+ * use the right salt length for the algorithm. Most algorithms
+ * use 8 bytes of salt.
+- * @param The iteration count for the PBE algorithm.
++ * @param iterations The iteration count for the PBE algorithm.
+ */
+ public PBEKeyGenParams(char[] pass, byte[] salt, int iterations) {
+ if(pass==null || salt==null) {
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11Token.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11Token.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11Token.java	2011-10-04 22:00:46.978107345 +0300
+@@ -228,8 +228,8 @@
+ * Initialize PIN. This sets the user's new PIN, using the current
+ * security officer PIN for authentication.
+ *
+- * @param ssopw The security officer's current password.
+- * @param userpw The user's new password.
++ * @param ssopwcb The security officer's current password callback.
++ * @param userpwcb The user's new password callback.
+ * @exception IncorrectPinException If the security officer PIN is
+ * incorrect.
+ * @exception TokenException If the PIN was already initialized,
+@@ -322,8 +322,8 @@
+ * Change password. This changes the user's PIN after it has already
+ * been initialized.
+ *
+- * @param oldPIN The user's old PIN.
+- * @param newPIN The new PIN.
++ * @param oldPINcb The user's old PIN callback.
++ * @param newPINcb The new PIN callback.
+ * @exception IncorrectPasswordException If the old PIN is incorrect.
+ * @exception TokenException If some other error occurs on the token.
+ *
+Index: jss/security/jss/org/mozilla/jss/pkcs12/SafeBag.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs12/SafeBag.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs12/SafeBag.java	2011-10-04 22:00:46.978107345 +0300
+@@ -288,7 +288,7 @@
+ * as the nickname of the associated cert.
+ * @param localKeyID The localKeyID for the key; should be the same as
+ * the localKeyID of the associated cert.
+- * @param The password used to encrypt the private key.
++ * @param password The password used to encrypt the private key.
+ */
+ public static SafeBag
+ createEncryptedPrivateKeyBag(PrivateKeyInfo privk, String friendlyName,
+Index: jss/security/jss/org/mozilla/jss/pkcs7/SignerInfo.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs7/SignerInfo.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs7/SignerInfo.java	2011-10-04 22:00:46.978107345 +0300
+@@ -430,7 +430,6 @@
+ * SignerInfo.
+ * @param contentType The type of the content that is signed by this
+ * SignerInfo.
+- * @param pubkey The public key to use to verify the signature.
+ * @exception NoSuchObjectException If no certificate matching the
+ * the issuer name and serial number can be found.
+ */
+Index: jss/security/jss/org/mozilla/jss/pkix/cmc/CMCStatusInfo.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkix/cmc/CMCStatusInfo.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkix/cmc/CMCStatusInfo.java	2011-10-04 22:00:46.978107345 +0300
+@@ -108,7 +108,7 @@
+ * @param status A CMCStatus constant.
+ * @param bodyList The sequence of bodyPartID.
+ * @param statusString A String.
+- * @param OtherInfo The OtherInfo choice.
++ * @param otherInfo The OtherInfo choice.
+ */
+ public CMCStatusInfo(int status, SEQUENCE bodyList, String
+ 						 statusString, OtherInfo otherInfo) {
+Index: jss/security/jss/org/mozilla/jss/pkix/cmmf/PKIStatusInfo.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkix/cmmf/PKIStatusInfo.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkix/cmmf/PKIStatusInfo.java	2011-10-04 22:00:46.982107345 +0300
+@@ -88,7 +88,6 @@
+ /**
+ * Create a PKIStatusInfo with no failure info.
+ * @param status A PKIStatus constant.
+- * @param failInfo The bitwise AND of the PKIFailureInfo constants.
+ */
+ public PKIStatusInfo(int status) {
+ this.status = new INTEGER(status);
+Index: jss/security/jss/org/mozilla/jss/pkix/primitive/DirectoryString.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkix/primitive/DirectoryString.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkix/primitive/DirectoryString.java	2011-10-04 22:00:46.982107345 +0300
+@@ -115,10 +115,6 @@
+ 
+ /**
+ * Converts an ASN.1 DirectoryString to a Java string.
+- *
+- * @param dirstr An ANY containing a BER-encoded DirectoryString.
+- * @exception InvalidBERException If the encoding does not contain a
+- * valid DirectoryString.
+ */
+ public String toString() {
+ return asn1String.toString();
+@@ -176,6 +172,8 @@
+ /**
+ * @param implicitTag This parameter is ignored, because
+ * DirectoryStrings (being CHOICEs) cannot have implicit tags.
++ * @exception InvalidBERException If the encoding does not contain a
++ * valid DirectoryString.
+ */
+ public ASN1Value decode(Tag implicitTag, InputStream istream)
+ throws IOException, InvalidBERException
+Index: jss/security/jss/org/mozilla/jss/provider/javax/crypto/JSSSecretKeyFactorySpi.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/provider/javax/crypto/JSSSecretKeyFactorySpi.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/provider/javax/crypto/JSSSecretKeyFactorySpi.java	2011-10-04 22:00:46.982107345 +0300
+@@ -91,14 +91,18 @@
+ // versions is to use the reflection API.
+ Class specClass = spec.getClass();
+ try {
+- Method getSaltMethod = specClass.getMethod("getSalt", null);
++ Method getSaltMethod = specClass.getMethod("getSalt",
++ (java.lang.Class) null);
+ Method getIterationMethod =
+- specClass.getMethod("getIterationCount", null);
++ specClass.getMethod("getIterationCount",
++ (java.lang.Class) null);
+ 
+- byte[] salt = (byte[]) getSaltMethod.invoke(spec, null);
++ byte[] salt = (byte[]) getSaltMethod.invoke(spec,
++ (java.lang.Class) null);
+ 
+ Integer itCountObj =
+- (Integer) getIterationMethod.invoke(spec,null);
++ (Integer) getIterationMethod.invoke(spec,
++ (java.lang.Class) null);
+ int iterationCount = itCountObj.intValue();
+ 
+ Password pass = new Password(spec.getPassword());
+Index: jss/security/jss/org/mozilla/jss/ssl/SSLSocket.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/ssl/SSLSocket.java	2011-10-04 21:41:14.810070106 +0300
++++ jss/security/jss/org/mozilla/jss/ssl/SSLSocket.java	2011-10-04 22:00:46.982107345 +0300
+@@ -188,11 +188,11 @@
+ }
+ 
+ /**
+- * Creates an SSL client socket and connects to the specified host and
++ * Creates an SSL client socket and connects to the specified address and
+ * port. Binds to the given local address and port. Installs the given
+ * callbacks for certificate approval and client certificate selection.
+ *
+- * @param host The hostname to connect to.
++ * @param address The IP address to connect to.
+ * @param port The port to connect to.
+ * @param localAddr The local address to bind to. It can be null, in which
+ * case an unspecified local address will be chosen.
+Index: jss/security/jss/org/mozilla/jss/tests/HMACTest.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/tests/HMACTest.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/tests/HMACTest.java	2011-10-04 22:00:46.982107345 +0300
+@@ -155,7 +155,7 @@
+ 
+ /**
+ * Main test method.
+- * @params args[]
++ * @param argv
+ */
+ public static void main(String[] argv) {
+ 
+Index: jss/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java	2011-10-04 22:00:46.982107345 +0300
+@@ -116,9 +116,9 @@
+ }
+ /**
+ * 
+- * @param key
+- * @param kg
+- * @return
++ * @param keyType
++ * @param provider
++ * @return javax.crypto.SecretKey key
+ */
+ public javax.crypto.SecretKey genSecretKey(String keyType, String provider){
+ javax.crypto.SecretKey key = null;
+@@ -155,7 +155,7 @@
+ * 
+ * @param keyType 
+ * @param provider 
+- * @return 
++ * @return javax.crypto.SecretKey key
+ */
+ public javax.crypto.SecretKey genPBESecretKey(String keyType,
+ String provider){
+@@ -197,8 +197,10 @@
+ /**
+ *
+ * @param sKey
+- * @param AlgType
+- * @param provider
++ * @param algFamily
++ * @param algType
++ * @param providerForEncrypt
++ * @param providerForDecrypt
+ */
+ public void testCipher(javax.crypto.SecretKey sKey, String algFamily,
+ String algType, String providerForEncrypt, String providerForDecrypt)
+@@ -304,8 +306,10 @@
+ /**
+ *
+ * @param sKey
+- * @param AlgType
+- * @param provider
++ * @param algFamily
++ * @param algType
++ * @param providerForEncrypt
++ * @param providerForDecrypt
+ */
+ public void testMultiPartCipher(javax.crypto.SecretKey sKey, String algFamily,
+ String algType, String providerForEncrypt, String providerForDecrypt)
+Index: jss/security/jss/org/mozilla/jss/tests/JSSE_SSLClient.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/tests/JSSE_SSLClient.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/tests/JSSE_SSLClient.java	2011-10-04 22:00:46.982107345 +0300
+@@ -78,7 +78,7 @@
+ 
+ /**
+ * Set the protocol type and revision
+- * @param String sslRevision
++ * @param fSslRevision
+ */
+ public void setSslRevision(String fSslRevision) {
+ 
+@@ -91,7 +91,7 @@
+ 
+ /**
+ * Set the host name to connect to.
+- * @param String hostname
++ * @param fHost
+ */
+ public void setHost(String fHost) {
+ this.host = fHost;
+@@ -99,7 +99,7 @@
+ 
+ /**
+ * Set the port number to connect to.
+- * @param int portnumber
++ * @param fPort
+ */
+ public void setPort(int fPort) {
+ this.port = fPort;
+@@ -107,7 +107,7 @@
+ 
+ /**
+ * Set the cipher suite name to use.
+- * @param String cipherSuiteName
++ * @param fCipherSuite
+ */
+ public void setCipherSuite(String fCipherSuite) {
+ this.cipherName = fCipherSuite;
+@@ -115,7 +115,7 @@
+ 
+ /**
+ * Set the location of rsa.pfx
+- * @param String fKeystoreLoc
++ * @param fKeystoreLoc
+ */
+ public void setKeystoreLoc(String fKeystoreLoc) {
+ keystoreLoc = fKeystoreLoc + "/" + keystoreLoc;
+Index: jss/security/jss/org/mozilla/jss/tests/JSSE_SSLServer.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/tests/JSSE_SSLServer.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/tests/JSSE_SSLServer.java	2011-10-04 22:00:46.982107345 +0300
+@@ -75,7 +75,7 @@
+ 
+ /**
+ * Set the provider to use.
+- * @param String p
++ * @param p
+ */
+ public void setProvider(String p) {
+ provider = p;
+@@ -90,7 +90,7 @@
+ }
+ /**
+ * Set the location of keystore file.
+- * @param String fconfigDir
++ * @param fconfigDir
+ */
+ public void setKeystore(String fconfigDir) {
+ configDir = fconfigDir;
+@@ -117,7 +117,7 @@
+ 
+ /**
+ * Start SSLServer and accept connections.
+- * @param args[]
++ * @param args
+ */
+ public void startSSLServer(String[] args) throws Exception {
+ String configDir = "";
+Index: jss/security/jss/org/mozilla/jss/tests/JSS_FileUploadClient.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/tests/JSS_FileUploadClient.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/tests/JSS_FileUploadClient.java	2011-10-04 22:00:46.982107345 +0300
+@@ -75,7 +75,7 @@
+ /**
+ * Initialize the desired cipher to be set
+ * on the socket.
+- * @param int Cipher
++ * @param aCipher
+ */
+ public void setCipher(int aCipher) {
+ fCipher = aCipher;
+@@ -83,7 +83,7 @@
+ 
+ /**
+ * Initialize the hostname to run the server
+- * @param String ServerName
++ * @param aHostName
+ */
+ public void setHostName(String aHostName) {
+ serverHost = aHostName;
+@@ -91,7 +91,7 @@
+ 
+ /**
+ * Initialize the port to run the server
+- * @param int port
++ * @param aPort
+ */
+ public void setPort(int aPort) {
+ port = aPort;
+@@ -99,7 +99,7 @@
+ 
+ /**
+ * Initialize the passwords file name
+- * @param String passwords
++ * @param aPasswordFile
+ */
+ public void setPasswordFile(String aPasswordFile) {
+ fPasswordFile = aPasswordFile;
+@@ -107,7 +107,7 @@
+ 
+ /**
+ * Initialize the cert db path name
+- * @param String CertDbPath
++ * @param aCertDbPath
+ */
+ public void setCertDbPath(String aCertDbPath) {
+ fCertDbPath = aCertDbPath;
+@@ -116,7 +116,7 @@
+ /**
+ * Initialize the name of the file to
+ * be used for testing along with full path.
+- * @param String UploadFile
++ * @param aUploadFile
+ */
+ public void setUploadFile(String aUploadFile) {
+ fUploadFile = aUploadFile;
+@@ -124,7 +124,7 @@
+ 
+ /**
+ * Enable/disable Test Cert Callback.
+- * @param boolean
++ * @param aTestCertCallback
+ */
+ public void setTestCertCallback(boolean aTestCertCallback) {
+ TestCertCallBack = aTestCertCallback;
+@@ -132,7 +132,7 @@
+ 
+ /**
+ * Set client certificate
+- * @param String Certificate Nick Name
++ * @param aClientCertNick Certificate Nick Name
+ */
+ public void setClientCertNick(String aClientCertNick) {
+ clientCertNick = aClientCertNick;
+@@ -166,7 +166,7 @@
+ 
+ /**
+ * Set EOF for closing server socket
+- * @param null for closing server socket
++ * @param fEof null for closing server socket
+ */
+ public void setEOF(String fEof) {
+ this.EOF = fEof;
+Index: jss/security/jss/org/mozilla/jss/tests/JSS_SelfServClient.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/tests/JSS_SelfServClient.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/tests/JSS_SelfServClient.java	2011-10-04 22:00:46.982107345 +0300
+@@ -327,7 +327,7 @@
+ /**
+ * Initialize the desired ciphersuite to be set
+ * on the socket.
+- * @param int Cipher
++ * @param aCipher
+ */
+ public void setCipher(int aCipher) {
+ 
+@@ -379,7 +379,7 @@
+ 
+ /**
+ * Initialize the hostname to run the server
+- * @param String ServerName
++ * @param aHostName
+ */
+ public void setHostName(String aHostName) {
+ serverHost = aHostName;
+@@ -387,7 +387,7 @@
+ 
+ /**
+ * Initialize the port to run the server
+- * @param int port
++ * @param aPort
+ */
+ public void setPort(int aPort) {
+ port = aPort;
+@@ -395,7 +395,7 @@
+ 
+ /**
+ * Initialize the passwords file name
+- * @param String passwords
++ * @param aPasswordFile
+ */
+ public void setPasswordFile(String aPasswordFile) {
+ fPasswordFile = aPasswordFile;
+@@ -403,7 +403,7 @@
+ 
+ /**
+ * Initialize the cert db path name
+- * @param String CertDbPath
++ * @param aCertDbPath
+ */
+ public void setCertDbPath(String aCertDbPath) {
+ fCertDbPath = aCertDbPath;
+@@ -411,7 +411,7 @@
+ 
+ /**
+ * Enable/disable Test Cert Callback.
+- * @param boolean
++ * @param aTestCertCallback
+ */
+ public void setTestCertCallback(boolean aTestCertCallback) {
+ TestCertCallBack = aTestCertCallback;
+@@ -419,7 +419,7 @@
+ 
+ /**
+ * Set client certificate
+- * @param String Certificate Nick Name
++ * @param aClientCertNick Certificate Nick Name
+ */
+ public void setClientCertNick(String aClientCertNick) {
+ clientCertNick = aClientCertNick;
+Index: jss/security/jss/org/mozilla/jss/tests/SSLClientAuth.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/tests/SSLClientAuth.java	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/tests/SSLClientAuth.java	2011-10-04 22:00:46.986107345 +0300
+@@ -71,7 +71,7 @@
+ * @param rand
+ * @param extensions
+ * @throws java.lang.Exception
+- * @return
++ * @return Certificate
+ */
+ public static Certificate makeCert(String issuerName, String subjectName,
+ int serialNumber, PrivateKey privKey, PublicKey pubKey, int rand,

jss-eliminate-native-compiler-warnings.patch Added

@@ -0,0 +1,629 @@
+Index: jss/security/jss/org/mozilla/jss/CryptoManager.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/CryptoManager.c	2011-10-04 21:35:23.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/CryptoManager.c	2011-10-04 21:38:22.226064623 +0300
+@@ -55,7 +55,7 @@
+ 
+ #include "pk11util.h"
+ 
+-#if defined(AIX) || defined(HPUX) || defined(LINUX)
++#if defined(AIX) || defined(HPUX)
+ #include <signal.h>
+ #endif
+ 
+@@ -106,13 +106,13 @@
+ getPWFromCallback(PK11SlotInfo *slot, PRBool retry, void *arg);
+ 
+ /*************************************************************
+- * AIX, HP, and Linux signal handling madness
++ * AIX and HP signal handling madness
+ *
+ * In order for the JVM, kernel, and NSPR to work together, we setup
+ * a signal handler for SIGCHLD that does nothing. This is only done
+- * on AIX, HP, and Linux.
++ * on AIX and HP.
+ *************************************************************/
+-#if defined(AIX) || defined(HPUX) || defined(LINUX)
++#if defined(AIX) || defined(HPUX)
+ 
+ static PRStatus
+ handleSigChild(JNIEnv *env) {
+@@ -300,8 +300,6 @@
+ jboolean cooperate)
+ {
+ SECStatus rv = SECFailure;
+- JavaVM *VMs[5];
+- jint numVMs;
+ char *szConfigDir = NULL;
+ char *szCertPrefix = NULL;
+ char *szKeyPrefix = NULL;
+Index: jss/security/jss/org/mozilla/jss/PK11Finder.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/PK11Finder.c	2011-10-04 21:35:23.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/PK11Finder.c	2011-10-04 21:38:22.230064623 +0300
+@@ -263,7 +263,7 @@
+ Java_org_mozilla_jss_CryptoManager_findPrivKeyByCertNative
+ (JNIEnv *env, jobject this, jobject Cert)
+ {
+- PRThread *pThread;
++ PRThread * VARIABLE_MAY_NOT_BE_USED pThread=NULL;
+ CERTCertificate *cert;
+ PK11SlotInfo *slot;
+ SECKEYPrivateKey *privKey=NULL;
+@@ -458,7 +458,7 @@
+ Java_org_mozilla_jss_CryptoManager_buildCertificateChainNative
+ (JNIEnv *env, jobject this, jobject leafCert)
+ {
+- PRThread *pThread;
++ PRThread * VARIABLE_MAY_NOT_BE_USED pThread=NULL;
+ CERTCertificate *leaf;
+ jobjectArray chainArray=NULL;
+ CERTCertDBHandle *certdb;
+@@ -812,7 +812,7 @@
+ SECItem *derCerts=NULL;
+ int certi= -1;
+ SECItem theDerCert;
+- int numCerts;
++ int numCerts = 0;
+ jbyte *packageBytes=NULL;
+ jsize packageLen;
+ SECStatus status;
+@@ -1486,7 +1486,7 @@
+ CERTSignedCrl *crl = NULL;
+ SECItem *packageItem = NULL;
+ int status = SECFailure;
+- char *url;
++ char *url = NULL;
+ char *errmsg = NULL;
+ 
+ /***************************************************
+@@ -1651,7 +1651,7 @@
+ Java_org_mozilla_jss_CryptoManager_verifyCertificateNowCUNative(JNIEnv *env,
+ jobject self, jstring nickString, jboolean checkSig)
+ {
+- SECStatus rv = SECFailure;
++ SECStatus VARIABLE_MAY_NOT_BE_USED rv = SECFailure;
+ SECCertificateUsage currUsage = 0x0000;
+ 
+ rv = verifyCertificateNow(env, self, nickString, checkSig, 0, &currUsage);
+@@ -1736,7 +1736,6 @@
+ SECStatus rv = SECFailure;
+ SECCertUsage certUsage;
+ SECItem *derCerts[2];
+- SECStatus status;
+ CERTCertificate **certArray = NULL;
+ CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
+ 
+Index: jss/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c	2011-10-04 21:38:22.230064623 +0300
+@@ -358,7 +358,6 @@
+ {
+ PK11SlotInfo *slot = NULL;
+ PK11SymKey *symk = NULL;
+- SECStatus status;
+ 
+ /* get the slot */
+ if( JSS_PK11_getTokenSlotPtr(env, tokenObj, &slot) != PR_SUCCESS ) {
+Index: jss/security/jss/org/mozilla/jss/crypto/PQGParams.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/crypto/PQGParams.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/crypto/PQGParams.c	2011-10-04 21:38:22.230064623 +0300
+@@ -371,7 +371,7 @@
+ /***********************************************************************
+ * Perform the verification.
+ */
+- if( PK11_PQG_VerifyParams(pParams, pVfy, &verifyResult) != PR_SUCCESS) {
++ if( PK11_PQG_VerifyParams(pParams, pVfy, &verifyResult) != SECSuccess) {
+ JSS_throw(env, OUT_OF_MEMORY_ERROR);
+ goto finish;
+ }
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11Cert.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11Cert.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11Cert.c	2011-10-04 21:38:22.230064623 +0300
+@@ -62,7 +62,7 @@
+ JNIEXPORT jbyteArray JNICALL Java_org_mozilla_jss_pkcs11_PK11Cert_getEncoded
+ (JNIEnv *env, jobject this)
+ {
+-	PRThread *pThread;
++	PRThread * VARIABLE_MAY_NOT_BE_USED pThread;
+ 	CERTCertificate *cert;
+ 	SECItem *derCert;
+ 	jbyteArray derArray=NULL;
+@@ -118,9 +118,9 @@
+ JNIEXPORT jint JNICALL Java_org_mozilla_jss_pkcs11_PK11Cert_getVersion
+ (JNIEnv *env, jobject this)
+ {
+-	PRThread *pThread;
++	PRThread * VARIABLE_MAY_NOT_BE_USED pThread;
+ 	CERTCertificate *cert;
+-	long lVersion;
++	long lVersion = 0;
+ 
+ 	pThread = PR_AttachThread(PR_SYSTEM_THREAD, 0, NULL);
+ 	PR_ASSERT(pThread != NULL);
+@@ -165,7 +165,7 @@
+ {
+ 	CERTCertificate *cert;
+ 	SECKEYPublicKey *pubk=NULL;
+-	PRThread *pThread;
++	PRThread * VARIABLE_MAY_NOT_BE_USED pThread;
+ 	jobject pubKey=NULL;
+ 
+ 	PR_ASSERT(env!=NULL && this!=NULL);
+@@ -210,7 +210,7 @@
+ (JNIEnv *env, jobject this)
+ {
+ 	CERTCertificate *cert;
+-	PRThread *pThread;
++	PRThread * VARIABLE_MAY_NOT_BE_USED pThread;
+ 
+ 	PR_ASSERT(env!=NULL && this!=NULL);
+ 
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c	2011-10-04 21:38:22.230064623 +0300
+@@ -73,7 +73,7 @@
+ SECItem *iv=NULL;
+ PK11Context *context=NULL;
+ CK_ATTRIBUTE_TYPE op;
+- jobject contextObj;
++ jobject contextObj = NULL;
+ 
+ PR_ASSERT(env!=NULL && clazz!=NULL && keyObj!=NULL && algObj!=NULL);
+ 
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c	2011-10-04 21:38:22.230064623 +0300
+@@ -196,7 +196,7 @@
+ }
+ #endif
+ 
+-static void
++static void FUNCTION_MAY_NOT_BE_USED
+ print_secitem(SECItem *item) {
+ int i;
+ int online;
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c	2011-10-04 21:38:22.230064623 +0300
+@@ -452,7 +452,7 @@
+ for (i=0; i < item->len; i++) {
+ printf(" %02x",data[i]);
+ }
+- printf(" : 0x%08x %d\n", data, item->len);
++ printf(" : %8p %d\n", data, item->len);
+ }
+ 
+ /**********************************************************************
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c	2011-10-04 21:38:22.230064623 +0300
+@@ -562,7 +562,7 @@
+ jint keyLen, jbyteArray ivBA, jint usageEnum)
+ {
+ PK11SymKey *symKey=NULL;
+- CK_MECHANISM_TYPE wrappingMech, keyTypeMech;
++ CK_MECHANISM_TYPE wrappingMech=0, keyTypeMech=0;
+ SECItem *wrappedKey=NULL, *iv=NULL, *param=NULL;
+ jobject keyObj=NULL;
+ SECKEYPrivateKey *wrappingKey=NULL;
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c	2011-10-04 21:38:22.230064623 +0300
+@@ -88,7 +88,6 @@
+ PK11Context *context = NULL;
+ CK_MECHANISM_TYPE mech;
+ SECItem param;
+- PK11SlotInfo *slot=NULL;
+ jobject contextObj=NULL;
+ 
+ mech = JSS_getPK11MechFromAlg(env, algObj);
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11Module.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11Module.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11Module.c	2011-10-04 21:38:22.230064623 +0300
+@@ -254,7 +254,7 @@
+ {
+ SECMODModule *module;
+ 
+- if (JSS_getPtrFromProxy(env, this, &module) != PR_SUCCESS) {
++ if (JSS_getPtrFromProxy(env, this, (void **)&module) != PR_SUCCESS) {
+ ASSERT_OUTOFMEM(env);
+ goto finish;
+ }
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c	2011-10-04 21:38:22.234064623 +0300
+@@ -174,7 +174,7 @@
+ Java_org_mozilla_jss_pkcs11_PK11PrivKey_getKeyType
+ (JNIEnv *env, jobject this)
+ {
+- PRThread *pThread;
++ PRThread * VARIABLE_MAY_NOT_BE_USED pThread;
+ SECKEYPrivateKey *privk;
+ KeyType keyType;
+ char* keyTypeFieldName;
+@@ -259,7 +259,7 @@
+ (JNIEnv *env, jobject this)
+ {
+ SECKEYPrivateKey *privk;
+- PRThread *pThread;
++ PRThread * VARIABLE_MAY_NOT_BE_USED pThread;
+ 
+ PR_ASSERT(env!=NULL && this!=NULL);
+ 
+@@ -358,7 +358,6 @@
+ (JNIEnv *env, jobject this)
+ {
+ SECKEYPrivateKey *key = NULL;
+- PK11SlotInfo *slot = NULL;
+ SECItem *idItem = NULL;
+ jbyteArray byteArray = NULL;
+ 
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c	2011-10-04 21:38:22.234064623 +0300
+@@ -62,7 +62,7 @@
+ (JNIEnv *env, jobject this)
+ {
+ SECKEYPublicKey *pubk;
+- PRThread *pThread;
++ PRThread * VARIABLE_MAY_NOT_BE_USED pThread;
+ 
+ PR_ASSERT(env!=NULL && this!=NULL);
+ 
+@@ -179,7 +179,7 @@
+ Java_org_mozilla_jss_pkcs11_PK11PubKey_verifyKeyIsOnToken
+ (JNIEnv *env, jobject this, jobject token)
+ {
+-	PRThread *pThread;
++ PRThread * VARIABLE_MAY_NOT_BE_USED pThread;
+ 	SECKEYPublicKey *key = NULL;
+ 	PK11SlotInfo *slot = NULL;
+ 	PK11SlotInfo *keySlot = NULL;
+@@ -231,7 +231,7 @@
+ Java_org_mozilla_jss_pkcs11_PK11PubKey_getKeyType
+ (JNIEnv *env, jobject this)
+ {
+- PRThread *pThread;
++ PRThread * VARIABLE_MAY_NOT_BE_USED pThread;
+ SECKEYPublicKey *pubk;
+ KeyType keyType;
+ char* keyTypeFieldName;
+@@ -454,7 +454,7 @@
+ {
+ SECKEYPublicKey *pubk;
+ jbyteArray byteArray=NULL;
+- SECItem *item;
++ SECItem *item=NULL;
+ 
+ PR_ASSERT(env!=NULL && this!=NULL);
+ 
+@@ -526,7 +526,6 @@
+ {
+ jobject pubkObj=NULL;
+ SECKEYPublicKey *pubk=NULL;
+- SECStatus rv;
+ SECItem *pubkDER=NULL;
+ 
+ /* validate args */
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11SecureRandom.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11SecureRandom.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11SecureRandom.c	2011-10-04 21:38:22.234064623 +0300
+@@ -112,7 +112,7 @@
+ * "C" data members
+ */
+ 
+- PRThread* pThread = NULL;
++ PRThread* VARIABLE_MAY_NOT_BE_USED pThread = NULL;
+ SECStatus status = PR_FALSE;
+ PK11SlotInfo* slot = NULL;
+ 
+@@ -262,7 +262,7 @@
+ * "C" data members
+ */
+ 
+- PRThread* pThread = NULL;
++ PRThread* VARIABLE_MAY_NOT_BE_USED pThread = NULL;
+ SECStatus status = PR_FALSE;
+ 
+ 
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11Store.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11Store.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11Store.c	2011-10-04 21:38:22.234064623 +0300
+@@ -319,7 +319,7 @@
+ (JNIEnv *env, jobject this, jobject certObject)
+ {
+ CERTCertificate *cert;
+- SECStatus status;
++ SECStatus VARIABLE_MAY_NOT_BE_USED status;
+ 
+ PR_ASSERT(env!=NULL && this!=NULL);
+ if(certObject == NULL) {
+@@ -349,7 +349,7 @@
+ (JNIEnv *env, jobject this, jobject certObject)
+ {
+ CERTCertificate *cert;
+- SECStatus status;
++ SECStatus VARIABLE_MAY_NOT_BE_USED status;
+ 
+ PR_ASSERT(env!=NULL && this!=NULL);
+ if(certObject == NULL) {
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11SymKey.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11SymKey.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11SymKey.c	2011-10-04 21:38:22.234064623 +0300
+@@ -233,7 +233,7 @@
+ jfieldID typeField=NULL;
+ jobject typeObject=NULL;
+ 
+- if( JSS_PK11_getSymKeyPtr(env, this, &key) != SECSuccess ) {
++ if( JSS_PK11_getSymKeyPtr(env, this, &key) != PR_SUCCESS ) {
+ ASSERT_OUTOFMEM(env);
+ goto finish;
+ }
+Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11Token.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/pkcs11/PK11Token.c	2011-10-04 21:38:22.234064623 +0300
+@@ -961,9 +961,9 @@
+ jstring keyType, jbyteArray P, jbyteArray Q, jbyteArray G)
+ {
+ PK11SlotInfo *slot;
+- const char* c_subject;
++ const char* c_subject=NULL;
+ jboolean isCopy;
+- unsigned char *b64request;
++ unsigned char *b64request=NULL;
+ SECItem p, q, g;
+ PQGParams *dsaParams=NULL;
+ const char* c_keyType;
+@@ -1080,7 +1080,7 @@
+ 	SECStatus rv;
+ 	PRArenaPool *arena;
+ 	SECItem result_der, result;
+-	SECItem *blob;
++	SECItem * VARIABLE_MAY_NOT_BE_USED blob;
+ 	CK_MECHANISM_TYPE signMech;
+ 	CK_MECHANISM_TYPE keygenMech;
+ 
+Index: jss/security/jss/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.c	2011-10-04 21:38:22.234064623 +0300
+@@ -89,7 +89,6 @@
+ SECKEYPublicKeyList* pubkList = NULL;
+ PK11SymKey *symKey = NULL;
+ CERTCertList *certList = NULL;
+- SECStatus secstat;
+ 
+ /*
+ * Get all private keys
+@@ -508,7 +507,6 @@
+ {
+ PK11SlotInfo *slot;
+ EngineGetCertificateCBInfo cbinfo = {NULL,NULL};
+- jbyteArray derCertBA = NULL;
+ PRStatus status = PR_FAILURE;
+ 
+ if( alias == NULL ) goto finish;
+@@ -813,7 +811,6 @@
+ PK11SlotInfo *slot;
+ EngineGetCertificateCBInfo cbinfo = {NULL,NULL};
+ jboolean retVal = JNI_FALSE;
+- SECKEYPrivateKey *privk = NULL;
+ 
+ if( alias == NULL ) goto finish;
+ 
+Index: jss/security/jss/org/mozilla/jss/ssl/SSLSocket.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/ssl/SSLSocket.c	2011-10-04 21:35:23.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/ssl/SSLSocket.c	2011-10-04 21:38:22.234064623 +0300
+@@ -397,7 +397,7 @@
+ {
+ PRSocketOptionData sockOptions;
+ JSSL_SocketData *sock = NULL;
+- jint retval;
++ jint retval=-1;
+ PRStatus status;
+ 
+ if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS ) {
+@@ -874,7 +874,7 @@
+ Java_org_mozilla_jss_ssl_SSLSocket_socketAvailable(
+ JNIEnv *env, jobject self)
+ {
+- jint available;
++ jint available=0;
+ JSSL_SocketData *sock = NULL;
+ 
+ if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS ) {
+Index: jss/security/jss/org/mozilla/jss/ssl/common.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/ssl/common.c	2011-10-04 21:35:23.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/ssl/common.c	2011-10-04 21:38:22.234064623 +0300
+@@ -64,7 +64,7 @@
+ jmethodID excepCons;
+ jobject excepObj;
+ jstring msgString;
+- jint result;
++ jint VARIABLE_MAY_NOT_BE_USED result;
+ 
+ /*
+ * get the error code and error string
+@@ -149,8 +149,8 @@
+ jbyteArray sdArray = NULL;
+ JSSL_SocketData *sockdata = NULL;
+ SECStatus status;
+- PRFileDesc *newFD;
+- PRFileDesc *tmpFD;
++ PRFileDesc *newFD = NULL;
++ PRFileDesc *tmpFD = NULL;
+ PRFilePrivate *priv = NULL;
+ int socketFamily = 0;
+ 
+@@ -633,7 +633,7 @@
+ SECStatus status = SECSuccess;
+ PRBool bOption = PR_FALSE;
+ 
+- if( JSSL_getSockData(env, self, &sock) != SECSuccess ) {
++ if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS ) {
+ goto finish;
+ }
+ 
+@@ -655,7 +655,7 @@
+ (JNIEnv *env, jobject self, PRNetAddr *addr, LocalOrPeer localOrPeer)
+ {
+ JSSL_SocketData *sock = NULL;
+- PRStatus status;
++ PRStatus status=PR_FAILURE;
+ 
+ /* get my fd */
+ if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS ) {
+@@ -899,7 +899,7 @@
+ 
+ finish:
+ if( currentExcep != NULL && (*env)->ExceptionOccurred(env) == NULL) {
+- int ret = (*env)->Throw(env, currentExcep);
++ int VARIABLE_MAY_NOT_BE_USED ret = (*env)->Throw(env, currentExcep);
+ PR_ASSERT(ret == 0);
+ }
+ }
+Index: jss/security/jss/org/mozilla/jss/ssl/javasock.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/ssl/javasock.c	2011-10-04 21:35:23.274058938 +0300
++++ jss/security/jss/org/mozilla/jss/ssl/javasock.c	2011-10-04 21:38:22.238064623 +0300
+@@ -92,7 +92,7 @@
+ jmethodID getOutputStream, writeMethod;
+ jclass sockClass, osClass;
+ jobject outputStream;
+- jint arrayLen;
++ jint arrayLen=-1;
+ PRInt32 retval;
+ 
+ /*
+@@ -211,7 +211,7 @@
+ jobject sockObj;
+ JNIEnv *env;
+ jbyteArray outbufArray;
+- PRInt32 retval;
++ PRInt32 retval=-1;
+ 
+ if( GET_ENV(fd->secret->javaVM, env) ) goto finish;
+ 
+@@ -500,7 +500,7 @@
+ jsock_recv(PRFileDesc *fd, void *buf, PRInt32 amount,
+ PRIntn flags, PRIntervalTime timeout)
+ {
+- PRInt32 retval;
++ PRInt32 retval=-1;
+ JNIEnv *env;
+ jobject sockObj;
+ jbyteArray byteArray;
+@@ -637,7 +637,7 @@
+ {
+ jclass sockClass;
+ jmethodID method;
+- jint retval;
++ jint retval=0;
+ 
+ sockClass = (*env)->GetObjectClass(env, sock);
+ if( sockClass == NULL ) goto finish;
+@@ -1001,12 +1001,6 @@
+ (PRReservedFN) invalidInt
+ };
+ 
+-static const PRIOMethods*
+-getJsockMethods()
+-{
+- return &jsockMethods;
+-}
+-
+ static void
+ jsockDestructor(PRFileDesc *fd)
+ {
+Index: jss/security/jss/org/mozilla/jss/util/jssutil.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/util/jssutil.c	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/util/jssutil.c	2011-10-04 21:38:22.238064623 +0300
+@@ -115,7 +115,7 @@
+ JSS_throwMsg(JNIEnv *env, char *throwableClassName, char *message) {
+ 
+ jclass throwableClass;
+- jint result;
++ jint VARIABLE_MAY_NOT_BE_USED result;
+ 
+ /* validate arguments */
+ PR_ASSERT(env!=NULL && throwableClassName!=NULL && message!=NULL);
+@@ -156,7 +156,7 @@
+ jclass throwableClass;
+ jobject throwable;
+ jmethodID constructor;
+- jint result;
++ jint VARIABLE_MAY_NOT_BE_USED result;
+ 
+ PR_ASSERT( (*env)->ExceptionOccurred(env) == NULL );
+ 
+@@ -222,7 +222,9 @@
+ PRStatus
+ JSS_getPtrFromProxy(JNIEnv *env, jobject nativeProxy, void **ptr)
+ {
++#ifdef DEBUG
+ jclass nativeProxyClass;
++#endif
+ 	jclass proxyClass;
+ jfieldID byteArrayField;
+ jbyteArray byteArray;
+@@ -745,7 +747,7 @@
+ void
+ JSS_assertOutOfMem(JNIEnv *env)
+ {
+- jclass memErrClass;
++ jclass VARIABLE_MAY_NOT_BE_USED memErrClass;
+ jthrowable excep;
+ 
+ PR_ASSERT(env != NULL);
+@@ -804,7 +806,7 @@
+ goto finish;
+ }
+ 
+- (*env)->SetByteArrayRegion(env, array, 0, item->len, item->data);
++ (*env)->SetByteArrayRegion(env, array, 0, item->len, (jbyte*)item->data);
+ 
+ finish:
+ return array;
+Index: jss/security/jss/org/mozilla/jss/util/jssutil.h
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/util/jssutil.h	2011-10-04 20:07:40.000000000 +0300
++++ jss/security/jss/org/mozilla/jss/util/jssutil.h	2011-10-04 21:38:22.238064623 +0300
+@@ -36,6 +36,19 @@
+ #ifndef JSS_NATIVE_UTIL_H
+ #define JSS_NATIVE_UTIL_H
+ 
++/* The following #defines are used to suppress undesired compiler warnings
++ * that have been deemed inappropriate.
++ *
++ * IMPORTANT: These are ONLY used on an "as-needed" basis!
++ */
++#ifdef __GNUC__
++#define FUNCTION_MAY_NOT_BE_USED __attribute__ ((unused))
++#define VARIABLE_MAY_NOT_BE_USED __attribute__ ((unused))
++#else
++#define FUNCTION_MAY_NOT_BE_USED
++#define VARIABLE_MAY_NOT_BE_USED
++#endif
++
+ /* Need to include these first.
+ * #include <nspr.h>
+ * #include <jni.h>

jss-eliminate-native-coverity-defects.patch Added

@@ -0,0 +1,253 @@
+diff -rupN jss-4.2.6.orig/mozilla/security/coreconf/nsinstall/pathsub.c jss-4.2.6/mozilla/security/coreconf/nsinstall/pathsub.c
+--- a/security/coreconf/nsinstall/pathsub.c	2004-04-25 08:02:18.000000000 -0700
++++ b/security/coreconf/nsinstall/pathsub.c	2011-09-17 18:37:39.875900000 -0700
+@@ -275,9 +275,11 @@ diagnosePath(const char * path)
+ 	 rv = readlink(myPath, buf, sizeof buf);
+ 	 if (rv < 0) {
+ 	 	perror("readlink");
+-		buf[0] = 0;
+-	 } else {
++	 	buf[0] = 0;
++	 } else if ( rv < BUFSIZ ) {
+ 	 	buf[rv] = 0;
++	 } else {
++	 	buf[BUFSIZ-1] = 0;
+ 	 }
+ 	 fprintf(stderr, "%s is a link to %s\n", myPath, buf);
+ 	} else if (S_ISDIR(sb.st_mode)) {
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/CryptoManager.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.c
+--- a/security/jss/org/mozilla/jss/CryptoManager.c	2011-09-17 17:33:08.823975000 -0700
++++ b/security/jss/org/mozilla/jss/CryptoManager.c	2011-09-17 20:09:35.446977000 -0700
+@@ -728,14 +728,14 @@ getPWFromCallback(PK11SlotInfo *slot, PR
+ }
+ 
+ finish:
+- if( (exception=(*env)->ExceptionOccurred(env)) != NULL) {
+ #ifdef DEBUG
++ if( (exception=(*env)->ExceptionOccurred(env)) != NULL) {
+ jclass giveupClass;
+ jmethodID printStackTrace;
+ jclass excepClass;
+-#endif
++
+ (*env)->ExceptionClear(env);
+-#ifdef DEBUG
++
+ giveupClass = (*env)->FindClass(env, GIVE_UP_EXCEPTION);
+ PR_ASSERT(giveupClass != NULL);
+ if( ! (*env)->IsInstanceOf(env, exception, giveupClass) ) {
+@@ -746,8 +746,12 @@ finish:
+ PR_ASSERT( PR_FALSE );
+ }
+ PR_ASSERT(returnchars==NULL);
+-#endif
+ }
++#else
++ if( ((*env)->ExceptionOccurred(env)) != NULL) {
++ (*env)->ExceptionClear(env);
++ }
++#endif
+ return returnchars;
+ }
+ 
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/PK11Finder.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/PK11Finder.c
+--- a/security/jss/org/mozilla/jss/PK11Finder.c	2011-09-17 17:33:08.834976000 -0700
++++ b/security/jss/org/mozilla/jss/PK11Finder.c	2011-09-19 16:51:46.438021000 -0700
+@@ -768,6 +768,10 @@ static int find_leaf_cert(
+ int *linked = NULL;
+ 
+ linked = PR_Malloc( sizeof(int) * numCerts );
++ if (linked == NULL) {
++ status = 0;
++ goto finish;
++ }
+ 
+ /* initialize the bitmap */
+ for (i = 0; i < numCerts; i++) {
+@@ -1735,7 +1739,7 @@ Java_org_mozilla_jss_CryptoManager_verif
+ {
+ SECStatus rv = SECFailure;
+ SECCertUsage certUsage;
+- SECItem *derCerts[2];
++ SECItem *derCerts[2] = { NULL, NULL };
+ CERTCertificate **certArray = NULL;
+ CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
+ 
+@@ -1749,7 +1753,6 @@ Java_org_mozilla_jss_CryptoManager_verif
+ }
+ PR_ASSERT(certdb != NULL);
+ 
+- derCerts[0] = NULL;
+ derCerts[0] = JSS_ByteArrayToSECItem(env, packageArray);
+ derCerts[1] = NULL;
+ 
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/crypto/Algorithm.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/Algorithm.c
+--- a/security/jss/org/mozilla/jss/crypto/Algorithm.c	2011-09-17 17:33:08.708976000 -0700
++++ b/security/jss/org/mozilla/jss/crypto/Algorithm.c	2011-09-17 19:37:52.834292000 -0700
+@@ -235,7 +235,7 @@ static PRStatus
+ getAlgInfo(JNIEnv *env, jobject alg, JSS_AlgInfo *info)
+ {
+ jint index;
+- PRStatus status;
++ PRStatus status = PR_FAILURE;
+ 
+ PR_ASSERT(env!=NULL && alg!=NULL && info!=NULL);
+ 
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c	2011-09-17 17:33:08.970975000 -0700
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c	2011-09-17 19:47:21.850722000 -0700
+@@ -181,7 +181,7 @@ Java_org_mozilla_jss_pkcs11_PK11MessageD
+ PK11Context *context=NULL;
+ jbyte *bytes=NULL;
+ SECStatus status;
+- unsigned int outLen;
++ unsigned int outLen = 0;
+ 
+ if( JSS_PK11_getCipherContext(env, proxyObj, &context) != PR_SUCCESS) {
+ /* exception was thrown */
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c	2011-09-17 17:33:09.013977000 -0700
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c	2011-09-17 18:16:40.231161000 -0700
+@@ -273,6 +273,7 @@ Java_org_mozilla_jss_pkcs11_PK11PubKey_g
+ break;
+ case keaKey:
+ keyTypeFieldName = KEA_KEYTYPE_FIELD;
++ break;
+ default:
+ PR_ASSERT(PR_FALSE);
+ keyTypeFieldName = NULL_KEYTYPE_FIELD;
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Store.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Store.c
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Store.c	2011-09-17 17:33:09.032977000 -0700
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Store.c	2011-09-17 19:48:57.776628000 -0700
+@@ -390,12 +390,6 @@ importPrivateKey
+ SECStatus status;
+ SECItem nickname;
+ 
+- keyType = JSS_PK11_getKeyType(env, keyTypeObj);
+- if( keyType == nullKey ) {
+- /* exception was thrown */
+- goto finish;
+- }
+-
+ /*
+ * initialize so we can goto finish
+ */
+@@ -403,6 +397,12 @@ importPrivateKey
+ derPK.len = 0;
+ 
+ 
++ keyType = JSS_PK11_getKeyType(env, keyTypeObj);
++ if( keyType == nullKey ) {
++ /* exception was thrown */
++ goto finish;
++ }
++
+ PR_ASSERT(env!=NULL && this!=NULL);
+ 
+ if(keyArray == NULL) {
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c	2011-09-17 17:33:09.050976000 -0700
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c	2011-09-17 19:53:46.184339000 -0700
+@@ -962,12 +962,12 @@ JNIEXPORT jstring JNICALL Java_org_mozil
+ {
+ PK11SlotInfo *slot;
+ const char* c_subject=NULL;
+- jboolean isCopy;
++ jboolean isCopy = JNI_FALSE;
+ unsigned char *b64request=NULL;
+ SECItem p, q, g;
+ PQGParams *dsaParams=NULL;
+ const char* c_keyType;
+- jboolean k_isCopy;
++ jboolean k_isCopy = JNI_FALSE;
+ SECOidTag signType = SEC_OID_UNKNOWN;
+ PK11RSAGenParams rsaParams;
+ void *params = NULL;
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c
+--- a/security/jss/org/mozilla/jss/ssl/SSLSocket.c	2011-09-17 17:33:09.073977000 -0700
++++ b/security/jss/org/mozilla/jss/ssl/SSLSocket.c	2011-09-17 19:56:20.428184000 -0700
+@@ -516,11 +516,6 @@ Java_org_mozilla_jss_ssl_SSLSocket_socke
+ goto finish;
+ }
+ 
+- if( addrBAelems == NULL ) {
+- ASSERT_OUTOFMEM(env);
+- goto finish;
+- }
+-
+ if(addrBALen != 4 && addrBALen != 16) {
+ JSSL_throwSSLSocketException(env, "Invalid address in connect!");
+ goto finish;
+@@ -720,7 +715,7 @@ Java_org_mozilla_jss_ssl_SSLSocket_getCi
+ {
+ JSSL_SocketData *sock=NULL;
+ SECStatus status;
+- PRBool enabled;
++ PRBool enabled = PR_FAILURE;
+ 
+ /* get the fd */
+ if( JSSL_getSockData(env, sockObj, &sock) != PR_SUCCESS) {
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/ssl/callbacks.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/callbacks.c
+--- a/security/jss/org/mozilla/jss/ssl/callbacks.c	2004-09-03 11:32:03.000000000 -0700
++++ b/security/jss/org/mozilla/jss/ssl/callbacks.c	2011-09-17 18:15:07.825252000 -0700
+@@ -684,17 +684,13 @@ JSSL_ConfirmExpiredPeerCert(void *arg, P
+ * Now check the name field in the cert against the desired hostname.
+ * NB: This is our only defense against Man-In-The-Middle (MITM) attacks!
+ */
+- if( peerCert == NULL ) {
+- rv = SECFailure;
++ char* hostname = NULL;
++ hostname = SSL_RevealURL(fd); /* really is a hostname, not a URL */
++ if (hostname && hostname[0]) {
++ rv = CERT_VerifyCertName(peerCert, hostname);
++ PORT_Free(hostname);
+ } else {
+- char* hostname = NULL;
+- hostname = SSL_RevealURL(fd); /* really is a hostname, not a URL */
+- if (hostname && hostname[0]) {
+- rv = CERT_VerifyCertName(peerCert, hostname);
+- PORT_Free(hostname);
+- } else {
+- rv = SECFailure;
+- }
++ rv = SECFailure;
+ }
+ }
+ 
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c
+--- a/security/jss/org/mozilla/jss/ssl/javasock.c	2011-09-17 17:33:09.094977000 -0700
++++ b/security/jss/org/mozilla/jss/ssl/javasock.c	2011-09-17 19:16:38.546566000 -0700
+@@ -95,6 +95,10 @@ writebuf(JNIEnv *env, PRFileDesc *fd, jo
+ jint arrayLen=-1;
+ PRInt32 retval;
+ 
++ if( env == NULL ) {
++ goto finish;
++ }
++
+ /*
+ * get the OutputStream
+ */
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/util/NativeErrcodes.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/util/NativeErrcodes.c
+--- a/security/jss/org/mozilla/jss/util/NativeErrcodes.c	2002-07-03 17:25:46.000000000 -0700
++++ b/security/jss/org/mozilla/jss/util/NativeErrcodes.c	2011-09-18 23:02:28.130883000 -0700
+@@ -427,6 +427,7 @@ JSS_ConvertNativeErrcodeToJava(PRErrorCo
+ #endif
+ 
+ key.native = nativeErrcode;
++ key.java = -1;
+ target = bsearch( &key, errcodeTable, numErrcodes, sizeof(Errcode),
+ errcodeCompare );
+ 
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/util/jssutil.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/util/jssutil.c
+--- a/security/jss/org/mozilla/jss/util/jssutil.c	2011-09-17 17:33:09.103977000 -0700
++++ b/security/jss/org/mozilla/jss/util/jssutil.c	2011-09-19 16:38:19.428634000 -0700
+@@ -529,7 +529,7 @@ JSS_wipeCharArray(char* array)
+ */
+ static char* getPWFromConsole()
+ {
+- char c;
++ int c;
+ char *ret;
+ int i;
+ char buf[200]; /* no buffer overflow: we bail after 200 chars */

jss-ipv6.patch Added

@@ -0,0 +1,643 @@
+Index: mozilla/security/jss/lib/jss.def
+===================================================================
+RCS file: /cvsroot/mozilla/security/jss/lib/jss.def,v
+retrieving revision 1.45
+diff -u -p -r1.45 jss.def
+--- mozilla/security/jss/lib/jss.def	25 Sep 2009 16:38:04 -0000	1.45
++++ mozilla/security/jss/lib/jss.def	11 Apr 2011 12:34:43 -0000
+@@ -175,6 +175,7 @@ Java_org_mozilla_jss_ssl_SSLServerSocket
+ Java_org_mozilla_jss_ssl_SSLSocket_forceHandshake;
+ Java_org_mozilla_jss_ssl_SSLSocket_getKeepAlive;
+ Java_org_mozilla_jss_ssl_SSLSocket_getLocalAddressNative;
++Java_org_mozilla_jss_ssl_SocketBase_getLocalAddressByteArrayNative;
+ Java_org_mozilla_jss_ssl_SSLSocket_getPort;
+ Java_org_mozilla_jss_ssl_SSLSocket_getReceiveBufferSize;
+ Java_org_mozilla_jss_ssl_SSLSocket_getSendBufferSize;
+@@ -199,6 +200,7 @@ Java_org_mozilla_jss_ssl_SSLSocket_socke
+ Java_org_mozilla_jss_ssl_SSLSocket_socketWrite;
+ Java_org_mozilla_jss_ssl_SocketBase_getLocalPortNative;
+ Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressNative;
++Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressByteArrayNative;
+ Java_org_mozilla_jss_ssl_SocketBase_setClientCertNicknameNative;
+ Java_org_mozilla_jss_ssl_SocketBase_requestClientAuthNoExpiryCheckNative;
+ Java_org_mozilla_jss_ssl_SocketBase_setSSLOption;
+Index: mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java
+===================================================================
+RCS file: /cvsroot/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java,v
+retrieving revision 1.27
+diff -u -p -r1.27 SSLServerSocket.java
+--- mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java	1 Mar 2010 21:57:01 -0000	1.27
++++ mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java	11 Apr 2011 12:34:44 -0000
+@@ -36,7 +36,8 @@
+ 
+ package org.mozilla.jss.ssl;
+ 
+-import java.net.InetAddress;
++import java.util.*;
++import java.net.*;
+ import java.io.IOException;
+ import java.net.Socket;
+ import java.net.SocketException;
+@@ -138,34 +139,34 @@ public class SSLServerSocket extends jav
+ super.close();
+ 
+ // create the socket
++
++ int socketFamily = SocketBase.SSL_AF_INET;
++ if(SocketBase.supportsIPV6()) {
++ socketFamily = SocketBase.SSL_AF_INET6;
++ }
++
+ sockProxy = new SocketProxy(
+- base.socketCreate(this, certApprovalCallback, null) );
++ base.socketCreate(this, certApprovalCallback, null,socketFamily) );
+ 
+ base.setProxy(sockProxy);
+ 
+ setReuseAddress(reuseAddr);
+ 
+- // bind it to the local address and port
+- if( bindAddr == null ) {
+- bindAddr = anyLocalAddr;
+- }
+ byte[] bindAddrBA = null;
+ if( bindAddr != null ) {
+ bindAddrBA = bindAddr.getAddress();
+ }
+ base.socketBind(bindAddrBA, port);
++
++ String hostName = null;
++ if(bindAddr != null) {
++ hostName = bindAddr.getCanonicalHostName();
++ }
+ socketListen(backlog);
+ }
+ 
+ private native void socketListen(int backlog) throws SocketException;
+ 
+- private static InetAddress anyLocalAddr;
+- static {
+- try {
+- anyLocalAddr = InetAddress.getByName("0.0.0.0");
+- } catch (java.net.UnknownHostException e) { }
+- }
+-
+ /**
+ * Accepts a connection. This call will block until a connection is made
+ * or the timeout is reached.
+Index: mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c,v
+retrieving revision 1.26
+diff -u -p -r1.26 SSLSocket.c
+--- mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c	9 May 2007 01:40:14 -0000	1.26
++++ mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c	11 Apr 2011 12:34:44 -0000
+@@ -460,10 +460,15 @@ Java_org_mozilla_jss_ssl_SSLSocket_socke
+ JSSL_SocketData *sock;
+ PRNetAddr addr;
+ jbyte *addrBAelems = NULL;
++ int addrBALen = 0; 
+ PRStatus status;
+ int stat;
+ const char *hostnameStr=NULL;
+ 
++ jmethodID supportsIPV6ID;
++ jclass socketBaseClass;
++ jboolean supportsIPV6 = 0;
++
+ if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS) {
+ /* exception was thrown */
+ goto finish;
+@@ -472,16 +477,32 @@ Java_org_mozilla_jss_ssl_SSLSocket_socke
+ /*
+ * setup the PRNetAddr structure
+ */
+- addr.inet.family = AF_INET;
+- addr.inet.port = htons(port);
+- PR_ASSERT(sizeof(addr.inet.ip) == 4);
+- PR_ASSERT( (*env)->GetArrayLength(env, addrBA) == 4);
++
++ socketBaseClass = (*env)->FindClass(env, SOCKET_BASE_NAME);
++ if( socketBaseClass == NULL ) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++ supportsIPV6ID = (*env)->GetStaticMethodID(env, socketBaseClass,
++ SUPPORTS_IPV6_NAME, SUPPORTS_IPV6_SIG);
++
++ if( supportsIPV6ID == NULL ) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++
++ supportsIPV6 = (*env)->CallStaticBooleanMethod(env, socketBaseClass,
++ supportsIPV6ID);
++
+ addrBAelems = (*env)->GetByteArrayElements(env, addrBA, NULL);
++ addrBALen = (*env)->GetArrayLength(env, addrBA);
++
++ PR_ASSERT(addrBALen != 0);
++
+ if( addrBAelems == NULL ) {
+ ASSERT_OUTOFMEM(env);
+ goto finish;
+ }
+- memcpy(&addr.inet.ip, addrBAelems, 4);
+ 
+ /*
+ * Tell SSL the URL we think we want to connect to.
+@@ -495,6 +516,38 @@ Java_org_mozilla_jss_ssl_SSLSocket_socke
+ goto finish;
+ }
+ 
++ if( addrBAelems == NULL ) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++
++ if(addrBALen != 4 && addrBALen != 16) {
++ JSSL_throwSSLSocketException(env, "Invalid address in connect!");
++ goto finish;
++ }
++
++ if( addrBALen == 4) {
++ addr.inet.family = AF_INET;
++ addr.inet.port = PR_htons(port);
++ memcpy(&addr.inet.ip, addrBAelems, 4);
++
++ if(supportsIPV6) {
++ addr.ipv6.family = AF_INET6;
++ addr.ipv6.port = PR_htons(port);
++ PR_ConvertIPv4AddrToIPv6(addr.inet.ip,&addr.ipv6.ip);
++ }
++
++ } else { /* Must be 16 and ipv6 */
++ if(supportsIPV6) {
++ addr.ipv6.family = AF_INET6;
++ addr.ipv6.port = PR_htons(port);
++ memcpy(&addr.ipv6.ip,addrBAelems, 16);
++ } else {
++ JSSL_throwSSLSocketException(env, "Invalid address in connect!");
++ goto finish;
++ }
++ }
++
+ /*
+ * make the connect call
+ */
+Index: mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java
+===================================================================
+RCS file: /cvsroot/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java,v
+retrieving revision 1.32
+diff -u -p -r1.32 SSLSocket.java
+--- mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java	1 Mar 2010 21:57:01 -0000	1.32
++++ mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java	11 Apr 2011 12:34:44 -0000
+@@ -251,11 +251,16 @@ public class SSLSocket extends java.net.
+ SSLClientCertificateSelectionCallback clientCertSelectionCallback)
+ throws IOException
+ {
++
++ int socketFamily = SocketBase.SSL_AF_INET;
++ if(SocketBase.supportsIPV6()) {
++ socketFamily = SocketBase.SSL_AF_INET6;
++ }
+ // create the socket
+ sockProxy =
+ new SocketProxy(
+ base.socketCreate(
+- this, certApprovalCallback, clientCertSelectionCallback) );
++ this, certApprovalCallback, clientCertSelectionCallback,socketFamily) );
+ 
+ base.setProxy(sockProxy);
+ 
+@@ -296,7 +301,7 @@ public class SSLSocket extends java.net.
+ new SocketProxy(
+ base.socketCreate(
+ this, certApprovalCallback, clientCertSelectionCallback,
+- s, host ) );
++ s, host,SocketBase.SSL_AF_INET ) );
+ 
+ base.setProxy(sockProxy);
+ resetHandshake();
+Index: mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java
+===================================================================
+RCS file: /cvsroot/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java,v
+retrieving revision 1.19
+diff -u -p -r1.19 SocketBase.java
+--- mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java	1 Mar 2010 21:57:01 -0000	1.19
++++ mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java	11 Apr 2011 12:34:44 -0000
+@@ -70,16 +70,16 @@ class SocketBase {
+ native byte[] socketCreate(Object socketObject,
+ SSLCertificateApprovalCallback certApprovalCallback,
+ SSLClientCertificateSelectionCallback clientCertSelectionCallback,
+- java.net.Socket javaSock, String host)
++ java.net.Socket javaSock, String host,int family)
+ throws SocketException;
+ 
+ byte[] socketCreate(Object socketObject,
+ SSLCertificateApprovalCallback certApprovalCallback,
+- SSLClientCertificateSelectionCallback clientCertSelectionCallback)
++ SSLClientCertificateSelectionCallback clientCertSelectionCallback,int family)
+ throws SocketException
+ {
+ return socketCreate(socketObject, certApprovalCallback,
+- clientCertSelectionCallback, null, null);
++ clientCertSelectionCallback, null, null,family);
+ }
+ 
+ native void socketBind(byte[] addrBA, int port) throws SocketException;
+@@ -122,6 +122,10 @@ class SocketBase {
+ static final int SSL_RENEGOTIATE_TRANSITIONAL = 27;
+ static final int SSL_REQUIRE_SAFE_NEGOTIATION = 28;
+ 
++
++ static final int SSL_AF_INET = 50;
++ static final int SSL_AF_INET6 = 51;
++
+ void close() throws IOException {
+ socketClose();
+ }
+@@ -327,13 +331,25 @@ class SocketBase {
+ return in;
+ }
+ 
++ private native byte[] getLocalAddressByteArrayNative() throws SocketException;
++ private native byte[] getPeerAddressByteArrayNative() throws SocketException;
+ /**
+ * @return the InetAddress of the peer end of the socket.
+ */
+ InetAddress getInetAddress()
+ {
+ try {
+- return convertIntToInetAddress( getPeerAddressNative() );
++ byte[] address = getPeerAddressByteArrayNative(); 
++
++ InetAddress iAddr = null;
++
++ try {
++
++ iAddr = InetAddress.getByAddress(address);
++ } catch(UnknownHostException e) {
++ }
++
++ return iAddr;
+ } catch(SocketException e) {
+ return null;
+ }
+@@ -345,7 +361,17 @@ class SocketBase {
+ */
+ InetAddress getLocalAddress() {
+ try {
+- return convertIntToInetAddress( getLocalAddressNative() );
++ byte[] address = getLocalAddressByteArrayNative();
++
++ InetAddress lAddr = null;
++
++ try {
++
++ lAddr = InetAddress.getByAddress(address);
++ } catch(UnknownHostException e) {
++ }
++
++ return lAddr;
+ } catch(SocketException e) {
+ return null;
+ }
+@@ -424,4 +450,45 @@ class SocketBase {
+ return topException;
+ }
+ }
++ 
++ static private int supportsIPV6 = -1;
++ static boolean supportsIPV6() {
++
++ if(supportsIPV6 >= 0) {
++ if(supportsIPV6 > 0) {
++ return true;
++ } else {
++ return false;
++ } 
++ }
++
++ Enumeration netInter;
++ try {
++ netInter = NetworkInterface.getNetworkInterfaces();
++ } catch (SocketException e) {
++
++ return false;
++ }
++ while ( netInter.hasMoreElements() )
++ {
++ NetworkInterface ni = (NetworkInterface)netInter.nextElement();
++ Enumeration addrs = ni.getInetAddresses();
++ while ( addrs.hasMoreElements() )
++ {
++ Object o = addrs.nextElement();
++ if ( o.getClass() == InetAddress.class ||
++ o.getClass() == Inet4Address.class ||
++ o.getClass() == Inet6Address.class )
++ {
++ InetAddress iaddr = (InetAddress) o;
++ if(o.getClass() == Inet6Address.class) {
++ supportsIPV6 = 1;
++ return true;
++ }
++ }
++ }
++ }
++ supportsIPV6 = 0;
++ return false;
++ }
+ }
+Index: mozilla/security/jss/org/mozilla/jss/ssl/common.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/jss/org/mozilla/jss/ssl/common.c,v
+retrieving revision 1.32
+diff -u -p -r1.32 common.c
+--- mozilla/security/jss/org/mozilla/jss/ssl/common.c	1 Mar 2010 21:57:01 -0000	1.32
++++ mozilla/security/jss/org/mozilla/jss/ssl/common.c	11 Apr 2011 12:34:45 -0000
+@@ -33,7 +33,6 @@
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+-
+ #include <nspr.h>
+ #include <jni.h>
+ #include <pk11func.h>
+@@ -51,6 +50,9 @@
+ #include <winsock.h>
+ #endif
+ 
++#define SSL_AF_INET 50
++#define SSL_AF_INET6 51
++
+ void
+ JSSL_throwSSLSocketException(JNIEnv *env, char *message)
+ {
+@@ -142,7 +144,7 @@ finish:
+ JNIEXPORT jbyteArray JNICALL
+ Java_org_mozilla_jss_ssl_SocketBase_socketCreate(JNIEnv *env, jobject self,
+ jobject sockObj, jobject certApprovalCallback,
+- jobject clientCertSelectionCallback, jobject javaSock, jstring host)
++ jobject clientCertSelectionCallback, jobject javaSock, jstring host,jint family)
+ {
+ jbyteArray sdArray = NULL;
+ JSSL_SocketData *sockdata = NULL;
+@@ -150,10 +152,21 @@ Java_org_mozilla_jss_ssl_SocketBase_sock
+ PRFileDesc *newFD;
+ PRFileDesc *tmpFD;
+ PRFilePrivate *priv = NULL;
++ int socketFamily = 0;
++
++ if (family != SSL_AF_INET6 && family != SSL_AF_INET) {
++ JSSL_throwSSLSocketException(env,
++ "socketCreate() Invalid family!");
++ goto finish;
++ }
++ if( family == SSL_AF_INET) 
++ socketFamily = PR_AF_INET;
++ else
++ socketFamily = PR_AF_INET6;
+ 
+ if( javaSock == NULL ) {
+ /* create a TCP socket */
+- newFD = PR_NewTCPSocket();
++ newFD = PR_OpenTCPSocket(socketFamily);
+ if( newFD == NULL ) {
+ JSSL_throwSSLSocketException(env,
+ "PR_NewTCPSocket() returned NULL");
+@@ -411,8 +424,13 @@ Java_org_mozilla_jss_ssl_SocketBase_sock
+ JSSL_SocketData *sock;
+ PRNetAddr addr;
+ jbyte *addrBAelems = NULL;
++ int addrBALen = 0;
+ PRStatus status;
+ 
++ jmethodID supportsIPV6ID;
++ jclass socketBaseClass;
++ jboolean supportsIPV6 = 0;
++
+ if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS) {
+ /* exception was thrown */
+ goto finish;
+@@ -421,19 +439,72 @@ Java_org_mozilla_jss_ssl_SocketBase_sock
+ /*
+ * setup the PRNetAddr structure
+ */
+- addr.inet.family = AF_INET;
+- addr.inet.port = htons(port);
++
++ /* 
++ * Do we support IPV6? 
++ */
++
++ socketBaseClass = (*env)->FindClass(env, SOCKET_BASE_NAME);
++ if( socketBaseClass == NULL ) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++ supportsIPV6ID = (*env)->GetStaticMethodID(env, socketBaseClass,
++ SUPPORTS_IPV6_NAME, SUPPORTS_IPV6_SIG);
++
++ if( supportsIPV6ID == NULL ) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++
++ supportsIPV6 = (*env)->CallStaticBooleanMethod(env, socketBaseClass,
++ supportsIPV6ID);
++
++ memset( &addr, 0, sizeof( PRNetAddr ));
++
+ if( addrBA != NULL ) {
+- PR_ASSERT(sizeof(addr.inet.ip) == 4);
+- PR_ASSERT( (*env)->GetArrayLength(env, addrBA) == 4);
+ addrBAelems = (*env)->GetByteArrayElements(env, addrBA, NULL);
++ addrBALen = (*env)->GetArrayLength(env, addrBA);
++
+ if( addrBAelems == NULL ) {
+ ASSERT_OUTOFMEM(env);
+ goto finish;
+ }
+- memcpy(&addr.inet.ip, addrBAelems, 4);
++
++ if(addrBALen != 4 && addrBALen != 16) {
++ JSS_throwMsgPrErr(env, BIND_EXCEPTION,
++ "Invalid address in bind!");
++ goto finish;
++ }
++
++ if( addrBALen == 4) {
++ addr.inet.family = PR_AF_INET;
++ addr.inet.port = PR_htons(port);
++ memcpy(&addr.inet.ip, addrBAelems, 4);
++
++ if(supportsIPV6) {
++ addr.inet.family = PR_AF_INET6;
++ addr.ipv6.port = PR_htons(port);
++ PR_ConvertIPv4AddrToIPv6(addr.inet.ip,&addr.ipv6.ip);
++ } 
++
++ } else { /* Must be 16 and ipv6 */
++ if(supportsIPV6) {
++ addr.ipv6.family = PR_AF_INET6;
++ addr.ipv6.port = PR_htons(port);
++ memcpy(&addr.ipv6.ip,addrBAelems, 16);
++ } else {
++ JSS_throwMsgPrErr(env, BIND_EXCEPTION,
++ "Invalid address in bind!");
++ goto finish;
++ }
++ }
+ } else {
+- addr.inet.ip = PR_htonl(INADDR_ANY);
++ if(supportsIPV6) {
++ status = PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr);
++ } else {
++ status = PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET, port, &addr);
++ }
+ }
+ 
+ /* do the bind() call */
+@@ -607,6 +678,78 @@ finish:
+ return status;
+ }
+ 
++JNIEXPORT jbyteArray JNICALL
++Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressByteArrayNative
++ (JNIEnv *env, jobject self)
++{
++ jbyteArray byteArray=NULL;
++ PRNetAddr addr;
++ jbyte *address=NULL;
++ int size=4;
++
++ if( JSSL_getSockAddr(env, self, &addr, PEER_SOCK) != PR_SUCCESS) { 
++ goto finish;
++ }
++
++ if( PR_NetAddrFamily(&addr) == PR_AF_INET6) {
++ size = 16;
++ address = (jbyte *) &addr.ipv6.ip;
++ } else {
++ address = (jbyte *) &addr.inet.ip;
++ }
++
++ byteArray = (*env)->NewByteArray(env,size);
++ if(byteArray == NULL) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++ (*env)->SetByteArrayRegion(env, byteArray, 0,size ,address);
++ if( (*env)->ExceptionOccurred(env) != NULL) {
++ PR_ASSERT(PR_FALSE);
++ goto finish;
++ }
++
++finish:
++ return byteArray;
++}
++
++JNIEXPORT jbyteArray JNICALL
++Java_org_mozilla_jss_ssl_SocketBase_getLocalAddressByteArrayNative
++ (JNIEnv *env, jobject self)
++{
++ jbyteArray byteArray=NULL;
++ PRNetAddr addr;
++ jbyte *address=NULL;
++ int size=4;
++
++ if( JSSL_getSockAddr(env, self, &addr, LOCAL_SOCK) != PR_SUCCESS) {
++ goto finish;
++ }
++
++ if( PR_NetAddrFamily(&addr) == PR_AF_INET6) {
++ size = 16;
++ address = (jbyte *) &addr.ipv6.ip; 
++ } else {
++ address = (jbyte *) &addr.inet.ip;
++ }
++ 
++ byteArray = (*env)->NewByteArray(env,size);
++ if(byteArray == NULL) {
++ ASSERT_OUTOFMEM(env);
++ goto finish;
++ }
++ (*env)->SetByteArrayRegion(env, byteArray, 0,size,address);
++ if( (*env)->ExceptionOccurred(env) != NULL) {
++ PR_ASSERT(PR_FALSE);
++ goto finish;
++ }
++
++finish:
++ return byteArray;
++}
++
++/* Leave the original versions of these functions for compatibility */
++
+ JNIEXPORT jint JNICALL
+ Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressNative
+ (JNIEnv *env, jobject self)
+Index: mozilla/security/jss/org/mozilla/jss/ssl/javasock.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c,v
+retrieving revision 1.5
+diff -u -p -r1.5 javasock.c
+--- mozilla/security/jss/org/mozilla/jss/ssl/javasock.c	24 Apr 2007 18:34:58 -0000	1.5
++++ mozilla/security/jss/org/mozilla/jss/ssl/javasock.c	11 Apr 2011 12:34:45 -0000
+@@ -290,6 +290,7 @@ getInetAddress(PRFileDesc *fd, PRNetAddr
+ jobject inetAddress;
+ jbyteArray addrByteArray;
+ jint port;
++ int addrBALen = 0;
+ 
+ if( GET_ENV(fd->secret->javaVM, env) ) goto finish;
+ 
+@@ -377,8 +378,9 @@ getInetAddress(PRFileDesc *fd, PRNetAddr
+ 
+ memset(addr, 0, sizeof(PRNetAddr));
+ 
+- /* we only handle IPV4 */
+- PR_ASSERT( (*env)->GetArrayLength(env, addrByteArray) == 4 );
++ addrBALen = (*env)->GetArrayLength(env, addrByteArray);
++
++ PR_ASSERT( (addrBALen == 4) || (addrBALen == 16 ) );
+ 
+ /* make sure you release them later */
+ addrBytes = (*env)->GetByteArrayElements(env, addrByteArray, NULL);
+@@ -388,9 +390,16 @@ getInetAddress(PRFileDesc *fd, PRNetAddr
+ }
+ 
+ /* ip field is in network byte order */
+- memcpy( (void*) &addr->inet.ip, addrBytes, 4);
+- addr->inet.family = PR_AF_INET;
+- addr->inet.port = port;
++
++ if (addrBALen == 4) {
++ memcpy( (void*) &addr->inet.ip, addrBytes, 4);
++ addr->inet.family = PR_AF_INET;
++ addr->inet.port = port;
++ } else {
++ memcpy( (void*) &addr->ipv6.ip,addrBytes, 16);
++ addr->inet.family = PR_AF_INET6;
++ addr->inet.port = port;
++ }
+ 
+ (*env)->ReleaseByteArrayElements(env, addrByteArray, addrBytes,
+ JNI_ABORT);
+Index: mozilla/security/jss/org/mozilla/jss/util/java_ids.h
+===================================================================
+RCS file: /cvsroot/mozilla/security/jss/org/mozilla/jss/util/java_ids.h,v
+retrieving revision 1.13
+diff -u -p -r1.13 java_ids.h
+--- mozilla/security/jss/org/mozilla/jss/util/java_ids.h	21 Apr 2008 15:32:28 -0000	1.13
++++ mozilla/security/jss/org/mozilla/jss/util/java_ids.h	11 Apr 2011 12:34:45 -0000
+@@ -312,6 +312,8 @@ PR_BEGIN_EXTERN_C
+ #define SOCKET_BASE_NAME "org/mozilla/jss/ssl/SocketBase"
+ #define PROCESS_EXCEPTIONS_NAME "processExceptions"
+ #define PROCESS_EXCEPTIONS_SIG "(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;"
++#define SUPPORTS_IPV6_NAME "supportsIPV6"
++#define SUPPORTS_IPV6_SIG "()Z"
+ 
+ /*
+ * SSLCertificateApprovalCallback

jss-loadlibrary.patch Added

@@ -0,0 +1,30 @@
+Index: jss/security/jss/org/mozilla/jss/CryptoManager.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 20:56:13.937984301 +0300
++++ jss/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 20:56:52.085985513 +0300
+@@ -1438,11 +1438,20 @@
+      */
+     synchronized static void loadNativeLibraries()
+     {
+-        if( ! mNativeLibrariesLoaded )
+-        {
+-            System.loadLibrary("jss4");
+-            Debug.trace(Debug.VERBOSE, "jss library loaded");
+-            mNativeLibrariesLoaded = true;
++        if( ! mNativeLibrariesLoaded ) {
++            try {
++                System.load( "/usr/lib64/jss/libjss4.so" );
++                Debug.trace(Debug.VERBOSE, "jss library loaded");
++                mNativeLibrariesLoaded = true;
++            } catch( UnsatisfiedLinkError e ) {
++                try {
++                    System.load( "/usr/lib/jss/libjss4.so" );
++                    Debug.trace(Debug.VERBOSE, "jss library loaded");
++                    mNativeLibrariesLoaded = true;
++                } catch( UnsatisfiedLinkError f ) {
++                    Debug.trace(Debug.VERBOSE, "jss library load failed");
++                }
++            }
+         }
+     }
+     static private boolean mNativeLibrariesLoaded = false;

jss-ocspSettings.patch Added

@@ -0,0 +1,109 @@
+Index: jss/security/jss/lib/jss.def
+===================================================================
+--- jss.orig/security/jss/lib/jss.def	2011-10-04 21:05:04.170001146 +0300
++++ jss/security/jss/lib/jss.def	2011-10-04 21:05:04.190001146 +0300
+@@ -328,6 +328,8 @@
+ Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateECKeyPairWithOpFlags;
+ Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateRSAKeyPairWithOpFlags;
+ Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateDSAKeyPairWithOpFlags;
++Java_org_mozilla_jss_CryptoManager_OCSPCacheSettingsNative;
++Java_org_mozilla_jss_CryptoManager_setOCSPTimeoutNative;
+ ;+    local:
+ ;+       *;
+ ;+};
+Index: jss/security/jss/org/mozilla/jss/CryptoManager.c
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/CryptoManager.c	2011-10-04 20:32:37.021939286 +0300
++++ jss/security/jss/org/mozilla/jss/CryptoManager.c	2011-10-04 21:05:04.190001146 +0300
+@@ -985,3 +985,45 @@
+     }
+ }
+ 
++
++/**********************************************************************
++* OCSPCacheSettingsNative
++*
++* Allows configuration of the OCSP responder cache during runtime.
++*/
++JNIEXPORT void JNICALL
++Java_org_mozilla_jss_CryptoManager_OCSPCacheSettingsNative(
++        JNIEnv *env, jobject this,
++        jint ocsp_cache_size,
++        jint ocsp_min_cache_entry_duration,
++        jint ocsp_max_cache_entry_duration)
++{
++    SECStatus rv = SECFailure;
++
++    rv = CERT_OCSPCacheSettings(
++        ocsp_cache_size, ocsp_min_cache_entry_duration,
++        ocsp_max_cache_entry_duration);
++
++    if (rv != SECSuccess) {
++        JSS_throwMsgPrErr(env,
++                     GENERAL_SECURITY_EXCEPTION,
++                     "Failed to set OCSP cache: error "+ PORT_GetError());
++    }
++}
++
++JNIEXPORT void JNICALL
++Java_org_mozilla_jss_CryptoManager_setOCSPTimeoutNative(
++        JNIEnv *env, jobject this,
++        jint ocsp_timeout )
++{
++    SECStatus rv = SECFailure;
++
++    rv = CERT_SetOCSPTimeout(ocsp_timeout);
++
++    if (rv != SECSuccess) {
++        JSS_throwMsgPrErr(env,
++                     GENERAL_SECURITY_EXCEPTION,
++                     "Failed to set OCSP timeout: error "+ PORT_GetError());
++    }
++}
++
+Index: jss/security/jss/org/mozilla/jss/CryptoManager.java
+===================================================================
+--- jss.orig/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 21:05:04.182001146 +0300
++++ jss/security/jss/org/mozilla/jss/CryptoManager.java	2011-10-04 21:05:04.190001146 +0300
+@@ -1592,4 +1592,41 @@
+                     String ocspResponderCertNickname )
+                     throws GeneralSecurityException;
+ 
++    /**
++     * change OCSP cache settings
++     *      * @param ocsp_cache_size max cache entries
++     *      * @param ocsp_min_cache_entry_duration minimum seconds to next fetch attempt
++     *      * @param ocsp_max_cache_entry_duration maximum seconds to next fetch attempt
++     */
++    public void OCSPCacheSettings(
++        int ocsp_cache_size, 
++        int ocsp_min_cache_entry_duration,
++        int ocsp_max_cache_entry_duration)
++    throws GeneralSecurityException
++    {
++        OCSPCacheSettingsNative(ocsp_cache_size,
++                                   ocsp_min_cache_entry_duration,
++                                   ocsp_max_cache_entry_duration);
++    }
++
++    private native void OCSPCacheSettingsNative(
++        int ocsp_cache_size, 
++        int ocsp_min_cache_entry_duration,
++        int ocsp_max_cache_entry_duration)
++                    throws GeneralSecurityException;
++
++    /**
++     * set OCSP timeout value
++     *      * @param ocspTimeout OCSP timeout in seconds
++     */
++    public void setOCSPTimeout(
++        int ocsp_timeout )
++    throws GeneralSecurityException
++    {
++        setOCSPTimeoutNative( ocsp_timeout);
++    }
++
++    private native void setOCSPTimeoutNative(
++        int ocsp_timeout )
++                    throws GeneralSecurityException;
+ }

jss-wrapInToken.patch Added

@@ -0,0 +1,158 @@
+diff -up jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c.cfu jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c.cfu	2011-10-18 09:16:08.362000000 -0700
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c	2011-10-19 17:55:01.162000000 -0700
+@@ -283,8 +283,9 @@ Java_org_mozilla_jss_pkcs11_PK11KeyWrapp
+ status = PK11_WrapPrivKey(slot, wrapping, toBeWrapped, mech, param,
+ &wrapped, NULL /* wincx */ );
+ if(status != SECSuccess) {
+- JSS_throwMsg(env, TOKEN_EXCEPTION,
+- "Wrapping operation failed on token");
++ char err[256] = {0};
++ PR_snprintf(err, 256, "Wrapping operation failed on token:%d", PR_GetError());
++ JSS_throwMsg(env, TOKEN_EXCEPTION, err);
+ goto finish;
+ }
+ PR_ASSERT(wrapped.len>0 && wrapped.data!=NULL);
+@@ -328,11 +329,15 @@ Java_org_mozilla_jss_pkcs11_PK11KeyWrapp
+ int numAttribs = 0;
+ CK_TOKEN_INFO tokenInfo;
+ 
++ /* ideal defaults */
+ PRBool isSensitive = PR_TRUE;
+ PRBool isExtractable = PR_FALSE;
+- /* special case nethsm*/
++
++ /* special case nethsm and lunasa*/
+ CK_UTF8CHAR nethsmLabel[4] = {'N','H','S','M'};
++ CK_UTF8CHAR lunasaLabel[4] = {'l','u','n','a'};
+ PRBool isNethsm = PR_TRUE;
++ PRBool isLunasa = PR_TRUE;
+ 
+ if( JSS_PK11_getTokenSlotPtr(env, tokenObj, &slot) != PR_SUCCESS) {
+ /* exception was thrown */
+@@ -347,9 +352,17 @@ Java_org_mozilla_jss_pkcs11_PK11KeyWrapp
+ break;
+ }
+ }
++ ix = 0;
++ for(ix=0; ix < 4; ix++) {
++ if (tokenInfo.label[ix] != lunasaLabel[ix]) {
++ isLunasa = PR_FALSE;
++ break;
++ }
++ }
+ 
+ } else {
+ isNethsm = PR_FALSE;
++ isLunasa = PR_FALSE;
+ }
+ 
+ /* get unwrapping key */
+@@ -412,23 +425,25 @@ Java_org_mozilla_jss_pkcs11_PK11KeyWrapp
+ }
+ keyType = PK11_GetKeyType(keyTypeMech, 0);
+ 
++ /* special case nethsm and lunasa*/
+ if( isNethsm ) {
+ isSensitive = PR_FALSE;
+ isExtractable = PR_FALSE;
++ } else if ( isLunasa) {
++ isSensitive = PR_FALSE;
++ isExtractable = PR_TRUE;
+ }
+ 
+-setAttrs:
+ /* figure out which operations to enable for this key */
+ switch (keyType) {
+ case CKK_RSA:
++ numAttribs = 3;
+ attribs[0] = CKA_SIGN;
+ attribs[1] = CKA_SIGN_RECOVER;
+ attribs[2] = CKA_UNWRAP;
+ if (isExtractable) {
+ attribs[3] = CKA_EXTRACTABLE;
+ numAttribs = 4;
+- } else {
+- numAttribs = 3;
+ }
+ 	break;
+ case CKK_DSA:
+@@ -459,7 +474,9 @@ setAttrs:
+ &label, pubValue, token, isSensitive /*sensitive*/, keyType,
+ attribs, numAttribs, NULL /*wincx*/);
+ if( privk == NULL ) {
+- JSS_throwMsg(env, TOKEN_EXCEPTION, "Key Unwrap failed on token");
++ char err[256] = {0};
++ PR_snprintf(err, 256, "Key Unwrap failed on token:%d", PR_GetError());
++ JSS_throwMsg(env, TOKEN_EXCEPTION, err);
+ goto finish;
+ }
+ 
+diff -up jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java.cfu jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java.cfu	2011-10-18 15:29:50.597000000 -0700
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java	2011-10-18 15:49:40.073000000 -0700
+@@ -322,10 +322,13 @@ final class PK11KeyWrapper implements Ke
+ throw new InvalidKeyException("key to be wrapped is not a "+
+ "PKCS #11 key");
+ }
++/* NSS is capable of moving keys appropriately,
++ so this call is prematurely bailing
+ if( ! symKey.getOwningToken().equals(token) ) {
+ throw new InvalidKeyException("key to be wrapped does not live"+
+ " on the same token as the wrapping key");
+ }
++*/
+ }
+ 
+ /**
+@@ -340,10 +343,13 @@ final class PK11KeyWrapper implements Ke
+ throw new InvalidKeyException("key to be wrapped is not a "+
+ "PKCS #11 key");
+ }
++/* NSS is capable of moving keys appropriately,
++ so this call is prematurely bailing
+ if( ! privKey.getOwningToken().equals(token) ) {
+ throw new InvalidKeyException("key to be wrapped does not live"+
+ " on the same token as the wrapping key");
+ }
++*/
+ }
+ 
+ /**
+diff -up jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.java.cfu jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.java
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.java.cfu	2011-10-18 14:34:32.148000000 -0700
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.java	2011-10-18 14:35:20.402000000 -0700
+@@ -135,10 +135,13 @@ public final class PK11Token implements 
+ getKeyWrapper(KeyWrapAlgorithm algorithm)
+ throws NoSuchAlgorithmException, TokenException
+ {
++/* NSS is capable of finding the right token to do algorithm,
++ so this call is prematurely bailing
+ if( ! doesAlgorithm(algorithm) ) {
+ throw new NoSuchAlgorithmException(
+ algorithm+" is not supported by this token");
+ }
++*/
+ return new PK11KeyWrapper(this, algorithm);
+ }
+ 
+diff -up jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java.cfu jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java
+--- a/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java.cfu	2011-10-18 09:24:13.796001000 -0700
++++ b/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java	2011-10-18 15:41:24.687000000 -0700
+@@ -243,7 +243,7 @@ public class EncryptedPrivateKeyInfo imp
+ }
+ 
+ KeyWrapper wrapper = token.getKeyWrapper(
+- KeyWrapAlgorithm.DES3_CBC);
++ KeyWrapAlgorithm.DES3_CBC_PAD);
+ wrapper.initWrap(key, params);
+ byte encrypted[] = wrapper.wrap(pri);
+ 
+@@ -260,6 +260,7 @@ public class EncryptedPrivateKeyInfo imp
+ return epki;
+ 
+ } catch (Exception e) {
++ System.out.println("createPBE: exception:"+e.toString());
+ Assert.notReached("EncryptedPrivateKeyInfo exception:"
+ +".createPBE");
+ }

MPL-1.1.txt Added

@@ -0,0 +1,470 @@
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+

debian.changelog Added

@@ -0,0 +1,61 @@
+jss (4.3.2-1) unstable; urgency=low
+
+ * Ship jss 4.3.2
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Sun, 08 Sep 2013 12:12:12 +0100
+
+jss (4.3.1-4) unstable; urgency=low
+
+ * Update pull_coreconf.patch and match Linux3.0* during clean.
+ * rules:
+ - Remove dist/ on clean.
+ - Use openjdk-6 instead of gcj.
+ * patches: Add a bunch of patches from Fedora.
+ * control: Change the VCS header to point to the git repository.
+ * compat: Bump to 8.
+ * control: Build-depend on default-jdk.
+ * control: Update the maintainer address.
+ * control: Drop jre dependency per current java policy.
+ * patches: More patches from Fedora.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 04 Oct 2011 19:45:31 +0300
+
+jss (4.3.1-3) unstable; urgency=low
+
+ * Update my email address
+
+ -- Michele Baldessari <michele@acksyn.org> Sun, 17 Oct 2010 23:41:15 +0200
+
+jss (4.3.1-2) unstable; urgency=low
+
+ * Bump policy to 3.9.1
+ * Update to quilt 3.0 source package
+
+ -- Michele Baldessari <michele@pupazzo.org> Sat, 04 Sep 2010 20:48:04 +0200
+
+jss (4.3.1-1) unstable; urgency=low
+
+ * New upstream
+ * Bump policy to 3.8.3
+ * Patch in coreconf build system for the time being
+ * Add ${misc:Depends} as we depend on debhelper
+ * Fix jar links to the right version
+
+ -- Michele Baldessari <michele@pupazzo.org> Sun, 24 Jan 2010 23:36:55 +0100
+
+jss (4.2.5-2) unstable; urgency=low
+
+ * Bump to policy 3.8.0
+ * debian/control:
+ - Build-Depend on default-jdk-builddep instead of java-gcj-compat-dev
+ * Add VCS-* fields
+ * Fixed build-deps (added libnss3-dev and pkg-config)
+ * Changed section to "java"
+
+ -- Michele Baldessari <michele@pupazzo.org> Wed, 22 Apr 2009 21:31:06 +0200
+
+jss (4.2.5-1) unstable; urgency=low
+
+ * Initial release (Closes: #474489)
+
+ -- Michele Baldessari <michele@pupazzo.org> Wed, 09 Apr 2008 16:09:59 +0200

debian.control Added

debian.rules Added

@@ -0,0 +1,121 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *$.*$-.*$$/\1/ p' | sed -e 's/~.*//')
+MOD_MAJOR_VERSION := $(word 1, $(subst ., ,$(UPSTREAM_VERSION)))
+MOD_MINOR_VERSION := $(word 2, $(subst ., ,$(UPSTREAM_VERSION)))
+MOD_PATCH_VERSION := $(word 3, $(subst ., ,$(UPSTREAM_VERSION)))
+
+export USE_64 := $(shell echo "int main(void) { int assert[(sizeof(long) == 8) ? 1 : -1]; return 0; }" | gcc -o /dev/null -x c - 2> /dev/null && echo "USE_64=1")
+
+CFLAGS := -Wall -pipe -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2 -fno-strict-aliasing
+endif
+
+CFLAGS += $(USE_64)
+# Enable compiler optimizations and disable debugging code
+BUILD_OPT=1
+export BUILD_OPT
+export XCFLAGS="-g"
+BASEDIR := $(CURDIR)/mozilla/security/
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+export NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
+export NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
+export NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss | sed 's/-I//'`
+export NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss | sed 's/-L//'`
+
+export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
+# Generate symbolic info for debuggers
+XCFLAGS="-g"
+export XCFLAGS
+export CFLAGS
+
+configure: configure-stamp
+configure-stamp: $(QUILT_STAMPFN)
+
+build: build-stamp
+build-stamp: configure
+	dh_testdir
+	make -C $(BASEDIR)/coreconf $(USE_64)
+	make -C $(BASEDIR)/jss $(USE_64)
+	touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+	dh_testdir
+	dh_testroot
+	-[ -f $(BASEDIR)/jss/Makefile ] || $(MAKE) -C $(BASEDIR)/jss clean
+	-[ -f $(BASEDIR)/coreconf/Makefile ] || $(MAKE) -C $(BASEDIR)/coreconf clean
+	-find . -name "*.class" -type f -exec rm -f "{}" \;
+	-find . -name "*.so.*" -type f -exec rm -f "{}" \;
+	-find . -name ".so" -type f -exec rm -f "{}" \;
+	-find . -type d -name "Linux3.0_x86_glibc_PTH_DBG.OBJ" -exec rm -rf "{}" \;
+	-find . -type d -name "Linux3.0_x86_glibc_PTH_OPT.OBJ" -exec rm -rf "{}" \;
+	-find . -type d -name "Linux3.0_x86_64_glibc_PTH_64_DBG.OBJ" -exec rm -rf "{}" \;
+	-find . -type d -name "Linux3.0_x86_64_glibc_PTH_64_OPT.OBJ" -exec rm -rf "{}" \;
+	rm -f $(BASEDIR)/jss/org/mozilla/jss/util/Debug.java
+	rm -rf $(CURDIR)/dist || true
+	dh_clean build-stamp install-stamp 
+
+install: install-stamp
+install-stamp:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/jni
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/java
+	install -m 644 mozilla/dist/xpclass.jar $(CURDIR)/debian/tmp/usr/share/java/jss-$(MOD_MAJOR_VERSION).$(MOD_MINOR_VERSION).$(MOD_PATCH_VERSION).jar
+	install -m 0755 mozilla/dist/Linux*.OBJ/lib/libjss4.so $(CURDIR)/debian/tmp/usr/lib/jni
+
+#
+# FIXME - sign jss4.jar. In order to use JSS as a JCE provider it needs to be
+# signed with a Sun-issued certificate. Since we would need to make this
+# certificate and private key public to provide reproducability in the rpm
+# building we have to ship an unsigned jar.
+#
+# Instructions for getting a signing cert can be found here:
+# http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html#Step61
+#
+# This signing is not required by every JVM. gcj ignores the signature and does
+# not require one. The Sun and IBM JVMs both check and enforce the signature.
+# Behavior of other JVMs is not known but they probably enforce the signature
+# as well.
+
+	touch install-stamp
+
+binary-indep:
+
+binary-arch: install-stamp
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_movefiles --sourcedir=debian/tmp -a -v
+	dh_link -a
+	dh_strip -a 
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a 
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-arch
+
+.PHONY: clean install build clean-patched binary-indep binary-arch binary

debian.series Added

debian.tar.gz Added

gpl.txt Added

@@ -0,0 +1,339 @@
+		 GNU GENERAL PUBLIC LICENSE
+		 Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			 Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+		 GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			 NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		 END OF TERMS AND CONDITIONS
+
+	 How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

jss-4.3.2.tar.bz2 Added

jss.dsc Added

lgpl.txt Added

@@ -0,0 +1,504 @@
+		 GNU LESSER GENERAL PUBLIC LICENSE
+		 Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			 Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+&#xc;
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+&#xc;
+		 GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+ 
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+&#xc;
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+&#xc;
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+&#xc;
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+&#xc;
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+&#xc;
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+&#xc;
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			 NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		 END OF TERMS AND CONDITIONS
+&#xc;
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+

mozilla-jss-rpmlintrc Added

pull_coreconf Added

@@ -0,0 +1,16056 @@
+Use the coreconf Makefile mechanism
+diff -Naur security/coreconf/AIX.mk mozilla/security/coreconf/AIX.mk
+--- a/security/coreconf/AIX.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/AIX.mk	2005-09-16 20:09:23.000000000 +0300
+@@ -0,0 +1,99 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# Config stuff for AIX.
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++#
++# There are two implementation strategies available on AIX:
++# pthreads, and pthreads-user. The default is pthreads.
++# In both strategies, we need to use pthread_user.c, instead of
++# aix.c. The fact that aix.c is never used is somewhat strange.
++# 
++# So we need to do the following:
++# - Default (PTHREADS_USER not defined in the environment or on
++# the command line):
++# Set PTHREADS_USER=1, USE_PTHREADS=1
++# - PTHREADS_USER=1 set in the environment or on the command line:
++# Do nothing.
++#
++ifeq ($(PTHREADS_USER),1)
++	USE_PTHREADS = # just to be safe
++	IMPL_STRATEGY = _PTH_USER
++else
++	USE_PTHREADS = 1
++	PTHREADS_USER = 1
++endif
++
++DEFAULT_COMPILER = xlc_r
++
++CC		= xlc_r
++CCC		= xlC_r
++
++CPU_ARCH	= rs6000
++
++RANLIB		= ranlib
++
++OS_CFLAGS	= -DAIX -DSYSV
++OS_LIBS 	+= -blibpath:/usr/lib:/lib -lc -lm
++
++DSO_LDOPTS	= -brtl -bnortllib -bM:SRE -bnoentry
++MKSHLIB 	= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
++
++AIX_WRAP	= $(DIST)/lib/aixwrap.o
++AIX_TMP		= $(OBJDIR)/_aix_tmp.o
++
++ifdef MAPFILE
++DSO_LDOPTS	+= -bexport:$(MAPFILE)
++else
++DSO_LDOPTS	+= -bexpall
++endif
++
++PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
++ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@
++
++ifdef BUILD_OPT
++	OPTIMIZER += -qmaxmem=-1
++endif
++
++ifeq ($(USE_64), 1)
++	OS_CFLAGS	+= -DAIX_64BIT
++	OBJECT_MODE=64
++	export OBJECT_MODE
++endif
++
+diff -Naur security/coreconf/arch.mk mozilla/security/coreconf/arch.mk
+--- a/security/coreconf/arch.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/arch.mk	2009-06-05 05:14:49.000000000 +0300
+@@ -0,0 +1,341 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++# 		Howard Chu <hyc@symas.com>
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++#######################################################################
++# Master "Core Components" macros for getting the OS architecture #
++# defines these symbols:
++# 64BIT_TAG
++# OS_ARCH	(from uname -r)
++# OS_TEST	(from uname -m)
++# OS_RELEASE	(from uname -v and/or -r)
++# OS_TARGET	User defined, or set to OS_ARCH
++# CPU_ARCH 	(from unmame -m or -p, ONLY on WINNT)
++# OS_CONFIG	OS_TARGET + OS_RELEASE
++# OBJDIR_TAG
++# OBJDIR_NAME
++#######################################################################
++
++#
++# Macros for getting the OS architecture
++#
++
++ifeq ($(USE_64), 1)
++	64BIT_TAG=_64
++else
++	64BIT_TAG=
++endif
++
++OS_ARCH := $(subst /,_,$(shell uname -s))
++
++#
++# Attempt to differentiate between sparc and x86 Solaris
++#
++
++OS_TEST := $(shell uname -m)
++ifeq ($(OS_TEST),i86pc)
++ OS_RELEASE := $(shell uname -r)_$(OS_TEST)
++else
++ OS_RELEASE := $(shell uname -r)
++endif
++
++#
++# Force the IRIX64 machines to use IRIX.
++#
++
++ifeq ($(OS_ARCH),IRIX64)
++ OS_ARCH = IRIX
++endif
++
++#
++# Force the older BSD/OS versions to use the new arch name.
++#
++
++ifeq ($(OS_ARCH),BSD_386)
++ OS_ARCH = BSD_OS
++endif
++
++#
++# Catch Deterim if SVR4 is NCR or UNIXWARE
++#
++
++ifeq ($(OS_ARCH),UNIX_SV)
++ ifneq ($(findstring NCR, $(shell grep NCR /etc/bcheckrc | head -1 )),)
++	OS_ARCH = NCR
++ else
++	# Make UnixWare something human readable
++	OS_ARCH = UNIXWARE
++ endif
++
++ # Get the OS release number, not 4.2
++ OS_RELEASE := $(shell uname -v)
++endif
++
++ifeq ($(OS_ARCH),UNIX_System_V)
++ OS_ARCH	= NEC
++endif
++
++ifeq ($(OS_ARCH),AIX)
++ OS_RELEASE := $(shell uname -v).$(shell uname -r)
++endif
++
++#
++# Distinguish between OSF1 V4.0B and V4.0D
++#
++
++ifeq ($(OS_ARCH)$(OS_RELEASE),OSF1V4.0)
++ OS_VERSION := $(shell uname -v)
++ ifeq ($(OS_VERSION),564)
++	OS_RELEASE := V4.0B
++ endif
++ ifeq ($(OS_VERSION),878)
++	OS_RELEASE := V4.0D
++ endif
++endif
++
++#
++# SINIX changes name to ReliantUNIX with 5.43
++#
++
++ifeq ($(OS_ARCH),ReliantUNIX-N)
++ OS_ARCH = ReliantUNIX
++ OS_RELEASE = 5.4
++endif
++
++ifeq ($(OS_ARCH),SINIX-N)
++ OS_ARCH = ReliantUNIX
++ OS_RELEASE = 5.4
++endif
++
++#
++# Handle FreeBSD 2.2-STABLE, Linux 2.0.30-osfmach3, and
++# IRIX 6.5-ALPHA-1289139620.
++#
++
++ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH)))
++ OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
++endif
++
++ifeq ($(OS_ARCH),Linux)
++ OS_RELEASE := $(subst ., ,$(OS_RELEASE))
++ ifneq ($(words $(OS_RELEASE)),1)
++	OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
++ endif
++endif
++
++#
++# For OS/2
++#
++ifeq ($(OS_ARCH),OS_2)
++ OS_ARCH = OS2
++ OS_RELEASE := $(shell uname -v)
++endif
++
++#######################################################################
++# Master "Core Components" macros for getting the OS target #
++#######################################################################
++
++#
++# Note: OS_TARGET should be specified on the command line for gmake.
++# When OS_TARGET=WIN95 is specified, then a Windows 95 target is built.
++# The difference between the Win95 target and the WinNT target is that
++# the WinNT target uses Windows NT specific features not available
++# in Windows 95. The Win95 target will run on Windows NT, but (supposedly)
++# at lesser performance (the Win95 target uses threads; the WinNT target
++# uses fibers).
++#
++# If OS_TARGET is not specified, it defaults to $(OS_ARCH), i.e., no
++# cross-compilation.
++#
++
++#
++# The following hack allows one to build on a WIN95 machine (as if
++# s/he were cross-compiling on a WINNT host for a WIN95 target).
++# It also accomodates for MKS's and Cygwin's uname.exe.
++#
++ifeq ($(OS_ARCH),WIN95)
++ OS_ARCH = WINNT
++ OS_TARGET = WIN95
++endif
++ifeq ($(OS_ARCH),Windows_95)
++ OS_ARCH = Windows_NT
++ OS_TARGET = WIN95
++endif
++ifeq ($(OS_ARCH),CYGWIN_95-4.0)
++	OS_ARCH = CYGWIN_NT-4.0
++	OS_TARGET = WIN95
++endif
++ifeq ($(OS_ARCH),CYGWIN_98-4.10)
++	OS_ARCH = CYGWIN_NT-4.0
++	OS_TARGET = WIN95
++endif
++ifeq ($(OS_ARCH),CYGWIN_ME-4.90)
++	OS_ARCH = CYGWIN_NT-4.0
++	OS_TARGET = WIN95
++endif
++
++#
++# On WIN32, we also define the variable CPU_ARCH, if it isn't already.
++#
++ifndef CPU_ARCH
++ ifeq ($(OS_ARCH), WINNT)
++	CPU_ARCH := $(shell uname -p)
++	ifeq ($(CPU_ARCH),I386)
++	 CPU_ARCH = x386
++	endif
++ endif
++endif
++
++# If uname -s returns "Windows_NT", we assume that we are using
++# the uname.exe in MKS toolkit.
++#
++# The -r option of MKS uname only returns the major version number.
++# So we need to use its -v option to get the minor version number.
++# Moreover, it doesn't have the -p option, so we need to use uname -m.
++#
++ifeq ($(OS_ARCH), Windows_NT)
++ OS_ARCH = WINNT
++ OS_MINOR_RELEASE := $(shell uname -v)
++ # strip leading 0
++ OS_MINOR_RELEASE := $(patsubst 0%,%,$(OS_MINOR_RELEASE))
++ OS_RELEASE := $(OS_RELEASE).$(OS_MINOR_RELEASE)
++ ifndef CPU_ARCH
++	CPU_ARCH := $(shell uname -m)
++	#
++	# MKS's uname -m returns "586" on a Pentium machine.
++	#
++	ifneq (,$(findstring 86,$(CPU_ARCH)))
++	 CPU_ARCH = x386
++	endif
++ endif
++endif
++#
++# If uname -s returns "CYGWIN_NT-4.0", we assume that we are using
++# the uname.exe in the Cygwin tools.
++#
++ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH)))
++ OS_RELEASE := $(patsubst CYGWIN_NT-%,%,$(OS_ARCH))
++ OS_ARCH = WINNT
++ ifndef CPU_ARCH
++ ifeq (WOW64,$(findstring WOW64,$(OS_RELEASE)))
++ OS_RELEASE := $(patsubst %-WOW64,%,$(OS_RELEASE))
++ endif 
++	CPU_ARCH := $(shell uname -m)
++	#
++	# Cygwin's uname -m returns "i686" on a Pentium Pro machine.
++	#
++	ifneq (,$(findstring 86,$(CPU_ARCH)))
++	 CPU_ARCH = x386
++	endif
++ endif
++endif
++#
++# If uname -s returns "MINGW32_NT-5.1", we assume that we are using
++# the uname.exe in the MSYS toolkit.
++#
++ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH)))
++ OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH))
++ OS_ARCH = WINNT
++ USE_MSYS = 1
++ ifndef CPU_ARCH
++	CPU_ARCH := $(shell uname -m)
++	#
++	# MSYS's uname -m returns "i686" on a Pentium Pro machine.
++	#
++	ifneq (,$(findstring 86,$(CPU_ARCH)))
++	 CPU_ARCH = x386
++	endif
++ endif
++endif
++
++ifndef OS_TARGET
++ OS_TARGET = $(OS_ARCH)
++endif
++
++ifeq ($(OS_TARGET), WIN95)
++ OS_RELEASE = 4.0
++endif
++
++ifdef OS_TARGET_RELEASE
++ OS_RELEASE = $(OS_TARGET_RELEASE)
++endif
++
++#
++# This variable is used to get OS_CONFIG.mk.
++#
++
++OS_CONFIG = $(OS_TARGET)$(OS_RELEASE)
++
++#
++# OBJDIR_TAG depends on the predefined variable BUILD_OPT,
++# to distinguish between debug and release builds.
++#
++
++ifdef BUILD_OPT
++ OBJDIR_TAG = $(64BIT_TAG)_OPT
++else
++ ifdef BUILD_IDG
++	OBJDIR_TAG = $(64BIT_TAG)_IDG
++ else
++	OBJDIR_TAG = $(64BIT_TAG)_DBG
++ endif
++endif
++
++#
++# The following flags are defined in the individual $(OS_CONFIG).mk
++# files.
++#
++# CPU_TAG is defined if the CPU is not the most common CPU.
++# COMPILER_TAG is defined if the compiler is not the default compiler.
++# IMPL_STRATEGY may be defined too.
++#
++
++OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
++
++ifeq (,$(filter-out WIN%,$(OS_TARGET)))
++ifndef BUILD_OPT
++#
++# Define USE_DEBUG_RTL if you want to use the debug runtime library
++# (RTL) in the debug build
++#
++ifdef USE_DEBUG_RTL
++ OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJD
++endif
++endif
++endif
++
++MK_ARCH = included
+diff -Naur security/coreconf/BeOS.mk mozilla/security/coreconf/BeOS.mk
+--- a/security/coreconf/BeOS.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/BeOS.mk	2009-09-03 07:56:59.000000000 +0300
+@@ -0,0 +1,79 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 2002
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS)
++
++USE_PTHREADS = 
++
++ifeq ($(USE_PTHREADS),1)
++	IMPL_STRATEGY = _PTH
++endif
++
++CC			= gcc
++CCC			= g++
++RANLIB			= ranlib
++
++DEFAULT_COMPILER = gcc
++
++ifeq ($(OS_TEST),ppc)
++	OS_REL_CFLAGS	= -Dppc
++	CPU_ARCH	= ppc
++else
++	OS_REL_CFLAGS	= -Di386
++	CPU_ARCH	= x86
++endif
++
++MKSHLIB		= $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
++ifdef BUILD_OPT
++	OPTIMIZER	= -O2
++endif
++
++OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe
++OS_LIBS			= -lbe
++
++DEFINES			+= -DBEOS
++
++ifdef USE_PTHREADS
++	DEFINES		+= -D_REENTRANT
++endif
++
++ARCH			= beos
++
++DSO_CFLAGS		= -fPIC
++DSO_LDOPTS		=
+diff -Naur security/coreconf/BSD_OS.mk mozilla/security/coreconf/BSD_OS.mk
+--- a/security/coreconf/BSD_OS.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/BSD_OS.mk	2009-09-03 07:56:59.000000000 +0300
+@@ -0,0 +1,89 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++# Kurt J. Lidl
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER	= gcc
++CC			= gcc
++CCC			= g++
++RANLIB			= ranlib
++
++ifeq ($(OS_TEST),i386)
++	OS_REL_CFLAGS	= -D__i386__
++	CPU_ARCH	= x86
++else
++ifeq ($(OS_TEST),ppc)
++	OS_REL_CFLAGS	= -D__ppc__
++	CPU_ARCH	= ppc
++else
++ifeq ($(OS_TEST),sparc)
++	OS_REL_CFLAGS	= -D__sparc__
++	CPU_ARCH	= sparc
++else
++# treat the ultrasparc like a regular sparc, at least for now!
++ifeq ($(OS_TEST),sparc_v9)
++	OS_REL_CFLAGS	= -D__sparc__
++	CPU_ARCH	= sparc
++endif
++endif
++endif
++endif
++
++DLL_SUFFIX		= so
++
++OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -DBSD_OS -DBSDI -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++
++ARCH			= bsdos
++
++DSO_CFLAGS		= -fPIC -DPIC
++DSO_LDOPTS		= -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
++
++ifdef LIBRUNPATH
++DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
++endif
++
++MKSHLIB			= $(CC) $(DSO_LDOPTS)
++ifdef MAPFILE
++# Add LD options to restrict exported symbols to those in the map file
++endif
++# Change PROCESS to put the mapfile in the correct format for this platform
++PROCESS_MAP_FILE = cp $< $@
++
++G++INCLUDES		= -I/usr/include/g++
++
++INCLUDES		+= -I/usr/X11R6/include
+diff -Naur security/coreconf/command.mk mozilla/security/coreconf/command.mk
+--- a/security/coreconf/command.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/command.mk	2007-10-24 00:55:00.000000000 +0300
+@@ -0,0 +1,72 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++#######################################################################
++# Master "Core Components" default command macros; #
++# can be overridden in <arch>.mk #
++#######################################################################
++
++AS = $(CC)
++ASFLAGS += $(CFLAGS)
++CCF = $(CC) $(CFLAGS)
++LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
++LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
++CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
++		$(XCFLAGS)
++PERL = perl
++RANLIB = echo
++TAR = /bin/tar
++#
++# For purify
++#
++NOMD_CFLAGS += $(OPTIMIZER) $(NOMD_OS_CFLAGS) $(XP_DEFINE) $(DEFINES) \
++		$(INCLUDES) $(XCFLAGS)
++
++# Optimization of code for size
++# OPT_CODE_SIZE
++# =1: The code can be optimized for size.
++# The code is actually optimized for size only if ALLOW_OPT_CODE_SIZE=1
++# in a given source code directory (in manifest.mn)
++# =0: Never optimize the code for size.
++#
++# Default value = 0 
++# Can be overridden from the make command line.
++ifndef OPT_CODE_SIZE
++OPT_CODE_SIZE = 0
++endif
++
++MK_COMMAND = included
+diff -Naur security/coreconf/config.mk mozilla/security/coreconf/config.mk
+--- a/security/coreconf/config.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/config.mk	2011-07-03 09:13:29.000000000 +0300
+@@ -0,0 +1,209 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# Configuration information for building in the "Core Components" source module
++
++#######################################################################
++# [1.0] Master "Core Components" source and release <architecture> #
++# tags #
++#######################################################################
++ifndef MK_ARCH
++include $(CORE_DEPTH)/coreconf/arch.mk
++endif
++
++#######################################################################
++# [2.0] Master "Core Components" default command macros #
++# (NOTE: may be overridden in $(OS_TARGET)$(OS_RELEASE).mk) #
++#######################################################################
++ifndef MK_COMMAND
++include $(CORE_DEPTH)/coreconf/command.mk
++endif
++
++#######################################################################
++# [3.0] Master "Core Components" <architecture>-specific macros #
++# (dependent upon <architecture> tags) #
++# #
++# We are moving towards just having a $(OS_TARGET).mk file #
++# as opposed to multiple $(OS_TARGET)$(OS_RELEASE).mk files, #
++# one for each OS release. #
++#######################################################################
++
++TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
++ AIX RISCOS WINNT WIN95 WINCE Linux
++
++ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
++include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
++else
++include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
++endif
++
++#######################################################################
++# [4.0] Master "Core Components" source and release <platform> tags #
++# (dependent upon <architecture> tags) #
++#######################################################################
++PLATFORM = $(OBJDIR_NAME)
++
++#######################################################################
++# [5.0] Master "Core Components" release <tree> tags #
++# (dependent upon <architecture> tags) #
++#######################################################################
++ifndef MK_TREE
++include $(CORE_DEPTH)/coreconf/tree.mk
++endif
++
++#######################################################################
++# [6.0] Master "Core Components" source and release <component> tags #
++# NOTE: A component is also called a module or a subsystem. #
++# (dependent upon $(MODULE) being defined on the #
++# command line, as an environment variable, or in individual #
++# makefiles, or more appropriately, manifest.mn) #
++#######################################################################
++ifndef MK_MODULE
++include $(CORE_DEPTH)/coreconf/module.mk
++endif
++
++#######################################################################
++# [7.0] Master "Core Components" release <version> tags #
++# (dependent upon $(MODULE) being defined on the #
++# command line, as an environment variable, or in individual #
++# makefiles, or more appropriately, manifest.mn) #
++#######################################################################
++ifndef MK_VERSION
++include $(CORE_DEPTH)/coreconf/version.mk
++endif
++
++#######################################################################
++# [8.0] Master "Core Components" macros to figure out #
++# binary code location #
++# (dependent upon <platform> tags) #
++#######################################################################
++ifndef MK_LOCATION
++include $(CORE_DEPTH)/coreconf/location.mk
++endif
++
++#######################################################################
++# [9.0] Master "Core Components" <component>-specific source path #
++# (dependent upon <user_source_tree>, <source_component>, #
++# <version>, and <platform> tags) #
++#######################################################################
++ifndef MK_SOURCE
++include $(CORE_DEPTH)/coreconf/source.mk
++endif
++
++#######################################################################
++# [10.0] Master "Core Components" include switch for support header #
++# files #
++# (dependent upon <tree>, <component>, <version>, #
++# and <platform> tags) #
++#######################################################################
++ifndef MK_HEADERS
++include $(CORE_DEPTH)/coreconf/headers.mk
++endif
++
++#######################################################################
++# [11.0] Master "Core Components" for computing program prefixes #
++#######################################################################
++ifndef MK_PREFIX
++include $(CORE_DEPTH)/coreconf/prefix.mk
++endif
++
++#######################################################################
++# [12.0] Master "Core Components" for computing program suffixes #
++# (dependent upon <architecture> tags) #
++#######################################################################
++ifndef MK_SUFFIX
++include $(CORE_DEPTH)/coreconf/suffix.mk
++endif
++
++#######################################################################
++# [13.0] Master "Core Components" for defining JDK #
++# (dependent upon <architecture>, <source>, and <suffix> tags)#
++#######################################################################
++ifdef NS_USE_JDK
++include $(CORE_DEPTH)/coreconf/jdk.mk
++endif
++
++#######################################################################
++# [14.0] Master "Core Components" rule set #
++#######################################################################
++ifndef MK_RULESET
++include $(CORE_DEPTH)/coreconf/ruleset.mk
++endif
++
++#######################################################################
++# [15.0] Dependencies.
++#######################################################################
++
++-include $(MKDEPENDENCIES)
++
++#######################################################################
++# [16.0] Global environ ment defines
++#######################################################################
++
++ifdef NSS_ENABLE_ECC
++DEFINES += -DNSS_ENABLE_ECC
++endif
++
++ifdef NSS_ECC_MORE_THAN_SUITE_B
++DEFINES += -DNSS_ECC_MORE_THAN_SUITE_B
++endif
++
++ifdef NSS_ALLOW_UNSUPPORTED_CRITICAL
++DEFINES += -DNSS_ALLOW_UNSUPPORTED_CRITICAL
++endif
++
++ifdef BUILD_LIBPKIX_TESTS
++DEFINES += -DBUILD_LIBPKIX_TESTS
++endif
++
++ifdef NSS_DISABLE_DBM
++DEFINES += -DNSS_DISABLE_DBM
++endif
++
++# Avoid building object leak test code for optimized library
++ifndef BUILD_OPT
++ifdef PKIX_OBJECT_LEAK_TEST
++DEFINES += -DPKIX_OBJECT_LEAK_TEST
++endif
++endif
++
++# This allows all library and tools code to use the util function
++# implementations directly from libnssutil3, rather than the wrappers
++# in libnss3 which are present for binary compatibility only
++DEFINES += -DUSE_UTIL_DIRECTLY
++USE_UTIL_DIRECTLY = 1
++
+diff -Naur security/coreconf/coreconf.dep mozilla/security/coreconf/coreconf.dep
+--- a/security/coreconf/coreconf.dep	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/coreconf.dep	2009-07-30 00:50:47.000000000 +0300
+@@ -0,0 +1,45 @@
++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is the Netscape security libraries.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 2009
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++/*
++ * A dummy header file that is a dependency for all the object files.
++ * Used to force a full recompilation of NSS in Mozilla's Tinderbox
++ * depend builds. See comments in rules.mk.
++ */
++
++#error "Do not include this header file."
++
+diff -Naur security/coreconf/coreconf.pl mozilla/security/coreconf/coreconf.pl
+--- a/security/coreconf/coreconf.pl	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/coreconf.pl	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,160 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++sub recursive_copy {
++ local($fromdir);
++ local($todir);
++ local(@dirlist);
++ $fromdir = shift;
++ $todir = shift;
++ 
++ print STDERR "recursive copy called with $fromdir, $todir\n";
++
++#remove any trailing slashes.
++ $fromdir =~ s/\/$//;
++ $todir =~ s/\/$//;
++ 
++ opendir(DIR, $fromdir);
++ @dirlist = readdir DIR;
++ close DIR;
++
++
++ foreach $file (@dirlist) {
++	if (! (($file eq "." ) || ($file eq "..") )) {
++	 
++	 if (-d "$fromdir/$file") {
++		print STDERR "handling directory $todir/$file\n";
++		&rec_mkdir("$todir/$file");
++		&recursive_copy("$fromdir/$file","$todir/$file");
++	 }
++	 else {
++		print STDERR "handling file $fromdir/$file\n";
++		&my_copy("$fromdir/$file","$todir/$file");
++	 }
++	}
++ }
++}
++
++sub parse_argv {
++
++# print STDERR "Parsing Variables\n";
++
++ foreach $q ( @ARGV ) {
++	if (! ($q =~ /=/)) {
++	 $var{$lastassigned} .= " $q";
++	}
++	else {
++	 $q =~ /^([^=]*)=(.*)/;
++	 $left = $1;
++	 $right = $2;
++	
++	 $right =~ s/ *$//;
++	 $var{$left} = $right;
++
++	 $lastassigned = $left;
++	
++	 }
++	print STDERR "Assigned $lastassigned = $var{$lastassigned}\n";
++ }
++}
++
++
++# usage: &my_copy("dir/fromfile","dir2/tofile");
++# do a 'copy' - files only, 'to' MUST be a filename, not a directory.
++
++# fix this to be able to use copy on win nt.
++
++sub my_copy {
++ local($from);
++ local($to);
++ local($cpcmd);
++
++ $from = shift;
++ $to = shift;
++
++ if ( ! defined $var{OS_ARCH}) {
++	die "OS_ARCH not defined!";
++ }
++ else {
++	if ($var{OS_ARCH} eq 'WINNT') {
++	 $cpcmd = 'cp';
++	 	}
++	else {
++	 $cpcmd = 'cp';
++	 }
++	print STDERR "COPYING: $cpcmd $from $to\n";
++	system("$cpcmd $from $to");
++ }
++}
++
++
++sub old_my_copy {
++ local($from);
++ local($to);
++
++ $from = shift;
++ $to = shift;
++ open(FIN, "<$from") || die("Can't read from file $from\n");
++ if ( ! open(FOUT,">$to")) {
++	close FIN;
++	die "Can't write to file $to\n";
++ }
++ while (read(FIN, $buf, 100000)) {
++	print FOUT $buf;
++ }
++ close (FIN);
++ close (FOUT);
++}
++
++sub rec_mkdir {
++ local($arg);
++ local($t);
++ local($q);
++
++ $arg = shift;
++ $t = "";
++ foreach $q (split(/\//,$arg)) {
++	$t .= $q;
++	if (! ($t =~ /\.\.$/)) {
++	 if ($t =~ /./) {
++		mkdir($t,0775);
++	 }
++	}
++	$t.= '/';
++ }
++}
++
++1;
+diff -Naur security/coreconf/cpdist.pl mozilla/security/coreconf/cpdist.pl
+--- a/security/coreconf/cpdist.pl	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/cpdist.pl	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,199 @@
++#! /usr/local/bin/perl
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++require('coreconf.pl');
++
++#######-- read in variables on command line into %var
++
++&parse_argv;
++ 
++### do the copy
++
++print STDERR "RELEASE TREE / MODULE = $var{RELEASE_TREE} $var{MODULE}\n";
++
++
++
++# 1
++if ($var{RELEASE} eq "") { exit; } # Can't do release here, so exit.
++
++# 2
++#if (! ($var{RELEASE} =~ /\//)) { # if no specific version is specified in RELEASE variable
++# $component = $var{RELEASE};
++#}
++#else { # if a subcomponent/version is given in the RELEASE variable
++# $var{RELEASE} =~ m|^([^/]*)/|; 
++#	$component = $1; # everything before the first slash;
++# }
++
++# 3
++$path = $var{RELEASE};
++
++
++# 4
++# find out what directory we would create for 'today'
++
++$year = (localtime)[5] + 1900;
++$month = (localtime)[4] + 1;
++$day = (localtime)[3];
++$today = sprintf( "%d%02d%02d", $year, $month, $day );
++
++# 5
++# if version is null, then set the version to today.
++if ($var{"RELEASE_VERSION"} eq "") {
++ $var{"RELEASE_VERSION"} = $today;
++}
++
++#6
++$version = $var{"RELEASE_VERSION"}; # set RELEASE_VERSION to passed in variable
++
++#7
++# if version is today, then we will want to make a 'current' link.
++
++if ($version eq $today) {
++ $create_current = 1;
++}
++
++#8
++# version can be a) passed in value from command line, b) value in manifest.mn
++# or c) computed value such as '19970909'
++
++
++$dir = "$var{'RELEASE_TREE'}/$path";
++
++#9
++if (! (-e "$dir/$version" && -d "$dir/$version")) {
++ print "making dir $dir \n";
++ &rec_mkdir("$dir/$version");
++}
++
++
++
++print "version = $version\n";
++print "path = $path\n";
++print "var{release_tree} = $var{'RELEASE_TREE'}\n";
++print "dir = $dir = RELEASE_TREE/path\n";
++
++
++#10
++if ($create_current == 1) {
++
++# unlinking and linking always occurs, even if the link is correct
++ print "unlinking $dir/current\n";
++ unlink("$dir/current");
++ 
++ print "putting version number $today into 'current' file..";
++
++ open(FILE,">$dir/current") || die " couldn't open current\n";
++ print FILE "$today\n";
++ close(FILE);
++ print " ..done\n"
++ 
++}
++
++&rec_mkdir("$dir/$version/$var{'RELEASE_MD_DIR'}");
++&rec_mkdir("$dir/$version/$var{'RELEASE_XP_DIR'}");
++
++
++
++
++foreach $jarfile (split(/ /,$var{FILES}) ) {
++ print STDERR "---------------------------------------------\n";
++ 
++ $jarinfo = $var{$jarfile};
++ 
++ ($jardir,$jaropts) = split(/\|/,$jarinfo);
++ 
++ if ($jaropts =~ /f/) {
++ print STDERR "Copying files $jardir....\n";
++ }
++ else {
++ print STDERR "Copying jar file $jarfile....\n";
++ }
++ 
++ print "jaropts = $jaropts\n";
++ 
++ if ($jaropts =~ /m/) {
++ $destdir = $var{"RELEASE_MD_DIR"};
++ print "found m, using MD dir $destdir\n";
++ }
++ elsif ($jaropts =~ /x/) {
++ $destdir = $var{"RELEASE_XP_DIR"};
++ print "found x, using XP dir $destdir\n";
++ }
++ else {
++ die "Error: must specify m or x in jar options in $jarinfo line\n";
++ }
++ 
++ 
++ $distdir = "$dir/$version/$destdir";
++ 
++
++
++ if ($jaropts =~ /f/) {
++
++ print "splitting: \"$jardir\"\n";
++ for $srcfile (split(/ /,$jardir)) {
++
++#if srcfile has a slash
++	if ($srcfile =~ m|/|) {
++#pull out everything before the last slash into $1
++	 $srcfile =~ m|(.*)/|;
++	 $distsubdir = "/$1";
++	 print "making dir $distdir$distsubdir\n";
++	 &rec_mkdir("$distdir$distsubdir");
++	}
++	print "copy: from $srcfile\n";
++	print " to $distdir$distsubdir\n";
++	$srcprefix = "";
++	if ($jaropts =~/m/) {
++	 $srcprefix = "$var{'PLATFORM'}/";
++	}
++	system("cp $srcprefix$srcfile $distdir$distsubdir");
++ }
++ }
++ else {
++ $srcfile = "$var{SOURCE_RELEASE_PREFIX}/$jardir/$jarfile";
++ 
++ print "copy: from $srcfile\n";
++ print " to $distdir\n";
++ 
++ system("cp $srcfile $distdir");
++ 
++ }
++ 
++ }
++
+diff -Naur security/coreconf/Darwin.mk mozilla/security/coreconf/Darwin.mk
+--- a/security/coreconf/Darwin.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/Darwin.mk	2011-08-25 02:57:43.000000000 +0300
+@@ -0,0 +1,147 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER = gcc
++
++CC		= gcc
++CCC		= g++
++RANLIB		= ranlib
++
++ifndef CPU_ARCH
++# When cross-compiling, CPU_ARCH should already be defined as the target
++# architecture, set to powerpc or i386.
++CPU_ARCH	:= $(shell uname -p)
++endif
++
++ifeq (,$(filter-out i%86,$(CPU_ARCH)))
++ifdef USE_64
++CC += -arch x86_64
++override CPU_ARCH	= x86_64
++else
++OS_REL_CFLAGS	= -Di386
++CC += -arch i386
++override CPU_ARCH	= x86
++endif
++else
++ifeq (arm,$(CPU_ARCH))
++# Nothing set for arm currently.
++else
++OS_REL_CFLAGS	= -Dppc
++CC += -arch ppc
++endif
++endif
++
++ifneq (,$(MACOS_SDK_DIR))
++ GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
++ GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }')
++ GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }')
++ GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR)
++
++ ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
++ # GCC <= 3
++ DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks
++ ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0))
++ DARWIN_SDK_FRAMEWORKS += -F$(MACOS_SDK_DIR)/Library/Frameworks
++ endif
++ DARWIN_SDK_CFLAGS = -nostdinc -isystem $(MACOS_SDK_DIR)/usr/include/gcc/darwin/$(GCC_VERSION) -isystem $(MACOS_SDK_DIR)/usr/include $(DARWIN_SDK_FRAMEWORKS)
++ DARWIN_SDK_LDFLAGS = -L$(MACOS_SDK_DIR)/usr/lib/gcc/darwin -L$(MACOS_SDK_DIR)/usr/lib/gcc/darwin/$(GCC_VERSION_FULL) -L$(MACOS_SDK_DIR)/usr/lib
++ DARWIN_SDK_SHLIBFLAGS = $(DARWIN_SDK_LDFLAGS) $(DARWIN_SDK_FRAMEWORKS)
++ NEXT_ROOT = $(MACOS_SDK_DIR)
++ export NEXT_ROOT
++ else
++ # GCC >= 4
++ DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR)
++ ifneq (4.0.0,$(GCC_VERSION_FULL))
++ # gcc > 4.0.0 passes -syslibroot to ld based on -isysroot.
++ # Don't add -isysroot to DARWIN_SDK_LDFLAGS, because the programs
++ # that are linked with those flags also get DARWIN_SDK_CFLAGS.
++ DARWIN_SDK_SHLIBFLAGS = -isysroot $(MACOS_SDK_DIR)
++ else
++ # gcc 4.0.0 doesn't pass -syslibroot to ld, it needs to be
++ # explicit.
++ DARWIN_SDK_LDFLAGS = -Wl,-syslibroot,$(MACOS_SDK_DIR)
++ DARWIN_SDK_SHLIBFLAGS = $(DARWIN_SDK_LDFLAGS)
++ endif
++ endif
++
++ LDFLAGS += $(DARWIN_SDK_LDFLAGS)
++endif
++
++# "Commons" are tentative definitions in a global scope, like this:
++# int x;
++# The meaning of a common is ambiguous. It may be a true definition:
++# int x = 0;
++# or it may be a declaration of a symbol defined in another file:
++# extern int x;
++# Use the -fno-common option to force all commons to become true
++# definitions so that the linker can catch multiply-defined symbols.
++# Also, common symbols are not allowed with Darwin dynamic libraries.
++
++OS_CFLAGS	= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS)
++
++ifdef BUILD_OPT
++ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
++	OPTIMIZER = -Oz
++else
++	OPTIMIZER	= -O2
++endif
++ifdef MOZ_DEBUG_SYMBOLS
++	ifdef MOZ_DEBUG_FLAGS
++		OPTIMIZER += $(MOZ_DEBUG_FLAGS)
++	else
++		OPTIMIZER += -gdwarf-2 -gfull
++	endif
++endif
++endif
++
++ARCH		= darwin
++
++DSO_CFLAGS	= -fPIC
++# May override this with different compatibility and current version numbers.
++DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
++# May override this with -bundle to create a loadable module.
++DSO_LDOPTS	= -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
++
++MKSHLIB		= $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
++DLL_SUFFIX	= dylib
++PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
++ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@
++
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS	= -lz
+diff -Naur security/coreconf/FreeBSD.mk mozilla/security/coreconf/FreeBSD.mk
+--- a/security/coreconf/FreeBSD.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/FreeBSD.mk	2009-08-22 08:33:09.000000000 +0300
+@@ -0,0 +1,90 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER	= gcc
++CC			= gcc
++CCC			= g++
++RANLIB			= ranlib
++
++CPU_ARCH		= $(OS_TEST)
++ifeq ($(CPU_ARCH),i386)
++CPU_ARCH		= x86
++endif
++ifeq ($(CPU_ARCH),pc98)
++CPU_ARCH		= x86
++endif
++ifeq ($(CPU_ARCH),amd64)
++CPU_ARCH		= x86_64
++endif
++
++OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++
++DSO_CFLAGS		= -fPIC
++DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
++
++#
++# The default implementation strategy for FreeBSD is pthreads.
++#
++ifndef CLASSIC_NSPR
++USE_PTHREADS		= 1
++DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
++OS_LIBS			+= -pthread
++DSO_LDOPTS		+= -pthread
++endif
++
++ARCH			= freebsd
++
++MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
++
++ifeq ($(MOZ_OBJFORMAT),elf)
++DLL_SUFFIX		= so
++else
++DLL_SUFFIX		= so.1.0
++endif
++
++MKSHLIB			= $(CC) $(DSO_LDOPTS)
++ifdef MAPFILE
++	MKSHLIB += -Wl,--version-script,$(MAPFILE)
++endif
++PROCESS_MAP_FILE = grep -v ';-' $< | \
++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++
++G++INCLUDES		= -I/usr/include/g++
++
++INCLUDES		+= -I/usr/X11R6/include
+diff -Naur security/coreconf/headers.mk mozilla/security/coreconf/headers.mk
+--- a/security/coreconf/headers.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/headers.mk	2010-07-30 05:25:55.000000000 +0300
+@@ -0,0 +1,56 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++#######################################################################
++# Master "Core Components" include switch for support header files #
++#######################################################################
++
++#
++# Always append source-side machine-dependent (md) and cross-platform
++# (xp) include paths
++#
++
++INCLUDES += -I$(SOURCE_MDHEADERS_DIR) -I$(SOURCE_XPHEADERS_DIR)
++
++#
++# Only append source-side private cross-platform include paths for
++# sectools
++#
++
++INCLUDES += -I$(SOURCE_XPPRIVATE_DIR)
++
++MK_HEADERS = included
+diff -Naur security/coreconf/HP-UXA.09.03.mk mozilla/security/coreconf/HP-UXA.09.03.mk
+--- a/security/coreconf/HP-UXA.09.03.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXA.09.03.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,49 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++#
++# On HP-UX 9, the default (and only) implementation strategy is
++# classic nspr.
++#
++ifeq ($(OS_RELEASE),A.09.03)
++	DEFAULT_IMPL_STRATEGY	 = _CLASSIC
++endif
++
++#
++# Config stuff for HP-UXA.09.03
++#
++include $(CORE_DEPTH)/coreconf/HP-UXA.09.mk
+diff -Naur security/coreconf/HP-UXA.09.07.mk mozilla/security/coreconf/HP-UXA.09.07.mk
+--- a/security/coreconf/HP-UXA.09.07.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXA.09.07.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,48 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# On HP-UX 9, the default (and only) implementation strategy is
++# classic nspr.
++
++ifeq ($(OS_RELEASE),A.09.07)
++	DEFAULT_IMPL_STRATEGY	 = _CLASSIC
++endif
++
++#
++# Config stuff for HP-UXA.09.07
++#
++include $(CORE_DEPTH)/coreconf/HP-UXA.09.mk
+diff -Naur security/coreconf/HP-UXA.09.mk mozilla/security/coreconf/HP-UXA.09.mk
+--- a/security/coreconf/HP-UXA.09.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXA.09.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,43 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++#
++# Config stuff for HP-UXA.09
++#
++include $(CORE_DEPTH)/coreconf/HP-UX.mk
++
++OS_CFLAGS += -DHPUX9
+diff -Naur security/coreconf/HP-UXB.10.01.mk mozilla/security/coreconf/HP-UXB.10.01.mk
+--- a/security/coreconf/HP-UXB.10.01.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXB.10.01.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,44 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++ifeq ($(OS_RELEASE),B.10.01)
++	DEFAULT_IMPL_STRATEGY	 = _CLASSIC
++endif
++
++#
++# Config stuff for HP-UXB.10.01
++#
++include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk
+diff -Naur security/coreconf/HP-UXB.10.10.mk mozilla/security/coreconf/HP-UXB.10.10.mk
+--- a/security/coreconf/HP-UXB.10.10.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXB.10.10.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,54 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# On HP-UX 10.10 and 10.20, the default implementation strategy is
++# pthreads (actually DCE threads). Classic nspr is also available.
++
++ifeq ($(OS_RELEASE),B.10.10)
++	DEFAULT_IMPL_STRATEGY 	 = _PTH
++endif
++
++#
++# Config stuff for HP-UXB.10.10
++#
++include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk
++
++OS_CFLAGS += -DHPUX10_10
++
++ifeq ($(USE_PTHREADS),1)
++	OS_CFLAGS	+= -D_REENTRANT
++endif
+diff -Naur security/coreconf/HP-UXB.10.20.mk mozilla/security/coreconf/HP-UXB.10.20.mk
+--- a/security/coreconf/HP-UXB.10.20.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXB.10.20.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,54 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# On HP-UX 10.10 and 10.20, the default implementation strategy is
++# pthreads (actually DCE threads). Classic nspr is also available.
++
++ifeq ($(OS_RELEASE),B.10.20)
++	DEFAULT_IMPL_STRATEGY = _PTH
++endif
++
++#
++# Config stuff for HP-UXB.10.20
++#
++include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk
++
++OS_CFLAGS		+= -DHPUX10_20
++
++ifeq ($(USE_PTHREADS),1)
++	OS_CFLAGS	+= -D_REENTRANT
++endif
+diff -Naur security/coreconf/HP-UXB.10.30.mk mozilla/security/coreconf/HP-UXB.10.30.mk
+--- a/security/coreconf/HP-UXB.10.30.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXB.10.30.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,60 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# On HP-UX 10.30 and 11.00, the default implementation strategy is
++# pthreads. Classic nspr and pthreads-user are also available.
++
++ifeq ($(OS_RELEASE),B.10.30)
++	DEFAULT_IMPL_STRATEGY	 = _PTH
++endif
++
++#
++# Config stuff for HP-UXB.10.30.
++#
++include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk
++
++OS_CFLAGS		+= -DHPUX10_30
++
++#
++# To use the true pthread (kernel thread) library on 10.30 and
++# 11.00, we should define _POSIX_C_SOURCE to be 199506L.
++# The _REENTRANT macro is deprecated.
++#
++
++ifdef USE_PTHREADS
++	OS_CFLAGS	+= -D_POSIX_C_SOURCE=199506L
++endif
+diff -Naur security/coreconf/HP-UXB.10.mk mozilla/security/coreconf/HP-UXB.10.mk
+--- a/security/coreconf/HP-UXB.10.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXB.10.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,40 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++include $(CORE_DEPTH)/coreconf/HP-UX.mk
++
++OS_CFLAGS += -DHPUX10
++OS_LIBS += -lpthread -lm
+diff -Naur security/coreconf/HP-UXB.11.00.mk mozilla/security/coreconf/HP-UXB.11.00.mk
+--- a/security/coreconf/HP-UXB.11.00.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXB.11.00.mk	2006-12-07 20:28:40.000000000 +0200
+@@ -0,0 +1,49 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# On HP-UX 10.30 and 11.00, the default implementation strategy is
++# pthreads. Classic nspr and pthreads-user are also available.
++
++ifeq ($(OS_RELEASE),B.11.00)
++OS_CFLAGS		+= -DHPUX10
++DEFAULT_IMPL_STRATEGY = _PTH
++endif
++
++#
++# Config stuff for HP-UXB.11.00.
++#
++include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk
+diff -Naur security/coreconf/HP-UXB.11.11.mk mozilla/security/coreconf/HP-UXB.11.11.mk
+--- a/security/coreconf/HP-UXB.11.11.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXB.11.11.mk	2006-12-07 20:28:40.000000000 +0200
+@@ -0,0 +1,49 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 2001
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# On HP-UX 10.30 and 11.x, the default implementation strategy is
++# pthreads. Classic nspr and pthreads-user are also available.
++
++ifeq ($(OS_RELEASE),B.11.11)
++OS_CFLAGS		+= -DHPUX10
++DEFAULT_IMPL_STRATEGY = _PTH
++endif
++
++#
++# Config stuff for HP-UXB.11.11.
++#
++include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk
+diff -Naur security/coreconf/HP-UXB.11.20.mk mozilla/security/coreconf/HP-UXB.11.20.mk
+--- a/security/coreconf/HP-UXB.11.20.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXB.11.20.mk	2006-12-07 20:28:40.000000000 +0200
+@@ -0,0 +1,49 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 2002
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# On HP-UX 10.30 and 11.x, the default implementation strategy is
++# pthreads. Classic nspr and pthreads-user are also available.
++
++ifeq ($(OS_RELEASE),B.11.20)
++OS_CFLAGS		+= -DHPUX10
++DEFAULT_IMPL_STRATEGY = _PTH
++endif
++
++#
++# Config stuff for HP-UXB.11.x.
++#
++include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk
+diff -Naur security/coreconf/HP-UXB.11.22.mk mozilla/security/coreconf/HP-UXB.11.22.mk
+--- a/security/coreconf/HP-UXB.11.22.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXB.11.22.mk	2006-12-07 20:28:40.000000000 +0200
+@@ -0,0 +1,49 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 2002
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# On HP-UX 10.30 and 11.x, the default implementation strategy is
++# pthreads. Classic nspr and pthreads-user are also available.
++
++ifeq ($(OS_RELEASE),B.11.22)
++OS_CFLAGS		+= -DHPUX10
++DEFAULT_IMPL_STRATEGY = _PTH
++endif
++
++#
++# Config stuff for HP-UXB.11.x.
++#
++include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk
+diff -Naur security/coreconf/HP-UXB.11.23.mk mozilla/security/coreconf/HP-UXB.11.23.mk
+--- a/security/coreconf/HP-UXB.11.23.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXB.11.23.mk	2006-12-07 20:28:40.000000000 +0200
+@@ -0,0 +1,49 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 2002
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# On HP-UX 10.30 and 11.x, the default implementation strategy is
++# pthreads. Classic nspr and pthreads-user are also available.
++
++ifeq ($(OS_RELEASE),B.11.23)
++OS_CFLAGS		+= -DHPUX10
++DEFAULT_IMPL_STRATEGY = _PTH
++endif
++
++#
++# Config stuff for HP-UXB.11.x.
++#
++include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk
+diff -Naur security/coreconf/HP-UXB.11.mk mozilla/security/coreconf/HP-UXB.11.mk
+--- a/security/coreconf/HP-UXB.11.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UXB.11.mk	2006-12-07 20:31:49.000000000 +0200
+@@ -0,0 +1,80 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++include $(CORE_DEPTH)/coreconf/HP-UX.mk
++
++ifndef NS_USE_GCC
++ CCC = /opt/aCC/bin/aCC -ext
++ ifeq ($(USE_64), 1)
++	ifeq ($(OS_TEST), ia64)
++	 ARCHFLAG	= -Aa +e +p +DD64
++	else
++	 # Our HP-UX build machine has a strange problem. If
++	 # a 64-bit PA-RISC executable calls getcwd() in a
++	 # network-mounted directory, it fails with ENOENT.
++	 # We don't know why. Since nsinstall calls getcwd(),
++	 # this breaks our 64-bit HP-UX nightly builds. None
++	 # of our other HP-UX machines have this problem.
++	 #
++	 # We worked around this problem by building nsinstall
++	 # as a 32-bit PA-RISC executable for 64-bit PA-RISC
++	 # builds. -- wtc 2003-06-03
++	 ifdef INTERNAL_TOOLS
++	 ARCHFLAG	= +DAportable +DS2.0
++	 else
++	 ARCHFLAG	= -Aa +e +DA2.0W +DS2.0 +DChpux
++	 endif
++	endif
++ else
++	ifeq ($(OS_TEST), ia64)
++	 ARCHFLAG	= -Aa +e +p +DD32
++	else
++	 ARCHFLAG	= +DAportable +DS2.0
++	endif
++ endif
++else
++ CCC = aCC
++endif
++
++#
++# To use the true pthread (kernel thread) library on HP-UX
++# 11.x, we should define _POSIX_C_SOURCE to be 199506L.
++# The _REENTRANT macro is deprecated.
++#
++
++OS_CFLAGS += $(ARCHFLAG) -DHPUX11 -D_POSIX_C_SOURCE=199506L
++OS_LIBS += -lpthread -lm -lrt
++HPUX11	= 1
+diff -Naur security/coreconf/HP-UX.mk mozilla/security/coreconf/HP-UX.mk
+--- a/security/coreconf/HP-UX.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/HP-UX.mk	2010-05-01 22:07:17.000000000 +0300
+@@ -0,0 +1,116 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++#
++# Config stuff for HP-UX
++#
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER = cc
++
++ifeq ($(OS_TEST),ia64)
++	CPU_ARCH = ia64
++	CPU_TAG = _$(CPU_ARCH)
++	ifneq ($(USE_64),1)
++		64BIT_TAG = _32
++	endif
++	DLL_SUFFIX = so
++else
++	CPU_ARCH = hppa
++	DLL_SUFFIX = sl
++endif
++CC = cc
++CCC = CC
++ifndef NS_USE_GCC
++OS_CFLAGS += -Ae
++endif
++OS_CFLAGS += $(DSO_CFLAGS) -DHPUX -D$(CPU_ARCH) -D_HPUX_SOURCE -D_USE_BIG_FDS
++
++ifeq ($(DEFAULT_IMPL_STRATEGY),_PTH)
++	USE_PTHREADS = 1
++	ifeq ($(CLASSIC_NSPR),1)
++		USE_PTHREADS =
++		IMPL_STRATEGY = _CLASSIC
++	endif
++	ifeq ($(PTHREADS_USER),1)
++		USE_PTHREADS =
++		IMPL_STRATEGY = _PTH_USER
++	endif
++endif
++
++ifdef PTHREADS_USER
++	OS_CFLAGS	+= -D_POSIX_C_SOURCE=199506L
++endif
++
++LDFLAGS			= -z -Wl,+s
++
++ifdef NS_USE_GCC
++LD = $(CC)
++endif
++MKSHLIB			= $(LD) $(DSO_LDOPTS) $(RPATH)
++ifdef MAPFILE
++ifndef NS_USE_GCC
++MKSHLIB += -c $(MAPFILE)
++else
++MKSHLIB += -Wl,-c,$(MAPFILE)
++endif
++endif
++PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
++ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,+e ,' > $@
++
++ifndef NS_USE_GCC
++DSO_LDOPTS		= -b +h $(notdir $@)
++RPATH			= +b '$$ORIGIN'
++else
++DSO_LDOPTS		= -shared -Wl,+h,$(notdir $@)
++RPATH			= -Wl,+b,'$$ORIGIN'
++endif
++ifneq ($(OS_TEST),ia64)
++# pa-risc
++ifndef USE_64
++RPATH			=
++endif
++endif
++
++# +Z generates position independent code for use in shared libraries.
++ifndef NS_USE_GCC
++DSO_CFLAGS = +Z
++else
++DSO_CFLAGS = -fPIC
++ASFLAGS += -x assembler-with-cpp
++endif
+diff -Naur security/coreconf/import.pl mozilla/security/coreconf/import.pl
+--- a/security/coreconf/import.pl	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/import.pl	2005-09-16 03:33:23.000000000 +0300
+@@ -0,0 +1,221 @@
++#! /usr/local/bin/perl
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++print STDERR "import.pl\n";
++
++require('coreconf.pl');
++
++
++$returncode =0;
++
++
++#######-- read in variables on command line into %var
++
++$var{UNZIP} = "unzip -o";
++
++&parse_argv;
++
++if (! ($var{IMPORTS} =~ /\w/)) {
++ print STDERR "nothing to import\n";
++}
++
++######-- Do the import!
++
++foreach $import (split(/ /,$var{IMPORTS}) ) {
++
++ print STDERR "\n\nIMPORTING .... $import\n-----------------------------\n";
++
++
++# if a specific version specified in IMPORT variable
++# (if $import has a slash in it)
++
++ if ($import =~ /\//) {
++ # $component=everything before the first slash of $import
++
++	$import =~ m|^([^/]*)/|; 
++	$component = $1;
++
++	$import =~ m|^(.*)/([^/]*)$|;
++
++	# $path=everything before the last slash of $import
++	$path = $1;
++
++	# $version=everything after the last slash of $import
++	$version = $2;
++
++	if ($var{VERSION} ne "current") {
++	 $version = $var{VERSION};
++	}
++ }
++ else {
++	$component = $import;
++	$path = $import;
++	$version = $var{VERSION};
++ }
++
++ $releasejardir = "$var{RELEASE_TREE}/$path";
++ if ($version eq "current") {
++	print STDERR "Current version specified. Reading 'current' file ... \n";
++	
++	open(CURRENT,"$releasejardir/current") || die "NO CURRENT FILE\n";
++	$version = <CURRENT>;
++	$version =~ s/(\r?\n)*$//; # remove any trailing [CR/]LF's
++	close(CURRENT);
++	print STDERR "Using version $version\n";
++	if ( $version eq "") {
++	 die "Current version file empty. Stopping\n";
++	}
++ }
++ 
++ $releasejardir = "$releasejardir/$version";
++ if ( ! -d $releasejardir) {
++	die "$releasejardir doesn't exist (Invalid Version?)\n";
++ }
++ foreach $jarfile (split(/ /,$var{FILES})) {
++
++	($relpath,$distpath,$options) = split(/\|/, $var{$jarfile});
++
++	if ($var{'OVERRIDE_IMPORT_CHECK'} eq 'YES') {
++	 $options =~ s/v//g;
++	}
++
++	if ( $relpath ne "") { $releasejarpathname = "$releasejardir/$relpath";}
++	else { $releasejarpathname = $releasejardir; }
++
++# If a component doesn't have IDG versions, import the DBG ones
++ if( ! -e "$releasejarpathname/$jarfile" ) {
++ if( $relpath =~ /IDG\.OBJ$/ ) {
++ $relpath =~ s/IDG.OBJ/DBG.OBJ/;
++ $releasejarpathname = "$releasejardir/$relpath";
++ } elsif( $relpath =~ /IDG\.OBJD$/ ) {
++ $relpath =~ s/IDG.OBJD/DBG.OBJD/;
++ $releasejarpathname = "$releasejardir/$relpath";
++ }
++ }
++
++	if (-e "$releasejarpathname/$jarfile") {
++	 print STDERR "\nWorking on jarfile: $jarfile\n";
++	 
++	 if ($distpath =~ m|/$|) {
++		$distpathname = "$distpath$component";
++	 }
++	 else {
++		$distpathname = "$distpath"; 
++	 }
++	 
++	 
++#the block below is used to determine whether or not the xp headers have
++#already been imported for this component
++
++	 $doimport = 1;
++	 if ($options =~ /v/) { # if we should check the imported version
++	 print STDERR "Checking if version file exists $distpathname/version\n";
++	 if (-e "$distpathname/version") {
++		 open( VFILE, "<$distpathname/version") ||
++		 die "Cannot open $distpathname/version for reading. Permissions?\n";
++		 $importversion = <VFILE>;
++		 close (VFILE);
++		 $importversion =~ s/\r?\n$//; # Strip off any trailing CR/LF
++		 if ($version eq $importversion) {
++		 print STDERR "$distpathname version '$importversion' already imported. Skipping...\n";
++		 $doimport =0;
++		 }
++	 }
++	 }
++	 
++	 if ($doimport == 1) {
++	 if (! -d "$distpathname") {
++		 &rec_mkdir("$distpathname");
++	 }
++	 # delete the stuff in there already.
++	 # (this should really be recursive delete.)
++	 
++	 if ($options =~ /v/) {
++		 $remheader = "\nREMOVING files in '$distpathname/' :";
++		 opendir(DIR,"$distpathname") ||
++		 die ("Cannot read directory $distpathname\n");
++		 @filelist = readdir(DIR);
++		 closedir(DIR);
++		 foreach $file ( @filelist ) {
++		 if (! ($file =~ m!/.?.$!) ) {
++			 if (! (-d $file)) {
++			 $file =~ m!([^/]*)$!;
++			 print STDERR "$remheader $1";
++			 $remheader = " ";
++			 unlink "$distpathname/$file";
++			 }
++		 }
++		 }
++	 }
++
++
++	 print STDERR "\n\n";
++
++	 print STDERR "\nExtracting jarfile '$jarfile' to local directory $distpathname/\n";
++	 
++	 print STDERR "$var{UNZIP} $releasejarpathname/$jarfile -d $distpathname\n";
++	 system("$var{UNZIP} $releasejarpathname/$jarfile -d $distpathname");
++	 
++	 $r = $?;
++
++	 if ($options =~ /v/) {
++		 if ($r == 0) {
++		 unlink ("$distpathname/version");
++		 if (open(VFILE,">$distpathname/version")) {
++			 print VFILE "$version\n";
++			 close(VFILE);
++		 }
++		 }
++		 else {
++		 print STDERR "Could not create '$distpathname/version'. Permissions?\n";
++		 $returncode ++;
++		 }
++	 }
++	 } # if (doimport)
++	} # if (-e releasejarpathname/jarfile)
++ } # foreach jarfile)
++} # foreach IMPORT
++
++
++
++exit($returncode);
++
++
++
++
++
+diff -Naur security/coreconf/IRIX5.2.mk mozilla/security/coreconf/IRIX5.2.mk
+--- a/security/coreconf/IRIX5.2.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/IRIX5.2.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,37 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++include $(CORE_DEPTH)/coreconf/IRIX5.mk
+diff -Naur security/coreconf/IRIX5.3.mk mozilla/security/coreconf/IRIX5.3.mk
+--- a/security/coreconf/IRIX5.3.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/IRIX5.3.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,39 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++include $(CORE_DEPTH)/coreconf/IRIX5.mk
++
++OS_CFLAGS += -DIRIX5_3
+diff -Naur security/coreconf/IRIX5.mk mozilla/security/coreconf/IRIX5.mk
+--- a/security/coreconf/IRIX5.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/IRIX5.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,42 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/IRIX.mk
++
++ifndef NS_USE_GCC
++	ODD_CFLAGS += -xgot
++endif
+diff -Naur security/coreconf/IRIX6.2.mk mozilla/security/coreconf/IRIX6.2.mk
+--- a/security/coreconf/IRIX6.2.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/IRIX6.2.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,45 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++
++# catch unresolved symbols
++
++SHLIB_LD_OPTS += -no_unresolved
++
++include $(CORE_DEPTH)/coreconf/IRIX6.mk
++
++OS_CFLAGS += -DIRIX6_2
+diff -Naur security/coreconf/IRIX6.3.mk mozilla/security/coreconf/IRIX6.3.mk
+--- a/security/coreconf/IRIX6.3.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/IRIX6.3.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,44 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# catch unresolved symbols
++
++SHLIB_LD_OPTS += -no_unresolved
++
++include $(CORE_DEPTH)/coreconf/IRIX6.mk
++
++OS_CFLAGS += -DIRIX6_3
+diff -Naur security/coreconf/IRIX6.5.mk mozilla/security/coreconf/IRIX6.5.mk
+--- a/security/coreconf/IRIX6.5.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/IRIX6.5.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,47 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# catch unresolved symbols
++
++SHLIB_LD_OPTS += -no_unresolved
++
++include $(CORE_DEPTH)/coreconf/IRIX6.mk
++
++OS_CFLAGS += -DIRIX6_5
++ifndef NS_USE_GCC
++OS_CFLAGS += -mips3
++endif
+diff -Naur security/coreconf/IRIX6.mk mozilla/security/coreconf/IRIX6.mk
+--- a/security/coreconf/IRIX6.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/IRIX6.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,49 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/IRIX.mk
++
++ifndef NS_USE_GCC
++	ifneq ($(USE_N32),1)
++	OS_CFLAGS += -32
++	endif
++	ODD_CFLAGS += -multigot
++endif
++
++ifeq ($(USE_PTHREADS),1)
++OS_LIBS += -lpthread
++endif
+diff -Naur security/coreconf/IRIX.mk mozilla/security/coreconf/IRIX.mk
+--- a/security/coreconf/IRIX.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/IRIX.mk	2007-11-22 06:39:56.000000000 +0200
+@@ -0,0 +1,126 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++#
++# The default implementation strategy for Irix is classic nspr.
++#
++ifeq ($(USE_PTHREADS),1)
++	ifeq ($(USE_N32),1)
++		IMPL_STRATEGY = _n32_PTH
++	else
++		IMPL_STRATEGY = _PTH
++	endif
++endif
++
++DEFAULT_COMPILER = cc
++
++ifdef NS_USE_GCC
++	CC		= gcc
++	AS		= $(CC) -x assembler-with-cpp
++	ODD_CFLAGS	= -Wall -Wno-format -Wno-switch
++	ifdef BUILD_OPT
++		OPTIMIZER	= -O6
++	endif
++else
++	CC	= cc
++	CCC		= CC
++	ODD_CFLAGS	= -fullwarn -xansi -woff 1209
++	ifdef BUILD_OPT
++		ifeq ($(USE_N32),1)
++			OPTIMIZER	= -O -OPT:Olimit=4000
++		else
++			OPTIMIZER	= -O -Olimit 4000
++		endif
++	endif
++
++	# For 6.x machines, include this flag
++	ifeq (6., $(findstring 6., $(OS_RELEASE)))
++		ifeq ($(USE_N32),1)
++			ODD_CFLAGS	+= -n32 -mips3 -exceptions
++		else
++			ODD_CFLAGS	+= -32 -multigot
++		endif
++	else
++		ODD_CFLAGS		+= -xgot
++	endif
++	ifeq ($(USE_N32),1)
++		OS_CFLAGS	+= -dollar
++	endif
++endif
++
++ODD_CFLAGS	+= -DSVR4 -DIRIX 
++
++CPU_ARCH	= mips
++
++RANLIB		= /bin/true
++# For purify
++# NOTE: should always define _SGI_MP_SOURCE
++NOMD_OS_CFLAGS += $(ODD_CFLAGS) -D_SGI_MP_SOURCE
++
++OS_CFLAGS += $(NOMD_OS_CFLAGS)
++ifdef USE_MDUPDATE
++	OS_CFLAGS += -MDupdate $(DEPENDENCIES)
++endif
++
++ifeq ($(USE_N32),1)
++	SHLIB_LD_OPTS	+= -n32 -mips3
++endif
++
++MKSHLIB += $(LD) $(SHLIB_LD_OPTS) -shared -soname $(@:$(OBJDIR)/%.so=%.so)
++ifdef MAPFILE
++# Add LD options to restrict exported symbols to those in the map file
++endif
++# Change PROCESS to put the mapfile in the correct format for this platform
++PROCESS_MAP_FILE = cp $< $@
++
++DSO_LDOPTS	= -elf -shared -all
++
++ifdef DSO_BACKEND
++	DSO_LDOPTS += -soname $(DSO_NAME)
++endif
++
++#
++# Revision notes:
++#
++# In the IRIX compilers prior to version 7.2, -n32 implied -mips3.
++# Beginning in the 7.2 compilers, -n32 implies -mips4 when the compiler
++# is running on a system with a mips4 CPU (e.g. R8K, R10K).
++# We want our code to explicitly be mips3 code, so we now explicitly
++# set -mips3 whenever we set -n32.
++#
+diff -Naur security/coreconf/jdk.mk mozilla/security/coreconf/jdk.mk
+--- a/security/coreconf/jdk.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/jdk.mk	2006-08-05 04:27:37.000000000 +0300
+@@ -0,0 +1,536 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++ifdef NS_USE_JDK
++#######################################################################
++# [1] Define preliminary JDK "Core Components" toolset options #
++#######################################################################
++
++# set default JDK java threading model
++ifeq ($(JDK_THREADING_MODEL),)
++	JDK_THREADING_MODEL = native_threads
++# no such thing as -native flag
++	JDK_THREADING_MODEL_OPT =
++endif
++
++#######################################################################
++# [2] Define platform-independent JDK "Core Components" options #
++#######################################################################
++
++# set default location of the java classes repository
++ifeq ($(JAVA_DESTPATH),)
++ifdef BUILD_OPT
++	JAVA_DESTPATH = $(SOURCE_CLASSES_DIR)
++else
++	JAVA_DESTPATH = $(SOURCE_CLASSES_DBG_DIR)
++endif
++endif
++
++# set default location of the package under the java classes repository
++# note that this overrides the default package value in ruleset.mk
++ifeq ($(PACKAGE),)
++	PACKAGE = .
++endif
++
++# set default location of the java source code repository
++ifeq ($(JAVA_SOURCEPATH),)
++	JAVA_SOURCEPATH	= .
++endif
++
++# add JNI directory to default include search path
++ifneq ($(JNI_GEN),)
++	ifdef NSBUILDROOT
++		INCLUDES += -I$(JNI_GEN_DIR) -I$(SOURCE_XP_DIR)
++	else
++		INCLUDES += -I$(JNI_GEN_DIR)
++	endif
++endif
++
++#######################################################################
++# [3] Define platform-dependent JDK "Core Components" options #
++#######################################################################
++
++# set [Microsoft Windows] platforms
++ifeq ($(OS_ARCH), WINNT)
++	JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
++
++	ifeq ($(JRE_HOME),)
++		JRE_HOME = $(JAVA_HOME)
++		JRE_CLASSES = $(JAVA_CLASSES)
++	else
++		ifeq ($(JRE_CLASSES),)
++			JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
++		endif
++	endif
++
++	PATH_SEPARATOR = ;
++
++	# (2) specify "header" information
++	JAVA_ARCH = win32
++
++	INCLUDES += -I$(JAVA_HOME)/include
++	INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
++
++	# currently, disable JIT option on this platform
++	JDK_JIT_OPT = -nojit
++endif
++
++# set [Sun Solaris] platforms
++ifeq ($(OS_ARCH), SunOS)
++	JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
++
++	ifeq ($(JRE_HOME),)
++		JRE_HOME = $(JAVA_HOME)
++		JRE_CLASSES = $(JAVA_CLASSES)
++	else
++		ifeq ($(JRE_CLASSES),)
++			JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
++		endif
++	endif
++
++	PATH_SEPARATOR = :
++
++	# (2) specify "header" information
++	JAVA_ARCH = solaris
++
++	INCLUDES += -I$(JAVA_HOME)/include
++	INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
++
++	# currently, disable JIT option on this platform
++	JDK_JIT_OPT =
++endif
++
++# set [Hewlett Packard HP-UX] platforms
++ifeq ($(OS_ARCH), HP-UX)
++	JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
++
++	ifeq ($(JRE_HOME),)
++		JRE_HOME = $(JAVA_HOME)
++		JRE_CLASSES = $(JAVA_CLASSES)
++	else
++		ifeq ($(JRE_CLASSES),)
++			JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
++		endif
++	endif
++
++	PATH_SEPARATOR = :
++
++	# (2) specify "header" information
++	JAVA_ARCH = hp-ux
++
++	INCLUDES += -I$(JAVA_HOME)/include
++	INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
++
++	# no JIT option available on this platform
++	JDK_JIT_OPT =
++endif
++
++# set [Redhat Linux] platforms
++ifeq ($(OS_ARCH), Linux)
++	JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
++
++	ifeq ($(JRE_HOME),)
++		JRE_HOME = $(JAVA_HOME)
++		JRE_CLASSES = $(JAVA_CLASSES)
++	else
++		ifeq ($(JRE_CLASSES),)
++			JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
++		endif
++	endif
++
++	PATH_SEPARATOR = :
++
++	# (2) specify "header" information
++	JAVA_ARCH = linux
++
++	INCLUDES += -I$(JAVA_HOME)/include
++	INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
++
++	# no JIT option available on this platform
++	JDK_JIT_OPT =
++endif
++
++# set [Mac OS X] platforms
++ifeq ($(OS_ARCH), Darwin)
++	JAVA_CLASSES = $(JAVA_HOME)/../Classes/classes.jar
++
++	ifeq ($(JRE_HOME),)
++		JRE_HOME = $(JAVA_HOME)
++		JRE_CLASSES = $(JAVA_CLASSES)
++	else
++		ifeq ($(JRE_CLASSES),)
++			JRE_CLASSES = $(JRE_HOME)/../Classes/classes.jar
++		endif
++	endif
++
++	PATH_SEPARATOR = :
++
++	# (2) specify "header" information
++	JAVA_ARCH = darwin
++
++	INCLUDES += -I$(JAVA_HOME)/include
++	INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
++
++	# no JIT option available on this platform
++	JDK_JIT_OPT =
++endif
++
++# set [IBM AIX] platforms
++ifeq ($(OS_ARCH), AIX)
++	JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
++
++	ifeq ($(JRE_HOME),)
++		JRE_HOME = $(JAVA_HOME)
++		JRE_CLASSES = $(JAVA_CLASSES)
++	else
++		ifeq ($(JRE_CLASSES),)
++			JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
++		endif
++	endif
++
++	PATH_SEPARATOR = :
++
++	# (2) specify "header" information
++	JAVA_ARCH = aix
++
++	INCLUDES += -I$(JAVA_HOME)/include
++	INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
++
++	# no JIT option available on this platform
++	JDK_JIT_OPT =
++endif
++
++# set [Digital UNIX] platforms
++ifeq ($(OS_ARCH), OSF1)
++	JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
++
++	ifeq ($(JRE_HOME),)
++		JRE_HOME = $(JAVA_HOME)
++		JRE_CLASSES = $(JAVA_CLASSES)
++	else
++		ifeq ($(JRE_CLASSES),)
++			JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
++		endif
++	endif
++
++	PATH_SEPARATOR = :
++
++	# (2) specify "header" information
++	JAVA_ARCH = alpha
++
++	INCLUDES += -I$(JAVA_HOME)/include
++	INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
++
++	# no JIT option available on this platform
++	JDK_JIT_OPT =
++endif
++
++# set [Silicon Graphics IRIX] platforms
++ifeq ($(OS_ARCH), IRIX)
++	JAVA_CLASSES = $(JAVA_HOME)/lib/dev.jar:$(JAVA_HOME)/lib/rt.jar
++
++	ifeq ($(JRE_HOME),)
++		JRE_HOME = $(JAVA_HOME)
++		JRE_CLASSES = $(JAVA_CLASSES)
++	else
++		ifeq ($(JRE_CLASSES),)
++			JRE_CLASSES = $(JRE_HOME)/lib/dev.jar:$(JRE_HOME)/lib/rt.jar
++		endif
++	endif
++
++	PATH_SEPARATOR = :
++
++	# (2) specify "header" information
++	JAVA_ARCH = irix
++
++	INCLUDES += -I$(JAVA_HOME)/include
++	INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
++
++	# no JIT option available on this platform
++	JDK_JIT_OPT =
++endif
++
++#######################################################################
++# [4] Define remaining JDK "Core Components" default toolset options #
++#######################################################################
++
++# set JDK optimization model
++ifeq ($(BUILD_OPT),1)
++	JDK_OPTIMIZER_OPT = -O
++else
++	JDK_OPTIMIZER_OPT = -g
++endif
++
++# set minimal JDK debugging model
++ifeq ($(JDK_DEBUG),1)
++	JDK_DEBUG_OPT = -debug
++else
++	JDK_DEBUG_OPT =
++endif
++
++# set default path to repository for JDK classes
++ifeq ($(JDK_CLASS_REPOSITORY_OPT),)
++	JDK_CLASS_REPOSITORY_OPT = -d $(JAVA_DESTPATH)
++endif
++
++# define a default JDK classpath
++ifeq ($(JDK_CLASSPATH),)
++	JDK_CLASSPATH = '$(JAVA_DESTPATH)$(PATH_SEPARATOR)$(JAVA_SOURCEPATH)$(PATH_SEPARATOR)$(JAVA_CLASSES)'
++endif
++
++# by default, override CLASSPATH environment variable using the JDK classpath option with $(JDK_CLASSPATH)
++ifeq ($(JDK_CLASSPATH_OPT),)
++	JDK_CLASSPATH_OPT = -classpath $(JDK_CLASSPATH)
++endif
++
++ifeq ($(USE_64), 1)
++	JDK_USE_64 = -d64
++endif
++
++endif
++
++
++#######################################################################
++# [5] Define JDK "Core Components" toolset; #
++# (always allow a user to override these values) #
++#######################################################################
++
++#
++# (1) appletviewer
++#
++
++ifeq ($(APPLETVIEWER),)
++	APPLETVIEWER_PROG = $(JAVA_HOME)/bin/appletviewer$(PROG_SUFFIX)
++	APPLETVIEWER_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	APPLETVIEWER_FLAGS += $(JDK_DEBUG_OPT)
++	APPLETVIEWER_FLAGS += $(JDK_JIT_OPT)
++	APPLETVIEWER = $(APPLETVIEWER_PROG) $(APPLETVIEWER_FLAGS)
++endif
++
++#
++# (2) jar
++#
++
++ifeq ($(JAR),)
++	JAR_PROG = $(JAVA_HOME)/bin/jar$(PROG_SUFFIX)
++	JAR_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JAR = $(JAR_PROG) $(JAR_FLAGS)
++endif
++
++#
++# (3) java
++#
++
++ifeq ($(JAVA),)
++	JAVA_PROG = $(JAVA_HOME)/bin/java$(PROG_SUFFIX)
++	JAVA_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JAVA_FLAGS += $(JDK_DEBUG_OPT)
++	JAVA_FLAGS += $(JDK_CLASSPATH_OPT)
++	JAVA_FLAGS += $(JDK_JIT_OPT)
++	JAVA_FLAGS += $(JDK_USE_64)
++	JAVA = $(JAVA_PROG) $(JAVA_FLAGS) 
++endif
++
++#
++# (4) javac
++#
++
++ifeq ($(JAVAC),)
++	JAVAC_PROG = $(JAVA_HOME)/bin/javac$(PROG_SUFFIX)
++	JAVAC_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JAVAC_FLAGS += $(JDK_OPTIMIZER_OPT)
++	JAVAC_FLAGS += $(JDK_DEBUG_OPT)
++	JAVAC_FLAGS += $(JDK_CLASSPATH_OPT)
++	JAVAC_FLAGS += $(JDK_CLASS_REPOSITORY_OPT)
++	JAVAC_FLAGS += $(JDK_USE_64)
++	JAVAC = $(JAVAC_PROG) $(JAVAC_FLAGS)
++endif
++
++#
++# (5) javadoc
++#
++
++ifeq ($(JAVADOC),)
++	JAVADOC_PROG = $(JAVA_HOME)/bin/javadoc$(PROG_SUFFIX)
++	JAVADOC_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JAVADOC_FLAGS += $(JDK_CLASSPATH_OPT)
++	JAVADOC = $(JAVADOC_PROG) $(JAVADOC_FLAGS)
++endif
++
++#
++# (6) javah
++#
++
++ifeq ($(JAVAH),)
++	JAVAH_PROG = $(JAVA_HOME)/bin/javah$(PROG_SUFFIX)
++	JAVAH_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JAVAH_FLAGS += $(JDK_CLASSPATH_OPT)
++	JAVAH = $(JAVAH_PROG) $(JAVAH_FLAGS)
++endif
++
++#
++# (7) javakey
++#
++
++ifeq ($(JAVAKEY),)
++	JAVAKEY_PROG = $(JAVA_HOME)/bin/javakey$(PROG_SUFFIX)
++	JAVAKEY_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JAVAKEY = $(JAVAKEY_PROG) $(JAVAKEY_FLAGS)
++endif
++
++#
++# (8) javap
++#
++
++ifeq ($(JAVAP),)
++	JAVAP_PROG = $(JAVA_HOME)/bin/javap$(PROG_SUFFIX)
++	JAVAP_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JAVAP_FLAGS += $(JDK_CLASSPATH_OPT)
++	JAVAP = $(JAVAP_PROG) $(JAVAP_FLAGS)
++endif
++
++#
++# (9) javat
++#
++
++ifeq ($(JAVAT),)
++	JAVAT_PROG = $(JAVA_HOME)/bin/javat$(PROG_SUFFIX)
++	JAVAT_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JAVAT = $(JAVAT_PROG) $(JAVAT_FLAGS)
++endif
++
++#
++# (10) javaverify
++#
++
++ifeq ($(JAVAVERIFY),)
++	JAVAVERIFY_PROG = $(JAVA_HOME)/bin/javaverify$(PROG_SUFFIX)
++	JAVAVERIFY_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JAVAVERIFY = $(JAVAVERIFY_PROG) $(JAVAVERIFY_FLAGS)
++endif
++
++#
++# (11) javaw
++#
++
++ifeq ($(JAVAW),)
++	jJAVAW_PROG = $(JAVA_HOME)/bin/javaw$(PROG_SUFFIX)
++	jJAVAW_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	jJAVAW_FLAGS += $(JDK_DEBUG_OPT)
++	jJAVAW_FLAGS += $(JDK_CLASSPATH_OPT)
++	jJAVAW_FLAGS += $(JDK_JIT_OPT)
++	jJAVAW = $(JAVAW_PROG) $(JAVAW_FLAGS)
++endif
++
++#
++# (12) jdb
++#
++
++ifeq ($(JDB),)
++	JDB_PROG = $(JAVA_HOME)/bin/jdb$(PROG_SUFFIX)
++	JDB_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JDB_FLAGS += $(JDK_DEBUG_OPT)
++	JDB_FLAGS += $(JDK_CLASSPATH_OPT)
++	JDB_FLAGS += $(JDK_JIT_OPT)
++	JDB = $(JDB_PROG) $(JDB_FLAGS)
++endif
++
++#
++# (13) jre
++#
++
++ifeq ($(JRE),)
++	JRE_PROG = $(JAVA_HOME)/bin/jre$(PROG_SUFFIX)
++	JRE_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JRE_FLAGS += $(JDK_CLASSPATH_OPT)
++	JRE_FLAGS += $(JDK_JIT_OPT)
++	JRE = $(JRE_PROG) $(JRE_FLAGS) 
++endif
++
++#
++# (14) jrew
++#
++
++ifeq ($(JREW),)
++	JREW_PROG = $(JAVA_HOME)/bin/jrew$(PROG_SUFFIX)
++	JREW_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	JREW_FLAGS += $(JDK_CLASSPATH_OPT)
++	JREW_FLAGS += $(JDK_JIT_OPT)
++	JREW = $(JREW_PROG) $(JREW_FLAGS) 
++endif
++
++#
++# (15) native2ascii
++#
++
++ifeq ($(NATIVE2ASCII),)
++	NATIVE2ASCII_PROG = $(JAVA_HOME)/bin/native2ascii$(PROG_SUFFIX)
++	NATIVE2ASCII_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	NATIVE2ASCII = $(NATIVE2ASCII_PROG) $(NATIVE2ASCII_FLAGS) 
++endif
++
++#
++# (16) rmic
++#
++
++ifeq ($(RMIC),)
++	RMIC_PROG = $(JAVA_HOME)/bin/rmic$(PROG_SUFFIX)
++	RMIC_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	RMIC_FLAGS += $(JDK_OPTIMIZER_OPT)
++	RMIC_FLAGS += $(JDK_CLASSPATH_OPT)
++	RMIC = $(RMIC_PROG) $(RMIC_FLAGS) 
++endif
++
++#
++# (17) rmiregistry
++#
++
++ifeq ($(RMIREGISTRY),)
++	RMIREGISTRY_PROG = $(JAVA_HOME)/bin/rmiregistry$(PROG_SUFFIX)
++	RMIREGISTRY_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	RMIREGISTRY = $(RMIREGISTRY_PROG) $(RMIREGISTRY_FLAGS) 
++endif
++
++#
++# (18) serialver
++#
++
++ifeq ($(SERIALVER),)
++	SERIALVER_PROG = $(JAVA_HOME)/bin/serialver$(PROG_SUFFIX)
++	SERIALVER_FLAGS = $(JDK_THREADING_MODEL_OPT)
++	SERIALVER = $(SERIALVER_PROG) $(SERIALVER_FLAGS) 
++endif
+diff -Naur security/coreconf/jniregen.pl mozilla/security/coreconf/jniregen.pl
+--- a/security/coreconf/jniregen.pl	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/jniregen.pl	2010-04-26 02:37:40.000000000 +0300
+@@ -0,0 +1,111 @@
++#!/usr/local/bin/perl
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++# Input: -d dir -j javahcmd foo1 foo2 . . .
++# Compares generated "_jni/foo1.h" file with "foo1.class", and
++# generated "_jni/foo2.h" file with "foo2.class", etc.
++# (NOTE: unlike its closely related cousin, outofdate.pl,
++# the "-d dir" must always be specified)
++# Runs the javahcmd on all files that are different.
++#
++# Returns: list of headers which are OLDER than corresponding class
++# files (non-existent class files are considered to be real old :-)
++
++my $javah = "";
++my $classdir = "";
++
++while(1) {
++ if ($ARGV[0] eq '-d') {
++ $classdir = $ARGV[1];
++ $classdir .= "/";
++ shift;
++ shift;
++ } elsif($ARGV[0] eq '-j') {
++ $javah = $ARGV[1];
++ shift;
++ shift;
++ } else {
++ last;
++ }
++}
++
++if( $javah eq "") {
++ die "Must specify -j <javah command>";
++}
++if( $classdir eq "") {
++ die "Must specify -d <classdir>";
++}
++
++foreach $filename (@ARGV)
++{
++ $headerfilename = "_jni/";
++ $headerfilename .= $filename;
++ $headerfilename =~ s/\./_/g;
++ $headerfilename .= ".h";
++
++ $classfilename = $filename;
++ $classfilename =~ s|\.|/|g;
++ $classfilename .= ".class";
++
++ $classfilename = $classdir . $classfilename;
++
++
++ ( $dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $headermtime,
++ $ctime, $blksize, $blocks ) = stat( $headerfilename );
++
++ ( $dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $classmtime,
++ $ctime, $blksize, $blocks ) = stat( $classfilename );
++
++ if( $headermtime < $classmtime )
++ {
++	# NOTE: Since this is used by "javah", and "javah" refuses to overwrite
++	# an existing file, we force an unlink from this script, since
++	# we actually want to regenerate the header file at this time.
++ unlink $headerfilename;
++ push @filelist, $filename;
++ }
++}
++
++if( @filelist ) {
++ $cmd = "$javah " . join(" ",@filelist);
++ $cmd =~ s/\'/\"/g; # because windows doesn't understand single quote
++ print "$cmd\n";
++ exit (system($cmd) >> 8);
++} else {
++ print "All JNI header files up to date.\n"
++}
+diff -Naur security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk
+--- a/security/coreconf/Linux.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/Linux.mk	2011-07-03 09:13:29.000000000 +0300
+@@ -0,0 +1,206 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++#
++# The default implementation strategy for Linux is now pthreads
++#
++USE_PTHREADS = 1
++
++ifeq ($(USE_PTHREADS),1)
++	IMPL_STRATEGY = _PTH
++endif
++
++CC			= gcc
++CCC			= g++
++RANLIB			= ranlib
++
++DEFAULT_COMPILER = gcc
++
++ifeq ($(OS_TEST),ppc64)
++	CPU_ARCH	= ppc
++ifeq ($(USE_64),1)
++	ARCHFLAG	= -m64
++endif
++else
++ifeq ($(OS_TEST),alpha)
++ OS_REL_CFLAGS = -D_ALPHA_
++	CPU_ARCH	= alpha
++else
++ifeq ($(OS_TEST),x86_64)
++ifeq ($(USE_64),1)
++	CPU_ARCH	= x86_64
++else
++	OS_REL_CFLAGS	= -Di386
++	CPU_ARCH	= x86
++	ARCHFLAG	= -m32
++endif
++else
++ifeq ($(OS_TEST),sparc64)
++	CPU_ARCH = sparc
++else
++ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
++	CPU_ARCH = arm
++else
++ifeq (,$(filter-out parisc%,$(OS_TEST)))
++	CPU_ARCH = hppa
++else
++ifeq (,$(filter-out i%86,$(OS_TEST)))
++	OS_REL_CFLAGS	= -Di386
++	CPU_ARCH	= x86
++else
++ifeq ($(OS_TEST),sh4a)
++	CPU_ARCH = sh4
++else
++# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4
++	CPU_ARCH	= $(OS_TEST)
++endif
++endif
++endif
++endif
++endif
++endif
++endif
++endif
++
++
++LIBC_TAG		= _glibc
++
++ifeq ($(OS_RELEASE),2.0)
++	OS_REL_CFLAGS	+= -DLINUX2_0
++	MKSHLIB		= $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
++	ifdef MAPFILE
++		MKSHLIB += -Wl,--version-script,$(MAPFILE)
++	endif
++	PROCESS_MAP_FILE = grep -v ';-' $< | \
++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++endif
++
++ifdef BUILD_OPT
++ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
++	OPTIMIZER = -Os
++else
++	OPTIMIZER = -O2
++endif
++ifdef MOZ_DEBUG_SYMBOLS
++	ifdef MOZ_DEBUG_FLAGS
++		OPTIMIZER += $(MOZ_DEBUG_FLAGS)
++	else
++		OPTIMIZER += -gdwarf-2
++	endif
++endif
++endif
++
++
++ifeq ($(USE_PTHREADS),1)
++OS_PTHREAD = -lpthread 
++endif
++
++# See bug 537829, in particular comment 23.
++# Place -ansi and *_SOURCE before $(DSO_CFLAGS) so DSO_CFLAGS can override
++# -ansi on platforms like Android where the system headers are C99 and do
++# not build with -ansi.
++STANDARDS_CFLAGS	= -ansi -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE
++OS_CFLAGS		= $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR
++OS_LIBS			= $(OS_PTHREAD) -ldl -lc
++
++ifdef USE_PTHREADS
++	DEFINES		+= -D_REENTRANT
++endif
++
++ARCH			= linux
++
++DSO_CFLAGS		= -fPIC
++DSO_LDOPTS		= -shared $(ARCHFLAG)
++# The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
++# incorrectly reports undefined references in the libraries we link with, so
++# we don't use -z defs there.
++ZDEFS_FLAG		= -Wl,-z,defs
++DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
++LDFLAGS			+= $(ARCHFLAG)
++
++# On Maemo, we need to use the -rpath-link flag for even the standard system
++# library directories.
++ifdef _SBOX_DIR
++LDFLAGS			+= -Wl,-rpath-link,/usr/lib:/lib
++endif
++
++# INCLUDES += -I/usr/include -Y/usr/include/linux
++G++INCLUDES		= -I/usr/include/g++
++
++#
++# Always set CPU_TAG on Linux, WINCE.
++#
++CPU_TAG = _$(CPU_ARCH)
++
++#
++# On Linux 2.6 or later, build libfreebl3.so with no NSPR and libnssutil3.so
++# dependencies by default. Set FREEBL_NO_DEPEND to 0 in the environment to
++# override this.
++#
++ifeq (2.6,$(firstword $(sort 2.6 $(OS_RELEASE))))
++ifndef FREEBL_NO_DEPEND
++FREEBL_NO_DEPEND = 1
++endif
++endif
++
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++
++# The -rpath '$$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++ifeq ($(BUILD_SUN_PKG), 1)
++ifeq ($(USE_64), 1)
++RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib64:/opt/sun/private/lib'
++else
++RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib'
++endif
++endif
++
++OS_REL_CFLAGS += -DLINUX2_1
++MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
++
++ifdef MAPFILE
++	MKSHLIB += -Wl,--version-script,$(MAPFILE)
++endif
++PROCESS_MAP_FILE = grep -v ';-' $< | \
++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++
++ifeq ($(OS_RELEASE),2.4)
++DEFINES += -DNO_FORK_CHECK
++endif
+diff -Naur security/coreconf/location.mk mozilla/security/coreconf/location.mk
+--- a/security/coreconf/location.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/location.mk	2010-06-12 03:58:32.000000000 +0300
+@@ -0,0 +1,106 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++#######################################################################
++# Master "Core Components" macros to figure out binary code location #
++#######################################################################
++
++#
++# Figure out where the binary code lives.
++#
++
++ifdef BUILD_TREE
++ifdef LIBRARY_NAME
++BUILD = $(BUILD_TREE)/nss/$(LIBRARY_NAME)
++OBJDIR = $(BUILD_TREE)/nss/$(LIBRARY_NAME)
++DEPENDENCIES = $(BUILD_TREE)/nss/$(LIBRARY_NAME)/.md
++else
++BUILD = $(BUILD_TREE)/nss
++OBJDIR = $(BUILD_TREE)/nss
++DEPENDENCIES = $(BUILD_TREE)/nss/.md
++endif
++else
++BUILD = $(PLATFORM)
++OBJDIR = $(PLATFORM)
++DEPENDENCIES = $(PLATFORM)/.md
++endif
++
++DIST = $(SOURCE_PREFIX)/$(PLATFORM)
++
++ifdef BUILD_DEBUG_GC
++ DEFINES += -DDEBUG_GC
++endif
++
++GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*)
++
++ifdef NSPR_INCLUDE_DIR
++ INCLUDES += -I$(NSPR_INCLUDE_DIR)
++endif
++
++ifndef NSPR_LIB_DIR
++ NSPR_LIB_DIR = $(DIST)/lib
++endif
++
++ifdef NSS_INCLUDE_DIR
++ INCLUDES += -I$(NSS_INCLUDE_DIR)
++endif
++
++ifndef NSS_LIB_DIR
++ NSS_LIB_DIR = $(DIST)/lib
++endif
++
++ifdef NSSUTIL_INCLUDE_DIR
++ INCLUDES += -I$(NSSUTIL_INCLUDE_DIR)
++endif
++
++ifndef NSSUTIL_LIB_DIR
++ NSSUTIL_LIB_DIR = $(DIST)/lib
++endif
++
++ifdef SOFTOKEN_INCLUDE_DIR
++ INCLUDES += -I$(SOFTOKEN_INCLUDE_DIR)
++endif
++
++ifndef SOFTOKEN_LIB_DIR
++ SOFTOKEN_LIB_DIR = $(DIST)/lib
++endif
++
++ifndef SQLITE_LIB_NAME
++ SQLITE_LIB_NAME = sqlite3
++endif
++
++MK_LOCATION = included
+diff -Naur security/coreconf/Makefile mozilla/security/coreconf/Makefile
+--- a/security/coreconf/Makefile	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/Makefile	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,47 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++DEPTH		= ..
++CORE_DEPTH	= ..
++
++MODULE		= coreconf
++
++DIRS		= nsinstall
++
++include $(DEPTH)/coreconf/config.mk
++include $(DEPTH)/coreconf/rules.mk
++
++export:: libs
+diff -Naur security/coreconf/mkdepend/cppsetup.c mozilla/security/coreconf/mkdepend/cppsetup.c
+--- a/security/coreconf/mkdepend/cppsetup.c	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/mkdepend/cppsetup.c	2009-02-14 02:37:00.000000000 +0200
+@@ -0,0 +1,233 @@
++/* $Xorg: cppsetup.c,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $ */
++/*
++
++Copyright (c) 1993, 1994, 1998 The Open Group
++
++Permission to use, copy, modify, distribute, and sell this software and its
++documentation for any purpose is hereby granted without fee, provided that
++the above copyright notice appear in all copies and that both that
++copyright notice and this permission notice appear in supporting
++documentation.
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of The Open Group shall not be
++used in advertising or otherwise to promote the sale, use or other dealings
++in this Software without prior written authorization from The Open Group.
++
++*/
++/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.11 2001/12/17 20:52:22 dawes Exp $ */
++
++#include "def.h"
++
++#ifdef	CPP
++/*
++ * This file is strictly for the sake of cpy.y and yylex.c (if
++ * you indeed have the source for cpp).
++ */
++#define IB 1
++#define SB 2
++#define NB 4
++#define CB 8
++#define QB 16
++#define WB 32
++#define SALT '#'
++#if defined(pdp11) || defined(vax) || defined(ns16000) || defined(mc68000) || defined(ibm032)
++#define COFF 128
++#else
++#define COFF 0
++#endif
++/*
++ * These variables used by cpy.y and yylex.c
++ */
++extern char	*outp, *inp, *newp, *pend;
++extern char	*ptrtab;
++extern char	fastab[];
++extern char	slotab[];
++
++/*
++ * cppsetup
++ */
++struct filepointer	*currentfile;
++struct inclist		*currentinc;
++
++int
++cppsetup(char *line, struct filepointer *filep, struct inclist *inc)
++{
++	char *p, savec;
++	static boolean setupdone = FALSE;
++	boolean	value;
++
++	if (!setupdone) {
++		cpp_varsetup();
++		setupdone = TRUE;
++	}
++
++	currentfile = filep;
++	currentinc = inc;
++	inp = newp = line;
++	for (p=newp; *p; p++)
++		;
++
++	/*
++	 * put a newline back on the end, and set up pend, etc.
++	 */
++	*p++ = '\n';
++	savec = *p;
++	*p = '\0';
++	pend = p;
++
++	ptrtab = slotab+COFF;
++	*--inp = SALT; 
++	outp=inp; 
++	value = yyparse();
++	*p = savec;
++	return(value);
++}
++
++struct symtab **lookup(symbol)
++	char	*symbol;
++{
++	static struct symtab *undefined;
++	struct symtab **sp;
++
++	sp = isdefined(symbol, currentinc, NULL);
++	if (sp == NULL) {
++		sp = &undefined;
++		(*sp)->s_value = NULL;
++	}
++	return (sp);
++}
++
++pperror(tag, x0,x1,x2,x3,x4)
++	int	tag,x0,x1,x2,x3,x4;
++{
++	warning("\"%s\", line %d: ", currentinc->i_file, currentfile->f_line);
++	warning(x0,x1,x2,x3,x4);
++}
++
++
++yyerror(s)
++	register char	*s;
++{
++	fatalerr("Fatal error: %s\n", s);
++}
++#else /* not CPP */
++
++#include "ifparser.h"
++struct _parse_data {
++ struct filepointer *filep;
++ struct inclist *inc;
++ char *filename;
++ const char *line;
++};
++
++static const char *
++my_if_errors (IfParser *ip, const char *cp, const char *expecting)
++{
++ struct _parse_data *pd = (struct _parse_data *) ip->data;
++ int lineno = pd->filep->f_line;
++ char *filename = pd->filename;
++ char prefix[300];
++ int prefixlen;
++ int i;
++
++ sprintf (prefix, "\"%s\":%d", filename, lineno);
++ prefixlen = strlen(prefix);
++ fprintf (stderr, "%s: %s", prefix, pd->line);
++ i = cp - pd->line;
++ if (i > 0 && pd->line[i-1] != '\n') {
++	putc ('\n', stderr);
++ }
++ for (i += prefixlen + 3; i > 0; i--) {
++	putc (' ', stderr);
++ }
++ fprintf (stderr, "^--- a/expecting %s\n", expecting);
++ return NULL;
++}
++
++
++#define MAXNAMELEN 256
++
++static struct symtab **
++lookup_variable (IfParser *ip, const char *var, int len)
++{
++ char tmpbuf[MAXNAMELEN + 1];
++ struct _parse_data *pd = (struct _parse_data *) ip->data;
++
++ if (len > MAXNAMELEN)
++	return 0;
++
++ strncpy (tmpbuf, var, len);
++ tmpbuf[len] = '\0';
++ return isdefined (tmpbuf, pd->inc, NULL);
++}
++
++
++static int
++my_eval_defined (IfParser *ip, const char *var, int len)
++{
++ if (lookup_variable (ip, var, len))
++	return 1;
++ else
++	return 0;
++}
++
++#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
++
++static long
++my_eval_variable (IfParser *ip, const char *var, int len)
++{
++ long val;
++ struct symtab **s;
++
++ s = lookup_variable (ip, var, len);
++ if (!s)
++	return 0;
++ do {
++	var = (*s)->s_value;
++	if (!isvarfirstletter(*var) || !strcmp((*s)->s_name, var))
++	 break;
++	s = lookup_variable (ip, var, strlen(var));
++ } while (s);
++
++ var = ParseIfExpression(ip, var, &val);
++ if (var && *var) debug(4, ("extraneous: '%s'\n", var));
++ return val;
++}
++
++int
++cppsetup(char *filename,
++	 char *line,
++	 struct filepointer *filep,
++	 struct inclist *inc)
++{
++ IfParser ip;
++ struct _parse_data pd;
++ long val = 0;
++
++ pd.filep = filep;
++ pd.inc = inc;
++ pd.line = line;
++ pd.filename = filename;
++ ip.funcs.handle_error = my_if_errors;
++ ip.funcs.eval_defined = my_eval_defined;
++ ip.funcs.eval_variable = my_eval_variable;
++ ip.data = (char *) &pd;
++
++ (void) ParseIfExpression (&ip, line, &val);
++ if (val)
++	return IF;
++ else
++	return IFFALSE;
++}
++#endif /* CPP */
++
+diff -Naur security/coreconf/mkdepend/def.h mozilla/security/coreconf/mkdepend/def.h
+--- a/security/coreconf/mkdepend/def.h	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/mkdepend/def.h	2009-02-14 02:37:00.000000000 +0200
+@@ -0,0 +1,184 @@
++/* $Xorg: def.h,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */
++/*
++
++Copyright (c) 1993, 1994, 1998 The Open Group.
++
++Permission to use, copy, modify, distribute, and sell this software and its
++documentation for any purpose is hereby granted without fee, provided that
++the above copyright notice appear in all copies and that both that
++copyright notice and this permission notice appear in supporting
++documentation.
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of The Open Group shall not be
++used in advertising or otherwise to promote the sale, use or other dealings
++in this Software without prior written authorization from The Open Group.
++
++*/
++/* $XFree86: xc/config/makedepend/def.h,v 3.14 2003/01/17 17:09:49 tsi Exp $ */
++
++#ifndef NO_X11
++#include <X11/Xos.h>
++#include <X11/Xfuncproto.h>
++#endif
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <ctype.h>
++#if 0
++#ifndef X_NOT_POSIX
++#ifndef _POSIX_SOURCE
++#define _POSIX_SOURCE
++#endif
++#endif
++#endif
++#include <sys/types.h>
++#include <fcntl.h>
++#include <sys/stat.h>
++
++#define MAXDEFINES	512
++#define MAXFILES	1024
++#define MAXINCFILES	256	/* "-include" files */
++#define MAXDIRS		1024
++#define SYMTABINC	10	/* must be > 1 for define() to work right */
++#define	TRUE		1
++#define	FALSE		0
++
++/* the following must match the directives table in main.c */
++#define	IF		0
++#define	IFDEF		1
++#define	IFNDEF		2
++#define	ELSE		3
++#define	ENDIF		4
++#define	DEFINE		5
++#define	UNDEF		6
++#define	INCLUDE		7
++#define	LINE		8
++#define	PRAGMA		9
++#define ERROR 10
++#define IDENT 11
++#define SCCS 12
++#define ELIF 13
++#define EJECT 14
++#define WARNING 15
++#define INCLUDENEXT 16
++#define IFFALSE 17 /* pseudo value --- a/never matched */
++#define ELIFFALSE 18 /* pseudo value --- a/never matched */
++#define INCLUDEDOT 19 /* pseudo value --- a/never matched */
++#define IFGUESSFALSE 20 /* pseudo value --- a/never matched */
++#define ELIFGUESSFALSE 21 /* pseudo value --- a/never matched */
++#define INCLUDENEXTDOT 22 /* pseudo value --- a/never matched */
++
++#ifdef DEBUG
++extern int	_debugmask;
++/*
++ * debug levels are:
++ * 
++ * 0	show ifn*(def)*,endif
++ * 1	trace defined/!defined
++ * 2	show #include
++ * 3	show #include SYMBOL
++ * 4-6	unused
++ */
++#define debug(level,arg) { if (_debugmask & (1 << level)) warning arg; }
++#else
++#define	debug(level,arg) /**/
++#endif /* DEBUG */
++
++typedef	unsigned char boolean;
++
++struct symtab {
++	char	*s_name;
++	char	*s_value;
++};
++
++/* possible i_flag */
++#define DEFCHECKED	(1<<0)	/* whether defines have been checked */
++#define NOTIFIED	(1<<1)	/* whether we have revealed includes */
++#define MARKED		(1<<2)	/* whether it's in the makefile */
++#define SEARCHED	(1<<3)	/* whether we have read this */
++#define FINISHED	(1<<4)	/* whether we are done reading this */
++#define INCLUDED_SYM	(1<<5)	/* whether #include SYMBOL was found
++				 Can't use i_list if TRUE */
++struct	inclist {
++	char		*i_incstring;	/* string from #include line */
++	char		*i_file;	/* path name of the include file */
++	struct inclist	**i_list;	/* list of files it itself includes */
++	int		i_listlen;	/* length of i_list */
++	struct symtab	**i_defs;	/* symbol table for this file and its
++					 children when merged */
++	int		i_ndefs;	/* current # defines */
++	boolean		*i_merged; /* whether we have merged child
++					 defines */
++	unsigned char i_flags;
++};
++
++struct filepointer {
++	char	*f_name;
++	char	*f_p;
++	char	*f_base;
++	char	*f_end;
++	long	f_len;
++	long	f_line;
++	long	cmdinc_count;
++	char	**cmdinc_list;
++	long	cmdinc_line;
++};
++
++#include <stdlib.h>
++#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */
++char *malloc(), *realloc();
++#endif /* macII */
++
++char			*copy(char *str);
++int match(char *str, char **list);
++char			*base_name(char *file);
++char			*getnextline(struct filepointer *fp);
++struct symtab		**slookup(char *symbol, struct inclist *file);
++struct symtab		**isdefined(char *symbol, struct inclist *file,
++				 struct inclist **srcfile);
++struct symtab		**fdefined(char *symbol, struct inclist *file,
++				 struct inclist **srcfile);
++struct filepointer	*getfile(char *file);
++void included_by(struct inclist *ip, 
++				 struct inclist *newfile);
++struct inclist		*newinclude(char *newfile, char *incstring);
++void inc_clean (void);
++struct inclist		*inc_path(char *file, char *include, int type);
++
++void freefile(struct filepointer *fp);
++
++void define2(char *name, char *val, struct inclist *file);
++void define(char *def, struct inclist *file);
++void undefine(char *symbol, struct inclist *file);
++int find_includes(struct filepointer *filep, 
++				 struct inclist *file, 
++				 struct inclist *file_red, 
++				 int recursion, boolean failOK);
++
++void recursive_pr_include(struct inclist *head, 
++					 char *file, char *base);
++void add_include(struct filepointer *filep, 
++				 struct inclist *file, 
++				 struct inclist *file_red, 
++				 char *include, int type,
++				 boolean failOK);
++
++int cppsetup(char *filename,
++				 char *line,
++				 struct filepointer *filep,
++				 struct inclist *inc);
++
++
++extern void fatalerr(char *, ...);
++extern void warning(char *, ...);
++extern void warning1(char *, ...);
+diff -Naur security/coreconf/mkdepend/ifparser.c mozilla/security/coreconf/mkdepend/ifparser.c
+--- a/security/coreconf/mkdepend/ifparser.c	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/mkdepend/ifparser.c	2009-02-14 21:40:54.000000000 +0200
+@@ -0,0 +1,551 @@
++/*
++ * $Xorg: ifparser.c,v 1.3 2000/08/17 19:41:50 cpqbld Exp $
++ *
++ * Copyright 1992 Network Computing Devices, Inc.
++ * 
++ * Permission to use, copy, modify, and distribute this software and its
++ * documentation for any purpose and without fee is hereby granted, provided
++ * that the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Network Computing Devices may not be
++ * used in advertising or publicity pertaining to distribution of the software
++ * without specific, written prior permission. Network Computing Devices makes
++ * no representations about the suitability of this software for any purpose.
++ * It is provided ``as is'' without express or implied warranty.
++ * 
++ * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
++ * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR ANY SPECIAL,
++ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
++ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ * 
++ * Author: Jim Fulton
++ * Network Computing Devices, Inc.
++ * 
++ * Simple if statement processor
++ *
++ * This module can be used to evaluate string representations of C language
++ * if constructs. It accepts the following grammar:
++ * 
++ * EXPRESSION	:=	VALUE
++ * 			 |	VALUE BINOP	EXPRESSION
++ *			 |	VALUE	'?'	EXPRESSION ':'	EXPRESSION
++ * 
++ * VALUE		:=	'(' EXPRESSION ')'
++ * 			 |	'!' VALUE
++ * 			 |	'-' VALUE
++ * 			 |	'+' VALUE
++ *			 |	'~' VALUE
++ * 			 |	'defined' '(' variable ')'
++ * 			 |	'defined' variable
++ *			 |	# variable '(' variable-list ')'
++ * 			 |	variable
++ * 			 |	number
++ * 
++ * BINOP		:=	'*'	| '/'	| '%'
++ * 			 |	'+'	| '-'
++ * 			 |	'<<'	| '>>'
++ * 			 |	'<'	| '>'	| '<=' | '>='
++ * 			 |	'=='	| '!='
++ * 			 |	'&'	| '^' | '|'
++ * 			 |	'&&'	| '||'
++ * 
++ * The normal C order of precedence is supported.
++ * 
++ * 
++ * External Entry Points:
++ * 
++ * ParseIfExpression		parse a string for #if
++ */
++/* $XFree86: xc/config/makedepend/ifparser.c,v 3.11 2002/09/23 01:48:08 tsi Exp $ */
++
++#include "ifparser.h"
++#include <ctype.h>
++#include <stdlib.h>
++#include <string.h>
++
++/****************************************************************************
++		 Internal Macros and Utilities for Parser
++ ****************************************************************************/
++
++#define DO(val) if (!(val)) return NULL
++#define CALLFUNC(ggg,fff) (*((ggg)->funcs.fff))
++#define SKIPSPACE(ccc) while (isspace(*ccc)) ccc++
++#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
++
++
++static const char *
++parse_variable (IfParser *g, const char *cp, const char **varp)
++{
++ SKIPSPACE (cp);
++
++ if (!isvarfirstletter (*cp))
++	return CALLFUNC(g, handle_error) (g, cp, "variable name");
++
++ *varp = cp;
++ /* EMPTY */
++ for (cp++; isalnum(*cp) || *cp == '_'; cp++) ;
++ return cp;
++}
++
++
++static const char *
++parse_number (IfParser *g, const char *cp, long *valp)
++{
++ long base = 10;
++ SKIPSPACE (cp);
++
++ if (!isdigit(*cp))
++	return CALLFUNC(g, handle_error) (g, cp, "number");
++
++ *valp = 0;
++
++ if (*cp == '0') {
++	cp++;
++	if ((*cp == 'x') || (*cp == 'X')) {
++	 base = 16;
++	 cp++;
++	} else {
++	 base = 8;
++	}
++ }
++
++ /* Ignore overflows and assume ASCII, what source is usually written in */
++ while (1) {
++	int increment = -1;
++	if (base == 8) {
++	 if ((*cp >= '0') && (*cp <= '7'))
++		increment = *cp++ - '0';
++	} else if (base == 16) {
++	 if ((*cp >= '0') && (*cp <= '9'))
++		increment = *cp++ - '0';
++	 else if ((*cp >= 'A') && (*cp <= 'F'))
++		increment = *cp++ - ('A' - 10);
++	 else if ((*cp >= 'a') && (*cp <= 'f'))
++		increment = *cp++ - ('a' - 10);
++	} else {	/* Decimal */
++	 if ((*cp >= '0') && (*cp <= '9'))
++		increment = *cp++ - '0';
++	}
++	if (increment < 0)
++	 break;
++	*valp = (*valp * base) + increment;
++ }
++
++ /* Skip trailing qualifiers */
++ while (*cp == 'U' || *cp == 'u' || *cp == 'L' || *cp == 'l') cp++;
++ return cp;
++}
++
++static const char *
++parse_character (IfParser *g, const char *cp, long *valp)
++{
++ char val;
++
++ SKIPSPACE (cp);
++ if (*cp == '\\')
++	switch (cp[1]) {
++	case 'n': val = '\n'; break;
++	case 't': val = '\t'; break;
++	case 'v': val = '\v'; break;
++	case 'b': val = '\b'; break;
++	case 'r': val = '\r'; break;
++	case 'f': val = '\f'; break;
++	case 'a': val = '\a'; break;
++	case '\\': val = '\\'; break;
++	case '?': val = '\?'; break;
++	case '\'': val = '\''; break;
++	case '\"': val = '\"'; break;
++	case 'x': val = (char) strtol (cp + 2, NULL, 16); break;
++	default: val = (char) strtol (cp + 1, NULL, 8); break;
++	}
++ else
++	val = *cp;
++ while (*cp != '\'') cp++;
++ *valp = (long) val;
++ return cp;
++}
++
++static const char *
++parse_value (IfParser *g, const char *cp, long *valp)
++{
++ const char *var, *varend;
++
++ *valp = 0;
++
++ SKIPSPACE (cp);
++ if (!*cp)
++	return cp;
++
++ switch (*cp) {
++ case '(':
++	DO (cp = ParseIfExpression (g, cp + 1, valp));
++	SKIPSPACE (cp);
++	if (*cp != ')') 
++	 return CALLFUNC(g, handle_error) (g, cp, ")");
++
++	return cp + 1;			/* skip the right paren */
++
++ case '!':
++	DO (cp = parse_value (g, cp + 1, valp));
++	*valp = !(*valp);
++	return cp;
++
++ case '-':
++	DO (cp = parse_value (g, cp + 1, valp));
++	*valp = -(*valp);
++	return cp;
++
++ case '+':
++	DO (cp = parse_value (g, cp + 1, valp));
++	return cp;
++
++ case '~':
++	DO (cp = parse_value (g, cp + 1, valp));
++	*valp = ~(*valp);
++	return cp;
++
++ case '#':
++	DO (cp = parse_variable (g, cp + 1, &var));
++	SKIPSPACE (cp);
++	if (*cp != '(')
++	 return CALLFUNC(g, handle_error) (g, cp, "(");
++	do {
++	 DO (cp = parse_variable (g, cp + 1, &var));
++	 SKIPSPACE (cp);
++	} while (*cp && *cp != ')');
++	if (*cp != ')')
++	 return CALLFUNC(g, handle_error) (g, cp, ")");
++	*valp = 1; /* XXX */
++	return cp + 1;
++
++ case '\'':
++	DO (cp = parse_character (g, cp + 1, valp));
++	if (*cp != '\'')
++	 return CALLFUNC(g, handle_error) (g, cp, "'");
++	return cp + 1;
++
++ case 'd':
++	if (strncmp (cp, "defined", 7) == 0 && !isalnum(cp[7])) {
++	 int paren = 0;
++	 int len;
++
++	 cp += 7;
++	 SKIPSPACE (cp);
++	 if (*cp == '(') {
++		paren = 1;
++		cp++;
++	 }
++	 DO (cp = parse_variable (g, cp, &var));
++	 len = cp - var;
++	 SKIPSPACE (cp);
++	 if (paren && *cp != ')')
++		return CALLFUNC(g, handle_error) (g, cp, ")");
++	 *valp = (*(g->funcs.eval_defined)) (g, var, len);
++	 return cp + paren;		/* skip the right paren */
++	}
++	/* fall out */
++ }
++
++ if (isdigit(*cp)) {
++	DO (cp = parse_number (g, cp, valp));
++ } else if (!isvarfirstletter(*cp))
++	return CALLFUNC(g, handle_error) (g, cp, "variable or number");
++ else {
++	DO (cp = parse_variable (g, cp, &var));
++	varend = cp;
++	SKIPSPACE(cp);
++	if (*cp != '(') {
++	 *valp = (*(g->funcs.eval_variable)) (g, var, varend - var);
++	} else {
++	 do {
++		long dummy;
++		DO (cp = ParseIfExpression (g, cp + 1, &dummy));
++		SKIPSPACE(cp);
++		if (*cp == ')')
++		 break;
++		if (*cp != ',')
++		 return CALLFUNC(g, handle_error) (g, cp, ",");
++	 } while (1);
++
++	 *valp = 1;	/* XXX */
++	 cp++;
++	}
++ }
++ 
++ return cp;
++}
++
++
++
++static const char *
++parse_product (IfParser *g, const char *cp, long *valp)
++{
++ long rightval;
++
++ DO (cp = parse_value (g, cp, valp));
++ SKIPSPACE (cp);
++
++ switch (*cp) {
++ case '*':
++	DO (cp = parse_product (g, cp + 1, &rightval));
++	*valp = (*valp * rightval);
++	break;
++
++ case '/':
++	DO (cp = parse_product (g, cp + 1, &rightval));
++	if (rightval == 0)
++	 return CALLFUNC(g, handle_error) (g, cp, "0");
++	*valp = (*valp / rightval);
++	break;
++
++ case '%':
++	DO (cp = parse_product (g, cp + 1, &rightval));
++	*valp = (*valp % rightval);
++	break;
++ }
++ return cp;
++}
++
++
++static const char *
++parse_sum (IfParser *g, const char *cp, long *valp)
++{
++ long rightval;
++
++ DO (cp = parse_product (g, cp, valp));
++ SKIPSPACE (cp);
++
++ switch (*cp) {
++ case '+':
++	DO (cp = parse_sum (g, cp + 1, &rightval));
++	*valp = (*valp + rightval);
++	break;
++
++ case '-':
++	DO (cp = parse_sum (g, cp + 1, &rightval));
++	*valp = (*valp - rightval);
++	break;
++ }
++ return cp;
++}
++
++
++static const char *
++parse_shift (IfParser *g, const char *cp, long *valp)
++{
++ long rightval;
++
++ DO (cp = parse_sum (g, cp, valp));
++ SKIPSPACE (cp);
++
++ switch (*cp) {
++ case '<':
++	if (cp[1] == '<') {
++	 DO (cp = parse_shift (g, cp + 2, &rightval));
++	 *valp = (*valp << rightval);
++	}
++	break;
++
++ case '>':
++	if (cp[1] == '>') {
++	 DO (cp = parse_shift (g, cp + 2, &rightval));
++	 *valp = (*valp >> rightval);
++	}
++	break;
++ }
++ return cp;
++}
++
++
++static const char *
++parse_inequality (IfParser *g, const char *cp, long *valp)
++{
++ long rightval;
++
++ DO (cp = parse_shift (g, cp, valp));
++ SKIPSPACE (cp);
++
++ switch (*cp) {
++ case '<':
++	if (cp[1] == '=') {
++	 DO (cp = parse_inequality (g, cp + 2, &rightval));
++	 *valp = (*valp <= rightval);
++	} else {
++	 DO (cp = parse_inequality (g, cp + 1, &rightval));
++	 *valp = (*valp < rightval);
++	}
++	break;
++
++ case '>':
++	if (cp[1] == '=') {
++	 DO (cp = parse_inequality (g, cp + 2, &rightval));
++	 *valp = (*valp >= rightval);
++	} else {
++	 DO (cp = parse_inequality (g, cp + 1, &rightval));
++	 *valp = (*valp > rightval);
++	}
++	break;
++ }
++ return cp;
++}
++
++
++static const char *
++parse_equality (IfParser *g, const char *cp, long *valp)
++{
++ long rightval;
++
++ DO (cp = parse_inequality (g, cp, valp));
++ SKIPSPACE (cp);
++
++ switch (*cp) {
++ case '=':
++	if (cp[1] == '=')
++	 cp++;
++	DO (cp = parse_equality (g, cp + 1, &rightval));
++	*valp = (*valp == rightval);
++	break;
++
++ case '!':
++	if (cp[1] != '=')
++	 break;
++	DO (cp = parse_equality (g, cp + 2, &rightval));
++	*valp = (*valp != rightval);
++	break;
++ }
++ return cp;
++}
++
++
++static const char *
++parse_band (IfParser *g, const char *cp, long *valp)
++{
++ long rightval;
++
++ DO (cp = parse_equality (g, cp, valp));
++ SKIPSPACE (cp);
++
++ switch (*cp) {
++ case '&':
++	if (cp[1] != '&') {
++	 DO (cp = parse_band (g, cp + 1, &rightval));
++	 *valp = (*valp & rightval);
++	}
++	break;
++ }
++ return cp;
++}
++
++
++static const char *
++parse_bxor (IfParser *g, const char *cp, long *valp)
++{
++ long rightval;
++
++ DO (cp = parse_band (g, cp, valp));
++ SKIPSPACE (cp);
++
++ switch (*cp) {
++ case '^':
++	DO (cp = parse_bxor (g, cp + 1, &rightval));
++	*valp = (*valp ^ rightval);
++	break;
++ }
++ return cp;
++}
++
++
++static const char *
++parse_bor (IfParser *g, const char *cp, long *valp)
++{
++ long rightval;
++
++ DO (cp = parse_bxor (g, cp, valp));
++ SKIPSPACE (cp);
++
++ switch (*cp) {
++ case '|':
++	if (cp[1] != '|') {
++	 DO (cp = parse_bor (g, cp + 1, &rightval));
++	 *valp = (*valp | rightval);
++	}
++	break;
++ }
++ return cp;
++}
++
++
++static const char *
++parse_land (IfParser *g, const char *cp, long *valp)
++{
++ long rightval;
++
++ DO (cp = parse_bor (g, cp, valp));
++ SKIPSPACE (cp);
++
++ switch (*cp) {
++ case '&':
++	if (cp[1] != '&')
++	 return CALLFUNC(g, handle_error) (g, cp, "&&");
++	DO (cp = parse_land (g, cp + 2, &rightval));
++	*valp = (*valp && rightval);
++	break;
++ }
++ return cp;
++}
++
++
++static const char *
++parse_lor (IfParser *g, const char *cp, long *valp)
++{
++ long rightval;
++
++ DO (cp = parse_land (g, cp, valp));
++ SKIPSPACE (cp);
++
++ switch (*cp) {
++ case '|':
++	if (cp[1] != '|')
++	 return CALLFUNC(g, handle_error) (g, cp, "||");
++	DO (cp = parse_lor (g, cp + 2, &rightval));
++	*valp = (*valp || rightval);
++	break;
++ }
++ return cp;
++}
++
++
++static const char *
++parse_cond(IfParser *g, const char *cp, long *valp)
++{
++ long trueval, falseval;
++
++ DO (cp = parse_lor (g, cp, valp));
++ SKIPSPACE (cp);
++
++ switch (*cp) {
++ case '?':
++	DO (cp = parse_cond (g, cp + 1, &trueval));
++	SKIPSPACE (cp);
++	if (*cp != ':')
++	 return CALLFUNC(g, handle_error) (g, cp, ":");
++	DO (cp = parse_cond (g, cp + 1, &falseval));
++	*valp = (*valp ? trueval : falseval);
++	break;
++ }
++ return cp;
++}
++
++
++/****************************************************************************
++			 External Entry Points
++ ****************************************************************************/
++
++const char *
++ParseIfExpression (IfParser *g, const char *cp, long *valp)
++{
++ return parse_cond (g, cp, valp);
++}
+diff -Naur security/coreconf/mkdepend/ifparser.h mozilla/security/coreconf/mkdepend/ifparser.h
+--- a/security/coreconf/mkdepend/ifparser.h	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/mkdepend/ifparser.h	2009-02-14 02:37:01.000000000 +0200
+@@ -0,0 +1,83 @@
++/*
++ * $Xorg: ifparser.h,v 1.3 2000/08/17 19:41:51 cpqbld Exp $
++ *
++ * Copyright 1992 Network Computing Devices, Inc.
++ * 
++ * Permission to use, copy, modify, and distribute this software and its
++ * documentation for any purpose and without fee is hereby granted, provided
++ * that the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Network Computing Devices may not be
++ * used in advertising or publicity pertaining to distribution of the software
++ * without specific, written prior permission. Network Computing Devices makes
++ * no representations about the suitability of this software for any purpose.
++ * It is provided ``as is'' without express or implied warranty.
++ * 
++ * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
++ * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR ANY SPECIAL,
++ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
++ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ * 
++ * Author: Jim Fulton
++ * Network Computing Devices, Inc.
++ * 
++ * Simple if statement processor
++ *
++ * This module can be used to evaluate string representations of C language
++ * if constructs. It accepts the following grammar:
++ * 
++ * EXPRESSION	:=	VALUE
++ * 			 |	VALUE BINOP	EXPRESSION
++ *			 |	VALUE	'?'	EXPRESSION ':'	EXPRESSION
++ * 
++ * VALUE		:=	'(' EXPRESSION ')'
++ * 			 |	'!' VALUE
++ * 			 |	'-' VALUE
++ *			 |	'~' VALUE
++ * 			 |	'defined' '(' variable ')'
++ * 			 |	variable
++ * 			 |	number
++ * 
++ * BINOP		:=	'*'	| '/'	| '%'
++ * 			 |	'+'	| '-'
++ * 			 |	'<<'	| '>>'
++ * 			 |	'<'	| '>'	| '<=' | '>='
++ * 			 |	'=='	| '!='
++ * 			 |	'&'	| '^' | '|'
++ * 			 |	'&&'	| '||'
++ * 
++ * The normal C order of precedence is supported.
++ * 
++ * 
++ * External Entry Points:
++ * 
++ * ParseIfExpression		parse a string for #if
++ */
++
++/* $XFree86: xc/config/makedepend/ifparser.h,v 3.5 2001/07/25 15:04:40 dawes Exp $ */
++
++#include <stdio.h>
++
++typedef int Bool;
++#define False 0
++#define True 1
++
++typedef struct _if_parser {
++ struct {				/* functions */
++	const char *(*handle_error) (struct _if_parser *, const char *,
++				 const char *);
++	long (*eval_variable) (struct _if_parser *, const char *, int);
++	int (*eval_defined) (struct _if_parser *, const char *, int);
++ } funcs;
++ char *data;
++} IfParser;
++
++const char *ParseIfExpression (
++ IfParser *, 
++ const char *, 
++ long *
++);
++
+diff -Naur security/coreconf/mkdepend/imakemdep.h mozilla/security/coreconf/mkdepend/imakemdep.h
+--- a/security/coreconf/mkdepend/imakemdep.h	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/mkdepend/imakemdep.h	2009-02-14 03:06:13.000000000 +0200
+@@ -0,0 +1,782 @@
++
++/* $XConsortium: imakemdep.h,v 1.83 95/04/07 19:47:46 kaleb Exp $ */
++/* $XFree86: xc/config/imake/imakemdep.h,v 3.12 1995/07/08 10:22:17 dawes Exp $ */
++/*
++
++Copyright (c) 1993, 1994 X Consortium
++
++Permission is hereby granted, free of charge, to any person obtaining a copy
++of this software and associated documentation files (the "Software"), to deal
++in the Software without restriction, including without limitation the rights
++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++copies of the Software, and to permit persons to whom the Software is
++furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of the X Consortium shall not be
++used in advertising or otherwise to promote the sale, use or other dealings
++in this Software without prior written authorization from the X Consortium.
++
++*/
++
++
++/* 
++ * This file contains machine-dependent constants for the imake utility.
++ * When porting imake, read each of the steps below and add in any necessary
++ * definitions. In general you should *not* edit ccimake.c or imake.c!
++ */
++
++#ifdef CCIMAKE
++/*
++ * Step 1: imake_ccflags
++ * Define any special flags that will be needed to get imake.c to compile.
++ * These will be passed to the compile along with the contents of the
++ * make variable BOOTSTRAPCFLAGS.
++ */
++#ifdef hpux
++#ifdef hp9000s800
++#define imake_ccflags "-DSYSV"
++#else
++#define imake_ccflags "-Wc,-Nd4000,-Ns3000 -DSYSV"
++#endif
++#endif
++
++#if defined(macII) || defined(_AUX_SOURCE)
++#define imake_ccflags "-DmacII -DSYSV"
++#endif
++
++#ifdef stellar
++#define imake_ccflags "-DSYSV"
++#endif
++
++#if defined(USL) || defined(Oki) || defined(NCR)
++#define imake_ccflags "-Xc -DSVR4"
++#endif
++
++#ifdef sony
++#if defined(SYSTYPE_SYSV) || defined(_SYSTYPE_SYSV)
++#define imake_ccflags "-DSVR4"
++#else
++#include <sys/param.h>
++#if NEWSOS < 41
++#define imake_ccflags "-Dbsd43 -DNOSTDHDRS"
++#else
++#if NEWSOS < 42
++#define imake_ccflags "-Dbsd43"
++#endif
++#endif
++#endif
++#endif
++
++#ifdef _CRAY
++#define imake_ccflags "-DSYSV -DUSG"
++#endif
++
++#if defined(_IBMR2) || defined(aix)
++#define imake_ccflags "-Daix -DSYSV"
++#endif
++
++#ifdef Mips
++# if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43)
++# define imake_ccflags "-DBSD43"
++# else 
++# define imake_ccflags "-DSYSV"
++# endif
++#endif 
++
++#ifdef is68k
++#define imake_ccflags "-Dluna -Duniosb"
++#endif
++
++#ifdef SYSV386
++# ifdef SVR4
++# define imake_ccflags "-Xc -DSVR4"
++# else
++# define imake_ccflags "-DSYSV"
++# endif
++#endif
++
++#ifdef SVR4
++# ifdef i386
++# define imake_ccflags "-Xc -DSVR4"
++# endif
++#endif
++
++#ifdef SYSV
++# ifdef i386
++# define imake_ccflags "-DSYSV"
++# endif
++#endif
++
++#ifdef __convex__
++#define imake_ccflags "-fn -tm c1"
++#endif
++
++#ifdef apollo
++#define imake_ccflags "-DX_NOT_POSIX"
++#endif
++
++#ifdef WIN32
++#define imake_ccflags "-nologo -batch -D__STDC__"
++#endif
++
++#ifdef __uxp__
++#define imake_ccflags "-DSVR4 -DANSICPP"
++#endif
++
++#ifdef __sxg__
++#define imake_ccflags "-DSYSV -DUSG -DNOSTDHDRS"
++#endif
++
++#ifdef sequent
++#define imake_ccflags "-DX_NOT_STDC_ENV -DX_NOT_POSIX"
++#endif
++
++#ifdef _SEQUENT_
++#define imake_ccflags "-DSYSV -DUSG"
++#endif
++
++#if defined(SX) || defined(PC_UX)
++#define imake_ccflags "-DSYSV"
++#endif
++
++#ifdef nec_ews_svr2
++#define imake_ccflags "-DUSG"
++#endif
++
++#if defined(nec_ews_svr4) || defined(_nec_ews_svr4) || defined(_nec_up) || defined(_nec_ft)
++#define imake_ccflags "-DSVR4"
++#endif
++
++#ifdef	MACH
++#define imake_ccflags "-DNOSTDHDRS"
++#endif
++
++/* this is for OS/2 under EMX. This won't work with DOS */
++#if defined(__EMX__) 
++#define imake_ccflags "-DBSD43"
++#endif
++
++#else /* not CCIMAKE */
++#ifndef MAKEDEPEND
++/*
++ * Step 2: dup2
++ * If your OS doesn't have a dup2() system call to duplicate one file
++ * descriptor onto another, define such a mechanism here (if you don't
++ * already fall under the existing category(ies).
++ */
++#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_)
++#define	dup2(fd1,fd2)	((fd1 == fd2) ? fd1 : (close(fd2), \
++					 fcntl(fd1, F_DUPFD, fd2)))
++#endif
++
++
++/*
++ * Step 3: FIXUP_CPP_WHITESPACE
++ * If your cpp collapses tabs macro expansions into a single space and
++ * replaces escaped newlines with a space, define this symbol. This will
++ * cause imake to attempt to patch up the generated Makefile by looking
++ * for lines that have colons in them (this is why the rules file escapes
++ * all colons). One way to tell if you need this is to see whether or not
++ * your Makefiles have no tabs in them and lots of @@ strings.
++ */
++#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || (defined(AMOEBA) && defined(CROSS_COMPILE))
++#define FIXUP_CPP_WHITESPACE
++#endif
++#ifdef WIN32
++#define REMOVE_CPP_LEADSPACE
++#define INLINE_SYNTAX
++#define MAGIC_MAKE_VARS
++#endif
++#ifdef __minix_vmd
++#define FIXUP_CPP_WHITESPACE
++#endif
++
++/*
++ * Step 4: USE_CC_E, DEFAULT_CC, DEFAULT_CPP
++ * If you want to use cc -E instead of cpp, define USE_CC_E.
++ * If use cc -E but want a different compiler, define DEFAULT_CC.
++ * If the cpp you need is not in /lib/cpp, define DEFAULT_CPP.
++ */
++#ifdef hpux
++#define USE_CC_E
++#endif
++#ifdef WIN32
++#define USE_CC_E
++#define DEFAULT_CC "cl"
++#endif
++#ifdef apollo
++#define DEFAULT_CPP "/usr/lib/cpp"
++#endif
++#if defined(_IBMR2) && !defined(DEFAULT_CPP)
++#define DEFAULT_CPP "/usr/lpp/X11/Xamples/util/cpp/cpp"
++#endif
++#if defined(sun) && defined(SVR4)
++#define DEFAULT_CPP "/usr/ccs/lib/cpp"
++#endif
++#ifdef __bsdi__
++#define DEFAULT_CPP "/usr/bin/cpp"
++#endif
++#ifdef __uxp__
++#define DEFAULT_CPP "/usr/ccs/lib/cpp"
++#endif
++#ifdef __sxg__
++#define DEFAULT_CPP "/usr/lib/cpp"
++#endif
++#ifdef _CRAY
++#define DEFAULT_CPP "/lib/pcpp"
++#endif
++#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#define DEFAULT_CPP "/usr/libexec/cpp"
++#endif
++#ifdef	MACH
++#define USE_CC_E
++#endif
++#ifdef __minix_vmd
++#define DEFAULT_CPP "/usr/lib/cpp"
++#endif
++#if defined(__EMX__)
++/* expects cpp in PATH */
++#define DEFAULT_CPP "cpp"
++#endif
++
++/*
++ * Step 5: cpp_argv
++ * The following table contains the flags that should be passed
++ * whenever a Makefile is being generated. If your preprocessor 
++ * doesn't predefine any unique symbols, choose one and add it to the
++ * end of this table. Then, do the following:
++ * 
++ * a. Use this symbol in Imake.tmpl when setting MacroFile.
++ * b. Put this symbol in the definition of BootstrapCFlags in your
++ * <platform>.cf file.
++ * c. When doing a make World, always add "BOOTSTRAPCFLAGS=-Dsymbol" 
++ * to the end of the command line.
++ * 
++ * Note that you may define more than one symbol (useful for platforms 
++ * that support multiple operating systems).
++ */
++
++#define	ARGUMENTS 50	/* number of arguments in various arrays */
++char *cpp_argv[ARGUMENTS] = {
++	"cc",		/* replaced by the actual program to exec */
++	"-I.",		/* add current directory to include path */
++#ifdef unix
++	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
++#endif
++#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH)
++# ifdef __i386__
++	"-D__i386__",
++# endif
++# ifdef __x86_64__
++	"-D__x86_64__",
++# endif
++# ifdef __GNUC__
++	"-traditional",
++# endif
++#endif
++#ifdef M4330
++	"-DM4330",	/* Tektronix */
++#endif
++#ifdef M4310
++	"-DM4310",	/* Tektronix */
++#endif
++#if defined(macII) || defined(_AUX_SOURCE)
++	"-DmacII",	/* Apple A/UX */
++#endif
++#ifdef USL
++	"-DUSL",	/* USL */
++#endif
++#ifdef sony
++	"-Dsony",	/* Sony */
++#if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) && NEWSOS < 42
++	"-Dbsd43",
++#endif
++#endif
++#ifdef _IBMR2
++	"-D_IBMR2",	/* IBM RS-6000 (we ensured that aix is defined above */
++#ifndef aix
++#define aix		/* allow BOOTSTRAPCFLAGS="-D_IBMR2" */
++#endif
++#endif /* _IBMR2 */
++#ifdef aix
++	"-Daix",	/* AIX instead of AOS */
++#ifndef ibm
++#define ibm		/* allow BOOTSTRAPCFLAGS="-Daix" */
++#endif
++#endif /* aix */
++#ifdef ibm
++	"-Dibm",	/* IBM PS/2 and RT under both AOS and AIX */
++#endif
++#ifdef luna
++	"-Dluna",	/* OMRON luna 68K and 88K */
++#ifdef luna1
++	"-Dluna1",
++#endif
++#ifdef luna88k		/* need not on UniOS-Mach Vers. 1.13 */
++	"-traditional", /* for some older version */
++#endif			/* instead of "-DXCOMM=\\#" */
++#ifdef uniosb
++	"-Duniosb",
++#endif
++#ifdef uniosu
++	"-Duniosu",
++#endif
++#endif /* luna */
++#ifdef _CRAY		/* Cray */
++	"-Ucray",
++#endif
++#ifdef Mips
++	"-DMips",	/* Define and use Mips for Mips Co. OS/mach. */
++# if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43)
++	"-DBSD43",	/* Mips RISCOS supports two environments */
++# else
++	"-DSYSV",	/* System V environment is the default */
++# endif
++#endif /* Mips */
++#ifdef MOTOROLA
++	"-DMOTOROLA", /* Motorola Delta Systems */
++# ifdef SYSV
++	"-DSYSV", 
++# endif
++# ifdef SVR4
++	"-DSVR4",
++# endif
++#endif /* MOTOROLA */
++#ifdef i386
++	"-Di386",
++# ifdef SVR4
++	"-DSVR4",
++# endif
++# ifdef SYSV
++	"-DSYSV",
++# ifdef ISC
++	"-DISC",
++# ifdef ISC40
++	"-DISC40", /* ISC 4.0 */
++# else
++# ifdef ISC202
++	"-DISC202", /* ISC 2.0.2 */
++# else
++# ifdef ISC30
++	"-DISC30", /* ISC 3.0 */
++# else
++	"-DISC22", /* ISC 2.2.1 */
++# endif
++# endif
++# endif
++# endif
++# ifdef SCO
++	"-DSCO",
++# ifdef SCO324
++	"-DSCO324",
++# endif
++# endif
++# endif
++# ifdef ESIX
++	"-DESIX",
++# endif
++# ifdef ATT
++	"-DATT",
++# endif
++# ifdef DELL
++	"-DDELL",
++# endif
++#endif
++#ifdef SYSV386 /* System V/386 folks, obsolete */
++	"-Di386",
++# ifdef SVR4
++	"-DSVR4",
++# endif
++# ifdef ISC
++	"-DISC",
++# ifdef ISC40
++	"-DISC40", /* ISC 4.0 */
++# else
++# ifdef ISC202
++	"-DISC202", /* ISC 2.0.2 */
++# else
++# ifdef ISC30
++	"-DISC30", /* ISC 3.0 */
++# else
++	"-DISC22", /* ISC 2.2.1 */
++# endif
++# endif
++# endif
++# endif
++# ifdef SCO
++	"-DSCO",
++# ifdef SCO324
++	"-DSCO324",
++# endif
++# endif
++# ifdef ESIX
++	"-DESIX",
++# endif
++# ifdef ATT
++	"-DATT",
++# endif
++# ifdef DELL
++	"-DDELL",
++# endif
++#endif
++#ifdef __osf__
++	"-D__osf__",
++# ifdef __mips__
++	"-D__mips__",
++# endif
++# ifdef __alpha
++	"-D__alpha",
++# endif
++# ifdef __i386__
++	"-D__i386__",
++# endif
++# ifdef __GNUC__
++	"-traditional",
++# endif
++#endif
++#ifdef Oki
++	"-DOki",
++#endif
++#ifdef sun
++#ifdef SVR4
++	"-DSVR4",
++#endif
++#endif
++#ifdef WIN32
++	"-DWIN32",
++	"-nologo",
++	"-batch",
++	"-D__STDC__",
++#endif
++#ifdef NCR
++	"-DNCR",	/* NCR */
++#endif
++#ifdef linux
++ "-traditional",
++ "-Dlinux",
++#endif
++#ifdef __uxp__
++	"-D__uxp__",
++#endif
++#ifdef __sxg__
++	"-D__sxg__",
++#endif
++#ifdef nec_ews_svr2
++	"-Dnec_ews_svr2",
++#endif
++#ifdef AMOEBA
++	"-DAMOEBA",
++# ifdef CROSS_COMPILE
++	"-DCROSS_COMPILE",
++# ifdef CROSS_i80386
++	"-Di80386",
++# endif
++# ifdef CROSS_sparc
++	"-Dsparc",
++# endif
++# ifdef CROSS_mc68000
++	"-Dmc68000",
++# endif
++# else
++# ifdef i80386
++	"-Di80386",
++# endif
++# ifdef sparc
++	"-Dsparc",
++# endif
++# ifdef mc68000
++	"-Dmc68000",
++# endif
++# endif
++#endif
++#ifdef __minix_vmd
++ "-Dminix",
++#endif
++
++#if defined(__EMX__)
++	"-traditional",
++	"-Demxos2",
++#endif
++
++};
++#else /* else MAKEDEPEND */
++/*
++ * Step 6: predefs
++ * If your compiler and/or preprocessor define any specific symbols, add
++ * them to the the following table. The definition of struct symtab is
++ * in util/makedepend/def.h.
++ */
++#define QUOTEIT(x) #x
++#define QUOTEEXPANSION(x) QUOTEIT(x)
++
++struct symtab	predefs[] = {
++#ifdef apollo
++	{"apollo", "1"},
++#endif
++#ifdef ibm032
++	{"ibm032", "1"},
++#endif
++#ifdef ibm
++	{"ibm", "1"},
++#endif
++#ifdef aix
++	{"aix", "1"},
++#endif
++#ifdef sun
++	{"sun", "1"},
++#endif
++#ifdef sun2
++	{"sun2", "1"},
++#endif
++#ifdef sun3
++	{"sun3", "1"},
++#endif
++#ifdef sun4
++	{"sun4", "1"},
++#endif
++#ifdef sparc
++	{"sparc", "1"},
++#endif
++#ifdef __sparc__
++	{"__sparc__", "1"},
++#endif
++#ifdef hpux
++	{"hpux", "1"},
++#endif
++#ifdef __hpux
++	{"__hpux", "1"},
++#endif
++#ifdef __hp9000s800
++	{"__hp9000s800", "1"},
++#endif
++#ifdef __hp9000s700
++	{"__hp9000s700", "1"},
++#endif
++#ifdef vax
++	{"vax", "1"},
++#endif
++#ifdef VMS
++	{"VMS", "1"},
++#endif
++#ifdef cray
++	{"cray", "1"},
++#endif
++#ifdef CRAY
++	{"CRAY", "1"},
++#endif
++#ifdef _CRAY
++	{"_CRAY", "1"},
++#endif
++#ifdef att
++	{"att", "1"},
++#endif
++#ifdef mips
++	{"mips", "1"},
++#endif
++#ifdef __mips__
++	{"__mips__", "1"},
++#endif
++#ifdef ultrix
++	{"ultrix", "1"},
++#endif
++#ifdef stellar
++	{"stellar", "1"},
++#endif
++#ifdef mc68000
++	{"mc68000", "1"},
++#endif
++#ifdef mc68020
++	{"mc68020", "1"},
++#endif
++#ifdef __GNUC__
++	{"__GNUC__", "1"},
++#endif
++#if __STDC__
++	{"__STDC__", "1"},
++#endif
++#ifdef __HIGHC__
++	{"__HIGHC__", "1"},
++#endif
++#ifdef CMU
++	{"CMU", "1"},
++#endif
++#ifdef luna
++	{"luna", "1"},
++#ifdef luna1
++	{"luna1", "1"},
++#endif
++#ifdef luna2
++	{"luna2", "1"},
++#endif
++#ifdef luna88k
++	{"luna88k", "1"},
++#endif
++#ifdef uniosb
++	{"uniosb", "1"},
++#endif
++#ifdef uniosu
++	{"uniosu", "1"},
++#endif
++#endif
++#ifdef ieeep754
++	{"ieeep754", "1"},
++#endif
++#ifdef is68k
++	{"is68k", "1"},
++#endif
++#ifdef m68k
++ {"m68k", "1"},
++#endif
++#ifdef m88k
++ {"m88k", "1"},
++#endif
++#ifdef __m88k__
++	{"__m88k__", "1"},
++#endif
++#ifdef bsd43
++	{"bsd43", "1"},
++#endif
++#ifdef hcx
++	{"hcx", "1"},
++#endif
++#ifdef sony
++	{"sony", "1"},
++#ifdef SYSTYPE_SYSV
++	{"SYSTYPE_SYSV", "1"},
++#endif
++#ifdef _SYSTYPE_SYSV
++	{"_SYSTYPE_SYSV", "1"},
++#endif
++#endif
++#ifdef __OSF__
++	{"__OSF__", "1"},
++#endif
++#ifdef __osf__
++	{"__osf__", "1"},
++#endif
++#ifdef __alpha
++	{"__alpha", "1"},
++#endif
++#ifdef __DECC
++	{"__DECC", "1"},
++#endif
++#ifdef __decc
++	{"__decc", "1"},
++#endif
++#ifdef __uxp__
++	{"__uxp__", "1"},
++#endif
++#ifdef __sxg__
++	{"__sxg__", "1"},
++#endif
++#ifdef _SEQUENT_
++	{"_SEQUENT_", "1"},
++	{"__STDC__", "1"},
++#endif
++#ifdef __bsdi__
++	{"__bsdi__", "1"},
++#endif
++#ifdef nec_ews_svr2
++	{"nec_ews_svr2", "1"},
++#endif
++#ifdef nec_ews_svr4
++	{"nec_ews_svr4", "1"},
++#endif
++#ifdef _nec_ews_svr4
++	{"_nec_ews_svr4", "1"},
++#endif
++#ifdef _nec_up
++	{"_nec_up", "1"},
++#endif
++#ifdef SX
++	{"SX", "1"},
++#endif
++#ifdef nec
++	{"nec", "1"},
++#endif
++#ifdef _nec_ft
++	{"_nec_ft", "1"},
++#endif
++#ifdef PC_UX
++	{"PC_UX", "1"},
++#endif
++#ifdef sgi
++	{"sgi", "1"},
++#endif
++#ifdef __sgi
++	{"__sgi", "1"},
++#endif
++#ifdef __FreeBSD__
++	{"__FreeBSD__", "1"},
++#endif
++#ifdef __NetBSD__
++	{"__NetBSD__", "1"},
++#endif
++#ifdef __OpenBSD__
++	{"__OpenBSD__", "1"},
++#endif
++#ifdef __EMX__
++	{"__EMX__", "1"},
++#endif
++	/* ADDED THE FOLLOWING SYMBOLS FOR WINDOWS */
++#ifdef _WIN32
++	{"_WIN32", QUOTEEXPANSION(_WIN32) },
++#endif
++#ifdef _WIN64
++	{"_WIN64", QUOTEEXPANSION(_WIN64) },
++#endif
++#ifdef _X86
++	{"_X86", QUOTEEXPANSION(_X86) },
++#endif
++#ifdef _X86_
++	{"_X86_", QUOTEEXPANSION(_X86_) },
++#endif
++#ifdef _X86_64
++	{"_X86_64", QUOTEEXPANSION(_X86_64) },
++#endif
++#ifdef _X86_64_
++	{"_X86_64_", QUOTEEXPANSION(_X86_64_) },
++#endif
++#ifdef _DEBUG
++	{"_DEBUG", QUOTEEXPANSION(_DEBUG) },
++#endif
++#ifdef _DLL
++	{"_DLL", QUOTEEXPANSION(_DLL) },
++#endif
++#ifdef _M_IX86
++	{"_M_IX86", QUOTEEXPANSION(_M_IX86) },
++#endif
++#ifdef _M_X64
++	{"_M_X64", QUOTEEXPANSION(_M_X64) },
++#endif
++#ifdef _MSC_FULL_VER
++	{"_MSC_FULL_VER", QUOTEEXPANSION(_MSC_FULL_VER) },
++#endif
++#ifdef _MSC_VER
++	{"_MSC_VER", QUOTEEXPANSION(_MSC_VER) },
++#endif
++#ifdef _MSVC_RUNTIME_CHECKS
++	{"_MSVC_RUNTIME_CHECKS", QUOTEEXPANSION(_MSVC_RUNTIME_CHECKS) },
++#endif
++#ifdef _MT
++	{"_MT", QUOTEEXPANSION(_MT) },
++#endif
++#ifdef _CHAR_UNSIGNED
++	{"_CHAR_UNSIGNED", QUOTEEXPANSION(_CHAR_UNSIGNED) },
++#endif
++	/* add any additional symbols before this line */
++	{NULL, NULL}
++};
++
++#endif /* MAKEDEPEND */
++#endif /* CCIMAKE */
+diff -Naur security/coreconf/mkdepend/include.c mozilla/security/coreconf/mkdepend/include.c
+--- a/security/coreconf/mkdepend/include.c	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/mkdepend/include.c	2009-02-14 02:37:01.000000000 +0200
+@@ -0,0 +1,337 @@
++/* $Xorg: include.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */
++/*
++
++Copyright (c) 1993, 1994, 1998 The Open Group
++
++Permission to use, copy, modify, distribute, and sell this software and its
++documentation for any purpose is hereby granted without fee, provided that
++the above copyright notice appear in all copies and that both that
++copyright notice and this permission notice appear in supporting
++documentation.
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of The Open Group shall not be
++used in advertising or otherwise to promote the sale, use or other dealings
++in this Software without prior written authorization from The Open Group.
++
++*/
++/* $XFree86: xc/config/makedepend/include.c,v 3.7 2001/12/14 19:53:20 dawes Exp $ */
++
++
++#include "def.h"
++
++#ifdef _MSC_VER
++#include <windows.h>
++static int
++does_file_exist(char *file)
++{
++ WIN32_FILE_ATTRIBUTE_DATA data;
++ BOOL b = GetFileAttributesExA(file, GetFileExInfoStandard, &data);
++ if (!b)
++ return 0;
++ return (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0;
++}
++#else
++static int
++does_file_exist(char *file)
++{
++ struct stat sb;
++ return stat(file, &sb) == 0 && !S_ISDIR(sb.st_mode);
++}
++#endif
++
++extern struct	inclist	inclist[ MAXFILES ],
++			*inclistp, *inclistnext;
++extern char	*includedirs[ ],
++		**includedirsnext;
++extern char	*notdotdot[ ];
++extern boolean show_where_not;
++extern boolean warn_multiple;
++
++static boolean
++isdot(char *p)
++{
++	if(p && *p++ == '.' && *p++ == '\0')
++		return(TRUE);
++	return(FALSE);
++}
++
++static boolean
++isdotdot(char *p)
++{
++	if(p && *p++ == '.' && *p++ == '.' && *p++ == '\0')
++		return(TRUE);
++	return(FALSE);
++}
++
++static boolean
++issymbolic(char *dir, char *component)
++{
++#ifdef S_IFLNK
++	struct stat	st;
++	char	buf[ BUFSIZ ], **pp;
++
++	sprintf(buf, "%s%s%s", dir, *dir ? "/" : "", component);
++	for (pp=notdotdot; *pp; pp++)
++		if (strcmp(*pp, buf) == 0)
++			return (TRUE);
++	if (lstat(buf, &st) == 0
++	&& (st.st_mode & S_IFMT) == S_IFLNK) {
++		*pp++ = copy(buf);
++		if (pp >= &notdotdot[ MAXDIRS ])
++			fatalerr("out of .. dirs, increase MAXDIRS\n");
++		return(TRUE);
++	}
++#endif
++	return(FALSE);
++}
++
++/*
++ * Occasionally, pathnames are created that look like .../x/../y
++ * Any of the 'x/..' sequences within the name can be eliminated.
++ * (but only if 'x' is not a symbolic link!!)
++ */
++static void
++remove_dotdot(char *path)
++{
++	register char	*end, *from, *to, **cp;
++	char		*components[ MAXFILES ],
++			newpath[ BUFSIZ ];
++	boolean		component_copied;
++
++	/*
++	 * slice path up into components.
++	 */
++	to = newpath;
++	if (*path == '/')
++		*to++ = '/';
++	*to = '\0';
++	cp = components;
++	for (from=end=path; *end; end++)
++		if (*end == '/') {
++			while (*end == '/')
++				*end++ = '\0';
++			if (*from)
++				*cp++ = from;
++			from = end;
++		}
++	*cp++ = from;
++	*cp = NULL;
++
++	/*
++	 * Recursively remove all 'x/..' component pairs.
++	 */
++	cp = components;
++	while(*cp) {
++		if (!isdot(*cp) && !isdotdot(*cp) && isdotdot(*(cp+1))
++		 && !issymbolic(newpath, *cp))
++		{
++		 char **fp = cp + 2;
++		 char **tp = cp;
++
++		 do 
++			*tp++ = *fp; /* move all the pointers down */
++		 while (*fp++);
++		 if (cp != components)
++			cp--;	/* go back and check for nested ".." */
++		} else {
++		 cp++;
++		}
++	}
++	/*
++	 * Concatenate the remaining path elements.
++	 */
++	cp = components;
++	component_copied = FALSE;
++	while(*cp) {
++		if (component_copied)
++			*to++ = '/';
++		component_copied = TRUE;
++		for (from = *cp; *from; )
++			*to++ = *from++;
++		*to = '\0';
++		cp++;
++	}
++	*to++ = '\0';
++
++	/*
++	 * copy the reconstituted path back to our pointer.
++	 */
++	strcpy(path, newpath);
++}
++
++/*
++ * Add an include file to the list of those included by 'file'.
++ */
++struct inclist *
++newinclude(char *newfile, char *incstring)
++{
++	register struct inclist	*ip;
++
++	/*
++	 * First, put this file on the global list of include files.
++	 */
++	ip = inclistp++;
++	if (inclistp == inclist + MAXFILES - 1)
++		fatalerr("out of space: increase MAXFILES\n");
++	ip->i_file = copy(newfile);
++
++	if (incstring == NULL)
++		ip->i_incstring = ip->i_file;
++	else
++		ip->i_incstring = copy(incstring);
++
++	inclistnext = inclistp;
++	return(ip);
++}
++
++void
++included_by(struct inclist *ip, struct inclist *newfile)
++{
++	register int i;
++
++	if (ip == NULL)
++		return;
++	/*
++	 * Put this include file (newfile) on the list of files included
++	 * by 'file'. If 'file' is NULL, then it is not an include
++	 * file itself (i.e. was probably mentioned on the command line).
++	 * If it is already on the list, don't stick it on again.
++	 */
++	if (ip->i_list == NULL) {
++		ip->i_list = (struct inclist **)
++			malloc(sizeof(struct inclist *) * ++ip->i_listlen);
++		ip->i_merged = (boolean *)
++		 malloc(sizeof(boolean) * ip->i_listlen);
++	} else {
++		for (i=0; i<ip->i_listlen; i++)
++			if (ip->i_list[ i ] == newfile) {
++			 i = strlen(newfile->i_file);
++			 if (!(ip->i_flags & INCLUDED_SYM) &&
++				!(i > 2 &&
++				 newfile->i_file[i-1] == 'c' &&
++				 newfile->i_file[i-2] == '.'))
++			 {
++				/* only bitch if ip has */
++				/* no #include SYMBOL lines */
++				/* and is not a .c file */
++				if (warn_multiple)
++				{
++					warning("%s includes %s more than once!\n",
++						ip->i_file, newfile->i_file);
++					warning1("Already have\n");
++					for (i=0; i<ip->i_listlen; i++)
++						warning1("\t%s\n", ip->i_list[i]->i_file);
++				}
++			 }
++			 return;
++			}
++		ip->i_list = (struct inclist **) realloc(ip->i_list,
++			sizeof(struct inclist *) * ++ip->i_listlen);
++		ip->i_merged = (boolean *)
++		 realloc(ip->i_merged, sizeof(boolean) * ip->i_listlen);
++	}
++	ip->i_list[ ip->i_listlen-1 ] = newfile;
++	ip->i_merged[ ip->i_listlen-1 ] = FALSE;
++}
++
++void
++inc_clean (void)
++{
++	register struct inclist *ip;
++
++	for (ip = inclist; ip < inclistp; ip++) {
++		ip->i_flags &= ~MARKED;
++	}
++}
++
++struct inclist *
++inc_path(char *file, char *include, int type)
++{
++	static char		path[ BUFSIZ ];
++	register char		**pp, *p;
++	register struct inclist	*ip;
++
++	/*
++	 * Check all previously found include files for a path that
++	 * has already been expanded.
++	 */
++	if ((type == INCLUDE) || (type == INCLUDEDOT))
++		inclistnext = inclist;
++	ip = inclistnext;
++
++	for (; ip->i_file; ip++) {
++		if ((strcmp(ip->i_incstring, include) == 0) &&
++		 !(ip->i_flags & INCLUDED_SYM)) {
++			inclistnext = ip + 1;
++			return ip;
++		}
++	}
++
++	if (inclistnext == inclist) {
++		/*
++		 * If the path was surrounded by "" or is an absolute path,
++		 * then check the exact path provided.
++		 */
++		if ((type == INCLUDEDOT) ||
++		 (type == INCLUDENEXTDOT) ||
++		 (*include == '/')) {
++			if (does_file_exist(include))
++				return newinclude(include, include);
++			if (show_where_not)
++				warning1("\tnot in %s\n", include);
++		}
++
++		/*
++		 * If the path was surrounded by "" see if this include file is
++		 * in the directory of the file being parsed.
++		 */
++		if ((type == INCLUDEDOT) || (type == INCLUDENEXTDOT)) {
++			for (p=file+strlen(file); p>file; p--)
++				if (*p == '/')
++					break;
++			if (p == file) {
++				strcpy(path, include);
++			} else {
++				strncpy(path, file, (p-file) + 1);
++				path[ (p-file) + 1 ] = '\0';
++				strcpy(path + (p-file) + 1, include);
++			}
++			remove_dotdot(path);
++			if (does_file_exist(path))
++				return newinclude(path, include);
++			if (show_where_not)
++				warning1("\tnot in %s\n", path);
++		}
++	}
++
++	/*
++	 * Check the include directories specified. Standard include dirs
++	 * should be at the end.
++	 */
++	if ((type == INCLUDE) || (type == INCLUDEDOT))
++		includedirsnext = includedirs;
++	pp = includedirsnext;
++
++	for (; *pp; pp++) {
++		sprintf(path, "%s/%s", *pp, include);
++		remove_dotdot(path);
++		if (does_file_exist(path)) {
++			includedirsnext = pp + 1;
++			return newinclude(path, include);
++		}
++		if (show_where_not)
++			warning1("\tnot in %s\n", path);
++	}
++
++	return NULL;
++}
+diff -Naur security/coreconf/mkdepend/main.c mozilla/security/coreconf/mkdepend/main.c
+--- a/security/coreconf/mkdepend/main.c	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/mkdepend/main.c	2009-02-14 21:40:55.000000000 +0200
+@@ -0,0 +1,870 @@
++/* $Xorg: main.c,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $ */
++/*
++
++Copyright (c) 1993, 1994, 1998 The Open Group
++
++Permission to use, copy, modify, distribute, and sell this software and its
++documentation for any purpose is hereby granted without fee, provided that
++the above copyright notice appear in all copies and that both that
++copyright notice and this permission notice appear in supporting
++documentation.
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of The Open Group shall not be
++used in advertising or otherwise to promote the sale, use or other dealings
++in this Software without prior written authorization from The Open Group.
++
++*/
++/* $XFree86: xc/config/makedepend/main.c,v 3.32 2003/03/26 20:43:48 tsi Exp $ */
++
++#include "def.h"
++#ifdef hpux
++#define sigvec sigvector
++#endif /* hpux */
++
++#ifdef X_POSIX_C_SOURCE
++#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
++#include <signal.h>
++#undef _POSIX_C_SOURCE
++#else
++#if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
++#include <signal.h>
++#else
++#define _POSIX_SOURCE
++#include <signal.h>
++#undef _POSIX_SOURCE
++#endif
++#endif
++
++#include <stdarg.h>
++#ifdef _WIN32
++#include <io.h>
++#endif
++
++#ifdef MINIX
++#define USE_CHMOD	1
++#endif
++
++#ifdef DEBUG
++int	_debugmask;
++#endif
++
++/* #define DEBUG_DUMP */
++#ifdef DEBUG_DUMP
++#define DBG_PRINT(file, fmt, args) fprintf(file, fmt, args)
++#else
++#define DBG_PRINT(file, fmt, args) /* empty */
++#endif
++
++#define DASH_INC_PRE "#include \""
++#define DASH_INC_POST "\""
++
++char *ProgramName;
++
++char	*directives[] = {
++	"if",
++	"ifdef",
++	"ifndef",
++	"else",
++	"endif",
++	"define",
++	"undef",
++	"include",
++	"line",
++	"pragma",
++	"error",
++	"ident",
++	"sccs",
++	"elif",
++	"eject",
++	"warning",
++	"include_next",
++	NULL
++};
++
++#define MAKEDEPEND
++#include "imakemdep.h"	/* from config sources */
++#undef MAKEDEPEND
++
++struct	inclist inclist[ MAXFILES ],
++		*inclistp = inclist,
++		*inclistnext = inclist,
++		maininclist;
++
++static char	*filelist[ MAXFILES ];
++char		*includedirs[ MAXDIRS + 1 ],
++		**includedirsnext = includedirs;
++char		*notdotdot[ MAXDIRS ];
++static int	cmdinc_count = 0;
++static char	*cmdinc_list[ 2 * MAXINCFILES ];
++char		*objprefix = "";
++char		*objsuffix = OBJSUFFIX;
++static char	*startat = "# DO NOT DELETE";
++int		width = 78;
++static boolean	append = FALSE;
++boolean		printed = FALSE;
++boolean		verbose = FALSE;
++boolean		show_where_not = FALSE;
++/* Warn on multiple includes of same file */
++boolean 	warn_multiple = FALSE;
++
++static void setfile_cmdinc(struct filepointer *filep, long count, char **list);
++static void redirect(char *line, char *makefile);
++
++static
++#ifdef SIGNALRETURNSINT
++int
++#else
++void
++#endif
++catch (int sig)
++{
++	fflush (stdout);
++	fatalerr ("got signal %d\n", sig);
++}
++
++#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(__UNIXOS2__) || defined(Lynx_22) || defined(__CYGWIN__)
++#define USGISH
++#endif
++
++#ifndef USGISH
++#ifdef X_NOT_POSIX
++#define sigaction sigvec
++#define sa_handler sv_handler
++#define sa_mask sv_mask
++#define sa_flags sv_flags
++#endif
++struct sigaction sig_act;
++#endif /* USGISH */
++
++int
++main(int argc, char *argv[])
++{
++	char	**fp = filelist;
++	char	**incp = includedirs;
++	char	*p;
++	struct inclist	*ip;
++	char	*makefile = NULL;
++	struct filepointer	*filecontent;
++	struct symtab *psymp = predefs;
++	char *endmarker = NULL;
++	char *defincdir = NULL;
++	char **undeflist = NULL;
++	int numundefs = 0, i;
++	register char offset;
++
++	ProgramName = argv[0];
++
++	while (psymp->s_name)
++	{
++	 define2(psymp->s_name, psymp->s_value, &maininclist);
++	 psymp++;
++	}
++	if (argc == 2 && argv[1][0] == '@') {
++	 struct stat ast;
++	 int afd;
++	 char *args;
++	 char **nargv;
++	 int nargc;
++	 char quotechar = '\0';
++
++	 nargc = 1;
++	 if ((afd = open(argv[1]+1, O_RDONLY)) < 0)
++		fatalerr("cannot open \"%s\"\n", argv[1]+1);
++	 fstat(afd, &ast);
++	 args = (char *)malloc(ast.st_size + 1);
++	 if ((ast.st_size = read(afd, args, ast.st_size)) < 0)
++		fatalerr("failed to read %s\n", argv[1]+1);
++	 args[ast.st_size] = '\0';
++	 close(afd);
++	 for (p = args; *p; p++) {
++		if (quotechar) {
++		 if (quotechar == '\\' ||
++			(*p == quotechar && p[-1] != '\\'))
++			quotechar = '\0';
++		 continue;
++		}
++		switch (*p) {
++		case '\\':
++		case '"':
++		case '\'':
++		 quotechar = *p;
++		 break;
++		case ' ':
++		case '\n':
++		 *p = '\0';
++		 if (p > args && p[-1])
++			nargc++;
++		 break;
++		}
++	 }
++	 if (p[-1])
++		nargc++;
++	 nargv = (char **)malloc(nargc * sizeof(char *));
++	 nargv[0] = argv[0];
++	 argc = 1;
++	 for (p = args; argc < nargc; p += strlen(p) + 1)
++		if (*p) nargv[argc++] = p;
++	 argv = nargv;
++	}
++	for(argc--, argv++; argc; argc--, argv++) {
++	 	/* if looking for endmarker then check before parsing */
++		if (endmarker && strcmp (endmarker, *argv) == 0) {
++		 endmarker = NULL;
++		 continue;
++		}
++		if (**argv != '-') {
++			/* treat +thing as an option for C++ */
++			if (endmarker && **argv == '+')
++				continue;
++			*fp++ = argv[0];
++			continue;
++		}
++		switch(argv[0][1]) {
++		case '-':
++			endmarker = &argv[0][2];
++			if (endmarker[0] == '\0') endmarker = "--";
++			break;
++		case 'D':
++			offset = 2;
++			if (argv[0][2] == '\0') {
++				argv++;
++				argc--;
++				offset = 0;
++			}
++			/* offset +1 here since first def letter
++			 * cannot be `=`
++			 */
++			for (p = argv[0] + offset + 1; *p; p++)
++				if (*p == '=') {
++					*p = ' ';
++					break;
++				}
++			define(argv[0] + offset, &maininclist);
++			break;
++		case 'I':
++			if (incp >= includedirs + MAXDIRS)
++			 fatalerr("Too many -I flags.\n");
++			*incp++ = argv[0]+2;
++			if (**(incp-1) == '\0') {
++				*(incp-1) = *(++argv);
++				argc--;
++			}
++			break;
++		case 'U':
++			/* Undef's override all -D's so save them up */
++			numundefs++;
++			if (numundefs == 1)
++			 undeflist = malloc(sizeof(char *));
++			else
++			 undeflist = realloc(undeflist,
++						numundefs * sizeof(char *));
++			offset = 2;
++			if (argv[0][2] == '\0') {
++				argv++;
++				argc--;
++				offset = 0;
++			}
++			undeflist[numundefs - 1] = argv[0] + offset;
++			break;
++		case 'Y':
++			defincdir = argv[0]+2;
++			break;
++		/* do not use if endmarker processing */
++		case 'a':
++			if (endmarker) break;
++			append = TRUE;
++			break;
++		case 'w':
++			if (endmarker) break;
++			if (argv[0][2] == '\0') {
++				argv++;
++				argc--;
++				width = atoi(argv[0]);
++			} else
++				width = atoi(argv[0]+2);
++			break;
++		case 'o':
++			if (endmarker) break;
++			if (argv[0][2] == '\0') {
++				argv++;
++				argc--;
++				objsuffix = argv[0];
++			} else
++				objsuffix = argv[0]+2;
++			break;
++		case 'p':
++			if (endmarker) break;
++			if (argv[0][2] == '\0') {
++				argv++;
++				argc--;
++				objprefix = argv[0];
++			} else
++				objprefix = argv[0]+2;
++			break;
++		case 'v':
++			if (endmarker) break;
++			verbose = TRUE;
++#ifdef DEBUG
++			if (argv[0][2])
++				_debugmask = atoi(argv[0]+2);
++#endif
++			break;
++		case 's':
++			if (endmarker) break;
++			startat = argv[0]+2;
++			if (*startat == '\0') {
++				startat = *(++argv);
++				argc--;
++			}
++			if (*startat != '#')
++				fatalerr("-s flag's value should start %s\n",
++					"with '#'.");
++			break;
++		case 'f':
++			if (endmarker) break;
++			makefile = argv[0]+2;
++			if (*makefile == '\0') {
++				makefile = *(++argv);
++				argc--;
++			}
++			break;
++
++		case 'm':
++			warn_multiple = TRUE;
++			break;
++			
++		/* Ignore -O, -g so we can just pass ${CFLAGS} to
++		 makedepend
++		 */
++		case 'O':
++		case 'g':
++			break;
++		case 'i':
++			if (strcmp(&argv[0][1],"include") == 0) {
++				char *buf;
++				if (argc<2)
++					fatalerr("option -include is a "
++						 "missing its parameter\n");
++				if (cmdinc_count >= MAXINCFILES)
++					fatalerr("Too many -include flags.\n");
++				argc--;
++				argv++;
++				buf = malloc(strlen(DASH_INC_PRE) +
++					 strlen(argv[0]) +
++					 strlen(DASH_INC_POST) + 1);
++ 		if(!buf)
++					fatalerr("out of memory at "
++						 "-include string\n");
++				cmdinc_list[2 * cmdinc_count + 0] = argv[0];
++				cmdinc_list[2 * cmdinc_count + 1] = buf;
++				cmdinc_count++;
++				break;
++			}
++			/* intentional fall through */
++		default:
++			if (endmarker) break;
++	/*		fatalerr("unknown opt = %s\n", argv[0]); */
++			warning("ignoring option %s\n", argv[0]);
++		}
++	}
++	/* Now do the undefs from the command line */
++	for (i = 0; i < numundefs; i++)
++	 undefine(undeflist[i], &maininclist);
++	if (numundefs > 0)
++	 free(undeflist);
++
++	if (!defincdir) {
++#ifdef PREINCDIR
++	 if (incp >= includedirs + MAXDIRS)
++		fatalerr("Too many -I flags.\n");
++	 *incp++ = PREINCDIR;
++#endif
++#if defined(__UNIXOS2__) || defined(_MSC_VER)
++	 {
++#if defined(_MSC_VER)
++		char *includepath = getenv("INCLUDE");
++#else
++		char *includepath = getenv("C_INCLUDE_PATH");
++#endif
++		/* can have more than one component */
++		if (includepath) {
++		 char *beg, *end;
++		 beg= (char*)strdup(includepath);
++		 for (;;) {
++			end = (char*)strchr(beg,';');
++			if (end) *end = 0;
++		 	if (incp >= includedirs + MAXDIRS)
++				fatalerr("Too many include dirs\n");
++			*incp++ = beg;
++			if (!end) break;
++			beg = end+1;
++		 }
++		}
++	 }
++#else /* !__UNIXOS2__ && !_MSC_VER, does not use INCLUDEDIR at all */
++	 if (incp >= includedirs + MAXDIRS)
++		fatalerr("Too many -I flags.\n");
++	 *incp++ = INCLUDEDIR;
++#endif
++
++#ifdef EXTRAINCDIR
++	 if (incp >= includedirs + MAXDIRS)
++		fatalerr("Too many -I flags.\n");
++	 *incp++ = EXTRAINCDIR;
++#endif
++
++#ifdef POSTINCDIR
++	 if (incp >= includedirs + MAXDIRS)
++		fatalerr("Too many -I flags.\n");
++	 *incp++ = POSTINCDIR;
++#endif
++	} else if (*defincdir) {
++	 if (incp >= includedirs + MAXDIRS)
++		fatalerr("Too many -I flags.\n");
++	 *incp++ = defincdir;
++	}
++
++	redirect(startat, makefile);
++
++	/*
++	 * catch signals.
++	 */
++#ifdef USGISH
++/* should really reset SIGINT to SIG_IGN if it was. */
++#ifdef SIGHUP
++	signal (SIGHUP, catch);
++#endif
++	signal (SIGINT, catch);
++#ifdef SIGQUIT
++	signal (SIGQUIT, catch);
++#endif
++	signal (SIGILL, catch);
++#ifdef SIGBUS
++	signal (SIGBUS, catch);
++#endif
++	signal (SIGSEGV, catch);
++#ifdef SIGSYS
++	signal (SIGSYS, catch);
++#endif
++#else
++	sig_act.sa_handler = catch;
++#if defined(_POSIX_SOURCE) || !defined(X_NOT_POSIX)
++	sigemptyset(&sig_act.sa_mask);
++	sigaddset(&sig_act.sa_mask, SIGINT);
++	sigaddset(&sig_act.sa_mask, SIGQUIT);
++#ifdef SIGBUS
++	sigaddset(&sig_act.sa_mask, SIGBUS);
++#endif
++	sigaddset(&sig_act.sa_mask, SIGILL);
++	sigaddset(&sig_act.sa_mask, SIGSEGV);
++	sigaddset(&sig_act.sa_mask, SIGHUP);
++	sigaddset(&sig_act.sa_mask, SIGPIPE);
++#ifdef SIGSYS
++	sigaddset(&sig_act.sa_mask, SIGSYS);
++#endif
++#else
++	sig_act.sa_mask = ((1<<(SIGINT -1))
++			 |(1<<(SIGQUIT-1))
++#ifdef SIGBUS
++			 |(1<<(SIGBUS-1))
++#endif
++			 |(1<<(SIGILL-1))
++			 |(1<<(SIGSEGV-1))
++			 |(1<<(SIGHUP-1))
++			 |(1<<(SIGPIPE-1))
++#ifdef SIGSYS
++			 |(1<<(SIGSYS-1))
++#endif
++			 );
++#endif /* _POSIX_SOURCE */
++	sig_act.sa_flags = 0;
++	sigaction(SIGHUP, &sig_act, (struct sigaction *)0);
++	sigaction(SIGINT, &sig_act, (struct sigaction *)0);
++	sigaction(SIGQUIT, &sig_act, (struct sigaction *)0);
++	sigaction(SIGILL, &sig_act, (struct sigaction *)0);
++#ifdef SIGBUS
++	sigaction(SIGBUS, &sig_act, (struct sigaction *)0);
++#endif
++	sigaction(SIGSEGV, &sig_act, (struct sigaction *)0);
++#ifdef SIGSYS
++	sigaction(SIGSYS, &sig_act, (struct sigaction *)0);
++#endif
++#endif /* USGISH */
++
++	/*
++	 * now peruse through the list of files.
++	 */
++	for(fp=filelist; *fp; fp++) {
++		DBG_PRINT(stderr,"file: %s\n",*fp);
++		filecontent = getfile(*fp);
++		setfile_cmdinc(filecontent, cmdinc_count, cmdinc_list);
++		ip = newinclude(*fp, (char *)NULL);
++
++		find_includes(filecontent, ip, ip, 0, FALSE);
++		freefile(filecontent);
++		recursive_pr_include(ip, ip->i_file, base_name(*fp));
++		inc_clean();
++	}
++	if (printed)
++		printf("\n");
++	return 0;
++}
++
++#ifdef __UNIXOS2__
++/*
++ * eliminate \r chars from file
++ */
++static int 
++elim_cr(char *buf, int sz)
++{
++	int i,wp;
++	for (i= wp = 0; i<sz; i++) {
++		if (buf[i] != '\r')
++			buf[wp++] = buf[i];
++	}
++	return wp;
++}
++#endif
++
++struct filepointer *
++getfile(char *file)
++{
++	int	fd;
++	struct filepointer	*content;
++	struct stat	st;
++
++	content = (struct filepointer *)malloc(sizeof(struct filepointer));
++	content->f_name = file;
++	if ((fd = open(file, O_RDONLY)) < 0) {
++		warning("cannot open \"%s\"\n", file);
++		content->f_p = content->f_base = content->f_end = (char *)malloc(1);
++		*content->f_p = '\0';
++		return(content);
++	}
++	fstat(fd, &st);
++	content->f_base = (char *)malloc(st.st_size+1);
++	if (content->f_base == NULL)
++		fatalerr("cannot allocate mem\n");
++	if ((st.st_size = read(fd, content->f_base, st.st_size)) < 0)
++		fatalerr("failed to read %s\n", file);
++#ifdef __UNIXOS2__
++	st.st_size = elim_cr(content->f_base,st.st_size);
++#endif
++	close(fd);
++	content->f_len = st.st_size+1;
++	content->f_p = content->f_base;
++	content->f_end = content->f_base + st.st_size;
++	*content->f_end = '\0';
++	content->f_line = 0;
++	content->cmdinc_count = 0;
++	content->cmdinc_list = NULL;
++	content->cmdinc_line = 0;
++	return(content);
++}
++
++void
++setfile_cmdinc(struct filepointer* filep, long count, char** list)
++{
++	filep->cmdinc_count = count;
++	filep->cmdinc_list = list;
++	filep->cmdinc_line = 0;
++}
++
++void
++freefile(struct filepointer *fp)
++{
++	free(fp->f_base);
++	free(fp);
++}
++
++char *copy(char *str)
++{
++	char	*p = (char *)malloc(strlen(str) + 1);
++
++	strcpy(p, str);
++	return(p);
++}
++
++int
++match(char *str, char **list)
++{
++	int	i;
++
++	for (i=0; *list; i++, list++)
++		if (strcmp(str, *list) == 0)
++			return(i);
++	return(-1);
++}
++
++/*
++ * Get the next line. We only return lines beginning with '#' since that
++ * is all this program is ever interested in.
++ */
++char *getnextline(struct filepointer *filep)
++{
++	char	*p,	/* walking pointer */
++		*eof,	/* end of file pointer */
++		*bol;	/* beginning of line pointer */
++	int	lineno;	/* line number */
++	boolean whitespace = FALSE;
++
++	/*
++	 * Fake the "-include" line files in form of #include to the
++	 * start of each file.
++	 */
++	if (filep->cmdinc_line < filep->cmdinc_count) {
++		char *inc = filep->cmdinc_list[2 * filep->cmdinc_line + 0];
++		char *buf = filep->cmdinc_list[2 * filep->cmdinc_line + 1];
++		filep->cmdinc_line++;
++		sprintf(buf,"%s%s%s",DASH_INC_PRE,inc,DASH_INC_POST);
++		DBG_PRINT(stderr,"%s\n",buf);
++		return(buf);
++	}
++
++	p = filep->f_p;
++	eof = filep->f_end;
++	if (p >= eof)
++		return((char *)NULL);
++	lineno = filep->f_line;
++
++	for (bol = p--; ++p < eof; ) {
++		if ((bol == p) && ((*p == ' ') || (*p == '\t')))
++		{
++			/* Consume leading white-spaces for this line */
++			while (((p+1) < eof) && ((*p == ' ') || (*p == '\t')))
++			{
++				p++;
++				bol++;
++			}
++			whitespace = TRUE;
++		}
++ 
++		if (*p == '/' && (p+1) < eof && *(p+1) == '*') {
++			/* Consume C comments */
++			*(p++) = ' ';
++			*(p++) = ' ';
++			while (p < eof && *p) {
++				if (*p == '*' && (p+1) < eof && *(p+1) == '/') {
++					*(p++) = ' ';
++					*(p++) = ' ';
++					break;
++				}
++				if (*p == '\n')
++					lineno++;
++				*(p++) = ' ';
++			}
++			--p;
++		}
++		else if (*p == '/' && (p+1) < eof && *(p+1) == '/') {
++			/* Consume C++ comments */
++			*(p++) = ' ';
++			*(p++) = ' ';
++			while (p < eof && *p) {
++				if (*p == '\\' && (p+1) < eof &&
++				 *(p+1) == '\n') {
++					*(p++) = ' ';
++					lineno++;
++				}
++				else if (*p == '?' && (p+3) < eof &&
++					 *(p+1) == '?' && 
++					 *(p+2) == '/' &&
++					 *(p+3) == '\n') {
++					*(p++) = ' ';
++					*(p++) = ' ';
++					*(p++) = ' ';
++					lineno++;
++				}
++				else if (*p == '\n')
++					break;	/* to process end of line */
++				*(p++) = ' ';
++			}
++			--p;
++		}
++		else if (*p == '\\' && (p+1) < eof && *(p+1) == '\n') {
++			/* Consume backslash line terminations */
++			*(p++) = ' ';
++			*p = ' ';
++			lineno++;
++		}
++		else if (*p == '?' && (p+3) < eof &&
++			 *(p+1) == '?' && *(p+2) == '/' && *(p+3) == '\n') {
++			/* Consume trigraph'ed backslash line terminations */
++			*(p++) = ' ';
++			*(p++) = ' ';
++			*(p++) = ' ';
++			*p = ' ';
++			lineno++;
++		}
++		else if (*p == '\n') {
++			lineno++;
++			if (*bol == '#') {
++				char *cp;
++
++				*(p++) = '\0';
++				/* punt lines with just # (yacc generated) */
++				for (cp = bol+1; 
++				 *cp && (*cp == ' ' || *cp == '\t'); cp++);
++				if (*cp) goto done;
++				--p;
++			}
++			bol = p+1;
++			whitespace = FALSE;
++		}
++	}
++	if (*bol != '#')
++		bol = NULL;
++done:
++#if !defined(__UNIXOS2__) && !defined(_MSC_VER) && !defined(_WIN32)
++	/* Don't print warnings for system header files */
++	if (bol && whitespace && !strstr(filep->f_name, INCLUDEDIR)) {
++		warning("%s: non-portable whitespace encountered at line %d\n",
++			filep->f_name, lineno);
++	}
++#endif
++	filep->f_p = p;
++	filep->f_line = lineno;
++#ifdef DEBUG_DUMP
++	if (bol)
++		DBG_PRINT(stderr,"%s\n",bol);
++#endif
++	return(bol);
++}
++
++/*
++ * Strip the file name down to what we want to see in the Makefile.
++ * It will have objprefix and objsuffix around it.
++ */
++char *base_name(char *file)
++{
++	char	*p;
++
++	file = copy(file);
++	for(p=file+strlen(file); p>file && *p != '.'; p--) ;
++
++	if (*p == '.')
++		*p = '\0';
++	return(file);
++}
++
++#if defined(USG) && !defined(CRAY) && !defined(SVR4) && !defined(__UNIXOS2__) && !defined(clipper) && !defined(__clipper__)
++int rename (char *from, char *to)
++{
++ (void) unlink (to);
++ if (link (from, to) == 0) {
++	unlink (from);
++	return 0;
++ } else {
++	return -1;
++ }
++}
++#endif /* USGISH */
++
++void
++redirect(char *line, char *makefile)
++{
++	struct stat	st;
++	FILE	*fdin, *fdout;
++	char	backup[ BUFSIZ ],
++		buf[ BUFSIZ ];
++	boolean	found = FALSE;
++	int	len;
++
++	/*
++	 * if makefile is "-" then let it pour onto stdout.
++	 */
++	if (makefile && *makefile == '-' && *(makefile+1) == '\0') {
++		puts(line);
++		return;
++	}
++
++	/*
++	 * use a default makefile is not specified.
++	 */
++	if (!makefile) {
++		if (stat("Makefile", &st) == 0)
++			makefile = "Makefile";
++		else if (stat("makefile", &st) == 0)
++			makefile = "makefile";
++		else
++			fatalerr("[mM]akefile is not present\n");
++	}
++	else
++	 stat(makefile, &st);
++	if ((fdin = fopen(makefile, "r")) == NULL)
++		fatalerr("cannot open \"%s\"\n", makefile);
++	sprintf(backup, "%s.bak", makefile);
++	unlink(backup);
++#if defined(WIN32) || defined(__UNIXOS2__) || defined(__CYGWIN__)
++	fclose(fdin);
++#endif
++	if (rename(makefile, backup) < 0)
++		fatalerr("cannot rename %s to %s\n", makefile, backup);
++#if defined(WIN32) || defined(__UNIXOS2__) || defined(__CYGWIN__)
++	if ((fdin = fopen(backup, "r")) == NULL)
++		fatalerr("cannot open \"%s\"\n", backup);
++#endif
++	if ((fdout = freopen(makefile, "w", stdout)) == NULL)
++		fatalerr("cannot open \"%s\"\n", backup);
++	len = strlen(line);
++	while (!found && fgets(buf, BUFSIZ, fdin)) {
++		if (*buf == '#' && strncmp(line, buf, len) == 0)
++			found = TRUE;
++		fputs(buf, fdout);
++	}
++	if (!found) {
++		if (verbose)
++		warning("Adding new delimiting line \"%s\" and dependencies...\n",
++			line);
++		puts(line); /* same as fputs(fdout); but with newline */
++	} else if (append) {
++	 while (fgets(buf, BUFSIZ, fdin)) {
++		fputs(buf, fdout);
++	 }
++	}
++	fflush(fdout);
++#if defined(USGISH) || defined(_SEQUENT_) || defined(USE_CHMOD)
++	chmod(makefile, st.st_mode);
++#else
++ fchmod(fileno(fdout), st.st_mode);
++#endif /* USGISH */
++}
++
++void
++fatalerr(char *msg, ...)
++{
++	va_list args;
++	fprintf(stderr, "%s: error: ", ProgramName);
++	va_start(args, msg);
++	vfprintf(stderr, msg, args);
++	va_end(args);
++	exit (1);
++}
++
++void
++warning(char *msg, ...)
++{
++	va_list args;
++	fprintf(stderr, "%s: warning: ", ProgramName);
++	va_start(args, msg);
++	vfprintf(stderr, msg, args);
++	va_end(args);
++}
++
++void
++warning1(char *msg, ...)
++{
++	va_list args;
++	va_start(args, msg);
++	vfprintf(stderr, msg, args);
++	va_end(args);
++}
+diff -Naur security/coreconf/mkdepend/Makefile mozilla/security/coreconf/mkdepend/Makefile
+--- a/security/coreconf/mkdepend/Makefile	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/mkdepend/Makefile	2009-02-14 03:06:13.000000000 +0200
+@@ -0,0 +1,93 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++DEPTH		= ../..
++CORE_DEPTH	= ../..
++
++MODULE		= coreconf
++
++CSRCS		= \
++ cppsetup.c \
++ ifparser.c \
++ include.c \
++ main.c \
++ parse.c \
++ pr.c
++
++PROGRAM		= mkdepend
++
++# Indicate that this directory builds build tools.
++INTERNAL_TOOLS = 1
++
++
++include $(DEPTH)/coreconf/config.mk
++
++TARGETS		= $(PROGRAM)
++ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
++DEFINES		+= -DNO_X11
++else
++INSTALL		= true
++endif
++
++ifdef NATIVE_CC
++CC=$(NATIVE_CC)
++endif
++
++ifdef NATIVE_FLAGS
++OS_CFLAGS=$(NATIVE_FLAGS)
++endif
++
++include $(DEPTH)/coreconf/rules.mk
++
++ifdef GNU_CC
++OPTIMIZER = -O3
++else
++ifeq ($(OS_ARCH),SunOS)
++OPTIMIZER = -fast
++endif
++ifeq ($(OS_ARCH),WINNT)
++OPTIMIZER = -Ox
++endif
++endif
++
++DEFINES += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++
++# Redefine MAKE_OBJDIR for just this directory
++define MAKE_OBJDIR
++if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); fi
++endef
++
+diff -Naur security/coreconf/mkdepend/mkdepend.man mozilla/security/coreconf/mkdepend/mkdepend.man
+--- a/security/coreconf/mkdepend/mkdepend.man	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/mkdepend/mkdepend.man	2009-02-14 02:37:01.000000000 +0200
+@@ -0,0 +1,382 @@
++.\" $Xorg: mkdepend.man,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $
++.\" Copyright (c) 1993, 1994, 1998 The Open Group
++.\" 
++.\" Permission to use, copy, modify, distribute, and sell this software and its
++.\" documentation for any purpose is hereby granted without fee, provided that
++.\" the above copyright notice appear in all copies and that both that
++.\" copyright notice and this permission notice appear in supporting
++.\" documentation.
++.\" 
++.\" The above copyright notice and this permission notice shall be included in
++.\" all copies or substantial portions of the Software.
++.\" 
++.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
++.\" THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
++.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
++.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
++.\" SOFTWARE.
++.\" 
++.\" Except as contained in this notice, the name of The Open Group shall not 
++.\" be used in advertising or otherwise to promote the sale, use or other 
++.\" dealing in this Software without prior written authorization from The
++.\" Open Group.
++.\"
++.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.7 2002/12/14 02:39:45 dawes Exp $
++.\"
++.TH MAKEDEPEND 1 __xorgversion__
++.UC 4
++.SH NAME
++makedepend \- create dependencies in makefiles
++.SH SYNOPSIS
++.B makedepend
++[
++.BI \-D name\fB=\fPdef
++] [
++.BI \-D name
++] [
++.BI \-I includedir
++] [
++.BI \-Y includedir
++] [
++.B \-a
++] [
++.BI \-f makefile
++] [
++.BI \-include \ file
++] [
++.BI \-o objsuffix
++] [
++.BI \-p objprefix
++] [
++.BI \-s string
++] [
++.BI \-w width
++] [
++.B \-v
++] [
++.B \-m
++] [
++\-\^\-
++.I otheroptions
++\-\^\-
++]
++.I sourcefile
++\&.\|.\|.
++.br
++.SH DESCRIPTION
++The
++.B makedepend
++program reads each
++.I sourcefile
++in sequence and parses it like a C-preprocessor,
++processing all
++.I #include,
++.I #define,
++.I #undef,
++.I #ifdef,
++.I #ifndef,
++.I #endif,
++.I #if,
++.I #elif
++and
++.I #else
++directives so that it can correctly tell which
++.I #include,
++directives would be used in a compilation.
++Any
++.I #include,
++directives can reference files having other
++.I #include
++directives, and parsing will occur in these files as well.
++.PP
++Every file that a
++.I sourcefile
++includes,
++directly or indirectly,
++is what
++.B makedepend
++calls a \fIdependency.\fP
++These dependencies are then written to a
++.I makefile
++in such a way that
++.B make(1)
++will know which object files must be recompiled when a dependency has changed.
++.PP
++By default,
++.B makedepend
++places its output in the file named
++.I makefile
++if it exists, otherwise
++.I Makefile.
++An alternate makefile may be specified with the
++.B \-f
++option.
++It first searches the makefile for
++the line
++.sp
++\& # DO NOT DELETE THIS LINE \-\^\- make depend depends on it.
++.sp
++or one provided with the
++.B \-s
++option,
++as a delimiter for the dependency output.
++If it finds it, it will delete everything
++following this to the end of the makefile
++and put the output after this line.
++If it doesn't find it, the program
++will append the string to the end of the makefile
++and place the output following that.
++For each
++.I sourcefile
++appearing on the command line,
++.B makedepend
++puts lines in the makefile of the form
++.sp
++ sourcefile.o:\0dfile .\|.\|.
++.sp
++Where \fIsourcefile.o\fP is the name from the command
++line with its suffix replaced with ``.o'',
++and \fIdfile\fP is a dependency discovered in a
++.I #include
++directive while parsing
++.I sourcefile
++or one of the files it included.
++.SH EXAMPLE
++Normally,
++.B makedepend
++will be used in a makefile target so that typing ``make depend'' will
++bring the dependencies up to date for the makefile.
++For example,
++.nf
++ SRCS\0=\0file1.c\0file2.c\0.\|.\|.
++ CFLAGS\0=\0\-O\0\-DHACK\0\-I\^.\^.\^/foobar\0\-xyz
++ depend:
++ makedepend\0\-\^\-\0$(CFLAGS)\0\-\^\-\0$(SRCS)
++.fi
++.SH OPTIONS
++The program
++will ignore any option that it does not understand so that you may use
++the same arguments that you would for
++.B cc(1).
++.TP 5
++.B \-D\fIname\fP=\fIdef\fP \fRor\fP \-D\fIname\fP
++Define.
++This places a definition for
++.I name
++in
++.B makedepend's
++symbol table.
++Without 
++.I =def\|
++the symbol becomes defined as ``1''.
++.TP 5
++.B \-I\fIincludedir\fP
++Include directory.
++This option tells
++.B makedepend
++to prepend
++.I includedir
++to its list of directories to search when it encounters
++a
++.I #include
++directive.
++By default,
++.B makedepend
++only searches the standard include directories (usually /usr/include
++and possibly a compiler-dependent directory).
++.TP 5
++.B \-Y\fIincludedir\fP
++Replace all of the standard include directories with the single specified
++include directory; you can omit the
++.I includedir
++to simply prevent searching the standard include directories.
++.TP 5
++.B \-a
++Append the dependencies to the end of the file instead of replacing them. 
++.TP 5
++.B \-f\fImakefile\fP
++Filename.
++This allows you to specify an alternate makefile in which
++.B makedepend
++can place its output.
++Specifying ``\-'' as the file name (i.e., \fB\-f\-\fP) sends the
++output to standard output instead of modifying an existing file.
++.TP 5
++.B \-include \fIfile\fP
++Process file as input, and include all the resulting output
++before processing the regular input file. This has the same
++affect as if the specified file is an include statement that
++appears before the very first line of the regular input file.
++.TP 5
++.B \-o\fIobjsuffix\fP
++Object file suffix.
++Some systems may have object files whose suffix is something other
++than ``.o''.
++This option allows you to specify another suffix, such as
++``.b'' with
++.I \-o.b
++or ``:obj''
++with
++.I \-o:obj
++and so forth.
++.TP 5
++.B \-p\fIobjprefix\fP
++Object file prefix.
++The prefix is prepended to the name of the object file. This is
++usually used to designate a different directory for the object file.
++The default is the empty string.
++.TP 5
++.B \-s\fIstring\fP
++Starting string delimiter.
++This option permits you to specify
++a different string for
++.B makedepend
++to look for in the makefile.
++.TP 5
++.B \-w\fIwidth\fP
++Line width.
++Normally,
++.B makedepend
++will ensure that every output line that it writes will be no wider than
++78 characters for the sake of readability.
++This option enables you to change this width.
++.TP 5
++.B \-v
++Verbose operation.
++This option causes 
++.B makedepend
++to emit the list of files included by each input file.
++.TP 5
++.B \-m
++Warn about multiple inclusion.
++This option causes 
++.B makedepend
++to produce a warning if any input file includes another file more than
++once. In previous versions of 
++.B makedepend
++this was the default behavior; the default has been changed to better
++match the behavior of the C compiler, which does not consider multiple
++inclusion to be an error. This option is provided for backward 
++compatibility, and to aid in debugging problems related to multiple
++inclusion.
++.TP 5
++.B "\-\^\- \fIoptions\fP \-\^\-"
++If
++.B makedepend
++encounters a double hyphen (\-\^\-) in the argument list,
++then any unrecognized argument following it
++will be silently ignored; a second double hyphen terminates this
++special treatment.
++In this way,
++.B makedepend
++can be made to safely ignore esoteric compiler arguments that might
++normally be found in a CFLAGS
++.B make
++macro (see the
++.B EXAMPLE
++section above).
++All options that
++.B makedepend
++recognizes and appear between the pair of double hyphens
++are processed normally.
++.SH ALGORITHM
++The approach used in this program enables it to run an order of magnitude
++faster than any other ``dependency generator'' I have ever seen.
++Central to this performance are two assumptions:
++that all files compiled by a single
++makefile will be compiled with roughly the same
++.I \-I
++and
++.I \-D
++options;
++and that most files in a single directory will include largely the
++same files.
++.PP
++Given these assumptions,
++.B makedepend
++expects to be called once for each makefile, with
++all source files that are maintained by the
++makefile appearing on the command line.
++It parses each source and include
++file exactly once, maintaining an internal symbol table
++for each.
++Thus, the first file on the command line will take an amount of time
++proportional to the amount of time that a normal C preprocessor takes.
++But on subsequent files, if it encounters an include file
++that it has already parsed, it does not parse it again.
++.PP
++For example,
++imagine you are compiling two files,
++.I file1.c
++and
++.I file2.c,
++they each include the header file
++.I header.h,
++and the file
++.I header.h
++in turn includes the files
++.I def1.h
++and
++.I def2.h.
++When you run the command
++.sp
++ makedepend\0file1.c\0file2.c
++.sp
++.B makedepend
++will parse
++.I file1.c
++and consequently,
++.I header.h
++and then
++.I def1.h
++and
++.I def2.h.
++It then decides that the dependencies for this file are
++.sp
++ file1.o:\0header.h\0def1.h\0def2.h
++.sp
++But when the program parses
++.I file2.c
++and discovers that it, too, includes
++.I header.h,
++it does not parse the file,
++but simply adds
++.I header.h,
++.I def1.h
++and
++.I def2.h
++to the list of dependencies for
++.I file2.o.
++.SH "SEE ALSO"
++cc(1), make(1)
++.SH BUGS
++.B makedepend
++parses, but does not currently evaluate, the SVR4 #predicate(token-list)
++preprocessor expression; such expressions are simply assumed to be true.
++This may cause the wrong
++.I #include
++directives to be evaluated.
++.PP
++Imagine you are parsing two files,
++say
++.I file1.c
++and
++.I file2.c,
++each includes the file
++.I def.h.
++The list of files that
++.I def.h
++includes might truly be different when
++.I def.h
++is included by
++.I file1.c
++than when it is included by
++.I file2.c.
++But once
++.B makedepend
++arrives at a list of dependencies for a file,
++it is cast in concrete.
++.SH AUTHOR
++Todd Brunhoff, Tektronix, Inc. and MIT Project Athena
+diff -Naur security/coreconf/mkdepend/parse.c mozilla/security/coreconf/mkdepend/parse.c
+--- a/security/coreconf/mkdepend/parse.c	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/mkdepend/parse.c	2009-02-14 02:37:01.000000000 +0200
+@@ -0,0 +1,686 @@
++/* $Xorg: parse.c,v 1.6 2001/02/09 02:03:16 xorgcvs Exp $ */
++/*
++
++Copyright (c) 1993, 1994, 1998 The Open Group
++
++Permission to use, copy, modify, distribute, and sell this software and its
++documentation for any purpose is hereby granted without fee, provided that
++the above copyright notice appear in all copies and that both that
++copyright notice and this permission notice appear in supporting
++documentation.
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of The Open Group shall not be
++used in advertising or otherwise to promote the sale, use or other dealings
++in this Software without prior written authorization from The Open Group.
++
++*/
++/* $XFree86: xc/config/makedepend/parse.c,v 1.12 2002/02/26 05:09:10 tsi Exp $ */
++
++#include "def.h"
++
++extern char	*directives[];
++extern struct inclist	inclist[ MAXFILES ],
++			*inclistnext,
++			maininclist;
++extern char	*includedirs[ ],
++		**includedirsnext;
++
++static int deftype (char *line, struct filepointer *filep,
++		 struct inclist *file_red, struct inclist *file,
++		 int parse_it);
++static int zero_value(char *filename, char *exp, struct filepointer *filep,
++		 struct inclist *file_red);
++static int merge2defines(struct inclist *file1, struct inclist *file2);
++
++static int
++gobble(struct filepointer *filep, struct inclist *file,
++ struct inclist *file_red)
++{
++	char	*line;
++	int	type;
++
++	while ((line = getnextline(filep))) {
++		switch(type = deftype(line, filep, file_red, file, FALSE)) {
++		case IF:
++		case IFFALSE:
++		case IFGUESSFALSE:
++		case IFDEF:
++		case IFNDEF:
++			type = gobble(filep, file, file_red);
++			while ((type == ELIF) || (type == ELIFFALSE) ||
++			 (type == ELIFGUESSFALSE))
++			 type = gobble(filep, file, file_red);
++			if (type == ELSE)
++			 (void)gobble(filep, file, file_red);
++			break;
++		case ELSE:
++		case ENDIF:
++			debug(0,("%s, line %d: #%s\n",
++				file->i_file, filep->f_line,
++				directives[type]));
++			return(type);
++		case DEFINE:
++		case UNDEF:
++		case INCLUDE:
++		case INCLUDEDOT:
++		case PRAGMA:
++		case ERROR:
++		case IDENT:
++		case SCCS:
++		case EJECT:
++		case WARNING:
++		case INCLUDENEXT:
++		case INCLUDENEXTDOT:
++			break;
++		case ELIF:
++		case ELIFFALSE:
++		case ELIFGUESSFALSE:
++			return(type);
++		case -1:
++			warning("%s", file_red->i_file);
++			if (file_red != file)
++				warning1(" (reading %s)", file->i_file);
++			warning1(", line %d: unknown directive == \"%s\"\n",
++				filep->f_line, line);
++			break;
++		}
++	}
++	return(-1);
++}
++
++/*
++ * Decide what type of # directive this line is.
++ */
++static int 
++deftype (char *line, struct filepointer *filep, 
++	 struct inclist *file_red, struct inclist *file, int parse_it)
++{
++	register char	*p;
++	char	*directive, savechar, *q;
++	register int	ret;
++
++	/*
++	 * Parse the directive...
++	 */
++	directive=line+1;
++	while (*directive == ' ' || *directive == '\t')
++		directive++;
++
++	p = directive;
++	while ((*p == '_') || (*p >= 'a' && *p <= 'z'))
++		p++;
++	savechar = *p;
++	*p = '\0';
++	ret = match(directive, directives);
++	*p = savechar;
++
++	/* If we don't recognize this compiler directive or we happen to just
++	 * be gobbling up text while waiting for an #endif or #elif or #else
++	 * in the case of an #elif we must check the zero_value and return an
++	 * ELIF or an ELIFFALSE.
++	 */
++
++	if (ret == ELIF && !parse_it)
++	{
++	 while (*p == ' ' || *p == '\t')
++		p++;
++	 /*
++	 * parse an expression.
++	 */
++	 debug(0,("%s, line %d: #elif %s ",
++		 file->i_file, filep->f_line, p));
++	 ret = zero_value(file->i_file, p, filep, file_red);
++	 if (ret != IF)
++	 {
++		debug(0,("false...\n"));
++		if (ret == IFFALSE)
++		 return(ELIFFALSE);
++		else
++		 return(ELIFGUESSFALSE);
++	 }
++	 else
++	 {
++		debug(0,("true...\n"));
++		return(ELIF);
++	 }
++	}
++
++	if (ret < 0 || ! parse_it)
++		return(ret);
++
++	/*
++	 * now decide how to parse the directive, and do it.
++	 */
++	while (*p == ' ' || *p == '\t')
++		p++;
++	q = p + strlen(p);
++	do {
++		q--;
++	} while (*q == ' ' || *q == '\t');
++	q[1] = '\0';
++	switch (ret) {
++	case IF:
++		/*
++		 * parse an expression.
++		 */
++		ret = zero_value(file->i_file, p, filep, file_red);
++		debug(0,("%s, line %d: %s #if %s\n",
++			 file->i_file, filep->f_line, ret?"false":"true", p));
++		break;
++	case IFDEF:
++	case IFNDEF:
++		debug(0,("%s, line %d: #%s %s\n",
++			file->i_file, filep->f_line, directives[ret], p));
++	case UNDEF:
++		/*
++		 * separate the name of a single symbol.
++		 */
++		while (isalnum(*p) || *p == '_')
++			*line++ = *p++;
++		*line = '\0';
++		break;
++	case INCLUDE:
++	case INCLUDENEXT:
++		debug(2,("%s, line %d: #include%s %s\n",
++			file->i_file, filep->f_line,
++			(ret == INCLUDE) ? "" : "_next", p));
++
++		/* Support ANSI macro substitution */
++		while (1) {
++			struct symtab **sym;
++
++			if (!*p || *p == '"' || *p == '<')
++				break;
++
++		 	sym = isdefined(p, file_red, NULL);
++			if (!sym)
++				break;
++
++			p = (*sym)->s_value;
++			debug(3,("%s : #includes SYMBOL %s = %s\n",
++			 file->i_incstring,
++			 (*sym) -> s_name,
++			 (*sym) -> s_value));
++			/* mark file as having included a 'soft include' */
++			file->i_flags |= INCLUDED_SYM; 
++		}
++
++		/*
++		 * Separate the name of the include file.
++		 */
++		while (*p && *p != '"' && *p != '<')
++			p++;
++		if (! *p)
++			return(-2);
++		if (*p++ == '"') {
++			if (ret == INCLUDE)
++				ret = INCLUDEDOT;
++			else
++				ret = INCLUDENEXTDOT;
++			while (*p && *p != '"')
++				*line++ = *p++;
++		} else
++			while (*p && *p != '>')
++				*line++ = *p++;
++		*line = '\0';
++		break;
++	case DEFINE:
++		/*
++		 * copy the definition back to the beginning of the line.
++		 */
++		strcpy (line, p);
++		break;
++	case ELSE:
++	case ENDIF:
++	case ELIF:
++	case PRAGMA:
++	case ERROR:
++	case IDENT:
++	case SCCS:
++	case EJECT:
++	case WARNING:
++		debug(0,("%s, line %d: #%s\n",
++			file->i_file, filep->f_line, directives[ret]));
++		/*
++		 * nothing to do.
++		 */
++		break;
++	}
++	return(ret);
++}
++
++struct symtab **
++fdefined(char *symbol, struct inclist *file, struct inclist **srcfile)
++{
++	struct inclist	**ip;
++	struct symtab	**val;
++	int	i;
++	static int	recurse_lvl = 0;
++
++	if (file->i_flags & DEFCHECKED)
++		return(NULL);
++	debug(2,("Looking for %s in %s\n", symbol, file->i_file));
++	file->i_flags |= DEFCHECKED;
++	if ((val = slookup(symbol, file)))
++		debug(1,("%s defined in %s as %s\n",
++			 symbol, file->i_file, (*val)->s_value));
++	if (val == NULL && file->i_list)
++	{
++		for (ip = file->i_list, i=0; i < file->i_listlen; i++, ip++)
++			if (file->i_merged[i]==FALSE) {
++				val = fdefined(symbol, *ip, srcfile);
++				file->i_merged[i]=merge2defines(file,*ip);
++				if (val!=NULL) break;
++			}
++	}
++	else if (val != NULL && srcfile != NULL) *srcfile = file;
++	recurse_lvl--;
++	file->i_flags &= ~DEFCHECKED;
++
++	return(val);
++}
++
++struct symtab **
++isdefined(char *symbol, struct inclist *file, struct inclist **srcfile)
++{
++	struct symtab	**val;
++
++	if ((val = slookup(symbol, &maininclist))) {
++		debug(1,("%s defined on command line\n", symbol));
++		if (srcfile != NULL) *srcfile = &maininclist;
++		return(val);
++	}
++	if ((val = fdefined(symbol, file, srcfile)))
++		return(val);
++	debug(1,("%s not defined in %s\n", symbol, file->i_file));
++	return(NULL);
++}
++
++/*
++ * Return type based on if the #if expression evaluates to 0
++ */
++static int
++zero_value(char *filename,
++	 char *exp,
++	 struct filepointer *filep,
++	 struct inclist *file_red)
++{
++	if (cppsetup(filename, exp, filep, file_red))
++	 return(IFFALSE);
++	else
++	 return(IF);
++}
++
++void
++define2(char *name, char *val, struct inclist *file)
++{
++ int first, last, below;
++ register struct symtab **sp = NULL, **dest;
++ struct symtab *stab;
++
++ /* Make space if it's needed */
++ if (file->i_defs == NULL)
++ {
++	file->i_defs = (struct symtab **)
++			malloc(sizeof (struct symtab*) * SYMTABINC);
++	file->i_ndefs = 0;
++ }
++ else if (!(file->i_ndefs % SYMTABINC))
++	file->i_defs = (struct symtab **)
++			realloc(file->i_defs,
++			 sizeof(struct symtab*)*(file->i_ndefs+SYMTABINC));
++
++ if (file->i_defs == NULL)
++	fatalerr("malloc()/realloc() failure in insert_defn()\n");
++
++ below = first = 0;
++ last = file->i_ndefs - 1;
++ while (last >= first)
++ {
++	/* Fast inline binary search */
++	register char *s1;
++	register char *s2;
++	register int middle = (first + last) / 2;
++
++	/* Fast inline strchr() */
++	s1 = name;
++	s2 = file->i_defs[middle]->s_name;
++	while (*s1++ == *s2++)
++	 if (s2[-1] == '\0') break;
++
++	/* If exact match, set sp and break */
++	if (*--s1 == *--s2) 
++	{
++	 sp = file->i_defs + middle;
++	 break;
++	}
++
++	/* If name > i_defs[middle] ... */
++	if (*s1 > *s2) 
++	{
++	 below = first;
++	 first = middle + 1;
++	}
++	/* else ... */
++	else
++	{
++	 below = last = middle - 1;
++	}
++ }
++
++ /* Search is done. If we found an exact match to the symbol name,
++ just replace its s_value */
++ if (sp != NULL)
++ {
++	debug(1,("redefining %s from %s to %s in file %s\n",
++		name, (*sp)->s_value, val, file->i_file));
++	free((*sp)->s_value);
++	(*sp)->s_value = copy(val);
++	return;
++ }
++
++ sp = file->i_defs + file->i_ndefs++;
++ dest = file->i_defs + below + 1;
++ while (sp > dest)
++ {
++	*sp = sp[-1];
++	sp--;
++ }
++ stab = (struct symtab *) malloc(sizeof (struct symtab));
++ if (stab == NULL)
++	fatalerr("malloc()/realloc() failure in insert_defn()\n");
++
++ debug(1,("defining %s to %s in file %s\n", name, val, file->i_file));
++ stab->s_name = copy(name);
++ stab->s_value = copy(val);
++ *sp = stab;
++}
++
++void
++define(char *def, struct inclist *file)
++{
++ char *val;
++
++ /* Separate symbol name and its value */
++ val = def;
++ while (isalnum(*val) || *val == '_')
++	val++;
++ if (*val)
++	*val++ = '\0';
++ while (*val == ' ' || *val == '\t')
++	val++;
++
++ if (!*val)
++	val = "1";
++ define2(def, val, file);
++}
++
++struct symtab **
++slookup(char *symbol, struct inclist *file)
++{
++	register int first = 0;
++	register int last = file->i_ndefs - 1;
++
++	if (file) while (last >= first)
++	{
++	 /* Fast inline binary search */
++	 register char *s1;
++	 register char *s2;
++	 register int middle = (first + last) / 2;
++
++	 /* Fast inline strchr() */
++	 s1 = symbol;
++	 s2 = file->i_defs[middle]->s_name;
++	 while (*s1++ == *s2++)
++	 if (s2[-1] == '\0') break;
++
++	 /* If exact match, we're done */
++	 if (*--s1 == *--s2) 
++	 {
++	 return file->i_defs + middle;
++	 }
++
++	 /* If symbol > i_defs[middle] ... */
++	 if (*s1 > *s2) 
++	 {
++	 first = middle + 1;
++	 }
++	 /* else ... */
++	 else
++	 {
++	 last = middle - 1;
++	 }
++	}
++	return(NULL);
++}
++
++static int 
++merge2defines(struct inclist *file1, struct inclist *file2)
++{
++	int i;
++
++	if ((file1==NULL) || (file2==NULL) ||
++	 !(file2->i_flags & FINISHED))
++		return 0;
++
++	for (i=0; i < file2->i_listlen; i++)
++		if (file2->i_merged[i]==FALSE)
++			return 0;
++
++	{
++		int first1 = 0;
++		int last1 = file1->i_ndefs - 1;
++
++		int first2 = 0;
++		int last2 = file2->i_ndefs - 1;
++
++ int first=0;
++ struct symtab** i_defs = NULL;
++		int deflen=file1->i_ndefs+file2->i_ndefs;
++
++		debug(2,("merging %s into %s\n",
++			file2->i_file, file1->i_file));
++
++ if (deflen>0)
++ { 
++ 	/* make sure deflen % SYMTABINC == 0 is still true */
++ 	deflen += (SYMTABINC - deflen % SYMTABINC) % SYMTABINC;
++ 	i_defs=(struct symtab**)
++			 malloc(deflen*sizeof(struct symtab*));
++ 	if (i_defs==NULL) return 0;
++ 	}
++
++ 	while ((last1 >= first1) && (last2 >= first2))
++ 	{
++	 		char *s1=file1->i_defs[first1]->s_name;
++	 		char *s2=file2->i_defs[first2]->s_name;
++
++ 			if (strcmp(s1,s2) < 0)
++ 	i_defs[first++]=file1->i_defs[first1++];
++ 			else if (strcmp(s1,s2) > 0)
++ 	i_defs[first++]=file2->i_defs[first2++];
++ else /* equal */
++ {
++ 	i_defs[first++]=file2->i_defs[first2++];
++ first1++;
++ }
++ 	}
++ 	while (last1 >= first1)
++ 	{
++ i_defs[first++]=file1->i_defs[first1++];
++ 	}
++ 	while (last2 >= first2)
++ 	{
++ i_defs[first++]=file2->i_defs[first2++];
++ 	}
++
++ if (file1->i_defs) free(file1->i_defs);
++ file1->i_defs=i_defs;
++ file1->i_ndefs=first;
++ 
++		return 1;
++ 	}
++}
++
++void
++undefine(char *symbol, struct inclist *file)
++{
++	register struct symtab **ptr;
++	struct inclist *srcfile;
++	while ((ptr = isdefined(symbol, file, &srcfile)) != NULL)
++	{
++	 srcfile->i_ndefs--;
++	 for (; ptr < srcfile->i_defs + srcfile->i_ndefs; ptr++)
++		*ptr = ptr[1];
++	}
++}
++
++int
++find_includes(struct filepointer *filep, struct inclist *file, 
++	 struct inclist *file_red, int recursion, boolean failOK)
++{
++	struct inclist	*inclistp;
++	char		**includedirsp;
++	register char	*line;
++	register int	type;
++	boolean recfailOK;
++
++	while ((line = getnextline(filep))) {
++		switch(type = deftype(line, filep, file_red, file, TRUE)) {
++		case IF:
++		doif:
++			type = find_includes(filep, file,
++				file_red, recursion+1, failOK);
++			while ((type == ELIF) || (type == ELIFFALSE) ||
++			 (type == ELIFGUESSFALSE))
++				type = gobble(filep, file, file_red);
++			if (type == ELSE)
++				gobble(filep, file, file_red);
++			break;
++		case IFFALSE:
++		case IFGUESSFALSE:
++		 doiffalse:
++			if (type == IFGUESSFALSE || type == ELIFGUESSFALSE)
++			 recfailOK = TRUE;
++			else
++			 recfailOK = failOK;
++			type = gobble(filep, file, file_red);
++			if (type == ELSE)
++			 find_includes(filep, file,
++					 file_red, recursion+1, recfailOK);
++			else
++			if (type == ELIF)
++			 goto doif;
++			else
++			if ((type == ELIFFALSE) || (type == ELIFGUESSFALSE))
++			 goto doiffalse;
++			break;
++		case IFDEF:
++		case IFNDEF:
++			if ((type == IFDEF && isdefined(line, file_red, NULL))
++			 || (type == IFNDEF && !isdefined(line, file_red, NULL))) {
++				debug(1,(type == IFNDEF ?
++				 "line %d: %s !def'd in %s via %s%s\n" : "",
++				 filep->f_line, line,
++				 file->i_file, file_red->i_file, ": doit"));
++				type = find_includes(filep, file,
++					file_red, recursion+1, failOK);
++				while (type == ELIF || type == ELIFFALSE || type == ELIFGUESSFALSE)
++					type = gobble(filep, file, file_red);
++				if (type == ELSE)
++					gobble(filep, file, file_red);
++			}
++			else {
++				debug(1,(type == IFDEF ?
++				 "line %d: %s !def'd in %s via %s%s\n" : "",
++				 filep->f_line, line,
++				 file->i_file, file_red->i_file, ": gobble"));
++				type = gobble(filep, file, file_red);
++				if (type == ELSE)
++					find_includes(filep, file,
++						file_red, recursion+1, failOK);
++				else if (type == ELIF)
++				 	goto doif;
++				else if (type == ELIFFALSE || type == ELIFGUESSFALSE)
++				 	goto doiffalse;
++			}
++			break;
++		case ELSE:
++		case ELIFFALSE:
++		case ELIFGUESSFALSE:
++		case ELIF:
++			if (!recursion)
++				gobble(filep, file, file_red);
++		case ENDIF:
++			if (recursion)
++				return(type);
++		case DEFINE:
++			define(line, file);
++			break;
++		case UNDEF:
++			if (!*line) {
++			 warning("%s", file_red->i_file);
++			 if (file_red != file)
++				warning1(" (reading %s)", file->i_file);
++			 warning1(", line %d: incomplete undef == \"%s\"\n",
++				filep->f_line, line);
++			 break;
++			}
++			undefine(line, file_red);
++			break;
++		case INCLUDE:
++		case INCLUDEDOT:
++		case INCLUDENEXT:
++		case INCLUDENEXTDOT:
++			inclistp = inclistnext;
++			includedirsp = includedirsnext;
++			debug(2,("%s, reading %s, includes %s\n",
++				file_red->i_file, file->i_file, line));
++			add_include(filep, file, file_red, line, type, failOK);
++			inclistnext = inclistp;
++			includedirsnext = includedirsp;
++			break;
++		case ERROR:
++		case WARNING:
++		 	warning("%s", file_red->i_file);
++			if (file_red != file)
++				warning1(" (reading %s)", file->i_file);
++			warning1(", line %d: %s\n",
++				 filep->f_line, line);
++		 	break;
++		 
++		case PRAGMA:
++		case IDENT:
++		case SCCS:
++		case EJECT:
++			break;
++		case -1:
++			warning("%s", file_red->i_file);
++			if (file_red != file)
++			 warning1(" (reading %s)", file->i_file);
++			warning1(", line %d: unknown directive == \"%s\"\n",
++				 filep->f_line, line);
++			break;
++		case -2:
++			warning("%s", file_red->i_file);
++			if (file_red != file)
++			 warning1(" (reading %s)", file->i_file);
++			warning1(", line %d: incomplete include == \"%s\"\n",
++				 filep->f_line, line);
++			break;
++		}
++	}
++	file->i_flags |= FINISHED;
++	debug(2,("finished with %s\n", file->i_file));
++	return(-1);
++}
+diff -Naur security/coreconf/mkdepend/pr.c mozilla/security/coreconf/mkdepend/pr.c
+--- a/security/coreconf/mkdepend/pr.c	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/mkdepend/pr.c	2009-02-14 02:37:01.000000000 +0200
+@@ -0,0 +1,124 @@
++/* $Xorg: pr.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */
++/*
++
++Copyright (c) 1993, 1994, 1998 The Open Group
++
++Permission to use, copy, modify, distribute, and sell this software and its
++documentation for any purpose is hereby granted without fee, provided that
++the above copyright notice appear in all copies and that both that
++copyright notice and this permission notice appear in supporting
++documentation.
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of The Open Group shall not be
++used in advertising or otherwise to promote the sale, use or other dealings
++in this Software without prior written authorization from The Open Group.
++
++*/
++/* $XFree86: xc/config/makedepend/pr.c,v 1.5 2001/12/14 19:53:21 dawes Exp $ */
++
++#include "def.h"
++
++extern struct	inclist	inclist[ MAXFILES ],
++			*inclistp;
++extern char	*objprefix;
++extern char	*objsuffix;
++extern int	width;
++extern boolean	printed;
++extern boolean	verbose;
++extern boolean	show_where_not;
++
++void
++add_include(struct filepointer *filep, struct inclist *file, 
++	 struct inclist *file_red, char *include, int type,
++	 boolean failOK)
++{
++	register struct inclist	*newfile;
++	register struct filepointer	*content;
++
++	/*
++	 * First decide what the pathname of this include file really is.
++	 */
++	newfile = inc_path(file->i_file, include, type);
++	if (newfile == NULL) {
++		if (failOK)
++		 return;
++		if (file != file_red)
++			warning("%s (reading %s, line %d): ",
++				file_red->i_file, file->i_file, filep->f_line);
++		else
++			warning("%s, line %d: ", file->i_file, filep->f_line);
++		warning1("cannot find include file \"%s\"\n", include);
++		show_where_not = TRUE;
++		newfile = inc_path(file->i_file, include, type);
++		show_where_not = FALSE;
++	}
++
++	if (newfile) {
++		included_by(file, newfile);
++		if (!(newfile->i_flags & SEARCHED)) {
++			newfile->i_flags |= SEARCHED;
++			content = getfile(newfile->i_file);
++			find_includes(content, newfile, file_red, 0, failOK);
++			freefile(content);
++		}
++	}
++}
++
++static void
++pr(struct inclist *ip, char *file, char *base)
++{
++	static char	*lastfile;
++	static int	current_len;
++	register int	len, i;
++	char	buf[ BUFSIZ ];
++
++	printed = TRUE;
++	len = strlen(ip->i_file)+1;
++	if (current_len + len > width || file != lastfile) {
++		lastfile = file;
++		sprintf(buf, "\n%s%s%s: %s", objprefix, base, objsuffix,
++			ip->i_file);
++		len = current_len = strlen(buf);
++	}
++	else {
++		buf[0] = ' ';
++		strcpy(buf+1, ip->i_file);
++		current_len += len;
++	}
++	fwrite(buf, len, 1, stdout);
++
++	/*
++	 * If verbose is set, then print out what this file includes.
++	 */
++	if (! verbose || ip->i_list == NULL || ip->i_flags & NOTIFIED)
++		return;
++	ip->i_flags |= NOTIFIED;
++	lastfile = NULL;
++	printf("\n# %s includes:", ip->i_file);
++	for (i=0; i<ip->i_listlen; i++)
++		printf("\n#\t%s", ip->i_list[ i ]->i_incstring);
++}
++
++void
++recursive_pr_include(struct inclist *head, char *file, char *base)
++{
++	int	i;
++
++	if (head->i_flags & MARKED)
++		return;
++	head->i_flags |= MARKED;
++	if (head->i_file != file)
++		pr(head, file, base);
++	for (i=0; i<head->i_listlen; i++)
++		recursive_pr_include(head->i_list[ i ], file, base);
++}
+diff -Naur security/coreconf/module.mk mozilla/security/coreconf/module.mk
+--- a/security/coreconf/module.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/module.mk	2004-04-25 18:02:17.000000000 +0300
+@@ -0,0 +1,69 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++#######################################################################
++# The master "Core Components" source and release component directory #
++# names are ALWAYS identical and are the value of $(MODULE). #
++# NOTE: A component is also called a module or a subsystem. #
++#######################################################################
++
++#
++# All "Core Components" <component>-specific source-side tags must
++# always be identified for compiling/linking purposes
++#
++
++ifndef JAVA_SOURCE_COMPONENT
++ JAVA_SOURCE_COMPONENT = java
++endif
++
++ifndef NETLIB_SOURCE_COMPONENT
++ NETLIB_SOURCE_COMPONENT = netlib
++endif
++
++ifndef NSPR_SOURCE_COMPONENT
++ NSPR_SOURCE_COMPONENT = nspr20
++endif
++
++ifndef SECTOOLS_SOURCE_COMPONENT
++ SECTOOLS_SOURCE_COMPONENT = sectools
++endif
++
++ifndef SECURITY_SOURCE_COMPONENT
++ SECURITY_SOURCE_COMPONENT = security
++endif
++
++MK_MODULE = included
+diff -Naur security/coreconf/NCR3.0.mk mozilla/security/coreconf/NCR3.0.mk
+--- a/security/coreconf/NCR3.0.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/NCR3.0.mk	2007-11-22 06:39:56.000000000 +0200
+@@ -0,0 +1,97 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER = cc
++
++###
++NS_USE_NATIVE = 1
++
++# NS_USE_GCC = 1
++
++export PATH:=$(PATH):/opt/ncc/bin
++###
++
++RANLIB = true
++GCC_FLAGS_EXTRA += -pipe
++
++DEFINES		+= -DSVR4 -DSYSV -DHAVE_STRERROR -DNCR
++
++OS_CFLAGS	+= -Hnocopyr -DSVR4 -DSYSV -DHAVE_STRERROR -DNCR -DPRFSTREAMS_BROKEN
++
++ifdef NS_USE_NATIVE
++	CC = cc
++	CCC = ncc
++	CXX = ncc
++#	OS_LIBS += -L/opt/ncc/lib 
++else
++#	OS_LIBS	+=
++endif
++
++#OS_LIBS += -lsocket -lnsl -ldl -lc
++
++MKSHLIB += $(LD) $(DSO_LDOPTS)
++#DSO_LDOPTS += -G -z defs
++DSO_LDOPTS += -G
++ifdef MAPFILE
++# Add LD options to restrict exported symbols to those in the map file
++endif
++# Change PROCESS to put the mapfile in the correct format for this platform
++PROCESS_MAP_FILE = cp $< $@
++
++CPU_ARCH = x86
++ARCH = ncr
++
++NOSUCHFILE = /solaris-rm-f-sucks
++
++# now take care of default GCC (rus@5/5/97)
++ 
++ifdef NS_USE_GCC
++	# if gcc-settings are redefined already - don't touch it
++	#
++	ifeq (,$(findstring gcc, $(CC)))
++		CC = gcc
++		CCC = g++
++		CXX = g++
++		# always use -fPIC - some makefiles are still broken and don't distinguish
++		# situation when they build shared and static libraries
++		CFLAGS += -fPIC -Wall -Wno-switch $(GCC_FLAGS_EXTRA)
++#		OS_LIBS += -L/usr/local/lib -lstdc++ -lg++ -lgcc
++	endif
++endif
++###
+diff -Naur security/coreconf/NEC4.2.mk mozilla/security/coreconf/NEC4.2.mk
+--- a/security/coreconf/NEC4.2.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/NEC4.2.mk	2005-09-16 20:09:23.000000000 +0300
+@@ -0,0 +1,68 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER = $(CORE_DEPTH)/build/hcc
++
++CPU_ARCH		= mips
++
++ifdef NS_USE_GCC
++CC			= gcc
++CCC			= g++
++else
++CC			= $(CORE_DEPTH)/build/hcc
++OS_CFLAGS		= -Xa -KGnum=0 -KOlimit=4000
++CCC			= g++
++endif
++
++MKSHLIB			= $(LD) $(DSO_LDOPTS)
++ifdef MAPFILE
++# Add LD options to restrict exported symbols to those in the map file
++endif
++# Change PROCESS to put the mapfile in the correct format for this platform
++PROCESS_MAP_FILE = cp $< $@
++
++RANLIB			= /bin/true
++
++OS_CFLAGS		+= $(ODD_CFLAGS) -DSVR4 -D__SVR4 -DNEC -Dnec_ews -DHAVE_STRERROR
++OS_LIBS			= -lsocket -lnsl -ldl $(LDOPTIONS)
++LDOPTIONS		= -lc -L/usr/ucblib -lucb
++
++NOSUCHFILE		= /nec-rm-f-sucks
++
++DSO_LDOPTS		= -G
+diff -Naur security/coreconf/NetBSD.mk mozilla/security/coreconf/NetBSD.mk
+--- a/security/coreconf/NetBSD.mk	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/NetBSD.mk	2009-09-03 07:57:00.000000000 +0300
+@@ -0,0 +1,87 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER	= gcc
++CC			= gcc
++CCC			= g++
++RANLIB			= ranlib
++
++CPU_ARCH		:= $(shell uname -p)
++ifeq ($(CPU_ARCH),i386)
++OS_REL_CFLAGS		= -Di386
++CPU_ARCH		= x86
++endif
++
++ifndef OBJECT_FMT
++OBJECT_FMT		:= $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)
++endif
++
++ifeq ($(OBJECT_FMT),ELF)
++DLL_SUFFIX		= so
++else
++DLL_SUFFIX		= so.1.0
++endif
++
++OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DNETBSD -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++
++OS_LIBS			= -lcompat
++
++ARCH			= netbsd
++
++DSO_CFLAGS		= -fPIC -DPIC
++DSO_LDOPTS		= -shared
++ifeq ($(OBJECT_FMT),ELF)
++DSO_LDOPTS		+= -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
++endif
++
++ifdef LIBRUNPATH
++DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
++endif
++
++MKSHLIB			= $(CC) $(DSO_LDOPTS)
++ifdef MAPFILE
++# Add LD options to restrict exported symbols to those in the map file
++endif
++# Change PROCESS to put the mapfile in the correct format for this platform
++PROCESS_MAP_FILE = cp $< $@
++
++
++G++INCLUDES		= -I/usr/include/g++
++
++INCLUDES		+= -I/usr/X11R6/include
+diff -Naur security/coreconf/nsinstall/Makefile mozilla/security/coreconf/nsinstall/Makefile
+--- a/security/coreconf/nsinstall/Makefile	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/nsinstall/Makefile	2005-10-06 01:25:37.000000000 +0300
+@@ -0,0 +1,74 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++DEPTH		= ../..
++CORE_DEPTH	= ../..
++
++MODULE		= coreconf
++
++CSRCS		= nsinstall.c pathsub.c
++
++PROGRAM		= nsinstall
++
++# Indicate that this directory builds build tools.
++INTERNAL_TOOLS = 1
++
++
++include $(DEPTH)/coreconf/config.mk
++
++ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
++PROGRAM		=
++else
++TARGETS		= $(PROGRAM)
++INSTALL		= true
++endif
++
++ifdef NATIVE_CC
++CC=$(NATIVE_CC)
++endif
++
++ifdef NATIVE_FLAGS
++OS_CFLAGS=$(NATIVE_FLAGS)
++endif
++
++include $(DEPTH)/coreconf/rules.mk
++
++# Redefine MAKE_OBJDIR for just this directory
++define MAKE_OBJDIR
++if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); fi
++endef
++
+diff -Naur security/coreconf/nsinstall/nsinstall.c mozilla/security/coreconf/nsinstall/nsinstall.c
+--- a/security/coreconf/nsinstall/nsinstall.c	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/nsinstall/nsinstall.c	2009-06-05 05:15:15.000000000 +0300
+@@ -0,0 +1,439 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is the Netscape security libraries.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 1994-2000
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++/*
++** Netscape portable install command.
++*/
++#include <stdio.h> /* OSF/1 requires this before grp.h, so put it first */
++#include <assert.h>
++#include <fcntl.h>
++#include <string.h>
++#if defined(_WINDOWS)
++#include <windows.h>
++typedef unsigned int mode_t;
++#else
++#include <grp.h>
++#include <pwd.h>
++#include <errno.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <utime.h>
++#endif
++#include <sys/types.h>
++#include <sys/stat.h>
++#include "pathsub.h"
++
++#define HAVE_LCHOWN
++
++#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(LINUX) || defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(NTO) || defined(DARWIN) || defined(BEOS) || defined(__riscos__)
++#undef HAVE_LCHOWN
++#endif
++
++#define HAVE_FCHMOD
++
++#if defined(BEOS)
++#undef HAVE_FCHMOD
++#endif
++
++#ifdef LINUX
++#include <getopt.h>
++#endif
++
++#if defined(SCO) || defined(UNIXWARE) || defined(SNI) || defined(NCR) || defined(NEC)
++#if !defined(S_ISLNK) && defined(S_IFLNK)
++#define S_ISLNK(a)	(((a) & S_IFMT) == S_IFLNK)
++#endif
++#endif
++
++#if defined(SNI)
++extern int fchmod(int fildes, mode_t mode);
++#endif
++
++
++#ifdef GETCWD_CANT_MALLOC
++/*
++ * this should probably go into a utility library in case other applications
++ * need it.
++ */
++static char *
++getcwd_do_malloc(char *path, int len) {
++
++ if (!path) {
++	path = malloc(PATH_MAX +1);
++	if (!path) return NULL;
++ }
++ return getcwd(path, PATH_MAX);
++}
++#define GETCWD	getcwd_do_malloc
++#else
++#define GETCWD	getcwd
++#endif
++
++
++static void
++usage(void)
++{
++ fprintf(stderr,
++	"usage: %s [-C cwd] [-L linkprefix] [-m mode] [-o owner] [-g group]\n"
++	" %*s [-DdltR] file [file ...] directory\n",
++	program, (int)strlen(program), "");
++ exit(2);
++}
++
++/* this is more-or-less equivalent to mkdir -p */
++static int
++mkdirs(char *path, mode_t mode)
++{
++ char * cp;
++ int rv;
++ struct stat sb;
++ 
++ if (!path || !path[0]) 
++	fail("Null pointer or empty string passed to mkdirs()");
++ while (*path == '/' && path[1] == '/')
++	path++;
++ for (cp = strrchr(path, '/'); cp && cp != path && *(cp - 1) == '/'; cp--);
++ if (cp && cp != path) {
++	*cp = '\0';
++	if ((stat(path, &sb) < 0 || !S_ISDIR(sb.st_mode)) &&
++	 mkdirs(path, mode) < 0) {
++	 return -1;
++	}
++	*cp = '/';
++ }
++ rv = mkdir(path, mode);
++ if (rv) {
++	if (errno != EEXIST)
++	 fail("mkdirs cannot make %s", path);
++	fprintf(stderr, "directory creation race: %s\n", path);
++	if (!stat(path, &sb) && S_ISDIR(sb.st_mode)) 
++	 rv = 0;
++ }
++ return rv;
++}
++
++static uid_t
++touid(char *owner)
++{
++ struct passwd *pw;
++ uid_t uid;
++ char *cp;
++
++ if (!owner || !owner[0]) 
++	fail("Null pointer or empty string passed to touid()");
++ pw = getpwnam(owner);
++ if (pw)
++	return pw->pw_uid;
++ uid = strtol(owner, &cp, 0);
++ if (uid == 0 && cp == owner)
++	fail("cannot find uid for %s", owner);
++ return uid;
++}
++
++static gid_t
++togid(char *group)
++{
++ struct group *gr;
++ gid_t gid;
++ char *cp;
++
++ if (!group || !group[0]) 
++	fail("Null pointer or empty string passed to togid()");
++ gr = getgrnam(group);
++ if (gr)
++	return gr->gr_gid;
++ gid = strtol(group, &cp, 0);
++ if (gid == 0 && cp == group)
++	fail("cannot find gid for %s", group);
++ return gid;
++}
++
++void * const uninit = (void *)0xdeadbeef;
++
++int
++main(int argc, char **argv)
++{
++ char *	base		= uninit;
++ char *	bp		= uninit;
++ char *	cp		= uninit;
++ char *	cwd		= 0;
++ char *	group		= 0;
++ char *	linkname	= 0;
++ char *	linkprefix	= 0;
++ char *	name		= uninit;
++ char *	owner		= 0;
++ char *	todir		= uninit;
++ char *	toname		= uninit;
++
++ int 	bnlen		= -1;
++ int 	cc		= 0;
++ int 	dodir		= 0;
++ int 	dolink		= 0;
++ int 	dorelsymlink	= 0;
++ int 	dotimes		= 0;
++ int 	exists		= 0;
++ int 	fromfd		= -1;
++ int 	len		= -1;
++ int 	lplen		= 0;
++ int		onlydir		= 0;
++ int 	opt		= -1;
++ int 	tdlen		= -1;
++ int 	tofd		= -1;
++ int 	wc		= -1;
++
++ mode_t 	mode		= 0755;
++
++ uid_t 	uid		= -1;
++ gid_t 	gid		= -1;
++
++ struct stat sb;
++ struct stat tosb;
++ struct utimbuf utb;
++ char 	buf[BUFSIZ];
++
++ program = strrchr(argv[0], '/');
++ if (!program)
++	program = strrchr(argv[0], '\\');
++ program = program ? program+1 : argv[0];
++
++
++ while ((opt = getopt(argc, argv, "C:DdlL:Rm:o:g:t")) != EOF) {
++	switch (opt) {
++	 case 'C': cwd = optarg;	break;
++	 case 'D': onlydir = 1; 	break;
++	 case 'd': dodir = 1; 		break;
++	 case 'l': dolink = 1;		break;
++	 case 'L':
++	 linkprefix = optarg;
++	 lplen = strlen(linkprefix);
++	 dolink = 1;
++	 break;
++	 case 'R': dolink = dorelsymlink = 1; break;
++	 case 'm':
++	 mode = strtoul(optarg, &cp, 8);
++	 if (mode == 0 && cp == optarg)
++		usage();
++	 break;
++	 case 'o': owner = optarg; 	break;
++	 case 'g': group = optarg; 	break;
++	 case 't': dotimes = 1; 	break;
++	 default: usage();
++	}
++ }
++
++ argc -= optind;
++ argv += optind;
++ if (argc < 2 - onlydir)
++	usage();
++
++ todir = argv[argc-1];
++ if ((stat(todir, &sb) < 0 || !S_ISDIR(sb.st_mode)) &&
++	mkdirs(todir, 0777) < 0) {
++	fail("cannot mkdir -p %s", todir);
++ }
++ if (onlydir)
++	return 0;
++
++ if (!cwd) {
++	cwd = GETCWD(0, PATH_MAX);
++	if (!cwd)
++	 fail("could not get CWD");
++ }
++
++ /* make sure we can get into todir. */
++ xchdir(todir);
++ todir = GETCWD(0, PATH_MAX);
++ if (!todir)
++	fail("could not get CWD in todir");
++ tdlen = strlen(todir);
++
++ /* back to original directory. */
++ xchdir(cwd);
++
++ uid = owner ? touid(owner) : -1;
++ gid = group ? togid(group) : -1;
++
++ while (--argc > 0) {
++	name = *argv++;
++	len = strlen(name);
++	base = xbasename(name);
++	bnlen = strlen(base);
++	toname = (char*)xmalloc(tdlen + 1 + bnlen + 1);
++	sprintf(toname, "%s/%s", todir, base);
++retry:
++	exists = (lstat(toname, &tosb) == 0);
++
++	if (dodir) {
++	 /* -d means create a directory, always */
++	 if (exists && !S_ISDIR(tosb.st_mode)) {
++		int rv = unlink(toname);
++		if (rv)
++		 fail("cannot unlink %s", toname);
++		exists = 0;
++	 }
++	 if (!exists && mkdir(toname, mode) < 0) {
++	 	/* we probably have two nsinstall programs in a race here. */
++		if (errno == EEXIST && !stat(toname, &sb) && 
++		 S_ISDIR(sb.st_mode)) {
++		 fprintf(stderr, "directory creation race: %s\n", toname);
++		 goto retry;
++	 	}
++		fail("cannot make directory %s", toname);
++	 }
++	 if ((owner || group) && chown(toname, uid, gid) < 0)
++		fail("cannot change owner of %s", toname);
++	} else if (dolink) {
++	 if (*name == '/') {
++		/* source is absolute pathname, link to it directly */
++		linkname = 0;
++	 } else {
++		if (linkprefix) {
++		 /* -L implies -l and prefixes names with a $cwd arg. */
++		 len += lplen + 1;
++		 linkname = (char*)xmalloc(len + 1);
++		 sprintf(linkname, "%s/%s", linkprefix, name);
++		} else if (dorelsymlink) {
++		 /* Symlink the relative path from todir to source name. */
++		 linkname = (char*)xmalloc(PATH_MAX);
++
++		 if (*todir == '/') {
++			/* todir is absolute: skip over common prefix. */
++			lplen = relatepaths(todir, cwd, linkname);
++			strcpy(linkname + lplen, name);
++		 } else {
++			/* todir is named by a relative path: reverse it. */
++			reversepath(todir, name, len, linkname);
++			xchdir(cwd);
++		 }
++
++		 len = strlen(linkname);
++		}
++		name = linkname;
++	 }
++
++	 /* Check for a pre-existing symlink with identical content. */
++	 if (exists &&
++		(!S_ISLNK(tosb.st_mode) ||
++		 readlink(toname, buf, sizeof buf) != len ||
++		 strncmp(buf, name, len) != 0)) {
++		int rmrv;
++		rmrv = (S_ISDIR(tosb.st_mode) ? rmdir : unlink)(toname);
++		if (rmrv < 0) {
++		 fail("destination exists, cannot remove %s", toname);
++		}
++		exists = 0;
++	 }
++	 if (!exists && symlink(name, toname) < 0) {
++		if (errno == EEXIST) {
++		 fprintf(stderr, "symlink creation race: %s\n", toname);
++ fail("symlink was attempted in working directory %s "
++ "from %s to %s.\n", cwd, name, toname);
++		 goto retry;
++		}
++		diagnosePath(toname);
++		fail("cannot make symbolic link %s", toname);
++	 }
++#ifdef HAVE_LCHOWN
++	 if ((owner || group) && lchown(toname, uid, gid) < 0)
++		fail("cannot change owner of %s", toname);
++#endif
++
++	 if (linkname) {
++		free(linkname);
++		linkname = 0;
++	 }
++	} else {
++	 /* Copy from name to toname, which might be the same file. */
++	 fromfd = open(name, O_RDONLY);
++	 if (fromfd < 0 || fstat(fromfd, &sb) < 0)
++		fail("cannot access %s", name);
++	 if (exists && 
++	 (!S_ISREG(tosb.st_mode) || access(toname, W_OK) < 0)) {
++		int rmrv;
++		rmrv = (S_ISDIR(tosb.st_mode) ? rmdir : unlink)(toname);
++		if (rmrv < 0) {
++		 fail("destination exists, cannot remove %s", toname);
++		}
++	 }
++	 tofd = open(toname, O_CREAT | O_WRONLY, 0666);
++	 if (tofd < 0)
++		fail("cannot create %s", toname);
++
++	 bp = buf;
++	 while ((cc = read(fromfd, bp, sizeof buf)) > 0) {
++		while ((wc = write(tofd, bp, cc)) > 0) {
++		 if ((cc -= wc) == 0)
++			break;
++		 bp += wc;
++		}
++		if (wc < 0)
++		 fail("cannot write to %s", toname);
++	 }
++	 if (cc < 0)
++		fail("cannot read from %s", name);
++
++	 if (ftruncate(tofd, sb.st_size) < 0)
++		fail("cannot truncate %s", toname);
++	 if (dotimes) {
++		utb.actime = sb.st_atime;
++		utb.modtime = sb.st_mtime;
++		if (utime(toname, &utb) < 0)
++		 fail("cannot set times of %s", toname);
++	 }
++#ifdef HAVE_FCHMOD
++	 if (fchmod(tofd, mode) < 0)
++#else
++	 if (chmod(toname, mode) < 0)
++#endif
++		fail("cannot change mode of %s", toname);
++
++	 if ((owner || group) && fchown(tofd, uid, gid) < 0)
++		fail("cannot change owner of %s", toname);
++
++	 /* Must check for delayed (NFS) write errors on close. */
++	 if (close(tofd) < 0)
++		fail("close reports write error on %s", toname);
++	 close(fromfd);
++	}
++
++	free(toname);
++ }
++
++ free(cwd);
++ free(todir);
++ return 0;
++}
++
+diff -Naur security/coreconf/nsinstall/pathsub.c mozilla/security/coreconf/nsinstall/pathsub.c
+--- a/security/coreconf/nsinstall/pathsub.c	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/nsinstall/pathsub.c	2004-04-25 18:02:18.000000000 +0300
+@@ -0,0 +1,306 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is the Netscape security libraries.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 1994-2000
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++/*
++** Pathname subroutines.
++*/
++#include <assert.h>
++#if defined(FREEBSD) || defined(BSDI) || defined(DARWIN)
++#include <sys/types.h>
++#endif /* FREEBSD */
++#include <dirent.h>
++#include <errno.h>
++#include <stdarg.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include "pathsub.h"
++#ifdef USE_REENTRANT_LIBC
++#include "libc_r.h"
++#endif /* USE_REENTRANT_LIBC */
++
++char *program;
++
++void
++fail(char *format, ...)
++{
++ int error;
++ va_list ap;
++
++#ifdef USE_REENTRANT_LIBC
++ R_STRERROR_INIT_R();
++#endif
++
++ error = errno;
++ fprintf(stderr, "%s: ", program);
++ va_start(ap, format);
++ vfprintf(stderr, format, ap);
++ va_end(ap);
++ if (error) {
++
++#ifdef USE_REENTRANT_LIBC
++ R_STRERROR_R(errno);
++	fprintf(stderr, ": %s", r_strerror_r);
++#else
++	fprintf(stderr, ": %s", strerror(errno));
++#endif
++ }
++ 
++ putc('\n', stderr);
++ abort();
++ exit(1);
++}
++
++char *
++getcomponent(char *path, char *name)
++{
++ if (*path == '\0')
++	return 0;
++ if (*path == '/') {
++	*name++ = '/';
++ } else {
++	do {
++	 *name++ = *path++;
++	} while (*path != '/' && *path != '\0');
++ }
++ *name = '\0';
++ while (*path == '/')
++	path++;
++ return path;
++}
++
++#ifdef UNIXWARE
++/* The static buffer in Unixware's readdir is too small. */
++struct dirent * readdir(DIR *d)
++{
++ static struct dirent *buf = NULL;
++#define MAX_PATH_LEN 1024
++
++ if (buf == NULL)
++	buf = (struct dirent *)xmalloc(sizeof(struct dirent) + MAX_PATH_LEN) ;
++ return readdir_r(d, buf);
++}
++#endif
++
++/* APPARENT BUG - ignores argument "dir", uses ".." instead. */
++char *
++ino2name(ino_t ino, char *dir)
++{
++ DIR *dp;
++ struct dirent *ep;
++ char *name;
++
++ dp = opendir("..");		/* XXX */
++ if (!dp)
++	fail("cannot read parent directory");
++ for (;;) {
++	if (!(ep = readdir(dp)))
++	 fail("cannot find current directory");
++	if (ep->d_ino == ino)
++	 break;
++ }
++ name = xstrdup(ep->d_name);
++ closedir(dp);
++ return name;
++}
++
++void *
++xmalloc(size_t size)
++{
++ void *p;
++
++ if (size <= 0)
++	fail("attempted to allocate %u bytes", size);
++ p = malloc(size);
++ if (!p)
++	fail("cannot allocate %u bytes", size);
++ return p;
++}
++
++char *
++xstrdup(char *s)
++{
++ if (!s || !s[0]) 
++	fail("Null pointer or empty string passed to xstrdup()");
++ return strcpy((char*)xmalloc(strlen(s) + 1), s);
++}
++
++char *
++xbasename(char *path)
++{
++ char *cp;
++
++ if (!path || !path[0]) 
++	fail("Null pointer or empty string passed to xbasename()");
++ while ((cp = strrchr(path, '/')) && cp[1] == '\0')
++	*cp = '\0';
++ if (!cp) return path;
++ return cp + 1;
++}
++
++void
++xchdir(char *dir)
++{
++ if (!dir || !dir[0]) 
++	fail("Null pointer or empty string passed to xchdir()");
++ if (chdir(dir) < 0)
++	fail("cannot change directory to %s", dir);
++}
++
++int
++relatepaths(char *from, char *to, char *outpath)
++{
++ char *cp, *cp2;
++ int len;
++ char buf[NAME_MAX];
++
++ assert(*from == '/' && *to == '/');
++ if (!from || *from != '/')
++	fail("relatepaths: from path does not start with /");
++ if (!to || *to != '/')
++	fail("relatepaths: to path does not start with /");
++
++ for (cp = to, cp2 = from; *cp == *cp2; cp++, cp2++)
++	if (*cp == '\0')
++	 break;
++ while (cp[-1] != '/')
++	cp--, cp2--;
++ if (cp - 1 == to) {
++	/* closest common ancestor is /, so use full pathname */
++	len = strlen(strcpy(outpath, to));
++	if (outpath[len] != '/') {
++	 outpath[len++] = '/';
++	 outpath[len] = '\0';
++	}
++ } else {
++	len = 0;
++	while ((cp2 = getcomponent(cp2, buf)) != 0) {
++	 strcpy(outpath + len, "../");
++	 len += 3;
++	}
++	while ((cp = getcomponent(cp, buf)) != 0) {
++	 sprintf(outpath + len, "%s/", buf);
++	 len += strlen(outpath + len);
++	}
++ }
++ return len;
++}
++
++void
++reversepath(char *inpath, char *name, int len, char *outpath)
++{
++ char *cp, *cp2;
++ char buf[NAME_MAX];
++ struct stat sb;
++
++ cp = strcpy(outpath + PATH_MAX - (len + 1), name);
++ cp2 = inpath;
++ while ((cp2 = getcomponent(cp2, buf)) != 0) {
++	if (strcmp(buf, ".") == 0)
++	 continue;
++	if (strcmp(buf, "..") == 0) {
++	 if (stat(".", &sb) < 0)
++		fail("cannot stat current directory");
++	 name = ino2name(sb.st_ino, "..");
++	 len = strlen(name);
++	 cp -= len + 1;
++	 strcpy(cp, name);
++	 cp[len] = '/';
++	 free(name);
++	 xchdir("..");
++	} else {
++	 cp -= 3;
++	 strncpy(cp, "../", 3);
++	 xchdir(buf);
++	}
++ }
++ strcpy(outpath, cp);
++}
++
++void
++diagnosePath(const char * path)
++{
++ char *	myPath;
++ char * slash;
++ int		rv;
++ struct stat sb;
++ char 	buf[BUFSIZ];
++
++ if (!path || !path[0]) 
++	fail("Null pointer or empty string passed to mkdirs()");
++ myPath = strdup(path);
++ if (!myPath)
++	fail("strdup() failed!");
++ do {
++ 	rv = lstat(myPath, &sb);
++	if (rv < 0) {
++	 perror(myPath);
++	} else if (S_ISLNK(sb.st_mode)) {
++	 rv = readlink(myPath, buf, sizeof buf);
++	 if (rv < 0) {
++	 	perror("readlink");
++		buf[0] = 0;
++	 } else {
++	 	buf[rv] = 0;
++	 }
++	 fprintf(stderr, "%s is a link to %s\n", myPath, buf);
++	} else if (S_ISDIR(sb.st_mode)) {
++	 fprintf(stderr, "%s is a directory\n", myPath);
++	 rv = access(myPath, X_OK);
++	 if (rv < 0) {
++	 	fprintf(stderr, "%s: no search permission\n", myPath);
++	 }
++	} else {
++	 fprintf(stderr, "%s is a file !?!\n", myPath);
++	 rv = access(myPath, F_OK);
++	 if (rv < 0) {
++	 	fprintf(stderr, "%s does not exist\n", myPath);
++	 }
++	}
++
++	/* chop path off one level. */
++	slash = strrchr(myPath, '/');
++	if (!slash)
++	 slash = strrchr(myPath, '\\');
++	if (!slash)
++	 slash = myPath;
++	*slash = 0;
++ } while (myPath[0]);
++ free(myPath);
++}
+diff -Naur security/coreconf/nsinstall/pathsub.h mozilla/security/coreconf/nsinstall/pathsub.h
+--- a/security/coreconf/nsinstall/pathsub.h	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/nsinstall/pathsub.h	2004-04-25 18:02:18.000000000 +0300
+@@ -0,0 +1,80 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is the Netscape security libraries.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 1994-2000
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#ifndef pathsub_h___
++#define pathsub_h___
++/*
++** Pathname subroutines.
++**
++** Brendan Eich, 8/29/95
++*/
++#include <limits.h>
++#include <sys/types.h>
++
++#if SUNOS4
++#include "sunos4.h"
++#endif
++
++#ifndef PATH_MAX
++#define PATH_MAX 1024
++#endif
++
++/*
++ * Just keep sane lengths
++ */
++#undef NAME_MAX
++#define NAME_MAX 256
++
++extern char *program;
++
++extern void fail(char *format, ...);
++extern char *getcomponent(char *path, char *name);
++extern char *ino2name(ino_t ino, char *dir);
++extern void *xmalloc(size_t size);
++extern char *xstrdup(char *s);
++extern char *xbasename(char *path);
++extern void xchdir(char *dir);
++
++/* Relate absolute pathnames from and to returning the result in outpath. */
++extern int relatepaths(char *from, char *to, char *outpath);
++
++/* NOTE: changes current working directory -- caveat emptor */
++extern void reversepath(char *inpath, char *name, int len, char *outpath);
++
++/* stats every directory in path, reports results. */
++extern void diagnosePath(const char * path);
++
++#endif /* pathsub_h___ */
+diff -Naur security/coreconf/nsinstall/sunos4.h mozilla/security/coreconf/nsinstall/sunos4.h
+--- a/security/coreconf/nsinstall/sunos4.h	1970-01-01 02:00:00.000000000 +0200
++++ b/security/coreconf/nsinstall/sunos4.h	2005-02-03 00:27:59.000000000 +0200
+@@ -0,0 +1,166 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is the Netscape security libraries.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 1994-2000
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#ifndef pr_sunos4_h___
++#define pr_sunos4_h___
++
++#ifndef SVR4
++
++/*
++** Hodge podge of random missing prototypes for the Sunos4 system
++*/
++#include <stdio.h>
++#include <stdarg.h>
++#include <time.h>
++#include <limits.h>
++#include <sys/types.h>
++
++#define PATH_MAX _POSIX_PATH_MAX
++
++struct timeval;
++struct timezone;
++struct itimerval;
++struct sockaddr;
++struct stat;
++struct tm;
++
++/* ctype.h */
++extern int tolower(int);
++extern int toupper(int);
++
++/* errno.h */
++extern char *sys_errlist[];
++extern int sys_nerr;
++
++#define strerror(e) sys_errlist[((unsigned)(e) < sys_nerr) ? e : 0]
++
++extern void perror(const char *);
++
++/* getopt */
++extern char *optarg;
++extern int optind;
++extern int getopt(int argc, char **argv, char *spec);
++
++/* math.h */
++extern int srandom(long val);
++extern long random(void);
++
++/* memory.h */
++#define memmove(to,from,len) bcopy((char*)(from),(char*)(to),len)
++
++extern void bcopy(const char *, char *, int);
++
++/* signal.h */
++/*
++** SunOS4 sigaction hides interrupts by default, so we can safely define
++** SA_RESTART to 0 (HP-UX is a counter-example -- its sigaction does not
++** hide interrupts but lacks an SA_RESTART option; you must use sigvector
++** and tweak the sigcontext from within each signal handler!).
++*/
++#define SA_RESTART 0
++#define SA_SIGINFO 0
++
++/* stdio.h */
++extern int printf(const char *, ...);
++extern int fprintf(FILE *, const char *, ...);
++extern int vprintf(const char *, va_list);
++extern int vfprintf(FILE *, const char *, va_list);
++extern char *vsprintf(char *, const char *, va_list);
++extern int scanf(const char *, ...);
++extern int sscanf(const char *, const char *, ...);
++extern int fscanf(FILE *, const char *, ...);
++extern int fgetc(FILE *);
++extern int fputc(int, FILE *);
++extern int fputs(const char *, FILE *);
++extern int puts(const char *);
++extern int fread(void *, size_t, size_t, FILE *);
++extern int fwrite(const char *, int, int, FILE *);
++extern int fseek(FILE *, long, int);
++extern long ftell(FILE *);
++extern int rewind(FILE *);
++extern int fflush(FILE *);
++extern int _flsbuf(unsigned char, FILE *);
++extern int fclose(FILE *);
++extern int remove(const char *);
++extern int setvbuf(FILE *, char *, int, size_t);
++extern int system(const char *);
++extern FILE *popen(const char *, const char *);
++extern int pclose(FILE *);
++
++/* stdlib.h */
++#define strtoul strtol
++
++extern int isatty(int fildes);
++extern long strtol(const char *, char **, int);
++extern int putenv(const char *);
++extern void srand48(long);
++extern long lrand48(void);
++extern double drand48(void);
++
++/* string.h */
++extern int strcasecmp(const char *, const char *);

Build Results
RPM Lint

Refresh

Comments for request 23 0

Request History

vanmeeuwen created request about 11 years ago

Add to Kolab:Development

vanmeeuwen accepted request about 11 years ago