Build sunbird against systemwide sqlite3 and add the PRAGMA

secure_delete patch. Consistency uber alles!
This commit is contained in:
landry 2011-01-14 22:57:44 +00:00
parent f325f438b2
commit 8a6ec97c9b
3 changed files with 22 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2011/01/05 08:22:30 dcoppa Exp $
# $OpenBSD: Makefile,v 1.20 2011/01/14 22:57:44 landry Exp $
COMMENT = Mozilla calendar
@ -8,12 +8,12 @@ MOZILLA_BRANCH = 1.9.1
MOZILLA_CODENAME = calendar
DISTNAME = lightning-sunbird-1.0b1.source
REVISION = 8
REVISION = 9
EPOCH = 0
CATEGORIES = productivity mail
SO_VERSION = 16.0
SO_VERSION = 16.1
MOZILLA_LIBS = calbasecomps accessibility auth autoconfig caps chardet chrome \
commandlines cookie docshell embedcomponents fileview gkgfxthebes \
@ -22,7 +22,7 @@ MOZILLA_LIBS = calbasecomps accessibility auth autoconfig caps chardet chrome \
remoteservice satchel spellchecker storagecomps system-pref \
tkautocomplete toolkitcomps txmgr uconv unixproxy webbrwsr widget_gtk2 \
windowds xpautocomplete xpconnect xpinstall zipwriter gfxpsshar gkgfx \
gtkxtbin mozjs sqlite3 thebes xpcom xpcom_core xul nullplugin unixprintplugin
gtkxtbin mozjs thebes xpcom xpcom_core xul nullplugin unixprintplugin
# MPL
PERMIT_PACKAGE_CDROM= Yes

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.1 2011/01/14 22:57:44 landry Exp $
--- mozilla/storage/src/mozStorageConnection.cpp.orig Wed Jan 12 09:50:06 2011
+++ mozilla/storage/src/mozStorageConnection.cpp Wed Jan 12 09:53:55 2011
@@ -375,6 +375,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;
+ return convertResultCode(srv);
+ }
+
// Set the synchronous PRAGMA, according to the pref
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
PRInt32 synchronous = 1; // Default to NORMAL if pref not set

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2010/10/27 13:00:55 landry Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/01/14 22:57:44 landry Exp $
@conflict sunbird-<=1.0b1
@pkgpath productivity/sunbird,-main
bin/${MOZILLA_PROJECT}
@ -341,7 +341,6 @@ ${MOZILLA_PROJECT}/icons/mozicon50.xpm
@lib ${MOZILLA_PROJECT}/libgkgfx.so.${LIBgkgfx_VERSION}
@lib ${MOZILLA_PROJECT}/libgtkxtbin.so.${LIBgtkxtbin_VERSION}
@lib ${MOZILLA_PROJECT}/libmozjs.so.${LIBmozjs_VERSION}
@lib ${MOZILLA_PROJECT}/libsqlite3.so.${LIBsqlite3_VERSION}
@lib ${MOZILLA_PROJECT}/libthebes.so.${LIBthebes_VERSION}
@lib ${MOZILLA_PROJECT}/libxpcom.so.${LIBxpcom_VERSION}
@lib ${MOZILLA_PROJECT}/libxpcom_core.so.${LIBxpcom_core_VERSION}