cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to seamonkey 2.14/enigmail 1.4.6/lightning 1.9b1.

Browse Source 
- see http://www.seamonkey-project.org/releases/seamonkey2.14/ for details.
- tidy up WANTLIB/CONFIGURE_ARGS
- enable the gio/libnotify interaction. If libnotify is found at
  runtime, a popup will show incoming messages notification/download complete.
- install an icon in pixmaps/ for the desktop file, like in ffx/tb
- fix desktop file Exec line so that an argument can be passed to seamonkey
- remove patch-mozilla_browser_app_profile_firefox_js, this is spar^Wseamonkey!
- for the other patches removed/added, same comments as for ffx apply
This commit is contained in:
landry 2012-11-24 10:36:20 +00:00
parent 1de4807996
commit 86de96c8d5
22 changed files with 81 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
www/seamonkey/Makefile
View File

@ -1,25 +1,22 @@
# $OpenBSD: Makefile,v 1.119 2012/11/12 20:45:32 landry Exp $
# $OpenBSD: Makefile,v 1.120 2012/11/24 10:36:20 landry Exp $
COMMENT-main = Mozilla application suite
COMMENT-lightning = Mozilla Seamonkey calendar extension
COMMENT-enigmail = Mozilla Seamonkey GnuPG extension
BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
MOZILLA_VERSION= 2.13.2
MOZILLA_VERSION= 2.14
MOZILLA_BRANCH = release
MOZILLA_PROJECT = seamonkey
MOZILLA_CODENAME = suite
MULTI_PACKAGES = -main -lightning -enigmail
PKGNAME-main = ${PKGNAME}
PKGNAME-lightning = lightning-seamonkey-1.8beta1
ENIG_V = 1.4.5
PKGNAME-lightning = lightning-seamonkey-1.9beta1
ENIG_V = 1.4.6
PKGNAME-enigmail = enigmail-seamonkey-${ENIG_V}
EPOCH-lightning = 0
REVISION-lightning = 2
REVISION-main = 0
EPOCH-enigmail = 0
REVISION-enigmail = 1
#MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/nightly/${MOZILLA_VERSION}-candidates/build1/source/
MASTER_SITES0 = http://www.mozilla-enigmail.org/download/source/
@ -27,11 +24,11 @@ DISTFILES += ${MOZILLA_PROJECT}-${MOZILLA_VERSION}.source.tar.bz2 \
enigmail-${ENIG_V}.tar.gz:0
EXTRACT_CASES = enigmail-*.tar.gz) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | tar -C comm-${MOZILLA_BRANCH}/mailnews/extensions/ -xf -;;
SO_VERSION = 26.0
SO_VERSION = 27.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = ldap60 ldif60 mozalloc prldap60 suite xpcom xul calbasecomps enigmime ipc
MOZILLA_LIBS = ldap60 ldif60 mozalloc mozgnome prldap60 suite xpcom xul calbasecomps enigmime ipc
CATEGORIES= www mail net news
@ -51,27 +48,23 @@ MODGNU_CONFIG_GUESS_DIRS += ${WRKSRC}/ldap/sdks/c-sdk/config/autoconf
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_ARGS += --enable-official-branding
CONFIGURE_ARGS += --with-system-libevent=/usr/
CONFIGURE_ARGS += --with-system-zlib=/usr/ --with-system-bz2=${LOCALBASE}
CONFIGURE_ARGS += --with-system-bz2=${LOCALBASE}
WANTLIB += event
# bug #736961
SEPARATE_BUILD = Yes
CONFIGURE_ENV += CPPFLAGS=-I${X11BASE}/include
# XXX needed since 2.7b?, relocation overflow otherwise...
# replaces -g by -Os
.if ${MACHINE_ARCH} == "powerpc"
CONFIGURE_ENV += MOZ_DEBUG_FLAGS="-Os"
.endif
LIB_DEPENDS-lightning = STEM->=${MOZILLA_VERSION:S/b/beta/}:${BUILD_PKGPATH},-main
WANTLIB-lightning = lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/xpcom \
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/xul \
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/mozalloc \
c m stdc++ nspr4 plc4 plds4
c m stdc++ nspr4 plc4 plds4 pthread
BUILD_DEPENDS+= archivers/unzip #to unzip xpi
RUN_DEPENDS-enigmail = security/gnupg
@ -80,6 +73,7 @@ WANTLIB-enigmail = ${WANTLIB-lightning}
# build lightning xpi
CONFIGURE_ARGS += --enable-calendar \
--enable-gio \
--disable-gconf
ALL_TARGET = default
@ -113,8 +107,13 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ ; \
${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
${PREFIX}/share/applications/${MOZILLA_PROJECT}.desktop ; \
# install icon for desktop file
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
${INSTALL_DATA} ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/${MOZILLA_PROJECT}.png \
${PREFIX}/share/pixmaps/${MOZILLA_PROJECT}.png
# cleanup useless dirs from #717616
rm -Rf ${PREFIX}/lib/seamonkey-${MOZILLA_VERSION:C/b.//}/js{sub,}loader
# cleanup useless dirs from #798450 (fx 18?)
rm -f ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/modules/services-{aitc,common,crypto,notifications,sync{/engines,}}/.mkdir.done
rmdir ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/modules{/services-{aitc,common,crypto,notifications,sync{/engines,}},}
.include <bsd.port.mk>

8
www/seamonkey/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (mozilla/enigmail-1.4.5.tar.gz) = +llJH7oh3pQUoAOTM0kHSo7BgzodZMrJ8Kn3Ag7WwCA=
SHA256 (mozilla/seamonkey-2.13.2.source.tar.bz2) = K9vhv32kgQ2R5pbhz94cguIRummxX9m2V0tsuJglLOM=
SIZE (mozilla/enigmail-1.4.5.tar.gz) = 1269207
SIZE (mozilla/seamonkey-2.13.2.source.tar.bz2) = 112085041
SHA256 (mozilla/enigmail-1.4.6.tar.gz) = 83cdH6omZ2gYurXixQ3OhQE7neMLgt5SYVnqp8o08DY=
SHA256 (mozilla/seamonkey-2.14.source.tar.bz2) = GkKp+zGSnFYHFpvmons86Eloh8UFxiNu/LxcX/UuWRQ=
SIZE (mozilla/enigmail-1.4.6.tar.gz) = 1262280
SIZE (mozilla/seamonkey-2.14.source.tar.bz2) = 114330817

4
www/seamonkey/files/seamonkey.desktop
View File

@ -1,10 +1,10 @@
[Desktop Entry]
Name=Seamonkey
Comment=Seamonkey application suite
Exec=seamonkey
Exec=seamonkey %u
Terminal=false
Type=Application
Icon=${TRUEPREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/${MOZILLA_PROJECT}.png
Icon=${TRUEPREFIX}/share/pixmaps/seamonkey.png
Categories=Application;Network;
MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
StartupNotify=True

46
www/seamonkey/patches/patch-mozilla_browser_app_profile_firefox_js
View File

@ -1,46 +0,0 @@
$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.11 2012/09/01 14:10:03 landry Exp $
--- mozilla/browser/app/profile/firefox.js.orig Mon Aug 27 06:49:02 2012
+++ mozilla/browser/app/profile/firefox.js Sat Sep 1 02:00:10 2012
@@ -124,7 +124,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
pref("app.update.certs.2.commonName", "aus3.mozilla.org");
// 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
@@ -587,7 +587,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
// by default we show an infobar message when pages require plugins the user has not installed, or are outdated
-pref("plugins.hide_infobar_for_missing_plugin", false);
+pref("plugins.hide_infobar_for_missing_plugin", true);
pref("plugins.hide_infobar_for_outdated_plugin", false);
#ifdef XP_MACOSX
@@ -716,10 +716,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");
@@ -773,10 +773,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);

14
www/seamonkey/patches/patch-mozilla_gfx_thebes_gfxPlatform_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.5 2012/10/10 21:03:40 landry Exp $
--- mozilla/gfx/thebes/gfxPlatform.cpp.orig Fri Aug 31 07:56:24 2012
+++ mozilla/gfx/thebes/gfxPlatform.cpp Sun Sep 2 12:45:41 2012
@@ -496,6 +496,7 @@ void SourceBufferDestroy(void *srcBuffer)
$OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.6 2012/11/24 10:36:20 landry Exp $
--- mozilla/gfx/thebes/gfxPlatform.cpp.orig Sat Oct 20 23:16:44 2012
+++ mozilla/gfx/thebes/gfxPlatform.cpp Sun Oct 21 12:22:08 2012
@@ -490,6 +490,7 @@ void SourceBufferDestroy(void *srcBuffer)
static_cast<SourceSurface*>(srcBuffer)->Release();
}
@ -9,7 +9,7 @@ $OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.5 2012/10/10 21:03:40 lan
void SourceSnapshotDetached(cairo_surface_t *nullSurf)
{
gfxImageSurface* origSurf =
@@ -503,6 +504,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
@@ -497,6 +498,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
origSurf->SetData(&kSourceSurface, NULL, NULL);
}
@ -17,7 +17,7 @@ $OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.5 2012/10/10 21:03:40 lan
RefPtr<SourceSurface>
gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
@@ -597,6 +599,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
@@ -594,6 +596,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
}
@ -25,7 +25,7 @@ $OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.5 2012/10/10 21:03:40 lan
cairo_surface_t *nullSurf =
cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
cairo_surface_set_user_data(nullSurf,
@@ -605,6 +608,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
@@ -602,6 +605,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
NULL);
cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
cairo_surface_destroy(nullSurf);

36
www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc_message_utils_h
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.7 2012/06/11 15:38:33 landry Exp $
Add new long long template, may not be best solution.
--- mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.orig Wed Jan 18 10:41:15 2012
+++ mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h Sun Jan 22 22:18:19 2012
@@ -193,6 +193,29 @@ struct ParamTraits<unsigned long long> {
l->append(StringPrintf(L"%ull", p));
}
};
+
+template <>
+struct ParamTraits<long long> {
+ typedef long long param_type;
+ static void Write(Message* m, const param_type& p) {
+ m->WriteData(reinterpret_cast<const char*>(&p), sizeof(param_type));
+ }
+ static bool Read(const Message* m, void** iter, param_type* r) {
+ const char *data;
+ int data_size = 0;
+ bool result = m->ReadData(iter, &data, &data_size);
+ if (result && data_size == sizeof(param_type)) {
+ memcpy(r, data, sizeof(param_type));
+ } else {
+ result = false;
+ NOTREACHED();
+ }
+ return result;
+ }
+ static void Log(const param_type& p, std::wstring* l) {
+ l->append(StringPrintf(L"%ull", p));
+ }
+};
#endif
#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390))

10
www/seamonkey/patches/patch-mozilla_js_src_configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.12 2012/10/10 21:03:40 landry Exp $
--- mozilla/js/src/configure.in.orig Fri Aug 31 07:56:25 2012
+++ mozilla/js/src/configure.in Sun Sep 2 12:45:41 2012
@@ -1983,7 +1983,12 @@ ia64*-hpux*)
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.13 2012/11/24 10:36:20 landry Exp $
--- mozilla/js/src/configure.in.orig Sat Oct 20 23:16:46 2012
+++ mozilla/js/src/configure.in Sun Oct 21 12:22:08 2012
@@ -1912,7 +1912,12 @@ ia64*-hpux*)
;;
*-openbsd*)
@ -15,7 +15,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.12 2012/10/10 21:03:40 landry Ex
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2271,6 +2276,10 @@ mips*-*)
@@ -2200,6 +2205,10 @@ mips*-*)
ENABLE_METHODJIT_TYPED_ARRAY=1
AC_DEFINE(JS_CPU_MIPS)
AC_DEFINE(JS_NUNBOX32)

12
www/seamonkey/patches/patch-mozilla_memory_mozalloc_mozalloc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_memory_mozalloc_mozalloc_cpp,v 1.7 2012/09/01 14:10:03 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=633857
--- mozilla/memory/mozalloc/mozalloc.cpp.orig Mon Aug 27 06:49:25 2012
+++ mozilla/memory/mozalloc/mozalloc.cpp Sat Sep 1 02:00:14 2012
@@ -12,6 +12,7 @@
#include <sys/types.h>
#if defined(MALLOC_H)
+#include <sys/types.h>
# include MALLOC_H // for memalign, valloc where available
#endif // if defined(MALLOC_H)
#include <stddef.h> // for size_t

36
www/seamonkey/patches/patch-mozilla_netwerk_base_src_nsSocketTransportService2_cpp
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-mozilla_netwerk_base_src_nsSocketTransportService2_cpp,v 1.5 2012/10/10 21:03:40 landry Exp $
--- mozilla/netwerk/base/src/nsSocketTransportService2.cpp.orig Fri Aug 31 07:56:36 2012
+++ mozilla/netwerk/base/src/nsSocketTransportService2.cpp Sun Sep 2 12:45:41 2012
@@ -21,14 +21,6 @@
#include "mozilla/FunctionTimer.h"
-// XXX: There is no good header file to put these in. :(
-namespace mozilla { namespace psm {
-
-void InitializeSSLServerCertVerificationThreads();
-void StopSSLServerCertVerificationThreads();
-
-} } // namespace mozilla::psm
-
using namespace mozilla;
#if defined(PR_LOGGING)
@@ -586,8 +578,6 @@ nsSocketTransportService::Run()
SOCKET_LOG(("STS thread init\n"));
- psm::InitializeSSLServerCertVerificationThreads();
-
gSocketThread = PR_GetCurrentThread();
// add thread event to poll list (mThreadEvent may be NULL)
@@ -646,8 +636,6 @@ nsSocketTransportService::Run()
NS_ProcessPendingEvents(thread);
gSocketThread = nsnull;
-
- psm::StopSSLServerCertVerificationThreads();
SOCKET_LOG(("STS thread exit\n"));
return NS_OK;

10
www/seamonkey/patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js,v 1.7 2012/09/01 14:10:03 landry Exp $
--- mozilla/security/manager/pki/resources/content/exceptionDialog.js.orig Mon Aug 27 06:49:28 2012
+++ mozilla/security/manager/pki/resources/content/exceptionDialog.js Sat Sep 1 02:00:14 2012
@@ -249,6 +249,7 @@ function updateCertStatus() {
$OpenBSD: patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js,v 1.8 2012/11/24 10:36:20 landry Exp $
--- mozilla/security/manager/pki/resources/content/exceptionDialog.js.orig Sat Oct 20 23:17:01 2012
+++ mozilla/security/manager/pki/resources/content/exceptionDialog.js Sun Oct 21 12:22:08 2012
@@ -260,6 +260,7 @@ function updateCertStatus() {
// In these cases, we do want to enable the "Add Exception" button
gDialog.getButton("extra1").disabled = false;
+ gDialog.getButton("extra1").focus();

14
www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_Makefile_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_Makefile_in,v 1.7 2012/09/01 14:10:03 landry Exp $
--- mozilla/security/manager/ssl/src/Makefile.in.orig Mon Aug 27 06:49:28 2012
+++ mozilla/security/manager/ssl/src/Makefile.in Sat Sep 1 02:00:14 2012
@@ -83,7 +83,10 @@ CSRCS += md4.c
EXTRA_DEPS = $(NSS_DEP_LIBS)
+NSS_LIBDIR = $(shell $(NSS_CONFIG) --libdir)
+
DEFINES += \
+ -DNSS_LIBDIR=\"$(NSS_LIBDIR)\" \
-DNSS_ENABLE_ECC \
-DDLL_PREFIX=\"$(DLL_PREFIX)\" \
-DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \

59
www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_SSLServerCertVerification_cpp
View File

@ -1,59 +0,0 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_SSLServerCertVerification_cpp,v 1.5 2012/10/10 21:03:40 landry Exp $
--- mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp.orig Fri Aug 31 07:56:37 2012
+++ mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp Sun Sep 2 12:45:41 2012
@@ -128,23 +128,25 @@ NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
NSSCleanupAutoPtrClass(CERTCertificate, CERT_DestroyCertificate)
NSSCleanupAutoPtrClass_WithParam(PRArenaPool, PORT_FreeArena, FalseParam, false)
+PRCallOnceType gCreateMutexCallOnce;
// do not use a nsCOMPtr to avoid static initializer/destructor
+Mutex * gMutex = nsnull;
nsIThreadPool * gCertVerificationThreadPool = nsnull;
+
+PRStatus createMutex()
+{
+ gMutex = new Mutex("SSLServerCertVerification mutex");
+ return PR_SUCCESS;
+}
+
} // unnamed namespace
-// Called when the socket transport thread starts, to initialize the SSL cert
-// verification thread pool. By tying the thread pool startup/shutdown directly
-// to the STS thread's lifetime, we ensure that they are *always* available for
-// SSL connections and that there are no races during startup and especially
-// shutdown. (Previously, we have had multiple problems with races in PSM
-// background threads, and the race-prevention/shutdown logic used there is
-// brittle. Since this service is critical to things like downloading updates,
-// we take no chances.) Also, by doing things this way, we avoid the need for
-// locks, since gCertVerificationThreadPool is only ever accessed on the socket
-// transport thread.
void
InitializeSSLServerCertVerificationThreads()
{
+ (void) PR_CallOnce(&gCreateMutexCallOnce, createMutex);
+ MutexAutoLock lock(*gMutex);
+
// TODO: tuning, make parameters preferences
// XXX: instantiate nsThreadPool directly, to make this more bulletproof.
// Currently, the nsThreadPool.h header isn't exported for us to do so.
@@ -173,10 +175,19 @@ InitializeSSLServerCertVerificationThreads()
// nsNSSShutdownPreventionLock where needed (not here) to prevent that.
void StopSSLServerCertVerificationThreads()
{
+ (void) PR_CallOnce(&gCreateMutexCallOnce, createMutex);
+ MutexAutoLock lock(*gMutex);
+
if (gCertVerificationThreadPool) {
gCertVerificationThreadPool->Shutdown();
NS_RELEASE(gCertVerificationThreadPool);
}
+}
+
+void ShutdownSSLServerCertVerification()
+{
+ delete gMutex;
+ gMutex = nsnull;
}
namespace {

14
www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_SSLServerCertVerification_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_SSLServerCertVerification_h,v 1.4 2012/09/01 14:10:03 landry Exp $
--- mozilla/security/manager/ssl/src/SSLServerCertVerification.h.orig Mon Aug 27 06:49:28 2012
+++ mozilla/security/manager/ssl/src/SSLServerCertVerification.h Sat Sep 1 02:00:14 2012
@@ -14,6 +14,10 @@ namespace mozilla { namespace psm {
SECStatus AuthCertificateHook(void *arg, PRFileDesc *fd,
PRBool checkSig, PRBool isServer);
+void InitializeSSLServerCertVerificationThreads();
+void StopSSLServerCertVerificationThreads();
+void ShutdownSSLServerCertVerification();
+
} } // namespace mozilla::psm
#endif

108
www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp
View File

@ -1,108 +0,0 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.12 2012/10/10 21:03:40 landry Exp $
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Fri Aug 31 07:56:37 2012
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Sun Sep 2 12:48:01 2012
@@ -71,6 +71,7 @@
#include "secerr.h"
#include "sslerr.h"
#include "cert.h"
+#include "SSLServerCertVerification.h"
#include "nsXULAppAPI.h"
@@ -356,6 +357,8 @@ nsNSSComponent::deleteBackgroundThreads()
delete mCertVerificationThread;
mCertVerificationThread = nsnull;
}
+
+ StopSSLServerCertVerificationThreads();
}
void
@@ -372,14 +375,14 @@ nsNSSComponent::createBackgroundThreads()
delete mCertVerificationThread;
mCertVerificationThread = nsnull;
}
+
+ InitializeSSLServerCertVerificationThreads();
}
nsNSSComponent::~nsNSSComponent()
{
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::dtor\n"));
- deleteBackgroundThreads();
-
if (mUpdateTimerInitialized) {
{
MutexAutoLock lock(mCrlTimerLock);
@@ -808,7 +811,7 @@ nsNSSComponent::InstallLoadableRoots()
if (!possible_ckbi_locations[il])
{
- fullLibraryPath = PR_GetLibraryName(nsnull, "nssckbi");
+ fullLibraryPath = PR_GetLibraryName(NSS_LIBDIR, "nssckbi");
}
else
{
@@ -1871,6 +1874,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
LaunchSmartCardThreads();
+ createBackgroundThreads();
+
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization done\n"));
}
}
@@ -2014,16 +2019,6 @@ nsNSSComponent::Init()
if (mClientAuthRememberService)
mClientAuthRememberService->Init();
- createBackgroundThreads();
- if (!mCertVerificationThread)
- {
- PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS init, could not create threads\n"));
-
- DeregisterObservers();
- mPIPNSSBundle = nsnull;
- return NS_ERROR_OUT_OF_MEMORY;
- }
-
InitializeCRLUpdateTimer();
RegisterPSMContentListener();
@@ -2238,6 +2233,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
DoProfileChangeTeardown(aSubject);
}
else if (nsCRT::strcmp(aTopic, PROFILE_CHANGE_TEARDOWN_VETO_TOPIC) == 0) {
+ createBackgroundThreads();
mShutdownObjectList->allowUI();
}
else if (nsCRT::strcmp(aTopic, PROFILE_BEFORE_CHANGE_TOPIC) == 0) {
@@ -2285,6 +2281,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
InitializeCRLUpdateTimer();
}
else if (nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
+ ShutdownSSLServerCertVerification();
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: XPCom shutdown observed\n"));
@@ -2575,6 +2572,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
void
nsNSSComponent::DoProfileChangeTeardown(nsISupports* aSubject)
{
+ /* XXX this doesn't work well, since nothing expects null pointers */
+ deleteBackgroundThreads();
+
bool callVeto = false;
if (!mShutdownObjectList->ifPossibleDisallowUI()) {
@@ -2628,9 +2628,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
void
nsNSSComponent::DoProfileChangeNetRestore()
{
- /* XXX this doesn't work well, since nothing expects null pointers */
- deleteBackgroundThreads();
- createBackgroundThreads();
mIsNetworkDown = false;
}

10
www/seamonkey/patches/patch-mozilla_storage_src_mozStorageConnection_cpp
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.11 2012/10/10 21:03:40 landry Exp $
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.12 2012/11/24 10:36:20 landry Exp $
force the use of secure_delete instead of using internal sqlite copy
--- mozilla/storage/src/mozStorageConnection.cpp.orig Fri Aug 31 07:56:38 2012
+++ mozilla/storage/src/mozStorageConnection.cpp Sun Sep 2 12:45:42 2012
@@ -551,6 +551,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
--- mozilla/storage/src/mozStorageConnection.cpp.orig Sat Oct 20 23:17:03 2012
+++ mozilla/storage/src/mozStorageConnection.cpp Sun Oct 21 12:22:08 2012
@@ -554,6 +554,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
return convertResultCode(srv);
}
+ srv = ::sqlite3_exec(mDBConn, "PRAGMA secure_delete = ON", NULL, NULL, NULL);
+ if (srv != SQLITE_OK) {
+ ::sqlite3_close(mDBConn);
+ mDBConn = nsnull;
+ mDBConn = nullptr;
+ return convertResultCode(srv);
+ }
+

10
www/seamonkey/patches/patch-mozilla_toolkit_library_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.12 2012/10/10 21:03:40 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Fri Aug 31 07:56:39 2012
+++ mozilla/toolkit/library/Makefile.in Sun Sep 2 12:45:42 2012
@@ -455,6 +455,12 @@ OS_LIBS += \
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.13 2012/11/24 10:36:20 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Sat Oct 20 23:17:04 2012
+++ mozilla/toolkit/library/Makefile.in Sun Oct 21 12:22:30 2012
@@ -461,6 +461,12 @@ OS_LIBS += \
$(NULL)
endif
@ -14,7 +14,7 @@ $OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.12 2012/10/10 21:03:40 l
ifeq ($(OS_ARCH),Darwin)
ifdef MOZ_SYDNEYAUDIO
OS_LIBS += \
@@ -467,12 +473,6 @@ OS_LIBS += \
@@ -473,12 +479,6 @@ OS_LIBS += \
-framework AppKit \
-framework Security \
$(NULL)

15
www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsGIOService_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-mozilla_toolkit_system_gnome_nsGIOService_cpp,v 1.1 2012/11/24 10:36:20 landry Exp $
--- mozilla/toolkit/system/gnome/nsGIOService.cpp.orig Thu Oct 11 01:37:27 2012
+++ mozilla/toolkit/system/gnome/nsGIOService.cpp Sat Oct 20 11:20:54 2012
@@ -75,7 +75,10 @@ nsGIOMimeApp::GetCommand(nsACString& aCommand)
void *libHandle = dlopen("libgio-2.0.so.0", RTLD_LAZY);
if (!libHandle) {
- return NS_ERROR_FAILURE;
+ libHandle = dlopen("libgio-2.0.so", RTLD_LAZY);
+ if (!libHandle) {
+ return NS_ERROR_FAILURE;
+ }
}
dlerror(); /* clear any existing error */
g_app_info_get_commandline_ptr =

8
www/seamonkey/patches/patch-mozilla_toolkit_xre_nsXREDirProvider_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.13 2012/10/10 21:03:40 landry Exp $
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Fri Aug 31 07:56:40 2012
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Sun Sep 2 12:45:42 2012
@@ -1174,11 +1174,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsIFile
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.14 2012/11/24 10:36:20 landry Exp $
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Sat Oct 20 23:17:05 2012
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Sun Oct 21 12:22:08 2012
@@ -1186,11 +1186,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsIFile
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_UNIX)
static const char *const sysSExtDir =

12
www/seamonkey/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.8 2012/09/01 14:10:03 landry Exp $
--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Mon Aug 27 06:49:34 2012
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in Sat Sep 1 02:00:16 2012
@@ -165,7 +165,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

6
www/seamonkey/pkg/PLIST-enigmail
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-enigmail,v 1.5 2012/09/01 14:10:03 landry Exp $
@comment $OpenBSD: PLIST-enigmail,v 1.6 2012/11/24 10:36:20 landry Exp $
@conflict enigmail-seamonkey-<=1.2
@pkgpath mail/enigmail/seamonkey
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/
@ -12,6 +12,8 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-00
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmime.xpt
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigprefs-service.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/ipc.xpt
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeDecrypt.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeEncrypt.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/pref/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/pref/enigmail.js
@ -22,7 +24,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-00
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/commonFuncs.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailCommon.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/keyManagement.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/mimeDecrypt.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/mimeVerify.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/pipeConsole.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/pipeTransport.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess.jsm

7
www/seamonkey/pkg/PLIST-lightning
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-lightning,v 1.12 2012/10/10 21:03:40 landry Exp $
@comment $OpenBSD: PLIST-lightning,v 1.13 2012/11/24 10:36:20 landry Exp $
@conflict lightning-seamonkey-<=1.0b1
@pkgpath productivity/sunbird,-seamonkey
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/calendar-timezones@mozilla.org/
@ -63,6 +63,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a4
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calCalendarSearchService.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDateTimeFormatter.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDavRequestHandlers.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDeletedItems.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calEvent.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFilter.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFreeBusyService.js
@ -209,9 +210,10 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a4
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/widgets/minimonth.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/abcard.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/alarm-flashing.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/alarm-icons.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/attendee-icons.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/cal-icon24.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/cal-icon32.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-alarm-dialog.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-alarms.css
@ -375,6 +377,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a4
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItipUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calPrintUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calProviderUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calRecurrenceUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageHelpers.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageUpgrade.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calUtils.jsm

5
www/seamonkey/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.23 2012/08/07 09:02:33 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.24 2012/11/24 10:36:20 landry Exp $
@conflict seamonkey-<=2.0.6
@pkgpath www/seamonkey
bin/${MOZILLA_PROJECT}
@ -60,6 +60,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/venkman-window16.
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/venkman-window48.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/binary.manifest
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/libmozgnome.so.${LIBmozgnome_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/libsuite.so.${LIBsuite_VERSION}
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/messenger/
@ -112,5 +113,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/yahoo.xml
@man man/man1/${MOZILLA_PROJECT}.1
share/applications/${MOZILLA_PROJECT}.desktop
share/doc/pkg-readmes/${FULLPKGNAME}
share/pixmaps/
share/pixmaps/${MOZILLA_PROJECT}.png
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database