Bug 837862: Remove MOZ_PSM as a configure option. r=Standard8, a=bustage-fix.
authorJoshua Cranmer <Pidgeot18@gmail.com>
Mon, 15 Jul 2013 11:11:42 -0500
changeset 16089 1e65ee5e592cb87b801cfe192abaf1592e7a7336
parent 16088 d4d533c8663fd3c0a8770b4dd263be8f01bf5f8b
child 16090 4b7b69bac9f2724e08170e5aa8d239d4fb86b096
push id1000
push userbugzilla@standard8.plus.com
push dateMon, 16 Sep 2013 20:21:48 +0000
treeherdercomm-beta@77f0178eb807 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8, bustage-fix
bugs837862
Bug 837862: Remove MOZ_PSM as a configure option. r=Standard8, a=bustage-fix. Still pushing to SeaMonkey even if it is a CLOSED TREE.
ldap/xpcom/src/Makefile.in
ldap/xpcom/src/moz.build
ldap/xpcom/src/nsLDAPConnection.cpp
ldap/xpcom/src/nsLDAPSecurityGlue.cpp
mail/extensions/Makefile.in
mail/extensions/moz.build
mailnews/extensions/moz.build
mailnews/mime/cthandlers/moz.build
mailnews/mime/cthandlers/smimestub/Makefile.in
mailnews/mime/cthandlers/smimestub/moz.build
mailnews/mime/cthandlers/smimestub/nsSMIMEStub.cpp
mailnews/mime/cthandlers/smimestub/nsSMIMEStub.h
mailnews/mime/cthandlers/smimestub/nsSMIMEStubFactory.cpp
mailnews/mime/cthandlers/smimestub/smime.def
mailnews/mime/src/Makefile.in
mailnews/mime/src/moz.build
suite/locales/Makefile.in
suite/locales/jar.mn
--- a/ldap/xpcom/src/Makefile.in
+++ b/ldap/xpcom/src/Makefile.in
@@ -21,20 +21,16 @@ else
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1
 endif
 
 ifdef MOZ_PREF_EXTENSIONS
 DEFINES += -DMOZ_PREF_EXTENSIONS
 endif
 
-ifdef MOZ_PSM
-DEFINES		+= -DMOZ_PSM
-endif
-
 EXTRA_DSO_LDOPTS += $(LDAP_LIBS)
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 else
 EXTRA_DSO_LDOPTS += \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(MOZ_JS_LIBS) \
 	$(NSPR_LIBS) \
--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@@ -9,24 +9,22 @@ CPP_SOURCES += [
     'nsLDAPBERElement.cpp',
     'nsLDAPBERValue.cpp',
     'nsLDAPConnection.cpp',
     'nsLDAPControl.cpp',
     'nsLDAPMessage.cpp',
     'nsLDAPModification.cpp',
     'nsLDAPOperation.cpp',
     'nsLDAPProtocolModule.cpp',
+    'nsLDAPSecurityGlue.cpp',
     'nsLDAPServer.cpp',
     'nsLDAPService.cpp',
     'nsLDAPURL.cpp',
 ]
 
 if CONFIG['MOZ_PREF_EXTENSIONS']:
     CPP_SOURCES += ['nsLDAPSyncQuery.cpp']
 
-if CONFIG['MOZ_PSM']:
-    CPP_SOURCES += ['nsLDAPSecurityGlue.cpp']
-
 EXTRA_COMPONENTS += [
     'ldapComponents.manifest',
     'nsLDAPProtocolHandler.js',
 ]
 
--- a/ldap/xpcom/src/nsLDAPConnection.cpp
+++ b/ldap/xpcom/src/nsLDAPConnection.cpp
@@ -553,17 +553,16 @@ nsLDAPConnection::OnLookupComplete(nsICa
                 ldap_set_option(mConnectionHandle, LDAP_OPT_PROTOCOL_VERSION,
                                 &version);
 		break;
             default:
                 NS_ERROR("nsLDAPConnection::OnLookupComplete(): mVersion"
                          " invalid");
             }
 
-#ifdef MOZ_PSM
             // This code sets up the current connection to use PSM for SSL
             // functionality.  Making this use libssldap instead for
             // non-browser user shouldn't be hard.
 
             extern nsresult nsLDAPInstallSSL(LDAP *ld, const char *aHostName);
 
             if (mSSL) {
                 if (ldap_set_option(mConnectionHandle, LDAP_OPT_SSL,
@@ -575,17 +574,16 @@ nsLDAPConnection::OnLookupComplete(nsICa
 
                 rv = nsLDAPInstallSSL(mConnectionHandle, mDNSHost.get());
                 if (NS_FAILED(rv)) {
                     NS_ERROR("nsLDAPConnection::OnStopLookup(): Error"
                              " installing secure LDAP routines for"
                              " connection");
                 }
             }
-#endif
         }
     }
 
     // Drop the DNS request object, we no longer need it, and set the flag
     // indicating that DNS has finished.
     //
     mDNSRequest = 0;
     mDNSHost.Truncate();
--- a/ldap/xpcom/src/nsLDAPSecurityGlue.cpp
+++ b/ldap/xpcom/src/nsLDAPSecurityGlue.cpp
@@ -1,16 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Only build this code if PSM is being built also
 //
-#ifdef MOZ_PSM
-
 #include "nsLDAPInternal.h"
 #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsNetCID.h"
 #include "nsISocketProvider.h"
 #include "nsISSLSocketControl.h"
 #include "nsMemory.h"
@@ -332,10 +330,8 @@ nsLDAPInstallSSL( LDAP *ld, const char *
     if (prldap_set_session_info(ld, nullptr, &sessionInfo) != LDAP_SUCCESS) {
 	NS_ERROR("nsLDAPInstallSSL(): error setting prldap session info");
 	nsMemory::Free(sessionClosure);
 	return NS_ERROR_UNEXPECTED;
     }
 
     return NS_OK;
 }
-
-#endif
deleted file mode 100644
--- a/mail/extensions/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifdef MOZ_PSM
-BUILD_SMIME=1
-endif
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mail/extensions/moz.build
+++ b/mail/extensions/moz.build
@@ -1,10 +1,10 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['mailviews']
+DIRS += [
+    'mailviews',
+    'smime',
+]
 
-if CONFIG['MOZ_PSM'] or CONFIG['BUILD_SMIME']:
-    DIRS += ['smime']
-
--- a/mailnews/extensions/moz.build
+++ b/mailnews/extensions/moz.build
@@ -9,13 +9,11 @@ PARALLEL_DIRS += [
     'mailviews/public',
     'mailviews/src',
     'mailviews/content',
     'bayesian-spam-filter',
     'offline-startup',
     'newsblog',
     'fts3/public',
     'fts3/src',
+    'smime',
 ]
 
-if CONFIG['MOZ_PSM']:
-    PARALLEL_DIRS += ['smime']
-
--- a/mailnews/mime/cthandlers/moz.build
+++ b/mailnews/mime/cthandlers/moz.build
@@ -5,13 +5,8 @@
 
 PARALLEL_DIRS += [
     'glue',
     'vcard',
 ]
 
 # pgpmime depends on glue.
 DIRS += ['pgpmime']
-
-if not CONFIG['MOZ_PSM']:
-    # smimestub always depends on glue, so always build that afterwards.
-    DIRS += ['smimestub']
-
deleted file mode 100644
--- a/mailnews/mime/cthandlers/smimestub/Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= smimestb
-EXPORT_LIBRARY = 1
-ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT	= 1
-MODULE_NAME	= nsSMIMEModule
-else
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-endif
-
-
-ifeq ($(OS_ARCH),WINNT)
-MAPFILE		= smimestb.map
-DEFFILE		= $(win_srcdir)/smime.def
-endif
-
-EXTRA_DSO_LIBS	= mimecthglue_s
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES = -I$(srcdir)/../glue
deleted file mode 100644
--- a/mailnews/mime/cthandlers/smimestub/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'smime'
-
-CPP_SOURCES += [
-    'nsSMIMEStub.cpp',
-    'nsSMIMEStubFactory.cpp',
-]
-
deleted file mode 100644
--- a/mailnews/mime/cthandlers/smimestub/nsSMIMEStub.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsSMIMEStub.h"
-
-#include "mimecth.h"
-#include "mimexpcom.h"
-#include "nsIStringBundle.h"
-#include "prmem.h"
-#include "plstr.h"
-#include "mozilla/Services.h"
-
-#define SMIME_PROPERTIES_URL          "chrome://messenger/locale/smime.properties"
-#define SMIME_STR_NOT_SUPPORTED_ID    1000
-
-static char *SMimeGetStringByID(int32_t aMsgId)
-{
-  nsCOMPtr<nsIStringBundleService> stringBundleService =
-    mozilla::services::GetStringBundleService();
-
-  nsCOMPtr<nsIStringBundle> stringBundle;
-  stringBundleService->CreateBundle(SMIME_PROPERTIES_URL,
-                                    getter_AddRefs(stringBundle));
-  if (stringBundle)
-  {
-    nsString v;
-    if (NS_SUCCEEDED(stringBundle->GetStringFromID(aMsgId, getter_Copies(v))))
-      return ToNewUTF8String(v);
-  }
-
-  return strdup("???");
-}
-
-static int MimeInlineTextSMIMEStub_parse_line (const char *, int32_t, MimeObject *);
-static int MimeInlineTextSMIMEStub_parse_eof (MimeObject *, bool);
-static int MimeInlineTextSMIMEStub_parse_begin (MimeObject *obj);
-
- /* This is the object definition. Note: we will set the superclass
-    to NULL and manually set this on the class creation */
-
-MimeDefClass(MimeInlineTextSMIMEStub, MimeInlineTextSMIMEStubClass, mimeInlineTextSMIMEStubClass, NULL);
-
-extern "C" MimeObjectClass *
-MIME_SMimeCreateContentTypeHandlerClass(const char *content_type,
-                                   contentTypeHandlerInitStruct *initStruct)
-{
-  MimeObjectClass *clazz = (MimeObjectClass *)&mimeInlineTextSMIMEStubClass;
-  /*
-   * Must set the superclass by hand.
-   */
-  if (!COM_GetmimeInlineTextClass())
-    return NULL;
-
-  clazz->superclass = (MimeObjectClass *)COM_GetmimeInlineTextClass();
-  initStruct->force_inline_display = true;
-  return clazz;
-}
-
-static int
-MimeInlineTextSMIMEStubClassInitialize(MimeInlineTextSMIMEStubClass *clazz)
-{
-  MimeObjectClass *oclass = (MimeObjectClass *) clazz;
-  NS_ASSERTION(!oclass->class_initialized, "1.1 <rhp@netscape.com> 28 Nov 1999 19:36");
-  oclass->parse_begin = MimeInlineTextSMIMEStub_parse_begin;
-  oclass->parse_line  = MimeInlineTextSMIMEStub_parse_line;
-  oclass->parse_eof   = MimeInlineTextSMIMEStub_parse_eof;
-
-  return 0;
-}
-
-int
-GenerateMessage(char** html)
-{
-  nsCString temp;
-  temp.Append("<BR><text=\"#000000\" bgcolor=\"#FFFFFF\" link=\"#FF0000\" vlink=\"#800080\" alink=\"#0000FF\">");
-  temp.Append("<center><table BORDER=1 ><tr><td><CENTER>");
-
-  char *tString = SMimeGetStringByID(SMIME_STR_NOT_SUPPORTED_ID);
-  temp.Append(tString);
-  PR_FREEIF(tString);
-
-  temp.Append("</CENTER></td></tr></table></center><BR>");
-  *html = ToNewCString(temp);
-  return 0;
-}
-
-static int
-MimeInlineTextSMIMEStub_parse_begin(MimeObject *obj)
-{
-  MimeInlineTextSMIMEStubClass *clazz;
-  int status = ((MimeObjectClass*)COM_GetmimeLeafClass())->parse_begin(obj);
-
-  if (status < 0)
-    return status;
-
-  if (!obj->output_p || !obj->options || !obj->options->write_html_p)
-    return 0;
-
-  /* This is a fine place to write out any HTML before the real meat begins. */
-
-  // Initialize the clazz variable...
-  clazz = ((MimeInlineTextSMIMEStubClass *) obj->clazz);
-  return 0;
-}
-
-static int
-MimeInlineTextSMIMEStub_parse_line(const char *line, int32_t length, MimeObject *obj)
-{
- /*
-  * This routine gets fed each line of data, one at a time. We just buffer
-  * it all up, to be dealt with all at once at the end.
-  */
-  if (!obj->output_p || !obj->options || !obj->options->output_fn)
-    return 0;
-
-  if (!obj->options->write_html_p)
-    return COM_MimeObject_write(obj, line, length, true);
-
-  return 0;
-}
-
-static int
-MimeInlineTextSMIMEStub_parse_eof (MimeObject *obj, bool abort_p)
-{
-  if (obj->closed_p)
-    return 0;
-
-  /* Run parent method first, to flush out any buffered data. */
-  int status = ((MimeObjectClass*)COM_GetmimeInlineTextClass())->parse_eof(obj, abort_p);
-  if (status < 0)
-    return status;
-
-  if (  (obj->options) &&
-        ((obj->options->format_out == nsMimeOutput::nsMimeMessageQuoting) ||
-         (obj->options->format_out == nsMimeOutput::nsMimeMessageBodyQuoting))
-     )
-    return 0;
-
-  char* html = NULL;
-  status = GenerateMessage(&html);
-  if (status < 0)
-    return status;
-
-  status = COM_MimeObject_write(obj, html, PL_strlen(html), true);
-  PR_FREEIF(html);
-  if (status < 0)
-    return status;
-
-  return 0;
-}
deleted file mode 100644
--- a/mailnews/mime/cthandlers/smimestub/nsSMIMEStub.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _NSSMIMESTUB_H_
-#define _NSSMIMESTUB_H_
-
-#include "mimetext.h"
-
-#define SMIME_CONTENT_TYPE "application/pkcs7-mime"
-
-/*
- * These functions are the public interface for this content type
- * handler and will be called in by the mime component.
- */
-
-/**
- * The MimeInlineTextSMIMEStub class implements the SMIME 2
- * MIME content types.
- */
-typedef struct MimeInlineTextSMIMEStubClass MimeInlineTextSMIMEStubClass;
-typedef struct MimeInlineTextSMIMEStub      MimeInlineTextSMIMEStub;
-
-struct MimeInlineTextSMIMEStubClass {
-    MimeInlineTextClass text;
-    char* buffer;
-    int32_t bufferlen;
-    int32_t buffermax;
-};
-
-extern MimeInlineTextSMIMEStubClass mimeInlineTextSMIMEStubClass;
-
-struct MimeInlineTextSMIMEStub {
-  MimeInlineText text;
-};
-
-#endif /* _NSSMIMESTUB_H_ */
deleted file mode 100644
--- a/mailnews/mime/cthandlers/smimestub/nsSMIMEStubFactory.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "mozilla/ModuleUtils.h"
-
-/* Include all of the interfaces our factory can generate components for */
-#include "nsSMIMEStub.h"
-#include "nsMimeContentTypeHandler.h"
-
-////////////////////////////////////////////////////////////////////////
-// Define the contructor function for the CID
-//
-// What this does is defines a function nsMimeContentTypeHandlerConstructor
-// which we will specific in the nsModuleComponentInfo table. This function will
-// be used by the generic factory to create an instance.
-//
-// NOTE: This creates an instance by using the default constructor
-//
-//NS_GENERIC_FACTORY_CONSTRUCTOR(nsMimeContentTypeHandler)
-extern "C" MimeObjectClass *
-MIME_SMimeCreateContentTypeHandlerClass(const char *content_type, 
-                                        contentTypeHandlerInitStruct *initStruct);
-
-static NS_IMETHODIMP
-nsSMimeMimeContentTypeHandlerConstructor(nsISupports *aOuter,
-                                         REFNSIID aIID,
-                                         void **aResult)
-{
-  nsresult rv;
-  nsMimeContentTypeHandler *inst = nullptr;
-
-  if (NULL == aResult) {
-    rv = NS_ERROR_NULL_POINTER;
-    return rv;
-  }
-  *aResult = NULL;
-  if (NULL != aOuter) {
-    rv = NS_ERROR_NO_AGGREGATION;
-    return rv;
-  }
-  inst = new nsMimeContentTypeHandler(SMIME_CONTENT_TYPE, 
-                                      &MIME_SMimeCreateContentTypeHandlerClass);
-  if (inst == NULL) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  NS_ADDREF(inst);
-  rv = inst->QueryInterface(aIID,aResult);
-  NS_RELEASE(inst);
-
-  return rv;
-}
-
-////////////////////////////////////////////////////////////////////////
-// Define a table of CIDs implemented by this module along with other
-// information like the function to create an instance, contractid, and
-// class name.
-//
-NS_DEFINE_NAMED_CID(NS_SMIME_CONTENT_TYPE_HANDLER_CID);
-
-static const mozilla::Module::CIDEntry kSMIMEContentHandlerCIDs[] =
-{
-  { &kNS_SMIME_CONTENT_TYPE_HANDLER_CID, false, NULL,
-    nsSMimeMimeContentTypeHandlerConstructor },
-  { &kNS_SMIME_CONTENT_TYPE_HANDLER_CID, false, NULL,
-    nsSMimeMimeContentTypeHandlerConstructor },
-  { NULL }
-};
-
-static const mozilla::Module::ContractIDEntry kSMIMEContentHandlerContracts[] =
-{
-  { "@mozilla.org/mimecth;1?type=application/x-pkcs7-mime",
-    &kNS_SMIME_CONTENT_TYPE_HANDLER_CID },
-  { "@mozilla.org/mimecth;1?type=application/pkcs7-mime",
-    &kNS_SMIME_CONTENT_TYPE_HANDLER_CID },
-  { NULL }
-};
-
-static const mozilla::Module kSMIMEContentHandlerModule =
-{
-  mozilla::Module::kVersion,
-  kSMIMEContentHandlerCIDs,
-  kSMIMEContentHandlerContracts
-};
-
-NSMODULE_DEFN(nsSMIMEModule) = &kSMIMEContentHandlerModule;
deleted file mode 100644
--- a/mailnews/mime/cthandlers/smimestub/smime.def
+++ /dev/null
@@ -1,7 +0,0 @@
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LIBRARY smimestb.dll
-
-EXPORTS	
--- a/mailnews/mime/src/Makefile.in
+++ b/mailnews/mime/src/Makefile.in
@@ -5,19 +5,17 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_PSM
 DEFINES		+= -DENABLE_SMIME
-endif
 
 LIBRARY_NAME	= mime_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 FORCE_STATIC_LIB = 1
--- a/mailnews/mime/src/moz.build
+++ b/mailnews/mime/src/moz.build
@@ -23,30 +23,32 @@ EXPORTS += [
     'modmimee.h',
     'nsMimeStringResources.h',
     'nsStreamConverter.h',
 ]
 
 CPP_SOURCES += [
     'comi18n.cpp',
     'mimebuf.cpp',
+    'mimecms.cpp',
     'mimecom.cpp',
     'mimecont.cpp',
     'mimecryp.cpp',
     'mimecth.cpp',
     'mimedrft.cpp',
     'mimeebod.cpp',
     'mimeenc.cpp',
     'mimeeobj.cpp',
     'mimehdrs.cpp',
     'mimei.cpp',
     'mimeiimg.cpp',
     'mimeleaf.cpp',
     'mimemalt.cpp',
     'mimemapl.cpp',
+    'mimemcms.cpp',
     'mimemdig.cpp',
     'mimemmix.cpp',
     'mimemoz2.cpp',
     'mimempar.cpp',
     'mimemrel.cpp',
     'mimemsg.cpp',
     'mimemsig.cpp',
     'mimemult.cpp',
@@ -64,19 +66,13 @@ CPP_SOURCES += [
     'mimeunty.cpp',
     'nsMimeConverter.cpp',
     'nsMimeObjectClassAccess.cpp',
     'nsMsgHeaderParser.cpp',
     'nsSimpleMimeConverterStub.cpp',
     'nsStreamConverter.cpp',
 ]
 
-if CONFIG['MOZ_PSM']:
-    CPP_SOURCES += [
-        'mimecms.cpp',
-        'mimemcms.cpp',
-    ]
-
 EXTRA_COMPONENTS += [
     'mimeJSComponents.js',
     'msgMime.manifest',
 ]
 
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -33,20 +33,16 @@ PWD := $(CURDIR)
 # override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
 # work in that case.
 ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
 WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
 RETRIEVE_WINDOWS_INSTALLER = 1
 
 MOZ_LANGPACK_EID=langpack-$(AB_CD)@seamonkey.mozilla.org
 
-DEFINES += \
-	-DMOZ_PSM=$(MOZ_PSM) \
-	$(NULL)
-
 PREF_JS_EXPORTS = $(call MERGE_FILE,suite-l10n.js)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
 endif
--- a/suite/locales/jar.mn
+++ b/suite/locales/jar.mn
@@ -7,19 +7,17 @@
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/@AB_CD@/branding/
 % locale communicator @AB_CD@ %locale/@AB_CD@/communicator/
 % locale communicator-platform @AB_CD@ %locale/@AB_CD@/communicator-platform/
 % locale communicator-region @AB_CD@ %locale/@AB_CD@/communicator-region/
 % locale messenger @AB_CD@ %locale/@AB_CD@/messenger/
 % locale messenger-mapi @AB_CD@ %locale/@AB_CD@/messenger-mapi/
 % locale messenger-region @AB_CD@ %locale/@AB_CD@/messenger-region/
-#ifdef MOZ_PSM
 % locale messenger-smime @AB_CD@ %locale/@AB_CD@/messenger-smime/
-#endif
 % locale messenger-newsblog @AB_CD@ %locale/@AB_CD@/messenger-newsblog/
 % locale mozldap @AB_CD@ %locale/@AB_CD@/mozldap/
 % locale navigator @AB_CD@ %locale/@AB_CD@/navigator/
 % locale navigator-platform @AB_CD@ %locale/@AB_CD@/navigator-platform/
 % locale navigator-region @AB_CD@ %locale/@AB_CD@/navigator-region/
   locale/@AB_CD@/branding/brand.dtd                                         (%chrome/branding/brand.dtd)
   locale/@AB_CD@/branding/brand.properties                                  (%chrome/branding/brand.properties)
   locale/@AB_CD@/branding/aboutRights.dtd                                   (%chrome/branding/aboutRights.dtd)
@@ -330,29 +328,27 @@
   locale/@AB_CD@/messenger/threadpane.dtd                                   (%chrome/mailnews/threadpane.dtd)
   locale/@AB_CD@/messenger/vCardImportMsgs.properties                       (%chrome/mailnews/vCardImportMsgs.properties)
   locale/@AB_CD@/messenger/viewLog.dtd                                      (%chrome/mailnews/viewLog.dtd)
   locale/@AB_CD@/messenger/virtualFolderProperties.dtd                      (%chrome/mailnews/virtualFolderProperties.dtd)
   locale/@AB_CD@/messenger/virtualFolderListDialog.dtd                      (%chrome/mailnews/virtualFolderListDialog.dtd)
   locale/@AB_CD@/messenger/wmImportMsgs.properties                          (%chrome/mailnews/wmImportMsgs.properties)
   locale/@AB_CD@/messenger-mapi/mapi.properties                             (%chrome/mailnews/mapi/mapi.properties)
   locale/@AB_CD@/messenger-region/region.properties                         (%chrome/mailnews/region.properties)
-#ifdef MOZ_PSM
   locale/@AB_CD@/messenger/am-smime.dtd                                     (%chrome/mailnews/smime/am-smime.dtd)
   locale/@AB_CD@/messenger/am-smime.properties                              (%chrome/mailnews/smime/am-smime.properties)
   locale/@AB_CD@/messenger-smime/certFetchingStatus.dtd                     (%chrome/mailnews/smime/certFetchingStatus.dtd)
   locale/@AB_CD@/messenger-smime/msgCompSecurityInfo.dtd                    (%chrome/mailnews/smime/msgCompSecurityInfo.dtd)
   locale/@AB_CD@/messenger-smime/msgCompSecurityInfo.properties             (%chrome/mailnews/smime/msgCompSecurityInfo.properties)
   locale/@AB_CD@/messenger-smime/msgCompSMIMEOverlay.dtd                    (%chrome/mailnews/smime/msgCompSMIMEOverlay.dtd)
   locale/@AB_CD@/messenger-smime/msgCompSMIMEOverlay.properties             (%chrome/mailnews/smime/msgCompSMIMEOverlay.properties)
   locale/@AB_CD@/messenger-smime/msgReadSecurityInfo.dtd                    (%chrome/mailnews/smime/msgReadSecurityInfo.dtd)
   locale/@AB_CD@/messenger-smime/msgReadSMIMEOverlay.dtd                    (%chrome/mailnews/smime/msgReadSMIMEOverlay.dtd)
   locale/@AB_CD@/messenger-smime/msgReadSMIMEOverlay.properties             (%chrome/mailnews/smime/msgReadSMIMEOverlay.properties)
   locale/@AB_CD@/messenger-smime/msgSecurityInfo.properties                 (%chrome/mailnews/smime/msgSecurityInfo.properties)
-#endif
   locale/@AB_CD@/messenger-newsblog/newsblog.properties                     (%chrome/mailnews/newsblog/newsblog.properties)
   locale/@AB_CD@/messenger-newsblog/feed-subscriptions.dtd                  (%chrome/mailnews/newsblog/feed-subscriptions.dtd)
   locale/@AB_CD@/messenger-newsblog/am-newsblog.dtd                         (%chrome/mailnews/newsblog/am-newsblog.dtd)
   locale/@AB_CD@/mozldap/ldap.properties                                    (%chrome/mozldap/ldap.properties)
   locale/@AB_CD@/navigator/linkToolbar.dtd                                  (%chrome/browser/linkToolbar.dtd)
   locale/@AB_CD@/navigator/mailNavigatorOverlay.dtd                         (%chrome/browser/mailNavigatorOverlay.dtd)
   locale/@AB_CD@/navigator/metadata.dtd                                     (%chrome/browser/metadata.dtd)
   locale/@AB_CD@/navigator/metadata.properties                              (%chrome/browser/metadata.properties)