Major update to mozilla-thunderbird 3.0.4. See for details:

http://www.mozillamessaging.com/en-US/thunderbird/3.0.4/releasenotes/
Backing up your profile before upgrading is recommended..
Update largely based on www/firefox35 port, tested on
i386/amd64/sparc64/powerpc by myself and alpha by naddy@.

ok naddy@

mail/mozilla-thunderbird/Makefile

@@ -1,29 +1,32 @@
-# $OpenBSD: Makefile,v 1.90 2010/03/23 18:16:01 espie Exp $
+# $OpenBSD: Makefile,v 1.91 2010/04/03 09:26:45 landry Exp $
 
 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
 
-COMMENT=	redesign of Mozilla's mail component
+COMMENT=	e-mail, rss and usenet client based on Mozilla codebase
 
-VER=		2.0.0.23
-DISTNAME=	mozilla
-PKGNAME=	mozilla-thunderbird-${VER}p2
-SO_VERSION=	14.0
+VER=		3.0.4
+DISTNAME=	comm-1.9.1
+PKGNAME=	mozilla-thunderbird-${VER}
+
+# need to be in synch with SO_VERSION in www/seamonkey
+# for productivity/sunbird,-lighting and mail/enigmail to work ine
+SO_VERSION=	15.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues. Whenever PKGNAME gets
 # bumped and/or SO_VERSION changes, remember to update enigmail's
 # and sunbird SO_VERSION and LIB_DEPENDS to match.
 
-.for _lib in accessibility appcomps auth autoconfig caps chrome commandlines \
-	composer docshell editor embedcomponents fileview gfx_gtk gfxps \
-	gfxpsshar gkgfx gklayout gtkembedmoz gtkxtbin htmlpars i18n imglib2 \
-	import jar50 jsd ldap50 mail mailcomps mork mozfind mozjs mozldap \
-	msgsmime myspell necko necko2 nsappshell pipboot \
-	pipnss pippki pref prldap50 rdf remoteservice \
-	spellchecker sqlite3 storagecomps system-pref toolkitcomps \
-	transformiix txmgr uconv universalchardet wallet walletviewers \
-	webbrwsr websrvcs widget_gtk2 xmlextras xpcom xpcom_compat \
-	xpcom_compat_c xpcom_core xpconnect xpinstall xpistub
+.for _lib in accessibility appcomps auth autoconfig caps chardet chrome commandlines \
+	composer cookie dbusservice docshell embedcomponents fileview \
+	gkgfxthebes gklayout gkplugin htmlpars i18n imgicon imglib2 import \
+	intlapp jar50 jsd mail mailcomps mork mozfind mozldap msgsmime necko \
+	nsappshell permissions pipboot pipnss pippki pref rdf remoteservice \
+	satchel spellchecker storagecomps system-pref tkautocomplete \
+	toolkitcomps txmgr uconv ucvmath universalchardet unixproxy webbrwsr \
+	widget_gtk2 windowds xpautocomplete xpconnect xpinstall zipwriter \
+	gfxpsshar gkgfx gtkxtbin ldap60 ldif60 mozjs prldap60 sqlite3 ssldap60 \
+	thebes xpcom xpcom_core xul nullplugin unixprintplugin
 SHARED_LIBS+=	${_lib} ${SO_VERSION}
 .endfor
 
@@ -38,22 +41,22 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xft Xi Xinerama Xrandr Xrender Xt atk-1.0 c cairo expat
+WANTLIB += Xi Xinerama Xrandr Xrender Xt atk-1.0 c cairo expat
 WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
 WANTLIB += gobject-2.0 gthread-2.0 jpeg m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pangox-1.0 pixman-1 png pthread pthread-stubs
-WANTLIB += xcb stdc++ z
+WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs
+WANTLIB += xcb sndio stdc++ z
 
 MASTER_SITES=	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${VER}/source/
-DISTFILES=	thunderbird-${VER}-source.tar.bz2
+DISTFILES=	thunderbird-${VER}.source.tar.bz2
 
-MODULES=	devel/gettext
+MODULES=	devel/gettext lang/python
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 BUILD_DEPENDS=	:libIDL-*:devel/libIDL \
 		:zip->=2.3:archivers/zip
 LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
 		nspr4.>=21,plc4.>=21,plds4.>=21:nspr->=4.8:devel/nspr \
-		nss3.>=23,smime3.>=23,softokn3.>=23,ssl3.>=23:nss->=3.12.3:security/nss
+		nss3.>=25,smime3.>=25,softokn3.>=25,ssl3.>=25:nss->=3.12.6:security/nss
 
 VMEM_WARNING=	Yes
 
@@ -62,20 +65,19 @@ USE_GMAKE=	Yes
 # Regression tests are too hard to adapt to run here
 NO_REGRESS=	Yes
 
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf \
+MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/mozilla/build/autoconf \
+				${WRKSRC}/mozilla/js/src/build/autoconf \
+				${WRKSRC}/mozilla/nsprpub/build/autoconf \
 				${WRKSRC}/directory/c-sdk/config/autoconf
 
 AUTOCONF_VERSION= 2.13
 CONFIGURE_STYLE= autoconf no-autoheader
 CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
-		--with-system-png=${LOCALBASE}	\
 		--with-system-zlib=/usr/lib	\
 		--with-system-nspr		\
 		--with-system-nss		\
 		--with-pthreads			\
-		--enable-xft			\
 		--disable-optimize		\
-		--enable-default-toolkit=gtk2	\
 		--disable-debug			\
 		--disable-tests			\
 		--disable-pedantic		\
@@ -83,6 +85,8 @@ CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
 		--disable-updater		\
 		--disable-gnomeui		\
 		--disable-gnomevfs		\
+		--disable-dbus			\
+		--enable-default-toolkit=cairo-gtk2	\
 		--enable-xinerama		\
 		--enable-svg			\
 		--enable-svg-renderer=cairo	\
@@ -91,8 +95,14 @@ CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
 		--enable-official-branding	\
 		--enable-application=mail
 
+#http://groups.google.com/group/mozilla.support.thunderbird/browse_thread/thread/c2b667c871db035a?pli=1
+#system sqlite must be built with FTS3 enabled
+#		--enable-system-sqlite		\
+
+ALL_TARGET=	default
+
 MAKE_ENV=	MOZ_CO_PROJECT=mail \
-		LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \
+		LD_LIBRARY_PATH="${WRKSRC}/mozilla/dist/bin" \
 		BUILD_OFFICIAL=1 \
 		MOZILLA_OFFICIAL=1 \
 		SO_VERSION="${SO_VERSION}"
@@ -101,45 +111,47 @@ CONFIGURE_ENV=	${MAKE_ENV} \
 		MOZ_ENABLE_COREXFONTS=1 \
 		topsrcdir=${WRKSRC}
 
-MOB=		${WRKSRC}/dist/bin
+MOB=		${WRKSRC}/mozilla/dist/bin
 MOZ=		${PREFIX}/mozilla-thunderbird
 
 DATADIRS=	chrome components defaults dictionaries extensions \
-		greprefs icons init.d isp res
+		greprefs isp modules plugins res
 
 post-extract:
-	@cp -f ${FILESDIR}/nsSound.cpp ${WRKSRC}/widget/src/gtk2/
+	cp -f ${FILESDIR}/sydney_audio_sndio.c \
+		${WRKSRC}/mozilla/media/libsydneyaudio/src/
+	cp -f ${FILESDIR}/nsSound.cpp ${WRKSRC}/mozilla/widget/src/gtk2/
 
 pre-configure:
-	@cd ${WRKSRC}/directory/c-sdk && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
-	@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
-		${WRKSRC}/js/src/xpconnect/shell/Makefile.in \
-		${WRKSRC}/mail/app/mozilla.in
-	@perl -pi -e 's|_SO_VERSION_|${SO_VERSION}|g' \
-		${WRKSRC}/xpcom/components/nsNativeComponentLoader.cpp
+	cd ${WRKSRC}/directory/c-sdk && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
+	cd ${WRKSRC}/mozilla && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
+	cd ${WRKSRC}/mozilla/js/src && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
+	cd ${WRKSRC}/mozilla/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
+	${SUBST_CMD} ${WRKSRC}/mozilla/js/src/xpconnect/shell/Makefile.in \
+		${WRKSRC}/mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp \
+		${WRKSRC}/mozilla/build/unix/mozilla.in \
+		${WRKSRC}/mozilla/toolkit/xre/nsXREDirProvider.cpp
 
 do-install:
-	@cd ${MOB} && \
+	cd ${MOB} && \
 		find ${DATADIRS} -type d \
 			-exec ${INSTALL_DATA_DIR} ${MOZ}/{} \; && \
 		find ${DATADIRS} ! -type d \
 			-exec ${INSTALL_DATA} -m 644 {} ${MOZ}/{} \;
-	${INSTALL_DATA} ${MOB}/*.so.${SO_VERSION} \
-		${WRKSRC}/LICENSE ${MOZ}
-	${INSTALL_SCRIPT} ${MOB}/thunderbird \
-		${MOB}/thunderbird-config ${PREFIX}/bin/
-	ln -f ${PREFIX}/bin/thunderbird ${PREFIX}/bin/mozilla-thunderbird
+	${INSTALL_DATA} ${MOB}/*.so.${SO_VERSION} ${MOZ}
+	${INSTALL_DATA} ${MOB}/*.ini ${MOZ}
+	${INSTALL_SCRIPT} ${MOB}/thunderbird ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ}
 	${INSTALL_PROGRAM} ${MOB}/regxpcom \
 		${MOB}/thunderbird-bin \
 		${MOB}/mozilla-xremote-client ${MOZ}
-	ln -f ${MOZ}/thunderbird-bin ${MOZ}/mozilla-thunderbird-bin
-	@sed -e 's,!!PREFIX!!,${TRUEPREFIX},g' \
-		-e 's,!!LOCALBASE!!,${LOCALBASE},g' \
-		< ${FILESDIR}/README.OpenBSD > ${MOZ}/README.OpenBSD
+	${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD \
+		${MOZ}/README.OpenBSD
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
-	@sed -e 's,!!PREFIX!!,${TRUEPREFIX},g' \
-		< ${FILESDIR}/thunderbird.desktop > \
-			${PREFIX}/share/applications/thunderbird.desktop
+	${SUBST_CMD} -c ${FILESDIR}/thunderbird.desktop \
+		${PREFIX}/share/applications/thunderbird.desktop
+	chown ${SHAREOWN}:${SHAREGRP} \
+		${PREFIX}/share/applications/thunderbird.desktop \
+		${MOZ}/README.OpenBSD
 
 .include <bsd.port.mk>

mail/mozilla-thunderbird/distinfo

@@ -1,5 +1,5 @@
-MD5 (thunderbird-2.0.0.23-source.tar.bz2) = LhGPz3Uu5gzplPFHH5Yy0Q==
-RMD160 (thunderbird-2.0.0.23-source.tar.bz2) = oe9K+AEhzdgADHluDF+1db6jA0g=
-SHA1 (thunderbird-2.0.0.23-source.tar.bz2) = oje/uS7JxLK+1+p0TpXQHsQ+B/E=
-SHA256 (thunderbird-2.0.0.23-source.tar.bz2) = LFAH36HQlNjwidQiCOd9Zz6BGkmYC333ewTtFgbTDSE=
-SIZE (thunderbird-2.0.0.23-source.tar.bz2) = 38860245
+MD5 (thunderbird-3.0.4.source.tar.bz2) = u4fKfmLVhpQiE3dlEmeYvg==
+RMD160 (thunderbird-3.0.4.source.tar.bz2) = 7YyQXjpgYcD/iWhX/aPZYUa7xqg=
+SHA1 (thunderbird-3.0.4.source.tar.bz2) = Wm6JCW2mGlIOXOy2H4r+uYH5BBI=
+SHA256 (thunderbird-3.0.4.source.tar.bz2) = /fKNap6kLJhVdVS6KNCjqNsRR17uSfFqpKOq8sofE0M=
+SIZE (thunderbird-3.0.4.source.tar.bz2) = 61094371

mail/mozilla-thunderbird/files/README.OpenBSD

@@ -1,4 +1,4 @@
-$OpenBSD: README.OpenBSD,v 1.3 2010/03/21 10:35:03 ajacoutot Exp $
+$OpenBSD: README.OpenBSD,v 1.4 2010/04/03 09:26:45 landry Exp $
 
 If you encounter strange problems or Thunderbird doesn't start at
 all, try the -safe-mode switch.
@@ -10,14 +10,14 @@ Links
 To make Thunderbird open links using Firefox, shut down Thunderbird
 and add these lines to ~/.thunderbird/<something>.default/prefs.js:
 
-user_pref("network.protocol-handler.app.ftp", "!!PREFIX!!/bin/firefox");
-user_pref("network.protocol-handler.app.http", "!!PREFIX!!/bin/firefox");
-user_pref("network.protocol-handler.app.https", "!!PREFIX!!/bin/firefox");
+user_pref("network.protocol-handler.app.ftp", "${LOCALBASE}/bin/firefox");
+user_pref("network.protocol-handler.app.http", "${LOCALBASE}/bin/firefox");
+user_pref("network.protocol-handler.app.https", "${LOCALBASE}/bin/firefox");
 
 Plugins
 
 Thunderbird looks for plugins in ~/.mozilla/plugins
-!!PREFIX!!/mozilla-thunderbird/plugins and
-!!LOCALBASE!!/lib/mozilla-plugins.
+${TRUEPREFIX}/mozilla-thunderbird/plugins and
+${LOCALBASE}/lib/mozilla-plugins.
 If the environment variable MOZ_PLUGIN_PATH is specified, this
 location will be overridden.

mail/mozilla-thunderbird/files/nsSound.cpp

@@ -1,4 +1,4 @@
-/*	$OpenBSD: nsSound.cpp,v 1.1 2009/05/09 22:47:08 martynas Exp $	*/
+/*	$OpenBSD: nsSound.cpp,v 1.2 2010/04/03 09:26:45 landry Exp $	*/
 
 /*
  * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@@ -66,6 +66,7 @@
 #include "nsNetUtil.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
+#include "nsString.h"
 
 #include <prthread.h>
 #include <sndio.h>
@@ -76,26 +77,26 @@
 
 #define WAV_MIN_LENGTH 44
 
-typedef struct sio_hdl * (PR_CALLBACK *SioOpenType)(char *,
-                          unsigned, int);
-typedef void (PR_CALLBACK *SioCloseType)(struct sio_hdl *);
-typedef int (PR_CALLBACK *SioSetparType)(struct sio_hdl *,
-                                         struct sio_par *);
-typedef int (PR_CALLBACK *SioGetparType)(struct sio_hdl *,
-                                         struct sio_par *);
-typedef int (PR_CALLBACK *SioStartType)(struct sio_hdl *);
-typedef size_t (PR_CALLBACK *SioWriteType)(struct sio_hdl *,
-                                           void *, size_t);
-typedef int (PR_CALLBACK *SioEofType)(struct sio_hdl *);
-typedef void (PR_CALLBACK *SioInitparType)(struct sio_par *);
-
 typedef struct {
     struct sio_hdl *sndio_hdl;
     void *audio;
     size_t audio_len;
 } SioThreadData;
 
-static PRLibrary *sndio_lib = nsnull;
+typedef struct _ca_context ca_context;
+
+/* used to find and play common system event sounds */
+typedef int (*ca_context_create_fn) (ca_context **);
+typedef int (*ca_context_destroy_fn) (ca_context *);
+typedef int (*ca_context_play_fn) (ca_context *c, uint32_t id, ...);
+typedef int (*ca_context_change_props_fn) (ca_context *c, ...);
+
+static ca_context_create_fn ca_context_create;
+static ca_context_destroy_fn ca_context_destroy;
+static ca_context_play_fn ca_context_play;
+static ca_context_change_props_fn ca_context_change_props;
+
+static PRLibrary *canberra_lib = nsnull;
 
 NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver)
 
@@ -107,30 +108,13 @@ RunSioThread(void *arg)
 
     td = (SioThreadData *)arg;
 
-    /* Close the stream if fail. */
-    SioCloseType SioClose =
-        (SioCloseType) PR_FindSymbol(sndio_lib, "sio_close");
-
     /* Write stream. */
-    SioWriteType SioWrite =
-        (SioWriteType) PR_FindSymbol(sndio_lib, "sio_write");
-    SioEofType SioEof =
-        (SioEofType) PR_FindSymbol(sndio_lib, "sio_eof");
-    if (!SioWrite || !SioEof) {
-        if (SioClose)
-            (*SioClose)(td->sndio_hdl);
-        free(td->audio);
-        free(td);
-        return;
-    }
-
-    if ((*SioWrite)(td->sndio_hdl, (void *)td->audio,
-        td->audio_len) == 0 && (*SioEof)(td->sndio_hdl)) {
+    if (sio_write(td->sndio_hdl, (void *)td->audio,
+        td->audio_len) == 0 && sio_eof(td->sndio_hdl)) {
         NS_WARNING("sio_write: couldn't write the stream");
     }
 
-    if (SioClose)
-        (*SioClose)(td->sndio_hdl);
+    sio_close(td->sndio_hdl);
 
     free(td->audio);
     free(td);
@@ -148,20 +132,47 @@ nsSound::~nsSound()
 NS_IMETHODIMP
 nsSound::Init()
 {
+    /*
+     * This function is designed so that no library is compulsory, and
+     * one library missing doesn't cause the other(s) to not be used.
+     */
     if (mInited)
         return NS_OK;
-    if (sndio_lib)
-        return NS_OK;
-
-    sndio_lib = PR_LoadLibrary("libsndio.so");
-    if (!sndio_lib)
-        return NS_ERROR_FAILURE;
 
     mInited = PR_TRUE;
 
+    if (!canberra_lib) {
+        canberra_lib = PR_LoadLibrary("libcanberra.so");
+        if (canberra_lib) {
+            ca_context_create = (ca_context_create_fn) PR_FindFunctionSymbol(
+                canberra_lib, "ca_context_create");
+            if (!ca_context_create) {
+                PR_UnloadLibrary(canberra_lib);
+                canberra_lib = nsnull;
+            } else {
+                ca_context_destroy = (ca_context_destroy_fn)
+                    PR_FindFunctionSymbol(canberra_lib, "ca_context_destroy");
+                ca_context_play = (ca_context_play_fn) PR_FindFunctionSymbol(
+                    canberra_lib, "ca_context_play");
+                ca_context_change_props = (ca_context_change_props_fn)
+                    PR_FindFunctionSymbol(canberra_lib,
+                    "ca_context_change_props");
+            }
+        }
+    }
+
     return NS_OK;
 }
 
+/* static */ void
+nsSound::Shutdown()
+{
+    if (canberra_lib) {
+        PR_UnloadLibrary(canberra_lib);
+        canberra_lib = nsnull;
+    }
+}
+
 #define GET_WORD(s, i) (s[i+1] << 8) | s[i]
 #define GET_DWORD(s, i) (s[i+3] << 24) | (s[i+2] << 16) | (s[i+1] << 8) | s[i]
 
@@ -271,31 +282,14 @@ NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
         return NS_OK;
 
     /* Open up connection to sndio. */
-    SioOpenType SioOpen =
-        (SioOpenType) PR_FindSymbol(sndio_lib, "sio_open");
-    if (!SioOpen)
-        return NS_ERROR_FAILURE;
-
-    sndio_hdl = SioOpen(NULL, SIO_PLAY, 0);
+    sndio_hdl = sio_open(NULL, SIO_PLAY, 0);
     if (sndio_hdl == NULL) {
         NS_WARNING("sio_open: couldn't open the stream");
         return NS_ERROR_FAILURE;
     }
 
-    /* Close the stream if fail. */
-    SioCloseType SioClose =
-        (SioCloseType) PR_FindSymbol(sndio_lib, "sio_close");
-
     /* Initialize parameters structure. */
-    SioInitparType SioInitpar =
-        (SioInitparType) PR_FindSymbol(sndio_lib, "sio_initpar");
-    if (!SioInitpar) {
-        if (SioClose)
-            (*SioClose)(sndio_hdl);
-        return NS_ERROR_FAILURE;
-    }
-
-    (*SioInitpar)(&sndio_par);
+    sio_initpar(&sndio_par);
     sndio_par.bits = bits_per_sample;
     sndio_par.le = SIO_LE_NATIVE;
     sndio_par.pchan = channels;
@@ -304,23 +298,10 @@ NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
 
     /* Set and get configuration set.
        Put the stream into writing state. */
-    SioSetparType SioSetpar =
-        (SioSetparType) PR_FindSymbol(sndio_lib, "sio_setpar");
-    SioGetparType SioGetpar =
-        (SioGetparType) PR_FindSymbol(sndio_lib, "sio_getpar");
-    SioStartType SioStart =
-        (SioStartType) PR_FindSymbol(sndio_lib, "sio_start");
-    if (!SioSetpar || !SioGetpar || !SioStart) {
-        if (SioClose)
-            (*SioClose)(sndio_hdl);
-        return NS_ERROR_FAILURE;
-    }
-
-    if (!(*SioSetpar)(sndio_hdl, &sndio_par) ||
-        !(*SioGetpar)(sndio_hdl, &sndio_par) || !(*SioStart)(sndio_hdl)) {
+    if (!sio_setpar(sndio_hdl, &sndio_par) ||
+        !sio_getpar(sndio_hdl, &sndio_par) || !sio_start(sndio_hdl)) {
         NS_WARNING("sio_setpar: couldn't set configuration");
-        if (SioClose)
-            (*SioClose)(sndio_hdl);
+        sio_close(sndio_hdl);
         return NS_ERROR_FAILURE;
     }
 
@@ -328,15 +309,13 @@ NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
     if (sndio_par.bits != bits_per_sample || sndio_par.pchan != channels ||
         sndio_par.rate != samples_per_sec) {
         NS_WARNING("configuration is not available");
-        if (SioClose)
-            (*SioClose)(sndio_hdl);
+        sio_close(sndio_hdl);
         return NS_ERROR_FAILURE;
     }
 
     if ((td = (SioThreadData *) malloc(sizeof(SioThreadData))) == NULL ||
         (td->audio = malloc(audio_len * sizeof(*audio))) == NULL) {
-        if (SioClose)
-            (*SioClose)(sndio_hdl);
+        sio_close(sndio_hdl);
         return NS_ERROR_FAILURE;
     }
 
@@ -363,31 +342,87 @@ NS_METHOD nsSound::Play(nsIURL *aURL)
     if (!mInited)
         Init();
 
-    if (!sndio_lib)
-	    return NS_ERROR_FAILURE;
-
     nsCOMPtr<nsIStreamLoader> loader;
     rv = NS_NewStreamLoader(getter_AddRefs(loader), aURL, this);
 
     return rv;
 }
 
-NS_IMETHODIMP nsSound::PlaySystemSound(const char *aSoundAlias)
+nsresult nsSound::PlaySystemEventSound(const nsAString &aSoundAlias)
 {
-    if (!aSoundAlias)
-        return NS_ERROR_FAILURE;
+    if (!canberra_lib)
+        return NS_OK;
+  
+    /*
+     * Do we even want alert sounds?
+     * If so, what sound theme are we using?
+     */
+    GtkSettings* settings = gtk_settings_get_default();
+    gchar* sound_theme_name = nsnull;
 
-    if (strcmp(aSoundAlias, "_moz_mailbeep") == 0) {
-        return Beep();
+    if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings),
+        "gtk-sound-theme-name") && g_object_class_find_property(
+        G_OBJECT_GET_CLASS(settings), "gtk-enable-event-sounds")) {
+        gboolean enable_sounds = TRUE;
+        g_object_get(settings, "gtk-enable-event-sounds", &enable_sounds,
+            "gtk-sound-theme-name", &sound_theme_name, NULL);
+
+        if (!enable_sounds) {
+            g_free(sound_theme_name);
+            return NS_OK;
+        }
+     }
+
+    /*
+     * This allows us to avoid race conditions with freeing the
+     * context by handing that responsibility to Glib, and still
+     * use one context at a time.
+     */
+    ca_context* ctx = nsnull;
+    static GStaticPrivate ctx_static_private = G_STATIC_PRIVATE_INIT;
+    ctx = (ca_context*) g_static_private_get(&ctx_static_private);
+    if (!ctx) {
+        ca_context_create(&ctx);
+        if (!ctx) {
+            g_free(sound_theme_name);
+            return NS_ERROR_OUT_OF_MEMORY;
+        }
+
+        g_static_private_set(&ctx_static_private, ctx, (GDestroyNotify)
+            ca_context_destroy);
     }
 
+    if (sound_theme_name) {
+        ca_context_change_props(ctx, "canberra.xdg-theme.name",
+            sound_theme_name, NULL);
+        g_free(sound_theme_name);
+    }
+
+    if (aSoundAlias.Equals(NS_SYSSOUND_ALERT_DIALOG))
+        ca_context_play(ctx, 0, "event.id", "dialog-warning", NULL);
+    else if (aSoundAlias.Equals(NS_SYSSOUND_CONFIRM_DIALOG))
+        ca_context_play(ctx, 0, "event.id", "dialog-question", NULL);
+    else if (aSoundAlias.Equals(NS_SYSSOUND_MAIL_BEEP))
+        ca_context_play(ctx, 0, "event.id", "message-new-email", NULL);
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsSound::PlaySystemSound(const nsAString &aSoundAlias)
+{
+    if (!mInited)
+        Init();
+
+    if (NS_IsMozAliasSound(aSoundAlias))
+        return PlaySystemEventSound(aSoundAlias);
+
     nsresult rv;
     nsCOMPtr <nsIURI> fileURI;
 
     /* create a nsILocalFile and then a nsIFileURL from that */
     nsCOMPtr <nsILocalFile> soundFile;
-    rv = NS_NewNativeLocalFile(nsDependentCString(aSoundAlias), PR_TRUE,
-                               getter_AddRefs(soundFile));
+    rv = NS_NewLocalFile(aSoundAlias, PR_TRUE,
+                         getter_AddRefs(soundFile));
     NS_ENSURE_SUCCESS(rv,rv);
 
     rv = NS_NewFileURI(getter_AddRefs(fileURI), soundFile);
@@ -400,3 +435,4 @@ NS_IMETHODIMP nsSound::PlaySystemSound(const char *aSoundAlias)
 
     return rv;
 }
+

mail/mozilla-thunderbird/files/sydney_audio_sndio.c

@@ -0,0 +1,407 @@
+/* $OpenBSD: sydney_audio_sndio.c,v 1.1 2010/04/03 09:26:45 landry Exp $ */
+
+/*
+ * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, 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.
+ */
+
+/* ***** 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 Initial Developer of the Original Code is
+ * Copyright (C) 2008 Sun Microsystems, Inc.,
+ *                Brian Lu <brian.lu@sun.com>
+ *
+ * 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 <sys/types.h>
+
+#include <pthread.h>
+#include <sndio.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "sydney_audio.h"
+
+struct sa_buffer {
+	struct sa_buffer *next;
+	unsigned int size;
+	unsigned char data[];
+};
+
+struct sa_stream {
+	struct sio_hdl *handle;
+	pthread_mutex_t mutex;
+	pthread_t thread;
+	int64_t position;
+	unsigned int buffer, channels, format, rate;
+	struct sa_buffer *head, *tail;
+};
+
+static struct sa_buffer *allocate_buffer(size_t size);
+static void audio_callback(void *data);
+
+/*
+ * STARTUP AND SHUTDOWN FUNCTIONS
+ */
+
+int
+sa_stream_create_pcm(sa_stream_t **_s, const char *client_name,
+    sa_mode_t mode, sa_pcm_format_t format, unsigned int rate,
+    unsigned int channels)
+{
+	sa_stream_t *s;
+
+	if (_s == NULL)
+		return SA_ERROR_INVALID;
+
+	*_s = NULL;
+
+	if (mode != SA_MODE_WRONLY || (format != SA_PCM_FORMAT_S16_LE &&
+	    format != SA_PCM_FORMAT_S16_BE))
+		return SA_ERROR_NOT_SUPPORTED;
+
+	s = malloc(sizeof(sa_stream_t));
+	if (s == NULL)
+		return SA_ERROR_OOM;
+
+	if (pthread_mutex_init(&s->mutex, NULL) != 0) {
+		free(s);
+		return SA_ERROR_SYSTEM;
+	}
+
+	s->handle = NULL;
+	s->channels = channels;
+	s->format = 16;
+	s->rate = rate;
+	s->position = s->buffer = 0;
+	s->tail = s->head = NULL;
+
+	*_s = s;
+
+	return SA_SUCCESS;
+}
+
+int
+sa_stream_open(sa_stream_t *s)
+{
+	struct sio_hdl *handle;
+	struct sio_par par;
+
+	if (s == NULL)
+		return SA_ERROR_NO_INIT;
+
+	if (s->handle != NULL)
+		return SA_ERROR_INVALID;
+
+	handle = sio_open(NULL, SIO_PLAY, 0);
+	if (handle == NULL)
+		return SA_ERROR_NO_DEVICE;
+
+	sio_initpar(&par);
+	par.bits = s->format;
+	par.le = SIO_LE_NATIVE;
+	par.pchan = s->channels;
+	par.rate = s->rate;
+	par.sig = 1;
+
+	if (!sio_setpar(handle, &par) || !sio_getpar(handle, &par)) {
+		sio_close(handle);
+		return SA_ERROR_NOT_SUPPORTED;
+	}
+
+	if (par.bits != s->format || par.le != SIO_LE_NATIVE ||
+	    par.pchan != s->channels || par.rate != s->rate || par.sig != 1) {
+		sio_close(handle);
+		return SA_ERROR_NOT_SUPPORTED;
+	}
+
+	if (!sio_start(handle)) {
+		sio_close(handle);
+		return SA_ERROR_NOT_SUPPORTED;
+	}
+
+	s->buffer = par.bufsz;
+	s->handle = handle;
+
+	if (pthread_create(&s->thread, NULL, (void *)audio_callback, s) != 0) {
+		s->handle = NULL;
+		sio_close(handle);
+		return SA_ERROR_SYSTEM;
+	}
+
+	return SA_SUCCESS;
+}
+
+int
+sa_stream_destroy(sa_stream_t *s)
+{
+	if (s == NULL)
+		return SA_SUCCESS;
+
+	pthread_mutex_lock(&s->mutex);
+	s->thread = 0;
+	while (s->head != NULL) {
+		struct sa_buffer *next = s->head->next;
+		free(s->head);
+		s->head = next;
+	}
+	pthread_mutex_unlock(&s->mutex);
+
+	if (pthread_mutex_destroy(&s->mutex) != 0)
+		return SA_ERROR_SYSTEM;
+
+	return SA_SUCCESS;
+}
+
+/*
+ * DATA READ AND WRITE FUNCTIONS
+ */
+
+int
+sa_stream_write(sa_stream_t *s, const void *data, size_t nbytes)
+{
+	struct sa_buffer *buffer;
+
+	if (s == NULL || s->handle == NULL)
+		return SA_ERROR_NO_INIT;
+
+	if (nbytes == 0)
+		return SA_SUCCESS;
+
+	buffer = allocate_buffer(nbytes);
+	if (buffer == NULL)
+		return SA_ERROR_OOM;
+
+	memcpy(buffer->data, data, nbytes);
+
+	pthread_mutex_lock(&s->mutex);
+	if (!s->head)
+		s->head = buffer;
+	else
+		s->tail->next = buffer;
+	s->tail = buffer;
+	pthread_mutex_unlock(&s->mutex);
+
+	return SA_SUCCESS;
+}
+
+/*
+ * GENERAL QUERY AND SUPPORT FUNCTIONS
+ */
+
+int
+sa_stream_get_write_size(sa_stream_t *s, size_t *size)
+{
+	if (s == NULL || s->handle == NULL)
+		return SA_ERROR_NO_INIT;
+
+	*size = s->buffer;
+
+	return SA_SUCCESS;
+}
+
+int
+sa_stream_get_position(sa_stream_t *s, sa_position_t position, int64_t *pos)
+{
+	if (s == NULL)
+		return SA_ERROR_NO_INIT;
+
+	if (position != SA_POSITION_WRITE_SOFTWARE)
+		return SA_ERROR_NOT_SUPPORTED;
+
+	pthread_mutex_lock(&s->mutex);
+	*pos = s->position;
+	pthread_mutex_unlock(&s->mutex);
+
+	return SA_SUCCESS;
+}
+
+/*
+ * PRIVATE SNDIO API SPECIFIC FUNCTIONS
+ */
+
+static struct sa_buffer *
+allocate_buffer(size_t size)
+{
+	struct sa_buffer *buffer;
+
+	buffer = malloc(sizeof(struct sa_buffer) + size);
+	if (buffer != NULL) {
+		buffer->next  = NULL;
+		buffer->size  = size;
+	}
+
+	return buffer;
+}
+
+static void
+audio_callback(void *data)
+{
+	sa_stream_t *s = (sa_stream_t *)data;
+	struct sa_buffer *buffer;
+
+	while (1) {
+		if (s->thread == 0) {
+			sio_close(s->handle);
+			free(s);
+
+			break;
+		}
+
+		pthread_mutex_lock(&s->mutex);
+		if (!s->head) {
+			pthread_mutex_unlock(&s->mutex);
+			continue;
+		}
+		buffer = s->head;
+		s->head = s->head->next;
+		pthread_mutex_unlock(&s->mutex);
+
+		sio_write(s->handle, buffer->data, buffer->size);
+
+		pthread_mutex_lock(&s->mutex);
+		s->position += buffer->size;
+		pthread_mutex_unlock(&s->mutex);
+
+		free(buffer);
+	}
+}
+
+/*
+ * UNSUPPORTED FUNCTIONS
+ */
+
+#define UNSUPPORTED(func)	func { return SA_ERROR_NOT_SUPPORTED; }
+
+UNSUPPORTED(int sa_stream_set_volume_abs(sa_stream_t *s, float vol))
+UNSUPPORTED(int sa_stream_get_volume_abs(sa_stream_t *s, float *vol))
+UNSUPPORTED(int sa_stream_pause(sa_stream_t *s))
+UNSUPPORTED(int sa_stream_resume(sa_stream_t *s))
+UNSUPPORTED(int sa_stream_create_opaque(sa_stream_t **s,
+    const char *client_name, sa_mode_t mode, const char *codec))
+UNSUPPORTED(int sa_stream_set_write_lower_watermark(sa_stream_t *s,
+    size_t size))
+UNSUPPORTED(int sa_stream_set_read_lower_watermark(sa_stream_t *s, size_t size))
+UNSUPPORTED(int sa_stream_set_write_upper_watermark(sa_stream_t *s,
+    size_t size))
+UNSUPPORTED(int sa_stream_set_read_upper_watermark(sa_stream_t *s, size_t size))
+UNSUPPORTED(int sa_stream_set_channel_map(sa_stream_t *s,
+    const sa_channel_t map[], unsigned int n))
+UNSUPPORTED(int sa_stream_set_xrun_mode(sa_stream_t *s, sa_xrun_mode_t mode))
+UNSUPPORTED(int sa_stream_set_non_interleaved(sa_stream_t *s, int enable))
+UNSUPPORTED(int sa_stream_set_dynamic_rate(sa_stream_t *s, int enable))
+UNSUPPORTED(int sa_stream_set_driver(sa_stream_t *s, const char *driver))
+UNSUPPORTED(int sa_stream_start_thread(sa_stream_t *s,
+    sa_event_callback_t callback))
+UNSUPPORTED(int sa_stream_stop_thread(sa_stream_t *s))
+UNSUPPORTED(int sa_stream_change_device(sa_stream_t *s,
+    const char *device_name))
+UNSUPPORTED(int sa_stream_change_read_volume(sa_stream_t *s,
+    const int32_t vol[], unsigned int n))
+UNSUPPORTED(int sa_stream_change_write_volume(sa_stream_t *s,
+    const int32_t vol[], unsigned int n))
+UNSUPPORTED(int sa_stream_change_rate(sa_stream_t *s, unsigned int rate))
+UNSUPPORTED(int sa_stream_change_meta_data(sa_stream_t *s, const char *name,
+    const void *data, size_t size))
+UNSUPPORTED(int sa_stream_change_user_data(sa_stream_t *s, const void *value))
+UNSUPPORTED(int sa_stream_set_adjust_rate(sa_stream_t *s,
+    sa_adjust_t direction))
+UNSUPPORTED(int sa_stream_set_adjust_nchannels(sa_stream_t *s,
+    sa_adjust_t direction))
+UNSUPPORTED(int sa_stream_set_adjust_pcm_format(sa_stream_t *s,
+    sa_adjust_t direction))
+UNSUPPORTED(int sa_stream_set_adjust_watermarks(sa_stream_t *s,
+    sa_adjust_t direction))
+UNSUPPORTED(int sa_stream_get_mode(sa_stream_t *s, sa_mode_t *access_mode))
+UNSUPPORTED(int sa_stream_get_codec(sa_stream_t *s, char *codec, size_t *size))
+UNSUPPORTED(int sa_stream_get_pcm_format(sa_stream_t *s,
+    sa_pcm_format_t *format))
+UNSUPPORTED(int sa_stream_get_rate(sa_stream_t *s, unsigned int *rate))
+UNSUPPORTED(int sa_stream_get_nchannels(sa_stream_t *s, int *nchannels))
+UNSUPPORTED(int sa_stream_get_user_data(sa_stream_t *s, void **value))
+UNSUPPORTED(int sa_stream_get_write_lower_watermark(sa_stream_t *s,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_read_lower_watermark(sa_stream_t *s,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_write_upper_watermark(sa_stream_t *s,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_read_upper_watermark(sa_stream_t *s,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_channel_map(sa_stream_t *s, sa_channel_t map[],
+    unsigned int *n))
+UNSUPPORTED(int sa_stream_get_xrun_mode(sa_stream_t *s, sa_xrun_mode_t *mode))
+UNSUPPORTED(int sa_stream_get_non_interleaved(sa_stream_t *s, int *enabled))
+UNSUPPORTED(int sa_stream_get_dynamic_rate(sa_stream_t *s, int *enabled))
+UNSUPPORTED(int sa_stream_get_driver(sa_stream_t *s, char *driver_name,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_device(sa_stream_t *s, char *device_name,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_read_volume(sa_stream_t *s, int32_t vol[],
+    unsigned int *n))
+UNSUPPORTED(int sa_stream_get_write_volume(sa_stream_t *s, int32_t vol[],
+    unsigned int *n))
+UNSUPPORTED(int sa_stream_get_meta_data(sa_stream_t *s, const char *name,
+    void *data, size_t *size))
+UNSUPPORTED(int sa_stream_get_adjust_rate(sa_stream_t *s,
+    sa_adjust_t *direction))
+UNSUPPORTED(int sa_stream_get_adjust_nchannels(sa_stream_t *s,
+    sa_adjust_t *direction))
+UNSUPPORTED(int sa_stream_get_adjust_pcm_format(sa_stream_t *s,
+    sa_adjust_t *direction))
+UNSUPPORTED(int sa_stream_get_adjust_watermarks(sa_stream_t *s,
+    sa_adjust_t *direction))
+UNSUPPORTED(int sa_stream_get_state(sa_stream_t *s, sa_state_t *state))
+UNSUPPORTED(int sa_stream_get_event_error(sa_stream_t *s, sa_error_t *error))
+UNSUPPORTED(int sa_stream_get_event_notify(sa_stream_t *s, sa_notify_t *notify))
+UNSUPPORTED(int sa_stream_read(sa_stream_t *s, void *data, size_t nbytes))
+UNSUPPORTED(int sa_stream_read_ni(sa_stream_t *s, unsigned int channel,
+    void *data, size_t nbytes))
+UNSUPPORTED(int sa_stream_write_ni(sa_stream_t *s, unsigned int channel,
+    const void *data, size_t nbytes))
+UNSUPPORTED(int sa_stream_pwrite(sa_stream_t *s, const void *data,
+    size_t nbytes, int64_t offset, sa_seek_t whence))
+UNSUPPORTED(int sa_stream_pwrite_ni(sa_stream_t *s, unsigned int channel,
+    const void *data, size_t nbytes, int64_t offset, sa_seek_t whence))
+UNSUPPORTED(int sa_stream_get_read_size(sa_stream_t *s, size_t *size))
+UNSUPPORTED(int sa_stream_drain(sa_stream_t *s))
+
+const char *sa_strerror(int code) { return NULL; }
+

mail/mozilla-thunderbird/files/thunderbird.desktop

@@ -8,7 +8,7 @@ Exec=thunderbird %u
 Terminal=false
 X-MultipleArgs=false
 Type=Application
-Icon=!!PREFIX!!/mozilla-thunderbird/icons/mozicon50.xpm
+Icon=${TRUEPREFIX}/mozilla-thunderbird/chrome/icons/default/default48.png
 Categories=Application;Network;
 MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png
 StartupWMClass=Thunderbird-bin

mail/mozilla-thunderbird/patches/patch-config_autoconf_mk_in

@@ -1,12 +1,22 @@
-$OpenBSD: patch-config_autoconf_mk_in,v 1.5 2007/04/30 22:40:31 martynas Exp $
---- config/autoconf.mk.in.orig	Thu Sep 14 21:07:03 2006
-+++ config/autoconf.mk.in	Sat Apr 21 00:50:24 2007
-@@ -63,7 +63,7 @@ datadir		= @datadir@
+$OpenBSD: patch-config_autoconf_mk_in,v 1.6 2010/04/03 09:26:45 landry Exp $
+--- config/autoconf.mk.in.orig	Fri Jan 22 19:20:56 2010
++++ config/autoconf.mk.in	Fri Jan 22 19:23:20 2010
+@@ -62,14 +62,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= ${prefix}/mozilla-thunderbird/include
+ libdir		= @libdir@
+ datadir		= @datadir@
  mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= ${prefix}/mozilla-thunderbird/idl/
  
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(prefix)/mozilla-thunderbird
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= ${prefix}/mozilla-thunderbird
++sdkdir	= ${prefix}/mozilla-thunderbird
  
+ MOZDEPTH	= $(DEPTH)/mozilla
+ DIST		= $(MOZDEPTH)/dist

mail/mozilla-thunderbird/patches/patch-configure_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.16 2009/08/21 16:40:42 martynas Exp $
---- configure.in.orig	Sun Aug  9 02:05:21 2009
-+++ configure.in	Thu Aug 20 22:12:56 2009
-@@ -2030,7 +2030,7 @@ case "$target" in
+$OpenBSD: patch-configure_in,v 1.17 2010/04/03 09:26:45 landry Exp $
+--- configure.in.orig	Sat Jan 16 18:42:12 2010
++++ configure.in	Sat Jan 16 18:42:51 2010
+@@ -2470,7 +2470,7 @@ case "$target" in
  	;;
  
  *-openbsd*)
@@ -10,21 +10,3 @@ $OpenBSD: patch-configure_in,v 1.16 2009/08/21 16:40:42 martynas Exp $
      DSO_CFLAGS=''
      DSO_PIC_CFLAGS='-fPIC'
      DSO_LDOPTS='-shared -fPIC'
-@@ -3882,7 +3882,7 @@ _SAVE_LIBS=$LIBS
- CFLAGS="$ZLIB_CFLAGS $CFLAGS"
- LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
- if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then
--    CFLAGS="-I${PNG_DIR}/include $CFLAGS"
-+    CFLAGS="-I${PNG_DIR}/include/libpng $CFLAGS"
-     LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
- fi
- if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
-@@ -3912,7 +3912,7 @@ LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
- 
- if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
--    PNG_CFLAGS="-I${PNG_DIR}/include"
-+    PNG_CFLAGS="-I${PNG_DIR}/include/libpng"
-     PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
- fi
- 

mail/mozilla-thunderbird/patches/patch-content_xul_templates_src_nsTemplateMatchSet_h

@@ -1,15 +0,0 @@
-$OpenBSD: patch-content_xul_templates_src_nsTemplateMatchSet_h,v 1.2 2007/04/30 22:40:31 martynas Exp $
---- content/xul/templates/src/nsTemplateMatchSet.h.orig	Sun Apr 18 00:52:30 2004
-+++ content/xul/templates/src/nsTemplateMatchSet.h	Thu Apr 19 14:31:46 2007
-@@ -207,7 +207,11 @@ class nsTemplateMatchRefSet (protected)
-      * If the set is currently
-      */
-     struct InlineMatches {
-+#ifdef __LP64__
-+        PRUint64         mCount;
-+#else
-         PRUint32         mCount;
-+#endif
-         nsTemplateMatch* mEntries[kMaxInlineMatches];
-     };
- 

mail/mozilla-thunderbird/patches/patch-directory_c-sdk_config_OpenBSD_mk

@@ -1,12 +0,0 @@
-$OpenBSD: patch-directory_c-sdk_config_OpenBSD_mk,v 1.4 2007/07/26 17:49:15 naddy Exp $
---- directory/c-sdk/config/OpenBSD.mk.orig	Tue Jul 24 19:49:17 2007
-+++ directory/c-sdk/config/OpenBSD.mk	Tue Jul 24 19:49:39 2007
-@@ -64,7 +64,7 @@ endif
- 
- ARCH                   = openbsd
- 
--DLL_SUFFIX             = so.1.0
-+DLL_SUFFIX             = so.${SO_VERSION}
- 
- DSO_CFLAGS             = -fPIC
- DSO_LDOPTS             = -shared

mail/mozilla-thunderbird/patches/patch-directory_c-sdk_configure_in

@@ -1,12 +1,12 @@
-$OpenBSD: patch-directory_c-sdk_configure_in,v 1.8 2007/07/26 17:49:15 naddy Exp $
---- directory/c-sdk/configure.in.orig	Wed Jul 11 22:43:19 2007
-+++ directory/c-sdk/configure.in	Tue Jul 24 19:50:45 2007
-@@ -1581,7 +1581,7 @@ mips-sony-newsos*)
+$OpenBSD: patch-directory_c-sdk_configure_in,v 1.9 2010/04/03 09:26:45 landry Exp $
+--- directory/c-sdk/configure.in.orig	Sat Jan 23 12:41:13 2010
++++ directory/c-sdk/configure.in	Sat Jan 23 12:41:57 2010
+@@ -1798,7 +1798,7 @@ mips-sony-newsos*)
      AC_DEFINE(HAVE_SOCKLEN_T)
      CFLAGS="$CFLAGS -ansi -Wall"
      CXXFLAGS="$CXXFLAGS -ansi -Wall"
 -    DLL_SUFFIX=so.1.0
-+    DLL_SUFFIX="so.${SO_VERSION}"
++    DLL_SUFFIX=so.${SO_VERSION}
      DSO_CFLAGS=-fPIC
-     MDCPUCFG_H=_openbsd.cfg
-     PR_MD_CSRCS=openbsd.c
+     USE_NSPR_THREADS=1
+     DSO_LDOPTS='-shared -fPIC'

mail/mozilla-thunderbird/patches/patch-extensions_spellcheck_myspell_src_Makefile_in

@@ -1,10 +0,0 @@
-$OpenBSD: patch-extensions_spellcheck_myspell_src_Makefile_in,v 1.1 2007/04/30 22:40:31 martynas Exp $
---- extensions/spellcheck/myspell/src/Makefile.in.orig	Mon Mar 12 19:27:15 2007
-+++ extensions/spellcheck/myspell/src/Makefile.in	Mon Mar 12 19:43:59 2007
-@@ -81,4 +81,6 @@ EXTRA_DSO_LDOPTS = \
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(NULL)
- 
-+DEFINES += -DLOCALBASE=\"$(prefix)\"
-+
- include $(topsrcdir)/config/rules.mk

mail/mozilla-thunderbird/patches/patch-extensions_spellcheck_myspell_src_mozMySpell_cpp

@@ -1,29 +0,0 @@
-$OpenBSD: patch-extensions_spellcheck_myspell_src_mozMySpell_cpp,v 1.1 2007/04/30 22:40:31 martynas Exp $
---- extensions/spellcheck/myspell/src/mozMySpell.cpp.orig	Fri Jun 30 01:16:17 2006
-+++ extensions/spellcheck/myspell/src/mozMySpell.cpp	Mon Mar 12 19:16:59 2007
-@@ -64,6 +64,9 @@
- #include "nsISimpleEnumerator.h"
- #include "nsIDirectoryEnumerator.h"
- #include "nsIFile.h"
-+#include "nsID.h"
-+#include "nsEmbedString.h"
-+#include "nsILocalFile.h"
- #include "nsDirectoryServiceUtils.h"
- #include "nsDirectoryServiceDefs.h"
- #include "mozISpellI18NManager.h"
-@@ -321,6 +324,15 @@ mozMySpell::LoadDictionaryList()
-   }
- 
-   LoadDictionariesFromDir(dictDir);
-+
-+  // provide common LOCALBASE/share/mozilla-dicts for all mozilla apps
-+  nsCOMPtr<nsILocalFile> file;
-+  rv = NS_NewNativeLocalFile(nsEmbedCString(LOCALBASE"/share/mozilla-dicts"), PR_TRUE,
-+                             getter_AddRefs(file));
-+  if (NS_SUCCEEDED(rv)) {
-+    file->QueryInterface(NS_GET_IID(nsIFile), (void**)&dictDir);
-+    LoadDictionariesFromDir(dictDir);
-+  }
- 
-   nsCOMPtr<nsISimpleEnumerator> dictDirs;
-   rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST,

mail/mozilla-thunderbird/patches/patch-extensions_transformiix_source_base_Double_cpp

@@ -1,29 +0,0 @@
-$OpenBSD: patch-extensions_transformiix_source_base_Double_cpp,v 1.3 2007/04/30 22:40:31 martynas Exp $
---- extensions/transformiix/source/base/Double.cpp.orig	Thu Jun 17 02:12:42 2004
-+++ extensions/transformiix/source/base/Double.cpp	Sat Sep 10 09:47:31 2005
-@@ -115,17 +115,19 @@ typedef union txdpun {
- #define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
- #define TX_DOUBLE_HI32_MANTMASK  0x000fffff
- 
-+#define STRICT_ALIGN __attribute__ ((aligned (8)))
-+
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
-+const PRUint32 nanMask[2] STRICT_ALIGN =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
-                                 0xffffffff};
--const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const PRUint32 infMask[2] STRICT_ALIGN =    {TX_DOUBLE_HI32_EXPMASK, 0};
-+const PRUint32 negInfMask[2] STRICT_ALIGN = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
- #else
--const PRUint32 nanMask[2] =    {0xffffffff,
-+const PRUint32 nanMask[2] STRICT_ALIGN =    {0xffffffff,
-                                 TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const PRUint32 infMask[2] STRICT_ALIGN =    {0, TX_DOUBLE_HI32_EXPMASK};
-+const PRUint32 negInfMask[2] STRICT_ALIGN = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
- #endif
- 
- const double Double::NaN = *((double*)nanMask);

mail/mozilla-thunderbird/patches/patch-gfx_src_gtk_Makefile_in

@@ -1,14 +0,0 @@
-$OpenBSD: patch-gfx_src_gtk_Makefile_in,v 1.1 2007/04/30 22:40:31 martynas Exp $
---- gfx/src/gtk/Makefile.in.orig	Sun Feb  4 20:53:15 2007
-+++ gfx/src/gtk/Makefile.in	Sun Feb  4 20:57:26 2007
-@@ -207,6 +207,10 @@ ifdef MOZ_ENABLE_PANGO
- EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
- endif
- 
-+ifdef MOZ_ENABLE_COREXFONTS
-+EXTRA_DSO_LDOPTS += -lpangox-1.0
-+endif
-+
- EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
- CXXFLAGS	+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
- CFLAGS		+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)

mail/mozilla-thunderbird/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.7 2007/04/30 22:40:31 martynas Exp $
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	Thu Nov 30 04:17:21 2006
-+++ gfx/src/ps/nsFontMetricsPS.cpp	Thu Apr 19 14:31:47 2007
-@@ -995,7 +995,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, const nsFont& a
- 
-         fontps *fps = new fontps;
-         fps->entry = xftEntry;
--        fps->charset = fc_charset;
-+        fps->charset = FcCharSetCopy(fc_charset);
-         fps->fontps = nsnull;
-         fpi.fontps->AppendElement(fps);
-     }

mail/mozilla-thunderbird/patches/patch-js_Makefile_in

@@ -1,11 +0,0 @@
-$OpenBSD: patch-js_Makefile_in,v 1.1 2008/08/23 22:07:03 martynas Exp $
---- js/Makefile.in.orig	Thu Aug 21 19:09:03 2008
-+++ js/Makefile.in	Thu Aug 21 21:20:54 2008
-@@ -61,6 +61,6 @@ include $(DEPTH)/config/autoconf.mk
- # See top-level makefile for details
- #
- 
--DIRS		= src/fdlibm src
-+DIRS		= src
- 
- include $(topsrcdir)/config/rules.mk

mail/mozilla-thunderbird/patches/patch-js_src_jsnum_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-js_src_jsnum_h,v 1.2 2008/02/29 21:49:48 bernd Exp $
---- js/src/jsnum.h.orig	Thu Nov  1 21:52:24 2007
-+++ js/src/jsnum.h	Wed Feb 27 12:39:54 2008
-@@ -61,7 +61,7 @@ JS_BEGIN_EXTERN_C
-  */
- 
- #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
--#ifndef __QNXNTO__
-+#if !defined(__QNXNTO__) && !defined(__OpenBSD__)
- #define CPU_IS_ARM
- #endif
- #endif

mail/mozilla-thunderbird/patches/patch-js_src_xpconnect_shell_Makefile_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-js_src_xpconnect_shell_Makefile_in,v 1.1 2008/07/24 10:10:34 martynas Exp $
---- js/src/xpconnect/shell/Makefile.in.orig	Tue Apr  5 15:35:51 2005
-+++ js/src/xpconnect/shell/Makefile.in	Wed Jul  2 13:36:12 2008
-@@ -56,6 +56,8 @@ REQUIRES	= xpconnect \
- CPPSRCS		= xpcshell.cpp
- 
- LIBS		= \
-+		-Wl,-rpath-link,_LOCALBASE_/lib/ \
-+		-Wl,-rpath-link,_X11BASE_/lib/ \
- 		$(MOZ_JS_LIBS) \
- 		$(XPCOM_LIBS) \
- 		$(NSPR_LIBS) \

mail/mozilla-thunderbird/patches/patch-mail_app_mozilla_in

@@ -1,30 +0,0 @@
-$OpenBSD: patch-mail_app_mozilla_in,v 1.11 2008/12/19 11:42:35 martynas Exp $
---- mail/app/mozilla.in.orig	Thu Oct 23 00:04:53 2008
-+++ mail/app/mozilla.in	Wed Dec 17 21:33:30 2008
-@@ -92,7 +92,13 @@ moz_pis_startstop_scripts()
- #uncomment for debugging
- #set -x
- 
-+LIMIT=`ulimit -n`
-+if [ $LIMIT -lt 128 -a "${LIMIT}" != "unlimited" ]; then  
-+	ulimit -Sn 128
-+fi
-+
- moz_libdir=%MOZAPPDIR%
-+MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH:=_LOCALBASE_/lib/mozilla-plugins}
- MRE_HOME=%MREDIR%
- 
- # Use run-mozilla.sh in the current dir if it exists
-@@ -172,7 +178,11 @@ do
-   esac
- done
- 
--export MRE_HOME
-+if [ `_X11BASE_/bin/fc-list | wc -l` -eq 0 ]; then
-+	export GDK_USE_XFT=0
-+fi
-+
-+export MOZ_PLUGIN_PATH MRE_HOME
- 
- ## Start addon scripts
- moz_pis_startstop_scripts "start"

mail/mozilla-thunderbird/patches/patch-mailnews_mime_src_mimemsg_cpp

@@ -1,12 +1,12 @@
-$OpenBSD: patch-mailnews_mime_src_mimemsg_cpp,v 1.2 2007/04/30 22:40:31 martynas Exp $
---- mailnews/mime/src/mimemsg.cpp.orig	Thu Jun 10 18:58:10 2004
-+++ mailnews/mime/src/mimemsg.cpp	Wed Apr 25 18:02:45 2007
-@@ -522,7 +522,7 @@ MimeMessage_close_headers (MimeObject *obj)
- 	{
- 		PRUint32 flags = 0;
- 		char dummy = 0;
--		if (sscanf(xmoz, " %lx %c", &flags, &dummy) == 1 &&
-+		if (sscanf(xmoz, " %x %c", &flags, &dummy) == 1 &&
- 			flags & MSG_FLAG_PARTIAL)
- 		{
- 			obj->options->html_closure = obj;
+$OpenBSD: patch-mailnews_mime_src_mimemsg_cpp,v 1.3 2010/04/03 09:26:45 landry Exp $
+--- mailnews/mime/src/mimemsg.cpp.orig	Mon Jan 11 18:40:36 2010
++++ mailnews/mime/src/mimemsg.cpp	Mon Jan 25 22:31:38 2010
+@@ -514,7 +514,7 @@ MimeMessage_close_headers (MimeObject *obj)
+   {
+     PRUint32 flags = 0;
+     char dummy = 0;
+-    if (sscanf(xmoz, " %lx %c", &flags, &dummy) == 1 &&
++    if (sscanf(xmoz, " %x %c", &flags, &dummy) == 1 &&
+       flags & nsMsgMessageFlags::Partial)
+     {
+       obj->options->html_closure = obj;

mail/mozilla-thunderbird/patches/patch-modules_libpref_src_init_all_js

@@ -1,61 +0,0 @@
-$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.8 2008/12/19 11:42:35 martynas Exp $
---- modules/libpref/src/init/all.js.orig	Mon Oct 13 00:48:38 2008
-+++ modules/libpref/src/init/all.js	Wed Dec 17 21:33:30 2008
-@@ -1944,33 +1944,33 @@ pref("font.name.monospace.ko", "monospace");
- 
- // th
- 
--pref("font.name.serif.tr", "Times");
--pref("font.name.sans-serif.tr", "Helvetica");
--pref("font.name.monospace.tr", "Courier");
-+pref("font.name.serif.tr", "serif");
-+pref("font.name.sans-serif.tr", "sans-serif");
-+pref("font.name.monospace.tr", "monospace");
- 
- pref("font.name.serif.x-baltic", "serif");
- pref("font.name.sans-serif.x-baltic", "sans-serif");
- pref("font.name.monospace.x-baltic", "monospace");
- 
--pref("font.name.serif.x-central-euro", "Times");
--pref("font.name.sans-serif.x-central-euro", "Helvetica");
--pref("font.name.monospace.x-central-euro", "Courier");
-+pref("font.name.serif.x-central-euro", "serif");
-+pref("font.name.sans-serif.x-central-euro", "sans-serif");
-+pref("font.name.monospace.x-central-euro", "monospace");
- 
- pref("font.name.serif.x-cyrillic", "serif");
- pref("font.name.sans-serif.x-cyrillic", "sans-serif");
- pref("font.name.monospace.x-cyrillic", "monospace");
- 
--pref("font.name.serif.x-unicode", "Times");
--pref("font.name.sans-serif.x-unicode", "Helvetica");
--pref("font.name.monospace.x-unicode", "Courier");
-+pref("font.name.serif.x-unicode", "serif");
-+pref("font.name.sans-serif.x-unicode", "sans-serif");
-+pref("font.name.monospace.x-unicode", "monospace");
- 
--pref("font.name.serif.x-user-def", "Times");
--pref("font.name.sans-serif.x-user-def", "Helvetica");
--pref("font.name.monospace.x-user-def", "Courier");
-+pref("font.name.serif.x-user-def", "serif");
-+pref("font.name.sans-serif.x-user-def", "sans-serif");
-+pref("font.name.monospace.x-user-def", "monospace");
- 
--pref("font.name.serif.x-western", "Times");
--pref("font.name.sans-serif.x-western", "Helvetica");
--pref("font.name.monospace.x-western", "Courier");
-+pref("font.name.serif.x-western", "serif");
-+pref("font.name.sans-serif.x-western", "sans-serif");
-+pref("font.name.monospace.x-western", "monospace");
- 
- pref("font.name.serif.zh-CN", "serif");
- pref("font.name.sans-serif.zh-CN", "sans-serif");
-@@ -2110,7 +2110,7 @@ pref("font.scale.outline.min",      6);
- 
- // TrueType
- pref("font.FreeType2.enable", false);
--pref("font.freetype2.shared-library", "libfreetype.so.6");
-+pref("font.freetype2.shared-library", "libfreetype.so");
- // if libfreetype was built without hinting compiled in
- // it is best to leave hinting off
- pref("font.FreeType2.autohinted", false);

mail/mozilla-thunderbird/patches/patch-mozilla_accessible_src_atk_nsAppRootAccessible_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_accessible_src_atk_nsAppRootAccessible_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/accessible/src/atk/nsAppRootAccessible.cpp.orig	Sat Dec  5 02:55:55 2009
++++ mozilla/accessible/src/atk/nsAppRootAccessible.cpp	Sat Jan 16 16:28:32 2010
+@@ -55,7 +55,7 @@ typedef GType (* AtkGetTypeType) (void);
+ GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
+ static PRBool sATKChecked = PR_FALSE;
+ static PRLibrary *sATKLib = nsnull;
+-static const char sATKLibName[] = "libatk-1.0.so.0";
++static const char sATKLibName[] = "libatk-1.0.so";
+ static const char sATKHyperlinkImplGetTypeSymbol[] =
+     "atk_hyperlink_impl_get_type";
+ static const char sAccEnv [] = "GNOME_ACCESSIBILITY";

mail/mozilla-thunderbird/patches/patch-mozilla_browser_app_application_ini

@@ -0,0 +1,11 @@
+$OpenBSD: patch-mozilla_browser_app_application_ini,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/browser/app/application.ini.orig	Sat Dec  5 02:55:55 2009
++++ mozilla/browser/app/application.ini	Sat Jan 16 16:28:32 2010
+@@ -59,7 +59,4 @@ EnableProfileMigrator=1
+ EnableExtensionManager=1
+ 
+ [Crash Reporter]
+-#if MOZILLA_OFFICIAL
+-Enabled=1
+-#endif
+ ServerURL=https://crash-reports.mozilla.com/submit

mail/mozilla-thunderbird/patches/patch-mozilla_browser_app_profile_firefox_js

@@ -0,0 +1,37 @@
+$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/browser/app/profile/firefox.js.orig	Sat Dec  5 02:55:55 2009
++++ mozilla/browser/app/profile/firefox.js	Sat Jan 16 16:28:32 2010
+@@ -92,7 +92,7 @@ pref("browser.dictionaries.download.url", "https://%LO
+ // App-specific update preferences
+ 
+ // Whether or not app updates are enabled
+-pref("app.update.enabled", true);
++pref("app.update.enabled", false);
+ 
+ // This preference turns on app.update.mode and allows automatic download and
+ // install to take place. We use a separate boolean toggle for this to make
+@@ -661,10 +661,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
+ 
+ #ifdef MOZ_SAFE_BROWSING
+ // Safe browsing does nothing unless this pref is set
+-pref("browser.safebrowsing.enabled", true);
++pref("browser.safebrowsing.enabled", false);
+ 
+ // Prevent loading of pages identified as malware
+-pref("browser.safebrowsing.malware.enabled", true);
++pref("browser.safebrowsing.malware.enabled", false);
+ 
+ // Non-enhanced mode (local url lists) URL list to check for updates
+ pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
+@@ -727,10 +727,8 @@ pref("browser.EULA.version", 3);
+ pref("browser.rights.version", 3);
+ pref("browser.rights.3.shown", false);
+ 
+-#ifdef DEBUG
+-// Don't show the about:rights notification in debug builds.
++// Don't show the about:rights notification
+ pref("browser.rights.override", true);
+-#endif
+ 
+ pref("browser.sessionstore.resume_from_crash", true);
+ pref("browser.sessionstore.resume_session_once", false);

mail/mozilla-thunderbird/patches/patch-mozilla_browser_components_certerror_content_aboutCertError_xhtml

@@ -0,0 +1,13 @@
+$OpenBSD: patch-mozilla_browser_components_certerror_content_aboutCertError_xhtml,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/browser/components/certerror/content/aboutCertError.xhtml.orig	Sat Dec  5 02:55:55 2009
++++ mozilla/browser/components/certerror/content/aboutCertError.xhtml	Sat Jan 16 16:28:32 2010
+@@ -128,6 +128,9 @@
+           tech.textContent = getDescription();
+         
+         addDomainErrorLink();
++
++        var button = document.getElementById("exceptionDialogButton");
++        button.click();
+       }
+       
+       /* In the case of SSL error pages about domain mismatch, see if

mail/mozilla-thunderbird/patches/patch-mozilla_browser_components_nsBrowserGlue_js

@@ -0,0 +1,94 @@
+$OpenBSD: patch-mozilla_browser_components_nsBrowserGlue_js,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/browser/components/nsBrowserGlue.js.orig	Mon Jan 11 18:42:36 2010
++++ mozilla/browser/components/nsBrowserGlue.js	Sat Jan 23 12:42:26 2010
+@@ -267,10 +267,6 @@ BrowserGlue.prototype = {
+   // Browser startup complete. All initial windows have opened.
+   _onBrowserStartup: function()
+   {
+-    // Show about:rights notification, if needed.
+-    if (this._shouldShowRights())
+-      this._showRightsNotification();
+-
+     // If new add-ons were installed during startup open the add-ons manager.
+     if (this._prefs.prefHasUserValue(PREF_EM_NEW_ADDONS_LIST)) {
+       var args = Cc["@mozilla.org/supports-array;1"].
+@@ -416,79 +412,6 @@ BrowserGlue.prototype = {
+       }
+       break;
+     }
+-  },
+-
+-  /*
+-   * _shouldShowRights - Determines if the user should be shown the
+-   * about:rights notification. The notification should *not* be shown if
+-   * we've already shown the current version, or if the override pref says to
+-   * never show it. The notification *should* be shown if it's never been seen
+-   * before, if a newer version is available, or if the override pref says to
+-   * always show it.
+-   */
+-  _shouldShowRights : function () {
+-    // Look for an unconditional override pref. If set, do what it says.
+-    // (true --> never show, false --> always show)
+-    try {
+-      return !this._prefs.getBoolPref("browser.rights.override");
+-    } catch (e) { }
+-    // Ditto, for the legacy EULA pref.
+-    try {
+-      return !this._prefs.getBoolPref("browser.EULA.override");
+-    } catch (e) { }
+-
+-#ifndef OFFICIAL_BUILD
+-    // Non-official builds shouldn't shouldn't show the notification.
+-    return false;
+-#endif
+-
+-    // Look to see if the user has seen the current version or not.
+-    var currentVersion = this._prefs.getIntPref("browser.rights.version");
+-    try {
+-      return !this._prefs.getBoolPref("browser.rights." + currentVersion + ".shown");
+-    } catch (e) { }
+-
+-    // Legacy: If the user accepted a EULA, we won't annoy them with the
+-    // equivalent about:rights page until the version changes.
+-    try {
+-      return !this._prefs.getBoolPref("browser.EULA." + currentVersion + ".accepted");
+-    } catch (e) { }
+-
+-    // We haven't shown the notification before, so do so now.
+-    return true;
+-  },
+-
+-  _showRightsNotification : function () {
+-    // Stick the notification onto the selected tab of the active browser window.
+-    var win = this.getMostRecentBrowserWindow();
+-    var browser = win.gBrowser; // for closure in notification bar callback
+-    var notifyBox = browser.getNotificationBox();
+-
+-    var brandBundle  = this._bundleService.createBundle("chrome://branding/locale/brand.properties");
+-    var rightsBundle = this._bundleService.createBundle("chrome://browser/locale/aboutRights.properties");
+-
+-    var buttonLabel      = rightsBundle.GetStringFromName("buttonLabel");
+-    var buttonAccessKey  = rightsBundle.GetStringFromName("buttonAccessKey");
+-    var productName      = brandBundle.GetStringFromName("brandFullName");
+-    var notifyRightsText = rightsBundle.formatStringFromName("notifyRightsText", [productName], 1);
+-    
+-    var buttons = [
+-                    {
+-                      label:     buttonLabel,
+-                      accessKey: buttonAccessKey,
+-                      popup:     null,
+-                      callback: function(aNotificationBar, aButton) {
+-                        browser.selectedTab = browser.addTab("about:rights");
+-                      }
+-                    }
+-                  ];
+-
+-    // Set pref to indicate we've shown the notification.
+-    var currentVersion = this._prefs.getIntPref("browser.rights.version");
+-    this._prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true);
+-
+-    var box = notifyBox.appendNotification(notifyRightsText, "about-rights", null, notifyBox.PRIORITY_INFO_LOW, buttons);
+-    box.persistence = 3; // arbitrary number, just so bar sticks around for a bit
+   },
+ 
+   // returns the (cached) Sanitizer constructor

mail/mozilla-thunderbird/patches/patch-mozilla_build_unix_mozilla_in

@@ -0,0 +1,28 @@
+$OpenBSD: patch-mozilla_build_unix_mozilla_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/build/unix/mozilla.in.orig	Sat Dec  5 02:55:56 2009
++++ mozilla/build/unix/mozilla.in	Sat Jan 16 16:31:41 2010
+@@ -50,6 +50,11 @@
+ #uncomment for debugging
+ #set -x
+ 
++LIMIT=`ulimit -n`
++if [ $LIMIT -lt 128 -a "${LIMIT}" != "unlimited" ]; then
++	ulimit -Sn 128
++fi
++
+ moz_libdir=%MOZAPPDIR%
+ 
+ # Use run-mozilla.sh in the current dir if it exists
+@@ -129,6 +134,12 @@ do
+       ;;
+   esac
+ done
++
++if [ `${X11BASE}/bin/fc-list | wc -l` -eq 0 ]; then
++	export GDK_USE_XFT=0
++fi
++
++export MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH:=${LOCALBASE}/lib/mozilla-plugins}
+ 
+ if [ $debugging = 1 ]
+ then

mail/mozilla-thunderbird/patches/patch-mozilla_config_autoconf_mk_in

@@ -0,0 +1,22 @@
+$OpenBSD: patch-mozilla_config_autoconf_mk_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/config/autoconf.mk.in.orig	Sat Dec  5 02:55:56 2009
++++ mozilla/config/autoconf.mk.in	Sat Jan 16 16:28:33 2010
+@@ -57,14 +57,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= $(prefix)/firefox35/include
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= $(prefix)/firefox35/idl
+ 
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(prefix)/firefox35
++sdkdir		= $(prefix)/firefox35
+ 
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@

mail/mozilla-thunderbird/patches/patch-mozilla_config_rules_mk

@@ -0,0 +1,16 @@
+$OpenBSD: patch-mozilla_config_rules_mk,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/config/rules.mk.orig	Sat Dec  5 02:55:56 2009
++++ mozilla/config/rules.mk	Sat Jan 16 16:28:33 2010
+@@ -607,6 +607,12 @@ endif
+ endif
+ endif
+ 
++ifeq ($(OS_ARCH),OpenBSD)
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
++endif
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ ifneq (,$(filter mips mipsel,$(OS_TEST)))
+ ifeq ($(MODULE),layout)

mail/mozilla-thunderbird/patches/patch-mozilla_configure_in

@@ -0,0 +1,34 @@
+$OpenBSD: patch-mozilla_configure_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/configure.in.orig	Wed Mar 17 18:06:33 2010
++++ mozilla/configure.in	Tue Mar 30 21:36:36 2010
+@@ -999,7 +999,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
+ 
+ MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
+ DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
+-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
++MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -L$(LIBXUL_DIST)/bin'
+ XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
+ XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
+@@ -2355,7 +2355,7 @@ case "$target" in
+ 	;;
+ 
+ *-openbsd*)
+-    DLL_SUFFIX=".so.1.0"
++    DLL_SUFFIX=".so.${SO_VERSION}"
+     DSO_CFLAGS=''
+     DSO_PIC_CFLAGS='-fPIC'
+     DSO_LDOPTS='-shared -fPIC'
+@@ -4026,9 +4026,9 @@ AC_CACHE_CHECK(for __thread keyword for TLS variables,
+                             ac_cv_thread_keyword=yes,
+                             ac_cv_thread_keyword=no)])
+ LDFLAGS=$_SAVE_LDFLAGS
+-if test "$ac_cv_thread_keyword" = yes; then
+-  AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
+-fi
++dnl if test "$ac_cv_thread_keyword" = yes; then
++dnl   AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
++dnl fi
+ 
+ dnl End of C++ language/feature checks
+ AC_LANG_C

mail/mozilla-thunderbird/patches/patch-mozilla_content_media_video_src_nsAudioStream_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_content_media_video_src_nsAudioStream_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/content/media/video/src/nsAudioStream.cpp.orig	Sat Dec  5 02:55:57 2009
++++ mozilla/content/media/video/src/nsAudioStream.cpp	Sat Jan 16 16:28:33 2010
+@@ -246,7 +246,7 @@ float nsAudioStream::GetPosition()
+ #if defined(XP_WIN)
+   positionType = SA_POSITION_WRITE_HARDWARE;
+ #endif
+-  PRInt64 position = 0;
++  int64_t position = 0;
+   if (sa_stream_get_position(static_cast<sa_stream_t*>(mAudioHandle),
+                              positionType, &position) == SA_SUCCESS) {
+     return (position / float(mRate) / mChannels / sizeof(short));

mail/mozilla-thunderbird/patches/patch-mozilla_content_xslt_public_txDouble_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_content_xslt_public_txDouble_h,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/content/xslt/public/txDouble.h.orig	Sat Dec  5 02:55:58 2009
++++ mozilla/content/xslt/public/txDouble.h	Sat Jan 16 16:28:33 2010
+@@ -63,7 +63,7 @@ static fp_except_t oldmask = fpsetmask(~allmask);
+  */
+ 
+ #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
+-#if !defined(__VFP_FP__)
++#if !defined(__VFP_FP__) && !defined(__OpenBSD__) /* Armel ABI */
+ #define FPU_IS_ARM_FPA
+ #endif
+ #endif

mail/mozilla-thunderbird/patches/patch-mozilla_content_xslt_src_base_txDouble_cpp

@@ -0,0 +1,25 @@
+$OpenBSD: patch-mozilla_content_xslt_src_base_txDouble_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/content/xslt/src/base/txDouble.cpp.orig	Sat Dec  5 02:55:58 2009
++++ mozilla/content/xslt/src/base/txDouble.cpp	Sat Jan 16 16:28:33 2010
+@@ -49,14 +49,16 @@
+  * Utility class for doubles
+  */
+ 
++#define STRICT_ALIGN __attribute__ ((aligned (8)))
++
+ //-- Initialize Double related constants
+-const txdpun nanMask =    TX_DOUBLE_NaN;
++const txdpun nanMask STRICT_ALIGN =    TX_DOUBLE_NaN;
+ #ifdef IS_BIG_ENDIAN
+-const txdpun infMask =    {{TX_DOUBLE_HI32_EXPMASK, 0}};
+-const txdpun negInfMask = {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
++const txdpun infMask STRICT_ALIGN =    {{TX_DOUBLE_HI32_EXPMASK, 0}};
++const txdpun negInfMask STRICT_ALIGN = {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
+ #else
+-const txdpun infMask =    {{0, TX_DOUBLE_HI32_EXPMASK}};
+-const txdpun negInfMask = {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
++const txdpun infMask STRICT_ALIGN =    {{0, TX_DOUBLE_HI32_EXPMASK}};
++const txdpun negInfMask STRICT_ALIGN = {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
+ #endif
+ 
+ const double Double::NaN = nanMask.d;

mail/mozilla-thunderbird/patches/patch-mozilla_extensions_auth_nsAuthGSSAPI_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-mozilla_extensions_auth_nsAuthGSSAPI_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/extensions/auth/nsAuthGSSAPI.cpp.orig	Wed Mar 17 18:05:38 2010
++++ mozilla/extensions/auth/nsAuthGSSAPI.cpp	Tue Mar 30 21:28:29 2010
+@@ -159,9 +159,8 @@ gssInit()
+         };
+         
+         const char *const verLibNames[] = {
+-            "libgssapi_krb5.so.2", /* MIT - FC, Suse10, Debian */
+-            "libgssapi.so.4",      /* Heimdal - Suse10, MDK */
+-            "libgssapi.so.1"       /* Heimdal - Suse9, CITI - FC, MDK, Suse10*/
++            "libgssapi_krb5.so",
++            "libgssapi.so"
+         };
+ 
+         for (size_t i = 0; i < NS_ARRAY_LENGTH(verLibNames) && !lib; ++i) {

mail/mozilla-thunderbird/patches/patch-mozilla_extensions_pref_system-pref_src_gconf_nsSystemPrefService_cpp

@@ -0,0 +1,14 @@
+$OpenBSD: patch-mozilla_extensions_pref_system-pref_src_gconf_nsSystemPrefService_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp.orig	Sat Dec  5 02:56:01 2009
++++ mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp	Sat Jan 16 16:28:33 2010
+@@ -543,8 +543,8 @@ struct PrefNamePair {
+ 
+ const char
+ GConfProxy::sPrefGConfKey[] = "accessibility.unix.gconf2.shared-library";
+-const char GConfProxy::sDefaultLibName1[] = "libgconf-2.so.4";
+-const char GConfProxy::sDefaultLibName2[] = "libgconf-2.so";
++const char GConfProxy::sDefaultLibName1[] = "libgconf-2.so";
++const char GConfProxy::sDefaultLibName2[] = "libgconf-2.so.4";
+ 
+ #define GCONF_FUNCS_POINTER_BEGIN \
+     static GConfFuncListType sGConfFuncList[] = {

mail/mozilla-thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell_cpp

@@ -0,0 +1,28 @@
+$OpenBSD: patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig	Sat Dec  5 02:56:01 2009
++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp	Sat Jan 16 16:31:41 2010
+@@ -63,6 +63,7 @@
+ #include "nsISimpleEnumerator.h"
+ #include "nsIDirectoryEnumerator.h"
+ #include "nsIFile.h"
++#include "nsILocalFile.h"
+ #include "nsDirectoryServiceUtils.h"
+ #include "nsDirectoryServiceDefs.h"
+ #include "mozISpellI18NManager.h"
+@@ -331,6 +332,16 @@ mozHunspell::LoadDictionaryList()
+       appDir->AppendNative(NS_LITERAL_CSTRING("dictionaries"));
+       LoadDictionariesFromDir(appDir);
+     }
++  }
++
++  // try to load the generic mozilla/dictionaries
++  nsCOMPtr<nsIFile> mozillaDir;
++  nsCOMPtr<nsILocalFile> localFile;
++  rv = NS_NewNativeLocalFile(nsDependentCString(
++    "${LOCALBASE}/share/mozilla-dicts"), PR_TRUE, getter_AddRefs(localFile));
++  if (localFile && NS_SUCCEEDED(rv)) {
++    localFile->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(mozillaDir));
++    LoadDictionariesFromDir(mozillaDir);
+   }
+ 
+   nsCOMPtr<nsISimpleEnumerator> dictDirs;

mail/mozilla-thunderbird/patches/patch-mozilla_gfx_qcms_qcmstypes_h

@@ -0,0 +1,19 @@
+$OpenBSD: patch-mozilla_gfx_qcms_qcmstypes_h,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/gfx/qcms/qcmstypes.h.orig	Sat Dec  5 02:56:01 2009
++++ mozilla/gfx/qcms/qcmstypes.h	Sat Jan 16 16:28:33 2010
+@@ -11,15 +11,6 @@
+ /* int_types.h gets included somehow, so avoid redefining the types differently */
+ #include <sys/int_types.h>
+ #else
+-typedef PRInt8 int8_t;
+-typedef PRUint8 uint8_t;
+-typedef PRInt16 int16_t;
+-typedef PRUint16 uint16_t;
+-typedef PRInt32 int32_t;
+-typedef PRUint32 uint32_t;
+-typedef PRInt64 int64_t;
+-typedef PRUint64 uint64_t;
+-
+ #ifdef __OS2__
+ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+ #include <stdlib.h>

mail/mozilla-thunderbird/patches/patch-mozilla_gfx_src_psshared_nsCUPSShim_cpp

@@ -1,6 +1,6 @@
-$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.2 2007/04/30 22:40:31 martynas Exp $
---- gfx/src/psshared/nsCUPSShim.cpp.orig	Sun May  8 18:01:20 2005
-+++ gfx/src/psshared/nsCUPSShim.cpp	Thu Apr 19 14:31:47 2007
+$OpenBSD: patch-mozilla_gfx_src_psshared_nsCUPSShim_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/gfx/src/psshared/nsCUPSShim.cpp.orig	Sat Dec  5 02:56:01 2009
++++ mozilla/gfx/src/psshared/nsCUPSShim.cpp	Sat Jan 16 16:28:33 2010
 @@ -59,7 +59,7 @@ static const int gSymNameCt = sizeof(gSymName) / sizeo
  PRBool
  nsCUPSShim::Init()

mail/mozilla-thunderbird/patches/patch-mozilla_gfx_src_thebes_Makefile_in

@@ -0,0 +1,14 @@
+$OpenBSD: patch-mozilla_gfx_src_thebes_Makefile_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/gfx/src/thebes/Makefile.in.orig	Sat Dec  5 02:56:01 2009
++++ mozilla/gfx/src/thebes/Makefile.in	Sat Jan 16 16:28:48 2010
+@@ -147,6 +147,10 @@ DEFINES += -DMOZ_ENABLE_GTK2
+ CXXFLAGS += $(MOZ_PANGO_CFLAGS)
+ endif
+ 
++ifdef MOZ_ENABLE_COREXFONTS
++EXTRA_DSO_LDOPTS += -lpangox-1.0
++endif
++
+ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+ CXXFLAGS += $(CAIRO_FT_CFLAGS)
+ endif

mail/mozilla-thunderbird/patches/patch-mozilla_js_src_configure_in

@@ -0,0 +1,39 @@
+$OpenBSD: patch-mozilla_js_src_configure_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/js/src/configure.in.orig	Wed Mar 17 18:05:53 2010
++++ mozilla/js/src/configure.in	Tue Mar 30 21:28:29 2010
+@@ -904,7 +904,7 @@ HOST_AR='$(AR)'
+ HOST_AR_FLAGS='$(AR_FLAGS)'
+ 
+ MOZ_JS_LIBS='-L$(libdir) -lmozjs'
+-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
++MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib -L$(LIBXUL_DIST)/bin'
+ 
+ MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
+ MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
+@@ -2134,7 +2134,7 @@ case "$target" in
+ 	;;
+ 
+ *-openbsd*)
+-    DLL_SUFFIX=".so.1.0"
++    DLL_SUFFIX=".so.${SO_VERSION}"
+     DSO_CFLAGS=''
+     DSO_PIC_CFLAGS='-fPIC'
+     DSO_LDOPTS='-shared -fPIC'
+@@ -2466,7 +2466,7 @@ arm*-*)
+     ENABLE_JIT=1
+     NANOJIT_ARCH=ARM
+     ;;
+-sparc*-*)
++sparc-*)
+     ENABLE_JIT=1
+     NANOJIT_ARCH=Sparc
+     ;;
+@@ -2503,7 +2503,7 @@ darwin*)
+ solaris*)
+     AC_DEFINE(AVMPLUS_UNIX)
+     ;;
+-freebsd*|kfreebsd*)
++freebsd*|kfreebsd*|openbsd*)
+     AC_DEFINE(AVMPLUS_UNIX)
+     ;;
+ *cygwin*|*mingw*|*mks*|*msvc*|*wince)

mail/mozilla-thunderbird/patches/patch-mozilla_js_src_jsgc_cpp

@@ -0,0 +1,11 @@
+$OpenBSD: patch-mozilla_js_src_jsgc_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/js/src/jsgc.cpp.orig	Sat Dec  5 02:57:14 2009
++++ mozilla/js/src/jsgc.cpp	Sat Jan 16 16:28:34 2010
+@@ -118,6 +118,7 @@ extern "C" {
+ #   ifndef JS_GC_USE_MMAP
+ #    define JS_GC_USE_MMAP 1
+ #   endif
++#   include <sys/types.h>
+ #   include <sys/mman.h>
+ 
+ /* On Mac OS X MAP_ANONYMOUS is not defined. */

mail/mozilla-thunderbird/patches/patch-mozilla_js_src_jsnum_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_js_src_jsnum_h,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/js/src/jsnum.h.orig	Sat Dec  5 02:56:02 2009
++++ mozilla/js/src/jsnum.h	Sat Jan 16 16:28:34 2010
+@@ -57,7 +57,7 @@ JS_BEGIN_EXTERN_C
+  * the high and low words are in big endian order).
+  */
+ #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
+-#if !defined(__VFP_FP__)
++#if !defined(__VFP_FP__) && !defined(__OpenBSD__) /* Armel ABI */
+ #define FPU_IS_ARM_FPA
+ #endif
+ #endif

mail/mozilla-thunderbird/patches/patch-mozilla_js_src_jsscript_cpp

@@ -0,0 +1,33 @@
+$OpenBSD: patch-mozilla_js_src_jsscript_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/js/src/jsscript.cpp.orig	Mon Mar 29 21:26:28 2010
++++ mozilla/js/src/jsscript.cpp	Mon Mar 29 21:26:51 2010
+@@ -1430,14 +1430,6 @@ js_NewScript(JSContext *cx, uint32 length, uint32 nsrc
+         cursor += vectorSize;
+     }
+ 
+-    if (nupvars != 0) {
+-        JS_SCRIPT_UPVARS(script)->length = nupvars;
+-        JS_SCRIPT_UPVARS(script)->vector = (uint32 *)cursor;
+-        vectorSize = nupvars * sizeof(JS_SCRIPT_UPVARS(script)->vector[0]);
+-        memset(cursor, 0, vectorSize);
+-        cursor += vectorSize;
+-    }
+-
+     if (nregexps != 0) {
+         JS_SCRIPT_REGEXPS(script)->length = nregexps;
+         JS_SCRIPT_REGEXPS(script)->vector = (JSObject **)cursor;
+@@ -1453,6 +1445,14 @@ js_NewScript(JSContext *cx, uint32 length, uint32 nsrc
+ #ifdef DEBUG
+         memset(cursor, 0, vectorSize);
+ #endif
++        cursor += vectorSize;
++    }
++
++    if (nupvars != 0) {
++        JS_SCRIPT_UPVARS(script)->length = nupvars;
++        JS_SCRIPT_UPVARS(script)->vector = (uint32 *)cursor;
++        vectorSize = nupvars * sizeof(JS_SCRIPT_UPVARS(script)->vector[0]);
++        memset(cursor, 0, vectorSize);
+         cursor += vectorSize;
+     }
+ 

mail/mozilla-thunderbird/patches/patch-mozilla_js_src_nanojit_NativeSparc_cpp

@@ -0,0 +1,11 @@
+$OpenBSD: patch-mozilla_js_src_nanojit_NativeSparc_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/js/src/nanojit/NativeSparc.cpp.orig	Sat Dec  5 02:56:03 2009
++++ mozilla/js/src/nanojit/NativeSparc.cpp	Sat Jan 16 16:28:34 2010
+@@ -37,6 +37,7 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
++#include <sys/types.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+ #include "nanojit.h"

mail/mozilla-thunderbird/patches/patch-mozilla_js_src_nanojit_Nativei386_cpp

@@ -0,0 +1,11 @@
+$OpenBSD: patch-mozilla_js_src_nanojit_Nativei386_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/js/src/nanojit/Nativei386.cpp.orig	Sat Dec  5 02:56:03 2009
++++ mozilla/js/src/nanojit/Nativei386.cpp	Sat Jan 16 16:28:34 2010
+@@ -44,6 +44,7 @@
+ #endif
+ 
+ #if defined AVMPLUS_UNIX || defined AVMPLUS_MAC
++#include <sys/types.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+ #include <stdlib.h>

mail/mozilla-thunderbird/patches/patch-mozilla_js_src_nanojit_avmplus_h

@@ -0,0 +1,11 @@
+$OpenBSD: patch-mozilla_js_src_nanojit_avmplus_h,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/js/src/nanojit/avmplus.h.orig	Sat Dec  5 02:56:03 2009
++++ mozilla/js/src/nanojit/avmplus.h	Sat Jan 16 16:28:34 2010
+@@ -41,6 +41,7 @@
+ 
+ #if defined(AVMPLUS_UNIX)
+ #include <unistd.h>
++#include <sys/types.h>
+ #include <sys/mman.h>
+ #endif
+ 

mail/mozilla-thunderbird/patches/patch-mozilla_js_src_xpconnect_shell_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_js_src_xpconnect_shell_Makefile_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/js/src/xpconnect/shell/Makefile.in.orig	Sat Dec  5 02:56:03 2009
++++ mozilla/js/src/xpconnect/shell/Makefile.in	Sat Jan 16 16:31:41 2010
+@@ -60,6 +60,8 @@ CMMSRCS += xpcshellMacUtils.mm
+ endif
+ 
+ LIBS		= \
++		-Wl,-rpath-link,${LOCALBASE}/lib \
++		-Wl,-rpath-link,${X11BASE}/lib \
+ 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
+ 		$(LIBXUL_LIBS) \
+ 		$(MOZ_JS_LIBS) \

mail/mozilla-thunderbird/patches/patch-mozilla_js_src_xpconnect_src_Makefile_in

@@ -0,0 +1,11 @@
+$OpenBSD: patch-mozilla_js_src_xpconnect_src_Makefile_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/js/src/xpconnect/src/Makefile.in.orig	Sat Dec  5 02:56:03 2009
++++ mozilla/js/src/xpconnect/src/Makefile.in	Sat Jan 16 16:28:49 2010
+@@ -220,6 +220,7 @@ dom_quickstubs.h dom_quickstubs.cpp: $(srcdir)/dom_qui
+ 	  --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
+ 	  $(ENABLE_TRACEABLE_FLAGS) \
+ 	  $(srcdir)/dom_quickstubs.qsconf
++	patch -p0 -d $(srcdir) -i $(srcdir)/dom_quickstubs.cpp.diff
+ 
+ GARBAGE += \
+ 		dom_quickstubs.h \

mail/mozilla-thunderbird/patches/patch-mozilla_js_src_xpconnect_src_dom_quickstubs_cpp_diff

@@ -0,0 +1,15 @@
+$OpenBSD: patch-mozilla_js_src_xpconnect_src_dom_quickstubs_cpp_diff,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/js/src/xpconnect/src/dom_quickstubs.cpp.diff.orig	Sat Jan 16 16:28:34 2010
++++ mozilla/js/src/xpconnect/src/dom_quickstubs.cpp.diff	Sat Jan 16 16:28:34 2010
+@@ -0,0 +1,11 @@
++--- dom_quickstubs.cpp.orig	Sun Jun 21 14:24:03 2009
+++++ dom_quickstubs.cpp	Sun Jun 21 14:51:17 2009
++@@ -3387,7 +3387,7 @@ nsIDOM3Node_SetUserData(JSContext *cx, uintN argc, jsv
++     xpc_qsDOMString arg0(cx, &argv[0]);
++     if (!arg0.IsValid())
++         return JS_FALSE;
++-    nsCOMPtr<nsIVariant> arg1(already_AddRefed<nsIVariant>(XPCVariant::newVariant(ccx, argv[1])));
+++    nsCOMPtr<nsIVariant> arg1 = nsCOMPtr<nsIVariant>(already_AddRefed<nsIVariant>(XPCVariant::newVariant(ccx, argv[1])));
++     if (!arg1)
++         return JS_FALSE;
++     nsresult rv;

mail/mozilla-thunderbird/patches/patch-mozilla_layout_build_Makefile_in

@@ -0,0 +1,14 @@
+$OpenBSD: patch-mozilla_layout_build_Makefile_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/layout/build/Makefile.in.orig	Sat Dec  5 02:56:14 2009
++++ mozilla/layout/build/Makefile.in	Sat Jan 16 16:28:49 2010
+@@ -263,6 +263,10 @@ ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
+ endif
+ 
++# Sydney audio sndio backend.
++EXTRA_DSO_LDOPTS += -lsndio \
++		    $(NULL)
++
+ ifdef MOZ_SYDNEYAUDIO
+ ifeq ($(OS_ARCH),Darwin)
+ OS_LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon

mail/mozilla-thunderbird/patches/patch-mozilla_media_liboggplay_src_liboggplay_std_semaphore_h

@@ -0,0 +1,15 @@
+$OpenBSD: patch-mozilla_media_liboggplay_src_liboggplay_std_semaphore_h,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/media/liboggplay/src/liboggplay/std_semaphore.h.orig	Sat Dec  5 02:56:19 2009
++++ mozilla/media/liboggplay/src/liboggplay/std_semaphore.h	Sat Jan 16 16:28:34 2010
+@@ -74,9 +74,9 @@
+  * @retval non-zero on error 
+  */
+ 
+-#if defined(linux) || defined(SOLARIS) || defined(AIX) || defined(__FreeBSD__)
++#if defined(linux) || defined(SOLARIS) || defined(AIX) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <semaphore.h>
+-#if defined(__FreeBSD__) 
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #define SEM_CREATE(p,s) sem_init(&(p), 0, s)  
+ #else
+ #define SEM_CREATE(p,s) sem_init(&(p), 1, s)

mail/mozilla-thunderbird/patches/patch-mozilla_media_liboggz_include_oggz_oggz_off_t_generated_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_media_liboggz_include_oggz_oggz_off_t_generated_h,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	Sat Dec  5 02:56:19 2009
++++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h	Sat Jan 16 16:28:34 2010
+@@ -59,7 +59,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined(__OpenBSD__)
+ typedef off_t oggz_off_t;
+ #else
+ typedef loff_t oggz_off_t;

mail/mozilla-thunderbird/patches/patch-mozilla_media_libsydneyaudio_include_sydney_audio_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_media_libsydneyaudio_include_sydney_audio_h,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/media/libsydneyaudio/include/sydney_audio.h.orig	Sat Dec  5 02:56:19 2009
++++ mozilla/media/libsydneyaudio/include/sydney_audio.h	Sat Jan 16 16:28:35 2010
+@@ -48,7 +48,7 @@ async-signal safe.
+ #if !defined (WIN32)
+ #include <sys/param.h>
+ #include <inttypes.h>
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/endian.h>
+ #endif
+ #else

mail/mozilla-thunderbird/patches/patch-mozilla_media_libsydneyaudio_src_Makefile_in

@@ -0,0 +1,16 @@
+$OpenBSD: patch-mozilla_media_libsydneyaudio_src_Makefile_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/media/libsydneyaudio/src/Makefile.in.orig	Sat Dec  5 02:56:19 2009
++++ mozilla/media/libsydneyaudio/src/Makefile.in	Sat Jan 16 16:28:49 2010
+@@ -77,6 +77,12 @@ CSRCS		= \
+ 		$(NULL)
+ endif
+ 
++ifeq ($(OS_ARCH),OpenBSD)
++CSRCS		= \
++		sydney_audio_sndio.c \
++		$(NULL)
++endif
++
+ ifeq ($(OS_ARCH),WINNT)
+ OS_LIBS += winmm.lib
+ endif

mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp

@@ -0,0 +1,30 @@
+$OpenBSD: patch-mozilla_modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp.orig	Sat Dec  5 02:56:19 2009
++++ mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp	Sat Jan 16 16:28:35 2010
+@@ -208,7 +208,7 @@ ensure_libgnomeui()
+   // Attempt to get the libgnomeui symbol references. We do it this way so that stock icons from Init()
+   // don't get held back by InitWithGnome()'s libgnomeui dependency.
+   if (!gTriedToLoadGnomeLibs) {
+-    gLibGnomeUI = PR_LoadLibrary("libgnomeui-2.so.0");
++    gLibGnomeUI = PR_LoadLibrary("libgnomeui-2.so");
+     if (!gLibGnomeUI)
+       return NS_ERROR_NOT_AVAILABLE;
+ 
+@@ -234,7 +234,7 @@ static nsresult
+ ensure_libgnome()
+ {
+   if (!gTriedToLoadGnomeLibs) {
+-    gLibGnome = PR_LoadLibrary("libgnome-2.so.0");
++    gLibGnome = PR_LoadLibrary("libgnome-2.so");
+     if (!gLibGnome)
+       return NS_ERROR_NOT_AVAILABLE;
+ 
+@@ -256,7 +256,7 @@ static nsresult
+ ensure_libgnomevfs()
+ {
+   if (!gTriedToLoadGnomeLibs) {
+-    gLibGnomeVFS = PR_LoadLibrary("libgnomevfs-2.so.0");
++    gLibGnomeVFS = PR_LoadLibrary("libgnomevfs-2.so");
+     if (!gLibGnomeVFS)
+       return NS_ERROR_NOT_AVAILABLE;
+ 

mail/mozilla-thunderbird/patches/patch-mozilla_modules_plugin_base_src_nsPluginsDirUnix_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_modules_plugin_base_src_nsPluginsDirUnix_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp.orig	Sat Dec  5 02:56:20 2009
++++ mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp	Sat Jan 16 16:28:35 2010
+@@ -152,7 +152,7 @@ static PRBool LoadExtraSharedLib(const char *name, cha
+ #endif
+ /*
+  this function looks for
+- user_pref("plugin.soname.list", "/usr/X11R6/lib/libXt.so.6:libXext.so");
++ user_pref("plugin.soname.list", "/usr/X11R6/lib/libXt.so:libXext.so");
+  in user's pref.js
+  and loads all libs in specified order
+ */

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_config_rules_mk

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_nsprpub_config_rules_mk,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/config/rules.mk.orig	Wed Mar 17 18:06:09 2010
++++ mozilla/nsprpub/config/rules.mk	Tue Mar 30 21:28:30 2010
+@@ -214,7 +214,7 @@ ifdef RELEASE_HEADERS
+ 	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
+ endif
+ ifdef RELEASE_LIBS
+-	$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
++	$(NSINSTALL) -t -m 0444 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
+ endif
+ 	+$(LOOP_OVER_DIRS)
+ 

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_configure_in

@@ -0,0 +1,16 @@
+$OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/configure.in.orig	Sat Dec  5 02:56:21 2009
++++ mozilla/nsprpub/configure.in	Sat Jan 16 16:28:35 2010
+@@ -1811,9 +1811,11 @@ mips-sony-newsos*)
+     AC_DEFINE(OPENBSD)
+     AC_DEFINE(HAVE_BSD_FLOCK)
+     AC_DEFINE(HAVE_SOCKLEN_T)
++    AC_DEFINE(_PR_HAVE_GETPROTO_R)
++    AC_DEFINE(_PR_HAVE_GETPROTO_R_INT)
+     CFLAGS="$CFLAGS -ansi -Wall"
+     CXXFLAGS="$CXXFLAGS -ansi -Wall"
+-    DLL_SUFFIX=so.1.0
++    DLL_SUFFIX="so.${SO_VERSION}"
+     DSO_CFLAGS=-fPIC
+     MDCPUCFG_H=_openbsd.cfg
+     PR_MD_CSRCS=openbsd.c

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_lib_tests_Makefile_in

@@ -0,0 +1,16 @@
+$OpenBSD: patch-mozilla_nsprpub_lib_tests_Makefile_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/lib/tests/Makefile.in.orig	Sat Dec  5 02:56:21 2009
++++ mozilla/nsprpub/lib/tests/Makefile.in	Sat Jan 16 16:28:49 2010
+@@ -117,6 +117,12 @@ ifeq (,$(filter-out OpenBSD,$(OS_ARCH)))
+     endif
+ endif
+ 
++ifeq ($(OS_ARCH), OpenBSD)
++        ifeq ($(USE_PTHREADS),1)
++            EXTRA_LIBS = -lpthread
++        endif
++endif
++
+ ifeq ($(OS_ARCH), OSF1)
+ LDOPTS += -rpath $(PWD)/$(dist_libdir) -lpthread
+ endif

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_cfg

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_cfg,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/pr/include/md/_openbsd.cfg.orig	Sat Dec  5 02:56:21 2009
++++ mozilla/nsprpub/pr/include/md/_openbsd.cfg	Sat Jan 16 16:28:35 2010
+@@ -193,7 +193,7 @@
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
+-#elif defined(__sparc__)
++#elif defined(__sparc__) || defined(__hppa__)
+ 
+ #undef IS_LITTLE_ENDIAN
+ #define  IS_BIG_ENDIAN 1

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h

@@ -0,0 +1,24 @@
+$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/pr/include/md/_openbsd.h.orig	Sat Dec  5 02:56:21 2009
++++ mozilla/nsprpub/pr/include/md/_openbsd.h	Sat Jan 16 16:28:35 2010
+@@ -56,6 +56,8 @@
+ #define _PR_SI_ARCHITECTURE "sparc"
+ #elif defined(__arm__)
+ #define _PR_SI_ARCHITECTURE "arm"
++#elif defined(__hppa__)
++#define _PR_SI_ARCHITECTURE "hppa"
+ #endif
+ 
+ #define PR_DLL_SUFFIX		".so"
+@@ -65,7 +67,11 @@
+ #define _MD_DEFAULT_STACK_SIZE	65536L
+ #define _MD_MMAP_FLAGS          MAP_PRIVATE
+ 
++#if defined(__hppa__)
++#define HAVE_STACK_GROWING_UP
++#else
+ #undef  HAVE_STACK_GROWING_UP
++#endif
+ #define HAVE_DLL
+ #define USE_DLFCN
+ #define _PR_HAVE_SOCKADDR_LEN

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_src_misc_prinit_c

@@ -0,0 +1,33 @@
+$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/pr/src/misc/prinit.c.orig	Sat Dec  5 02:56:21 2009
++++ mozilla/nsprpub/pr/src/misc/prinit.c	Sat Jan 16 16:28:35 2010
+@@ -414,8 +414,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+         _PR_CleanupDtoa();
+         _PR_CleanupCallOnce();
+ 		_PR_ShutdownLinker();
+-        _PR_CleanupNet();
+-        _PR_CleanupIO();
+         /* Release the primordial thread's private data, etc. */
+         _PR_CleanupThread(me);
+ 
+@@ -426,6 +424,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+ 	    _PR_LogCleanup();
+ 
+         /*
++         * accesses the current thread
++         */
++        _PR_CleanupNet();
++        _PR_CleanupIO();
++
++        /*
+          * This part should look like the end of _PR_NativeRunThread
+          * and _PR_UserRunThread.
+          */
+@@ -437,6 +441,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+             PR_DELETE(me->stack);
+             PR_DELETE(me);
+         }
++        _PR_MD_SET_CURRENT_THREAD(NULL);
+ 
+         /*
+          * XXX: We are freeing the heap memory here so that Purify won't

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c

@@ -0,0 +1,16 @@
+$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prnetdb_c,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	Sat Dec  5 02:56:21 2009
++++ mozilla/nsprpub/pr/src/misc/prnetdb.c	Sat Jan 16 16:28:35 2010
+@@ -2039,7 +2039,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInfoByName(const 
+          */
+         hints.ai_socktype = SOCK_STREAM;
+ 
++	LOCK_DNS();
++
+         rv = GETADDRINFO(hostname, NULL, &hints, &res);
++
++	UNLOCK_DNS();
++
+         if (rv == 0)
+             return (PRAddrInfo *) res;
+ 

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptthread_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptthread_c,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig	Sat Dec  5 02:56:21 2009
++++ mozilla/nsprpub/pr/src/pthreads/ptthread.c	Sat Jan 16 16:28:35 2010
+@@ -51,6 +51,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <signal.h>
++#undef _POSIX_THREAD_PRIORITY_SCHEDULING
+ 
+ #ifdef SYMBIAN
+ /* In Open C sched_get_priority_min/max do not work properly, so we undefine

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_tests_nameshm1_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-mozilla_nsprpub_pr_tests_nameshm1_c,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/pr/tests/nameshm1.c.orig	Sat Dec  5 02:56:21 2009
++++ mozilla/nsprpub/pr/tests/nameshm1.c	Sat Jan 16 16:28:36 2010
+@@ -598,7 +598,9 @@ int main(int argc, char **argv)
+         ReadOnlyTest();
+         if ( failed_already != 0 )
+             goto Finished;
++#if !defined(__OpenBSD__)
+         ClientServerTest();
++#endif
+     }
+ 
+ Finished:

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_tests_prpollml_c

@@ -0,0 +1,19 @@
+$OpenBSD: patch-mozilla_nsprpub_pr_tests_prpollml_c,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/pr/tests/prpollml.c.orig	Sat Dec  5 02:56:21 2009
++++ mozilla/nsprpub/pr/tests/prpollml.c	Sat Jan 16 16:28:36 2010
+@@ -47,14 +47,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#ifdef SYMBIAN
+-#define POLL_DESC_COUNT 128
+-#else
+-#define POLL_DESC_COUNT 256  /* This should be greater than the
++#define POLL_DESC_COUNT 120  /* This should be greater than the
+                               * STACK_POLL_DESC_COUNT macro in
+                               * ptio.c to cause syspoll_list to
+                               * be created. */
+-#endif
+ 
+ static PRPollDesc pd[POLL_DESC_COUNT];
+ 

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_tests_runtests_sh

@@ -0,0 +1,43 @@
+$OpenBSD: patch-mozilla_nsprpub_pr_tests_runtests_sh,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/pr/tests/runtests.sh.orig	Sat Dec  5 02:56:21 2009
++++ mozilla/nsprpub/pr/tests/runtests.sh	Sat Jan 16 16:28:36 2010
+@@ -90,11 +90,10 @@ fi
+ # Tests not run (but should)
+ #
+ 
+-#forktest (failed on IRIX)
++#nameshm1 - runs with ClientServerTest deactivated (idles forever) under OpenBSD
+ #nbconn - fails on some platforms 
+-#poll_er - fails on some platforms? limited use?
+ #prpoll -  the bad-FD test needs to be moved to a different test
+-#sleep	-  specific to OS/2
++#sema,semaerr and semaping - idles forever under OpenBSD (semaphore/thread)
+ 
+ LOGFILE=${NSPR_TEST_LOGFILE:-$NULL_DEVICE}
+ 
+@@ -124,6 +123,7 @@ exit
+ fdcach
+ fileio
+ foreign
++forktest
+ formattm
+ fsync
+ gethost
+@@ -168,6 +168,7 @@ perf
+ pipeping
+ pipeping2
+ pipeself
++poll_er
+ poll_nm
+ poll_to
+ pollable
+@@ -184,9 +185,6 @@ selct_er
+ selct_nm
+ selct_to
+ selintr
+-sema
+-semaerr
+-semaping
+ sendzlf
+ server_test
+ servr_kk

mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_tests_socket_c

@@ -0,0 +1,59 @@
+$OpenBSD: patch-mozilla_nsprpub_pr_tests_socket_c,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/nsprpub/pr/tests/socket.c.orig	Sat Dec  5 02:56:21 2009
++++ mozilla/nsprpub/pr/tests/socket.c	Sat Jan 16 16:28:36 2010
+@@ -2234,6 +2234,7 @@ int main(int argc, char **argv)
+     /*
+      * client-server test, Ipv6-Ipv4
+      */
++    #if !defined(__OpenBSD__)
+ 	client_domain = PR_AF_INET6;
+ 	printf("TCP Client/Server Test - IPv6/Ipv4\n");
+     if (TCP_Socket_Client_Server_Test() < 0) {
+@@ -2241,9 +2242,11 @@ int main(int argc, char **argv)
+         goto done;
+     } else
+         printf("TCP_Socket_Client_Server_Test Passed\n");
++    #endif
+     /*
+      * client-server test, Ipv4-Ipv6
+      */
++    #if !defined(__OpenBSD__)
+ 	client_domain = PR_AF_INET;
+ 	server_domain = PR_AF_INET6;
+ 	printf("TCP Client/Server Test - IPv4/Ipv6\n");
+@@ -2252,6 +2255,7 @@ int main(int argc, char **argv)
+         goto done;
+     } else
+         printf("TCP_Socket_Client_Server_Test Passed\n");
++    #endif
+     /*
+      * client-server test, Ipv6-Ipv6
+      */
+@@ -2281,6 +2285,7 @@ int main(int argc, char **argv)
+     /*
+      * run client-server test with UDP, IPv6/IPv4
+      */
++    #if !defined(__OpenBSD__)
+ 	printf("UDP Client/Server Test - IPv6/Ipv4\n");
+ 	client_domain = PR_AF_INET6;
+ 	server_domain = PR_AF_INET;
+@@ -2289,9 +2294,11 @@ int main(int argc, char **argv)
+         goto done;
+     } else
+         printf("UDP_Socket_Client_Server_Test Passed\n");
++    #endif
+     /*
+      * run client-server test with UDP,IPv4-IPv6
+      */
++    #if !defined(__OpenBSD__)
+ 	printf("UDP Client/Server Test - IPv4/Ipv6\n");
+ 	client_domain = PR_AF_INET;
+ 	server_domain = PR_AF_INET6;
+@@ -2300,6 +2307,7 @@ int main(int argc, char **argv)
+         goto done;
+     } else
+         printf("UDP_Socket_Client_Server_Test Passed\n");
++    #endif
+     /*
+      * run client-server test with UDP,IPv6-IPv6
+      */

mail/mozilla-thunderbird/patches/patch-mozilla_other-licenses_branding_firefox_pref_firefox-branding_js

@@ -0,0 +1,11 @@
+$OpenBSD: patch-mozilla_other-licenses_branding_firefox_pref_firefox-branding_js,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/other-licenses/branding/firefox/pref/firefox-branding.js.orig	Sat Dec  5 02:56:22 2009
++++ mozilla/other-licenses/branding/firefox/pref/firefox-branding.js	Sat Jan 16 16:28:36 2010
+@@ -1,5 +1,5 @@
+-pref("startup.homepage_override_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/whatsnew/");
+-pref("startup.homepage_welcome_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/firstrun/");
++pref("startup.homepage_override_url","about:blank");
++pref("startup.homepage_welcome_url","about:blank");
+ // Interval: Time between checks for a new version (in seconds)
+ // nightly=6 hours, official=24 hours
+ pref("app.update.interval", 86400);

mail/mozilla-thunderbird/patches/patch-mozilla_security_coreconf_OpenBSD_mk

@@ -0,0 +1,25 @@
+$OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/coreconf/OpenBSD.mk.orig	Wed Mar 17 18:06:11 2010
++++ mozilla/security/coreconf/OpenBSD.mk	Tue Mar 30 21:37:49 2010
+@@ -56,7 +56,7 @@ OS_LIBS			+= -pthread
+ DSO_LDOPTS		+= -pthread
+ endif
+ 
+-DLL_SUFFIX		= so.1.0
++DLL_SUFFIX		= so.${SO_VERSION}
+ 
+ OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD
+ 
+@@ -64,10 +64,10 @@ OS_LIBS			= 
+ 
+ ARCH			= openbsd
+ 
+-DSO_CFLAGS		= -fPIC -DPIC
++DSO_CFLAGS		= -I${LOCALBASE}/include -DRAND_DEV=\"/dev/arandom\" -fPIC -DPIC
+ DSO_LDOPTS		= -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+ 
+-MKSHLIB			= $(CC) $(DSO_LDOPTS)
++MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
+ 
+ USE_SYSTEM_ZLIB		= 1
+ ZLIB_LIBS		= -lz

mail/mozilla-thunderbird/patches/patch-mozilla_security_coreconf_UNIX_mk

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_security_coreconf_UNIX_mk,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/coreconf/UNIX.mk.orig	Sat Dec  5 02:56:23 2009
++++ mozilla/security/coreconf/UNIX.mk	Sat Jan 16 16:28:36 2010
+@@ -42,7 +42,7 @@ AR          = ar cr $@
+ LDOPTS     += -L$(SOURCE_LIB_DIR)
+ 
+ ifdef BUILD_OPT
+-	OPTIMIZER  += -O
++	OPTIMIZER  +=
+ 	DEFINES    += -UDEBUG -DNDEBUG
+ else
+ 	OPTIMIZER  += -g

mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js

@@ -0,0 +1,11 @@
+$OpenBSD: patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/manager/pki/resources/content/exceptionDialog.js.orig	Sat Dec  5 02:56:23 2009
++++ mozilla/security/manager/pki/resources/content/exceptionDialog.js	Sat Jan 16 16:28:36 2010
+@@ -287,6 +287,7 @@ function updateCertStatus() {
+       
+       // In these cases, we do want to enable the "Add Exception" button
+       gDialog.getButton("extra1").disabled = false;
++      gDialog.getButton("extra1").focus();
+ 
+       // If the Private Browsing service is available and the mode is active,
+       // don't store permanent exceptions, since they would persist after

mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_ssl_src_Makefile_in

@@ -0,0 +1,14 @@
+$OpenBSD: patch-mozilla_security_manager_ssl_src_Makefile_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/manager/ssl/src/Makefile.in.orig	Sat Dec  5 02:56:23 2009
++++ mozilla/security/manager/ssl/src/Makefile.in	Sat Jan 16 16:28:49 2010
+@@ -134,7 +134,10 @@ REQUIRES	= nspr \
+ 
+ EXTRA_DEPS = $(NSS_DEP_LIBS)
+ 
++NSS_LIBDIR = $(shell $(NSS_CONFIG) --libdir)
++
+ DEFINES += -DNSS_ENABLE_ECC
++DEFINES += -DNSS_LIBDIR=\"$(NSS_LIBDIR)\"
+ 
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's

mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp

@@ -0,0 +1,27 @@
+$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig	Sat Dec  5 02:56:23 2009
++++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	Sat Jan 16 16:28:36 2010
+@@ -812,11 +812,10 @@ nsNSSComponent::InstallLoadableRoots()
+     return;
+ 
+   const char *possible_ckbi_locations[] = {
+-    NS_XPCOM_CURRENT_PROCESS_DIR,
++    0, // This special value means: 
++       //   search for ckbi in NSS_LIBDIR
+     NS_GRE_DIR,
+-    0 // This special value means: 
+-      //   search for ckbi in the directories on the shared
+-      //   library/DLL search path
++    NS_XPCOM_CURRENT_PROCESS_DIR
+   };
+ 
+   for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
+@@ -825,7 +824,7 @@ nsNSSComponent::InstallLoadableRoots()
+ 
+     if (!possible_ckbi_locations[il])
+     {
+-      fullLibraryPath = PR_GetLibraryName(nsnull, "nssckbi");
++      fullLibraryPath = PR_GetLibraryName(NSS_LIBDIR, "nssckbi");
+     }
+     else
+     {

mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_cmd_platlibs_mk

@@ -0,0 +1,17 @@
+$OpenBSD: patch-mozilla_security_nss_cmd_platlibs_mk,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/nss/cmd/platlibs.mk.orig	Wed Mar 17 18:06:11 2010
++++ mozilla/security/nss/cmd/platlibs.mk	Tue Mar 30 21:28:32 2010
+@@ -179,10 +179,11 @@ endif
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib \
+-	$(SQLITE) \
+ 	-L$(NSSUTIL_LIB_DIR) \
+-	-lnssutil3 \
+ 	-L$(NSPR_LIB_DIR) \
++	-L$(LOCALBASE)/lib \
++	$(SQLITE) \
++	-lnssutil3 \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \

mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c

@@ -0,0 +1,374 @@
+$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/nss/lib/ckfw/builtins/certdata.c.orig	Wed Mar 17 18:06:11 2010
++++ mozilla/security/nss/lib/ckfw/builtins/certdata.c	Tue Mar 30 21:48:28 2010
+@@ -1020,6 +1020,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_320 
+ static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = {
+  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+ };
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_322 [] = {
++ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
++};
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_323 [] = {
++ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
++};
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_324 [] = {
++ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
++};
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_325 [] = {
++ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
++};
+ #ifdef DEBUG
+ static const NSSItem nss_builtins_items_0 [] = {
+   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+@@ -21537,6 +21549,332 @@ static const NSSItem nss_builtins_items_321 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
++static const NSSItem nss_builtins_items_322 [] = {
++  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 1 Certification Authority", (PRUint32)43 },
++  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"0", (PRUint32)2 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\000"
++, (PRUint32)3 },
++  { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000"
++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
++"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
++"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
++"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
++"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
++"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
++"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
++"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
++"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063"
++"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060"
++"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016"
++"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
++"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
++"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
++"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
++"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
++"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
++"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
++"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
++"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
++"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007"
++"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002"
++"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011"
++"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315"
++"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230"
++"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272"
++"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016"
++"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052"
++"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262"
++"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140"
++"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150"
++"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273"
++"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022"
++"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234"
++"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334"
++"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070"
++"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232"
++"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044"
++"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355"
++"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252"
++"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352"
++"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276"
++"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306"
++"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320"
++"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167"
++"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335"
++"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324"
++"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246"
++"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106"
++"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272"
++"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334"
++"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304"
++"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060"
++"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265"
++"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071"
++"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230"
++"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260"
++"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016"
++"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
++"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
++"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
++"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
++"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
++"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
++"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
++"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001"
++"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037"
++"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160"
++"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157"
++"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006"
++"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164"
++"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060"
++"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045"
++"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162"
++"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077"
++"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102"
++"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165"
++"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164"
++"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040"
++"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167"
++"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006"
++"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001"
++"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201"
++"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275"
++"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234"
++"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323"
++"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073"
++"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140"
++"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353"
++"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160"
++"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334"
++"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231"
++"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116"
++"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145"
++"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031"
++"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363"
++"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330"
++"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367"
++"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260"
++"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223"
++"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335"
++"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026"
++"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005"
++"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361"
++"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371"
++"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246"
++"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206"
++"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153"
++"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344"
++"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143"
++"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362"
++"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226"
++"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175"
++"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305"
++"\103"
++, (PRUint32)1857 }
++};
++static const NSSItem nss_builtins_items_323 [] = {
++  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 1 Certification Authority", (PRUint32)43 },
++  { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106"
++"\166\316\217\063"
++, (PRUint32)20 },
++  { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153"
++, (PRUint32)16 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\000"
++, (PRUint32)3 },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
++};
++static const NSSItem nss_builtins_items_324 [] = {
++  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 3 Certification Authority", (PRUint32)43 },
++  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
++  { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143"
++"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004"
++"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101"
++"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004"
++"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040"
++"\063\040\122\157\157\164"
++, (PRUint32)86 },
++  { (void *)"0", (PRUint32)2 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\001"
++, (PRUint32)3 },
++  { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001"
++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
++"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
++"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
++"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
++"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
++"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
++"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
++"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
++"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065"
++"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060"
++"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022"
++"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156"
++"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164"
++"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157"
++"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143"
++"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164"
++"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
++"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
++"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335"
++"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175"
++"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163"
++"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144"
++"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001"
++"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171"
++"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313"
++"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011"
++"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353"
++"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277"
++"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331"
++"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205"
++"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073"
++"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161"
++"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371"
++"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047"
++"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252"
++"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102"
++"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064"
++"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133"
++"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242"
++"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137"
++"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325"
++"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150"
++"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230"
++"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140"
++"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347"
++"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321"
++"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206"
++"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257"
++"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164"
++"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373"
++"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003"
++"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006"
++"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006"
++"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072"
++"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162"
++"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034"
++"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162"
++"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003"
++"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001"
++"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002"
++"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101"
++"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160"
++"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206"
++"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241"
++"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072"
++"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135"
++"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253"
++"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364"
++"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172"
++"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302"
++"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214"
++"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074"
++"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154"
++"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025"
++"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352"
++"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231"
++"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213"
++"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325"
++"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242"
++"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214"
++"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027"
++"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057"
++"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224"
++"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134"
++"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356"
++"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005"
++"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355"
++"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143"
++"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123"
++"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243"
++"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005"
++"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156"
++"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317"
++"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360"
++"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101"
++"\322\156\245\033\231\047\200\347\013\251\250\000"
++, (PRUint32)1548 }
++};
++static const NSSItem nss_builtins_items_325 [] = {
++  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 3 Certification Authority", (PRUint32)43 },
++  { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304"
++"\030\116\052\055"
++, (PRUint32)20 },
++  { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266"
++, (PRUint32)16 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\001"
++, (PRUint32)3 },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
++};
+ 
+ builtinsInternalObject
+ nss_builtins_data[] = {
+@@ -21863,11 +22201,15 @@ nss_builtins_data[] = {
+   { 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} },
+   { 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} },
+   { 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} },
+-  { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }
++  { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} },
++  { 11, nss_builtins_types_322, nss_builtins_items_322, {NULL} },
++  { 13, nss_builtins_types_323, nss_builtins_items_323, {NULL} },
++  { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
++  { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }
+ };
+ const PRUint32
+ #ifdef DEBUG
+-  nss_builtins_nObjects = 321+1;
++  nss_builtins_nObjects = 325+1;
+ #else
+-  nss_builtins_nObjects = 321;
++  nss_builtins_nObjects = 325;
+ #endif /* DEBUG */

mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt

@@ -0,0 +1,356 @@
+$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/nss/lib/ckfw/builtins/certdata.txt.orig	Wed Mar 17 18:06:11 2010
++++ mozilla/security/nss/lib/ckfw/builtins/certdata.txt	Tue Mar 30 21:28:32 2010
+@@ -19538,6 +19538,352 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNK
+ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+ 
+ #
++# Certificate "CAcert.org Class 1 Certification Authority"
++#
++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
++CKA_TOKEN CK_BBOOL CK_TRUE
++CKA_PRIVATE CK_BBOOL CK_FALSE
++CKA_MODIFIABLE CK_BBOOL CK_FALSE
++CKA_LABEL UTF8 "CAcert.org Class 1 Certification Authority"
++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
++CKA_SUBJECT MULTILINE_OCTAL
++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
++\100\143\141\143\145\162\164\056\157\162\147
++END
++CKA_ID UTF8 "0"
++CKA_ISSUER MULTILINE_OCTAL
++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
++\100\143\141\143\145\162\164\056\157\162\147
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\001\000
++END
++CKA_VALUE MULTILINE_OCTAL
++\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000
++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
++\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
++\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
++\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
++\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
++\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
++\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
++\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
++\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063
++\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060
++\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016
++\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
++\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
++\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
++\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
++\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
++\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
++\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
++\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
++\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
++\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007
++\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002
++\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011
++\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315
++\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230
++\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272
++\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016
++\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052
++\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262
++\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140
++\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150
++\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273
++\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022
++\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234
++\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334
++\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070
++\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232
++\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044
++\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355
++\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252
++\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352
++\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276
++\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306
++\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320
++\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167
++\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335
++\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324
++\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246
++\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106
++\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272
++\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334
++\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304
++\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060
++\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265
++\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071
++\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230
++\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260
++\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016
++\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
++\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
++\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
++\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
++\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
++\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
++\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
++\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001
++\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037
++\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160
++\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157
++\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006
++\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164
++\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060
++\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045
++\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
++\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077
++\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102
++\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165
++\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164
++\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040
++\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167
++\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006
++\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001
++\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201
++\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275
++\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234
++\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323
++\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073
++\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140
++\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353
++\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160
++\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334
++\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231
++\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116
++\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145
++\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031
++\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363
++\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330
++\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367
++\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260
++\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223
++\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335
++\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026
++\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005
++\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361
++\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371
++\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246
++\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206
++\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153
++\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344
++\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143
++\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362
++\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226
++\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175
++\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305
++\103
++END
++
++# Trust for Certificate "CAcert.org Class 1 Certification Authority"
++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
++CKA_TOKEN CK_BBOOL CK_TRUE
++CKA_PRIVATE CK_BBOOL CK_FALSE
++CKA_MODIFIABLE CK_BBOOL CK_FALSE
++CKA_LABEL UTF8 "CAcert.org Class 1 Certification Authority"
++CKA_CERT_SHA1_HASH MULTILINE_OCTAL
++\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106
++\166\316\217\063
++END
++CKA_CERT_MD5_HASH MULTILINE_OCTAL
++\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153
++END
++CKA_ISSUER MULTILINE_OCTAL
++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
++\100\143\141\143\145\162\164\056\157\162\147
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\001\000
++END
++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
++
++#
++# Certificate "CAcert.org Class 3 Certification Authority"
++#
++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
++CKA_TOKEN CK_BBOOL CK_TRUE
++CKA_PRIVATE CK_BBOOL CK_FALSE
++CKA_MODIFIABLE CK_BBOOL CK_FALSE
++CKA_LABEL UTF8 "CAcert.org Class 3 Certification Authority"
++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
++CKA_SUBJECT MULTILINE_OCTAL
++\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143
++\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004
++\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101
++\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004
++\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040
++\063\040\122\157\157\164
++END
++CKA_ID UTF8 "0"
++CKA_ISSUER MULTILINE_OCTAL
++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
++\100\143\141\143\145\162\164\056\157\162\147
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\001\001
++END
++CKA_VALUE MULTILINE_OCTAL
++\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001
++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
++\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
++\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
++\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
++\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
++\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
++\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
++\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
++\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065
++\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060
++\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022
++\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156
++\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164
++\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157
++\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143
++\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164
++\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
++\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
++\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335
++\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175
++\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163
++\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144
++\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001
++\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171
++\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313
++\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011
++\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353
++\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277
++\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331
++\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205
++\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073
++\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161
++\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371
++\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047
++\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252
++\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102
++\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064
++\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133
++\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242
++\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137
++\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325
++\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150
++\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230
++\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140
++\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347
++\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321
++\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206
++\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257
++\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164
++\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373
++\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003
++\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006
++\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006
++\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
++\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162
++\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034
++\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162
++\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003
++\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001
++\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002
++\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101
++\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160
++\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206
++\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241
++\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072
++\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135
++\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253
++\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364
++\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172
++\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302
++\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214
++\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074
++\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154
++\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025
++\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352
++\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231
++\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213
++\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325
++\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242
++\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214
++\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027
++\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057
++\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224
++\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134
++\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356
++\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005
++\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355
++\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143
++\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123
++\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243
++\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005
++\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156
++\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317
++\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360
++\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101
++\322\156\245\033\231\047\200\347\013\251\250\000
++END
++
++# Trust for Certificate "CAcert.org Class 3 Certification Authority"
++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
++CKA_TOKEN CK_BBOOL CK_TRUE
++CKA_PRIVATE CK_BBOOL CK_FALSE
++CKA_MODIFIABLE CK_BBOOL CK_FALSE
++CKA_LABEL UTF8 "CAcert.org Class 3 Certification Authority"
++CKA_CERT_SHA1_HASH MULTILINE_OCTAL
++\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304
++\030\116\052\055
++END
++CKA_CERT_MD5_HASH MULTILINE_OCTAL
++\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266
++END
++CKA_ISSUER MULTILINE_OCTAL
++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
++\100\143\141\143\145\162\164\056\157\162\147
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\001\001
++END
++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
++
++#
+ # Certificate "ePKI Root Certification Authority"
+ #
+ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE

mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_freebl_blapi_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_security_nss_lib_freebl_blapi_h,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/nss/lib/freebl/blapi.h.orig	Sat Dec  5 02:56:24 2009
++++ mozilla/security/nss/lib/freebl/blapi.h	Sat Jan 16 16:28:37 2010
+@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo
+ */
+ extern void SHA1_Begin(SHA1Context *cx);
+ 
++#define SHA1_Update NSS_SHA1_Update
++
+ /*
+ ** Update the SHA-1 hash function with more data.
+ **	"cx" the context

mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c

@@ -0,0 +1,29 @@
+$OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/nss/lib/freebl/unix_rand.c.orig	Sat Dec  5 02:56:24 2009
++++ mozilla/security/nss/lib/freebl/unix_rand.c	Sat Jan 16 16:28:37 2010
+@@ -849,7 +849,6 @@ safe_pclose(FILE *fp)
+ /* Fork netstat to collect its output by default. Do not unset this unless
+  * another source of entropy is available
+  */
+-#define DO_NETSTAT 1
+ 
+ void RNG_SystemInfoForRNG(void)
+ {
+@@ -916,7 +915,7 @@ void RNG_SystemInfoForRNG(void)
+     GiveSystemInfo();
+ 
+     /* grab some data from system's PRNG before any other files. */
+-    bytes = RNG_FileUpdate("/dev/urandom", SYSTEM_RNG_SEED_COUNT);
++    bytes = RNG_FileUpdate(RAND_DEV, SYSTEM_RNG_SEED_COUNT);
+ 
+     /* If the user points us to a random file, pass it through the rng */
+     randfile = getenv("NSRANDFILE");
+@@ -1159,7 +1158,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
+     size_t fileBytes = 0;
+     unsigned char *buffer = dest;
+ 
+-    file = fopen("/dev/urandom", "r");
++    file = fopen(RAND_DEV, "r");
+     if (file == NULL) {
+ 	return rng_systemFromNoise(dest, maxLen);
+     }

mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_softoken_config_mk

@@ -0,0 +1,27 @@
+$OpenBSD: patch-mozilla_security_nss_lib_softoken_config_mk,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/nss/lib/softoken/config.mk.orig	Sat Dec  5 02:56:24 2009
++++ mozilla/security/nss/lib/softoken/config.mk	Sat Jan 16 16:28:37 2010
+@@ -56,9 +56,10 @@ ifdef NS_USE_GCC
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib \
+ 	-L$(NSSUTIL_LIB_DIR) \
++	-L$(NSPR_LIB_DIR) \
++	-L$(LOCALBASE)/lib \
+ 	-lnssutil3 \
+ 	-lsqlite3 \
+-	-L$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+@@ -82,9 +83,10 @@ else
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib \
+ 	-L$(NSSUTIL_LIB_DIR) \
++	-L$(NSPR_LIB_DIR) \
++	-L$(LOCALBASE)/lib \
+ 	-lnssutil3 \
+ 	-lsqlite3 \
+-	-L$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \

mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_softoken_fipstokn_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_security_nss_lib_softoken_fipstokn_c,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/security/nss/lib/softoken/fipstokn.c.orig	Sat Dec  5 02:56:24 2009
++++ mozilla/security/nss/lib/softoken/fipstokn.c	Sat Jan 16 16:28:37 2010
+@@ -73,7 +73,7 @@
+ #ifdef LINUX
+ #include <pthread.h>
+ #include <dlfcn.h>
+-#define LIBAUDIT_NAME "libaudit.so.0"
++#define LIBAUDIT_NAME "libaudit.so"
+ #ifndef AUDIT_CRYPTO_TEST_USER
+ #define AUDIT_CRYPTO_TEST_USER          2400 /* Crypto test results */
+ #define AUDIT_CRYPTO_PARAM_CHANGE_USER  2401 /* Crypto attribute change */

mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_components_downloads_src_nsDownloadManager_cpp

@@ -0,0 +1,30 @@
+$OpenBSD: patch-mozilla_toolkit_components_downloads_src_nsDownloadManager_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp.orig	Sat Dec  5 02:57:14 2009
++++ mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp	Sat Jan 16 16:28:37 2010
+@@ -1385,7 +1385,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
+         NS_ENSURE_SUCCESS(rv, rv);
+         (*aResult)->Exists(&bRes);
+         if (!bRes) {
+-          rv = (*aResult)->Create(nsIFile::DIRECTORY_TYPE, 0755);
++          rv = (*aResult)->Create(nsIFile::DIRECTORY_TYPE, 0700);
+           NS_ENSURE_SUCCESS(rv, rv);
+         }
+         return NS_OK;
+@@ -1403,7 +1403,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
+             NS_ADDREF(*aResult = customDirectory);
+             return NS_OK;
+           }
+-          rv = customDirectory->Create(nsIFile::DIRECTORY_TYPE, 0755);
++          rv = customDirectory->Create(nsIFile::DIRECTORY_TYPE, 0700);
+           NS_ENSURE_SUCCESS(rv, rv);
+           NS_ADDREF(*aResult = customDirectory);
+           return NS_OK;
+@@ -1412,7 +1412,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
+         NS_ENSURE_SUCCESS(rv, rv);
+         (*aResult)->Exists(&bRes);
+         if (!bRes) {
+-          rv = (*aResult)->Create(nsIFile::DIRECTORY_TYPE, 0755);
++          rv = (*aResult)->Create(nsIFile::DIRECTORY_TYPE, 0700);
+           NS_ENSURE_SUCCESS(rv, rv);
+           // Update dir pref
+           prefBranch->SetComplexValue(NS_PREF_DIR,

mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_crashreporter_client_crashreporter_linux_cpp

@@ -0,0 +1,17 @@
+$OpenBSD: patch-mozilla_toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/toolkit/crashreporter/client/crashreporter_linux.cpp.orig	Sat Dec  5 02:56:50 2009
++++ mozilla/toolkit/crashreporter/client/crashreporter_linux.cpp	Sat Jan 16 16:28:37 2010
+@@ -557,11 +557,11 @@ typedef const GnomeModuleInfo * (*_libgnomeui_module_i
+ 
+ static void TryInitGnome()
+ {
+-  gnomeLib = dlopen("libgnome-2.so.0", RTLD_LAZY);
++  gnomeLib = dlopen("libgnome-2.so", RTLD_LAZY);
+   if (!gnomeLib)
+     return;
+ 
+-  gnomeuiLib = dlopen("libgnomeui-2.so.0", RTLD_LAZY);
++  gnomeuiLib = dlopen("libgnomeui-2.so", RTLD_LAZY);
+   if (!gnomeuiLib)
+     return;
+ 

mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_xre_nsNativeAppSupportUnix_cpp

@@ -0,0 +1,17 @@
+$OpenBSD: patch-mozilla_toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp.orig	Sat Dec  5 02:56:51 2009
++++ mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp	Sat Jan 16 16:28:37 2010
+@@ -341,11 +341,11 @@ nsNativeAppSupportUnix::Start(PRBool *aRetVal)
+ 
+ #ifdef MOZ_X11
+ 
+-  PRLibrary *gnomeuiLib = PR_LoadLibrary("libgnomeui-2.so.0");
++  PRLibrary *gnomeuiLib = PR_LoadLibrary("libgnomeui-2.so");
+   if (!gnomeuiLib)
+     return NS_OK;
+ 
+-  PRLibrary *gnomeLib = PR_LoadLibrary("libgnome-2.so.0");
++  PRLibrary *gnomeLib = PR_LoadLibrary("libgnome-2.so");
+   if (!gnomeLib) {
+     PR_UnloadLibrary(gnomeuiLib);
+     return NS_OK;

mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_xre_nsXREDirProvider_cpp

@@ -0,0 +1,16 @@
+$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig	Sat Dec  5 02:56:51 2009
++++ mozilla/toolkit/xre/nsXREDirProvider.cpp	Sat Jan 16 16:31:41 2010
+@@ -1144,11 +1144,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
+   NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_UNIX)
+   static const char *const sysSExtDir = 
+-#ifdef HAVE_USR_LIB64_DIR
+-    "/usr/lib64/mozilla/extensions";
+-#else
+-    "/usr/lib/mozilla/extensions";
+-#endif
++    "${LOCALBASE}/lib/mozilla-extensions";
+ 
+   rv = NS_NewNativeLocalFile(nsDependentCString(sysSExtDir), PR_FALSE,
+                              getter_AddRefs(localDir));

mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_gtk2_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_widget_src_gtk2_Makefile_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/widget/src/gtk2/Makefile.in.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/widget/src/gtk2/Makefile.in	Sat Jan 16 16:28:49 2010
+@@ -175,6 +175,8 @@ DEFINES         += -DUSE_POSTSCRIPT
+ EXTRA_DSO_LDOPTS += -lgfxpsshar
+ endif
+ 
++# GTK2 widget sndio backend.
++EXTRA_DSO_LDOPTS += -lsndio
+ 
+ DEFINES		+= 
+ INCLUDES	+= \

mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_gtk2_nsBidiKeyboard_cpp

@@ -0,0 +1,16 @@
+$OpenBSD: patch-mozilla_widget_src_gtk2_nsBidiKeyboard_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/widget/src/gtk2/nsBidiKeyboard.cpp.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/widget/src/gtk2/nsBidiKeyboard.cpp	Sat Jan 16 16:28:37 2010
+@@ -55,10 +55,10 @@ nsBidiKeyboard::nsBidiKeyboard()
+ {
+ #if defined(MOZ_X11)
+     if (!gtklib)
+-        gtklib = PR_LoadLibrary("libgtk-x11-2.0.so.0");
++        gtklib = PR_LoadLibrary("libgtk-x11-2.0.so");
+ #elif defined(MOZ_DFB)
+     if (!gtklib)
+-        gtklib = PR_LoadLibrary("libgtk-directfb-2.0.so.0");
++        gtklib = PR_LoadLibrary("libgtk-directfb-2.0.so");
+ #else
+     return;
+ #endif

mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_gtk2_nsIdleServiceGTK_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_widget_src_gtk2_nsIdleServiceGTK_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/widget/src/gtk2/nsIdleServiceGTK.cpp.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/widget/src/gtk2/nsIdleServiceGTK.cpp	Sat Jan 16 16:28:37 2010
+@@ -79,7 +79,7 @@ static void Initialize()
+     sInitialized = PR_TRUE;
+ 
+     // This will leak - See comments in ~nsIdleServiceGTK().
+-    PRLibrary* xsslib = PR_LoadLibrary("libXss.so.1");
++    PRLibrary* xsslib = PR_LoadLibrary("libXss.so");
+     if (!xsslib) // ouch.
+     {
+ #ifdef PR_LOGGING

mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_gtk2_nsScreenManagerGtk_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_widget_src_gtk2_nsScreenManagerGtk_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/widget/src/gtk2/nsScreenManagerGtk.cpp.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/widget/src/gtk2/nsScreenManagerGtk.cpp	Sat Jan 16 16:28:37 2010
+@@ -174,7 +174,7 @@ nsScreenManagerGtk :: Init()
+   int numScreens;
+ 
+   if (!mXineramalib) {
+-    mXineramalib = PR_LoadLibrary("libXinerama.so.1");
++    mXineramalib = PR_LoadLibrary("libXinerama.so");
+     if (!mXineramalib) {
+       mXineramalib = SCREEN_MANAGER_LIBRARY_LOAD_FAILED;
+     }

mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_qt_nsIdleServiceQt_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_widget_src_qt_nsIdleServiceQt_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/widget/src/qt/nsIdleServiceQt.cpp.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/widget/src/qt/nsIdleServiceQt.cpp	Sat Jan 16 16:28:38 2010
+@@ -72,7 +72,7 @@ static void Initialize()
+     sInitialized = PR_TRUE;
+ 
+     // This will leak - See comments in ~nsIdleServiceQt().
+-    PRLibrary* xsslib = PR_LoadLibrary("libXss.so.1");
++    PRLibrary* xsslib = PR_LoadLibrary("libXss.so");
+     if (!xsslib) {
+         return;
+     }

mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_qt_nsSound_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_widget_src_qt_nsSound_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/widget/src/qt/nsSound.cpp.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/widget/src/qt/nsSound.cpp	Sat Jan 16 16:28:38 2010
+@@ -123,7 +123,7 @@ nsSound::Init()
+ 
+     EsdOpenSoundType EsdOpenSound;
+ 
+-    elib = PR_LoadLibrary("libesd.so.0");
++    elib = PR_LoadLibrary("libesd.so");
+     if (!elib) return NS_ERROR_FAILURE;
+ 
+     EsdOpenSound = (EsdOpenSoundType) PR_FindFunctionSymbol(elib, "esd_open_sound");

mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_nsPrintSettingsImpl_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_widget_src_xpwidgets_nsPrintSettingsImpl_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/widget/src/xpwidgets/nsPrintSettingsImpl.cpp.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/widget/src/xpwidgets/nsPrintSettingsImpl.cpp	Sat Jan 16 16:28:38 2010
+@@ -62,7 +62,7 @@ nsPrintSettings::nsPrintSettings() :
+   mIsCancelled(PR_FALSE),
+   mPrintSilent(PR_FALSE),
+   mPrintPreview(PR_FALSE),
+-  mShrinkToFit(PR_TRUE),
++  mShrinkToFit(PR_FALSE),
+   mShowPrintProgress(PR_TRUE),
+   mPrintPageDelay(500),
+   mPaperData(0),

mail/mozilla-thunderbird/patches/patch-mozilla_xpcom_base_nsStackWalk_cpp

@@ -0,0 +1,21 @@
+$OpenBSD: patch-mozilla_xpcom_base_nsStackWalk_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/xpcom/base/nsStackWalk.cpp.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/xpcom/base/nsStackWalk.cpp	Sat Jan 16 16:28:38 2010
+@@ -1124,7 +1124,7 @@ NS_FormatCodeAddressDetails(void *aPC, const nsCodeAdd
+ #define __USE_GNU
+ #endif
+ 
+-#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
++#if defined(HAVE_LIBDL) || defined(XP_MACOSX) || defined(__OpenBSD__)
+ #include <dlfcn.h>
+ #endif
+ 
+@@ -1223,7 +1223,7 @@ myinit()
+     if (! initialized) {
+ #ifndef __GNUC__
+         void *handle;
+-        const char *libdem = "libdemangle.so.1";
++        const char *libdem = "libdemangle.so";
+ 
+         /* load libdemangle if we can and need to (only try this once) */
+         if ((handle = dlopen(libdem, RTLD_LAZY)) != NULL) {

mail/mozilla-thunderbird/patches/patch-mozilla_xpcom_io_SpecialSystemDirectory_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_xpcom_io_SpecialSystemDirectory_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/xpcom/io/SpecialSystemDirectory.cpp.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/xpcom/io/SpecialSystemDirectory.cpp	Sat Jan 16 16:28:38 2010
+@@ -447,7 +447,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
+     if (NS_FAILED(rv))
+         return rv;
+     if (!exists) {
+-        rv = file->Create(nsIFile::DIRECTORY_TYPE, 0755);
++        rv = file->Create(nsIFile::DIRECTORY_TYPE, 0700);
+         if (NS_FAILED(rv))
+             return rv;
+     }

mail/mozilla-thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in

@@ -0,0 +1,20 @@
+$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sat Jan 16 16:28:49 2010
+@@ -192,7 +192,7 @@ endif
+ #
+ # OpenBSD/ARM
+ #
+-ifneq (,$(filter OpenBSDarmish OpenBSDzaurus,$(OS_ARCH)$(OS_TEST)))
++ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDarm)
+ CPPSRCS		:= xptcinvoke_arm_openbsd.cpp xptcstubs_arm_openbsd.cpp
+ endif
+ 
+@@ -336,6 +336,7 @@ endif
+ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDpowerpc)
+ CPPSRCS		:= xptcinvoke_ppc_openbsd.cpp xptcstubs_ppc_openbsd.cpp
+ ASFILES		:= xptcinvoke_asm_ppc_openbsd.s xptcstubs_asm_ppc_openbsd.s
++AS		:= $(CC) -c -x assembler-with-cpp
+ endif
+ 
+ #

mail/mozilla-thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s

@@ -0,0 +1,227 @@
+$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s	Sat Jan 16 16:28:38 2010
+@@ -1,43 +1,43 @@
+-# -*- Mode: Asm -*-
+-#
+-# ***** 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 mozilla.org code.
+-#
+-# The Initial Developer of the Original Code is
+-# Netscape Communications Corporation.
+-# Portions created by the Initial Developer are Copyright (C) 1999
+-# the Initial Developer. All Rights Reserved.
+-#
+-# Contributor(s):
+-#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
+-#   beard@netscape.com (Patrick Beard)
+-#   waterson@netscape.com (Chris Waterson)
+-#
+-# 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 *****
++// -*- Mode: Asm -*-
++//
++// ***** 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 mozilla.org code.
++//
++// The Initial Developer of the Original Code is
++// Netscape Communications Corporation.
++// Portions created by the Initial Developer are Copyright (C) 1999
++// the Initial Developer. All Rights Reserved.
++//
++// Contributor(s):
++//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
++//   beard@netscape.com (Patrick Beard)
++//   waterson@netscape.com (Chris Waterson)
++//
++// 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 *****
+ 
+ .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
+ .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+@@ -53,80 +53,80 @@
+ .set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
+ .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+ .set f30,30; .set f31,31
+-		      
+-        .section ".text"
++
++	.section ".text"
+ 	.align 2
+ 	.globl NS_InvokeByIndex_P
+ 	.type  NS_InvokeByIndex_P,@function
+ 
+-#
+-# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
+-#                  PRUint32 paramCount, nsXPTCVariant* params)
+-#
++//
++// NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
++//                    PRUint32 paramCount, nsXPTCVariant* params)
++//
+ 
+ NS_InvokeByIndex_P:
+-	stwu    sp,-32(sp)			# setup standard stack frame
+-	mflr    r0				# save LR
+-	stw     r3,8(sp)			# r3 <= that
+-	stw     r4,12(sp)			# r4 <= methodIndex
+-	stw     r30,16(sp)
+-	stw     r31,20(sp)
++	stwu	sp,-32(sp)			// setup standard stack frame
++	mflr	r0				// save LR
++	stw	r3,8(sp)			// r3 <= that
++	stw	r4,12(sp)			// r4 <= methodIndex
++	stw	r30,16(sp)
++	stw	r31,20(sp)
+ 
+-	stw     r0,36(sp)			# store LR backchain
+-	mr      r31,sp
++	stw	r0,36(sp)			// store LR backchain
++	mr	r31,sp
+ 
+-	rlwinm  r10,r5,3,0,27			# r10 = (ParamCount * 2 * 4) & ~0x0f
+-	addi    r0,r10,96			# reserve stack for GPR and FPR register save area r0 = r10 + 96
+-	lwz     r9,0(sp)			# r9 = backchain
+-	neg     r0,r0
+-	stwux   r9,sp,r0			# reserve stack space and save SP backchain
++	rlwinm	r10,r5,3,0,27			// r10 = (ParamCount * 2 * 4) & ~0x0f
++	addi	r0,r10,96			// reserve stack for GPR and FPR register save area r0 = r10 + 96
++	lwz	r9,0(sp)			// r9 = backchain
++	neg	r0,r0
++	stwux	r9,sp,r0			// reserve stack space and save SP backchain
+ 
+-	addi    r3,sp,8				# r3 <= args
+-	mr      r4,r5				# r4 <= paramCount
+-	mr      r5,r6				# r5 <= params
+-	add     r6,r3,r10			# r6 <= gpregs ( == args + r10 )
+-	mr      r30,r6				# store in r30 for use later...
+-	addi    r7,r6,32			# r7 <= fpregs ( == gpregs + 32 )
++	addi	r3,sp,8				// r3 <= args
++	mr	r4,r5				// r4 <= paramCount
++	mr	r5,r6				// r5 <= params
++	add	r6,r3,r10			// r6 <= gpregs ( == args + r10 )
++	mr	r30,r6				// store in r30 for use later...
++	addi	r7,r6,32			// r7 <= fpregs ( == gpregs + 32 )
+ 
+-	bl      invoke_copy_to_stack@local	# (args, paramCount, params, gpregs, fpregs)
++	bl	invoke_copy_to_stack@local	// (args, paramCount, params, gpregs, fpregs)
+ 
+-	lfd     f1,32(r30)			# load FP registers with method parameters
+-	lfd     f2,40(r30)   
+-	lfd     f3,48(r30)  
+-	lfd     f4,56(r30)  
+-	lfd     f5,64(r30)  
+-	lfd     f6,72(r30)  
+-	lfd     f7,80(r30)  
+-	lfd     f8,88(r30)
++	lfd	f1,32(r30)			// load FP registers with method parameters
++	lfd	f2,40(r30)
++	lfd	f3,48(r30)
++	lfd	f4,56(r30)
++	lfd	f5,64(r30)
++	lfd	f6,72(r30)
++	lfd	f7,80(r30)
++	lfd	f8,88(r30)
+ 
+-	lwz     r3,8(r31)			# r3 <= that
+-	lwz     r4,12(r31)			# r4 <= methodIndex
+-	lwz     r5,0(r3)			# r5 <= vtable ( == *that )
+-#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION  >= 100) # G++ pre-V3 ABI
+-	addi	r4,r4,2				# skip first two vtable entries
++	lwz	r3,8(r31)			// r3 <= that
++	lwz	r4,12(r31)			// r4 <= methodIndex
++	lwz	r5,0(r3)			// r5 <= vtable ( == *that )
++#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION >= 100) // G++ pre-V3 ABI
++	addi	r4,r4,2				// skip first two vtable entries
+ #endif
+-	slwi    r4,r4,2				# convert to offset ( *= 4 )
+-	lwzx    r0,r5,r4			# r0 <= methodpointer ( == vtable + offset )
++	slwi	r4,r4,2				// convert to offset ( *= 4 )
++	lwzx	r0,r5,r4			// r0 <= methodpointer ( == vtable + offset )
+ 
+-        lwz     r4,4(r30)			# load GP regs with method parameters
+-	lwz     r5,8(r30)
+-	lwz     r6,12(r30)
+-	lwz     r7,16(r30)
+-	lwz     r8,20(r30)
+-	lwz     r9,24(r30)
+-	lwz     r10,28(r30)
++	lwz	r4,4(r30)			// load GP regs with method parameters
++	lwz	r5,8(r30)
++	lwz	r6,12(r30)
++	lwz	r7,16(r30)
++	lwz	r8,20(r30)
++	lwz	r9,24(r30)
++	lwz	r10,28(r30)
+ 
+-	mtlr    r0				# copy methodpointer to LR
+-	blrl					# call method
+-	
+-	lwz     r30,16(r31)			# restore r30 & r31
+-	lwz     r31,20(r31)
+-	
+-	lwz     r11,0(sp)			# clean up the stack
+-	lwz     r0,4(r11)
+-	mtlr    r0
+-	mr      sp,r11
++	mtlr	r0				// copy methodpointer to LR
++	blrl					// call method
++
++	lwz	r30,16(r31)			// restore r30 & r31
++	lwz	r31,20(r31)
++
++	lwz	r11,0(sp)			// clean up the stack
++	lwz	r0,4(r11)
++	mtlr	r0
++	mr	sp,r11
+ 	blr
+ 
+-# Magic indicating no need for an executable stack
++// Magic indicating no need for an executable stack
+ .section .note.GNU-stack, "", @progbits ; .previous

mail/mozilla-thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s

@@ -0,0 +1,170 @@
+$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s,v 1.1 2010/04/03 09:26:46 landry Exp $
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s.orig	Sat Dec  5 02:56:52 2009
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s	Sat Jan 16 16:28:38 2010
+@@ -1,43 +1,43 @@
+-# -*- Mode: Asm -*-
+-#
+-# ***** 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 mozilla.org code.
+-#
+-# The Initial Developer of the Original Code is
+-# Netscape Communications Corporation.
+-# Portions created by the Initial Developer are Copyright (C) 1999
+-# the Initial Developer. All Rights Reserved.
+-#
+-# Contributor(s):
+-#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
+-#   beard@netscape.com (Patrick Beard)
+-#   waterson@netscape.com (Chris Waterson)
+-#
+-# 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 *****
++// -*- Mode: Asm -*-
++//
++// ***** 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 mozilla.org code.
++//
++// The Initial Developer of the Original Code is
++// Netscape Communications Corporation.
++// Portions created by the Initial Developer are Copyright (C) 1999
++// the Initial Developer. All Rights Reserved.
++//
++// Contributor(s):
++//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
++//   beard@netscape.com (Patrick Beard)
++//   waterson@netscape.com (Chris Waterson)
++//
++// 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 *****
+ 
+ .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
+ .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+@@ -54,29 +54,29 @@
+ .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+ .set f30,30; .set f31,31
+ 
+-        .section ".text"
+-        .align 2
++	.section ".text"
++	.align 2
+ 	.globl SharedStub
+ 	.type  SharedStub,@function
+ 
+ SharedStub:
+-        stwu	sp,-112(sp)			# room for 
+-						# linkage (8),
+-						# gprData (32),
+-						# fprData (64), 
+-						# stack alignment(8)
+-        mflr	r0
+-	stw	r0,116(sp)			# save LR backchain
++	stwu	sp,-112(sp)			// room for
++						// linkage (8),
++						// gprData (32),
++						// fprData (64),
++						// stack alignment(8)
++	mflr	r0
++	stw	r0,116(sp)			// save LR backchain
+ 
+-	stw	r4,12(sp)			# save GP registers
+-	stw	r5,16(sp)			# (n.b. that we don't save r3
+-	stw	r6,20(sp)			# because PrepareAndDispatch() is savvy)
++	stw	r4,12(sp)			// save GP registers
++	stw	r5,16(sp)			// (n.b. that we don't save r3
++	stw	r6,20(sp)			// because PrepareAndDispatch() is savvy)
+ 	stw	r7,24(sp)
+ 	stw	r8,28(sp)
+ 	stw	r9,32(sp)
+ 	stw	r10,36(sp)
+ 
+-	stfd	f1,40(sp)			# save FP registers
++	stfd	f1,40(sp)			// save FP registers
+ 	stfd	f2,48(sp)
+ 	stfd	f3,56(sp)
+ 	stfd	f4,64(sp)
+@@ -85,23 +85,23 @@ SharedStub:
+ 	stfd	f7,88(sp)
+ 	stfd	f8,96(sp)
+ 
+-						# r3 has the 'self' pointer already
+-	
+-	mr      r4,r11				# r4 <= methodIndex selector, passed
+-						# via r11 in the nsXPTCStubBase::StubXX() call
+-	
+-	addi	r5,sp,120			# r5 <= pointer to callers args area,
+-						# beyond r3-r10/f1-f8 mapped range
+-	
+-	addi	r6,sp,8				# r6 <= gprData
+-	addi	r7,sp,40			# r7 <= fprData
+-      
+-	bl	PrepareAndDispatch@local	# Go!
+-    
+-	lwz	r0,116(sp)			# restore LR
++						// r3 has the 'self' pointer already
++
++	mr	r4,r11				// r4 <= methodIndex selector, passed
++						// via r11 in the nsXPTCStubBase::StubXX() call
++
++	addi	r5,sp,120			// r5 <= pointer to callers args area,
++						// beyond r3-r10/f1-f8 mapped range
++
++	addi	r6,sp,8				// r6 <= gprData
++	addi	r7,sp,40			// r7 <= fprData
++
++	bl	PrepareAndDispatch@local	// Go!
++
++	lwz	r0,116(sp)			// restore LR
+ 	mtlr	r0
+-	la	sp,112(sp)			# clean up the stack
++	la	sp,112(sp)			// clean up the stack
+ 	blr
+ 
+-# Magic indicating no need for an executable stack
++// Magic indicating no need for an executable stack
+ .section .note.GNU-stack, "", @progbits ; .previous

mail/mozilla-thunderbird/patches/patch-security_coreconf_OpenBSD_mk

@@ -1,12 +0,0 @@
-$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.9 2009/08/21 16:40:42 martynas Exp $
---- security/coreconf/OpenBSD.mk.orig	Thu Nov 22 06:39:56 2007
-+++ security/coreconf/OpenBSD.mk	Thu Aug 20 22:12:23 2009
-@@ -56,7 +56,7 @@ OS_LIBS			+= -pthread
- DSO_LDOPTS		+= -pthread
- endif
- 
--DLL_SUFFIX		= so.1.0
-+DLL_SUFFIX		= so.${SO_VERSION}
- 
- OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD
-