Hi,
so now that sqlite3 has been updated to a version that has support for
secure_delete PRAGMA, we can trick mozilla ports to finally build
against systemwide sqlite, that'll get us rid of the infamous warning
reported here several times.
/usr/local/mozilla-firefox/firefox-bin:/usr/local/lib/libsqlite3.so.14.0:
/usr/local/mozilla-firefox/libsqlite3.so.22.1 : WARNING:
symbol(sqlite3_version) size mismatch, relink your program
Mozilla requires secure_delete to be enabled to securely erase
cookies/history in .sqlite files, reported here :
https://bugzilla.mozilla.org/show_bug.cgi?id=445164
previously, if you cleaned your history and did 'strings
path/to/profile/*.sqlite', everything was still here. So that one is
fixed by forcing the use of secure_delete a year ago..
They are also a bit 'annoying' on making that an option, or use the
PRAGMA implemented for that in upstream sqlite3.
https://bugzilla.mozilla.org/show_bug.cgi?id=546162
So the fix is to trick configure to make it believe systemwide sqlite is
built with secure_delete by default, and patch mozStorageConnection.cpp
to enable it at runtime through a PRAGMA (diff from fgsch@).
I've actually tested it in ffx 3.6.13, thunderbird 3.1.7 and seamonkey
2.0.11, all built against systemwide sqlite and with the secure_delete
pragma. Browse the web with ffx, clean history, strings on the
{places,cookies,downloads}.sqlite, nothing left.
Same change applied to seamonkey/sunbird and ffx35 for the sake of consistency,
but as they are from branch 1.9.1 the bug is still not fixed there.
With seamonkey 2.0.11, deleting history doesnt effectively delete entries
in the sqlite file. Didnt test with ffx 3.5.
Thunderbird 3 looks happy with systemwide sqlite3, as now it's built
with FTS3 enabled, which is a requirement for GLODA indexing.
If one wants to test the diffs, make sure that nss is built against
latest sqlite3, otherwise you'll still get the infamous warning.
Landry
Index: mozilla.port.mk
===================================================================
RCS file: /cvs/ports/www/mozilla/mozilla.port.mk,v
retrieving revision 1.17
diff -u -r1.17 mozilla.port.mk
--- mozilla.port.mk 1 Dec 2010 15:00:12 -0000 1.17
+++ mozilla.port.mk 12 Jan 2011 10:18:32 -0000
@@ -24,16 +24,18 @@
archivers/zip>=2.3
MODMOZ_LIB_DEPENDS = x11/gtk+2 \
+ databases/sqlite3 \
devel/nspr>=4.8.6 \
security/nss>=3.12.8
+
MODMOZ_WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi
\
Xinerama Xrandr Xrender Xt atk-1.0 c cairo crypto expat \
fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
\
gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg krb5 m \
nspr4>=21 nss3>=25 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pixman-1 plc4>=21 plds4>=21 png pthread pthread-stubs \
- smime3>=25 sndio softokn3>=25 ssl3>=25 stdc++ xcb \
+ smime3>=25 sndio softokn3>=25 sqlite3 ssl3>=25 stdc++ xcb \
xcb-render GL Xxf86vm drm xcb-shm z
WANTLIB += ${MODMOZ_WANTLIB}
@@ -60,6 +62,7 @@
--disable-dbus \
--enable-default-toolkit=cairo-gtk2 \
--enable-xinerama \
+ --enable-system-sqlite \
--enable-svg \
--enable-svg-renderer=cairo \
--enable-canvas
@@ -116,6 +119,7 @@
CONFIGURE_ENV +=${MAKE_ENV} \
PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" \
MOZ_ENABLE_COREXFONTS=1 \
+ ac_cv_sqlite_secure_delete=yes \
topsrcdir=${WRKSRC}
MODGNU_CONFIG_GUESS_DIRS += ${WRKSRC}/${_MOZDIR}/build/autoconf \
? .git
? .gitignore
? build-asneeded
? build-ldflags-asneeded
? buildfindldtarget
? pkg/PLIST.orig-old
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.163
diff -u -r1.163 Makefile
--- Makefile 26 Dec 2010 13:16:29 -0000 1.163
+++ Makefile 12 Jan 2011 10:17:37 -0000
@@ -7,13 +7,13 @@
MOZILLA_BRANCH = 1.9.2
MOZILLA_PROJECT = mozilla-firefox
MOZILLA_CODENAME = browser
-REVISION = 0
+REVISION = 1
-SO_VERSION = 22.1
+SO_VERSION = 22.2
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = browsercomps browserdirprovider imgicon mozjs \
- sqlite3 xpcom xul nullplugin unixprintplugin
+ xpcom xul nullplugin unixprintplugin
CATEGORIES = www
@@ -39,8 +39,6 @@
CONFIGURE_ARGS += --enable-official-branding
# --with-system-png=${LOCALBASE}
# no system png : apng support not bundled in
-# --enable-system-sqlite
-# no system sqlite : requires SECURE_DELETE
MOZILLA_DATADIRS = chrome components defaults dictionaries extensions \
greprefs icons modules plugins res searchplugins
Index: patches/patch-storage_src_mozStorageConnection_cpp
===================================================================
RCS file: patches/patch-storage_src_mozStorageConnection_cpp
diff -N patches/patch-storage_src_mozStorageConnection_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-storage_src_mozStorageConnection_cpp 12 Jan 2011 10:17:37
-0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+set secure_delete PRAGMA on by default, instead of using internal sqlite copy
+--- storage/src/mozStorageConnection.cpp.orig Tue Jan 11 22:23:40 2011
++++ storage/src/mozStorageConnection.cpp Tue Jan 11 22:26:20 2011
+@@ -383,6 +383,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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/pkg/PLIST,v
retrieving revision 1.31
diff -u -r1.31 PLIST
--- pkg/PLIST 11 Nov 2010 09:30:37 -0000 1.31
+++ pkg/PLIST 12 Jan 2011 10:17:37 -0000
@@ -264,7 +264,6 @@
${MOZILLA_PROJECT}/icons/document.png
${MOZILLA_PROJECT}/icons/mozicon128.png
@lib ${MOZILLA_PROJECT}/libmozjs.so.${LIBmozjs_VERSION}
-...@lib ${MOZILLA_PROJECT}/libsqlite3.so.${LIBsqlite3_VERSION}
@lib ${MOZILLA_PROJECT}/libxpcom.so.${LIBxpcom_VERSION}
@lib ${MOZILLA_PROJECT}/libxul.so.${LIBxul_VERSION}
${MOZILLA_PROJECT}/modules/
? .git
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/firefox35/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- Makefile 10 Dec 2010 10:36:00 -0000 1.55
+++ Makefile 12 Jan 2011 13:52:24 -0000
@@ -6,6 +6,7 @@
MOZILLA_BRANCH = 1.9.1
MOZILLA_PROJECT = firefox35
MOZILLA_CODENAME = browser
+REVISION = 0
SO_VERSION = 24.0
# NOTE: Must bump minor version if any shlib's are removed from the
@@ -48,9 +49,6 @@
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_ARGS += --enable-official-branding
-CONFIGURE_ARGS += --enable-system-sqlite
-LIB_DEPENDS += databases/sqlite3>=3.6.16
-WANTLIB += sqlite3>=13.3
MOZILLA_DATADIRS = chrome components defaults dictionaries extensions \
greprefs icons modules plugins res searchplugins
Index: patches/patch-storage_src_mozStorageConnection_cpp
===================================================================
RCS file: patches/patch-storage_src_mozStorageConnection_cpp
diff -N patches/patch-storage_src_mozStorageConnection_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-storage_src_mozStorageConnection_cpp 12 Jan 2011 13:52:24
-0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- storage/src/mozStorageConnection.cpp.orig Tue Nov 23 21:19:55 2010
++++ storage/src/mozStorageConnection.cpp Wed Jan 12 11:09:43 2011
+@@ -184,6 +184,13 @@ mozStorageConnection::Initialize(nsIFile *aDatabaseFil
+ 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
? 2.0
? 1.9/build.log
? 1.9/build3
? 1.9/build4
? 1.9/build5
? 1.9/todo
? 1.9/xul
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/devel/xulrunner/Makefile.inc,v
retrieving revision 1.18
diff -u -r1.18 Makefile.inc
--- Makefile.inc 15 Nov 2010 19:46:10 -0000 1.18
+++ Makefile.inc 12 Jan 2011 10:44:20 -0000
@@ -38,5 +38,4 @@
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_ARGS = --disable-javaxpcom \
- --disable-system-sqlite \
--enable-extensions=default,cookie,permissions
Index: 1.9/Makefile
===================================================================
RCS file: /cvs/ports/devel/xulrunner/1.9/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- 1.9/Makefile 10 Dec 2010 10:54:24 -0000 1.32
+++ 1.9/Makefile 12 Jan 2011 10:44:20 -0000
@@ -5,13 +5,14 @@
MOZILLA_BRANCH = 1.9.2
MOZILLA_PROJECT = xulrunner1.9
DISTNAME = firefox-${FFX_VERSION}.source
+REVISION-main = 0
MASTER_SITES =
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${FFX_VERSION}/source/
-SO_VERSION = 3.1
+SO_VERSION = 3.2
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
-MOZILLA_LIBS = imgicon mozjs xpcom xul sqlite3 nullplugin unixprintplugin
+MOZILLA_LIBS = imgicon mozjs xpcom xul nullplugin unixprintplugin
.if ${MACHINE_ARCH} == "i386"
PKG_ARGS+= -Djit=1 -Damd64=0
Index: 1.9/pkg/PLIST-devel
===================================================================
RCS file: /cvs/ports/devel/xulrunner/1.9/pkg/PLIST-devel,v
retrieving revision 1.11
diff -u -r1.11 PLIST-devel
--- 1.9/pkg/PLIST-devel 22 Oct 2010 19:25:19 -0000 1.11
+++ 1.9/pkg/PLIST-devel 12 Jan 2011 10:44:20 -0000
@@ -1308,6 +1308,7 @@
${MOZILLA_PROJECT}/include/mozilla/DeadlockDetector.h
${MOZILLA_PROJECT}/include/mozilla/Monitor.h
${MOZILLA_PROJECT}/include/mozilla/Mutex.h
+${MOZILLA_PROJECT}/include/mozilla/PaintTracker.h
${MOZILLA_PROJECT}/include/mozilla/PluginLibrary.h
${MOZILLA_PROJECT}/include/mozilla/PluginPRLibrary.h
${MOZILLA_PROJECT}/include/mozilla/TimeStamp.h
@@ -2306,6 +2307,7 @@
${MOZILLA_PROJECT}/include/nsIMutable.h
${MOZILLA_PROJECT}/include/nsIMutableArray.h
${MOZILLA_PROJECT}/include/nsIMutationObserver.h
+${MOZILLA_PROJECT}/include/nsIMutationObserver2.h
${MOZILLA_PROJECT}/include/nsINIParser.h
${MOZILLA_PROJECT}/include/nsINSSCertCache.h
${MOZILLA_PROJECT}/include/nsINSSErrorsService.h
@@ -3008,6 +3010,8 @@
${MOZILLA_PROJECT}/include/oggz/oggz_stream.h
${MOZILLA_PROJECT}/include/oggz/oggz_table.h
${MOZILLA_PROJECT}/include/oggz/oggz_write.h
+${MOZILLA_PROJECT}/include/opentype-sanitiser.h
+${MOZILLA_PROJECT}/include/ots-memory-stream.h
${MOZILLA_PROJECT}/include/pixman-version.h
${MOZILLA_PROJECT}/include/pixman.h
${MOZILLA_PROJECT}/include/pldhash.h
@@ -3020,7 +3024,6 @@
${MOZILLA_PROJECT}/include/rdfIDataSource.h
${MOZILLA_PROJECT}/include/rdfISerializer.h
${MOZILLA_PROJECT}/include/rdfITripleVisitor.h
-${MOZILLA_PROJECT}/include/sqlite3.h
${MOZILLA_PROJECT}/include/std_semaphore.h
${MOZILLA_PROJECT}/include/stopwatch.h
${MOZILLA_PROJECT}/include/string-template-def-char.h
Index: 1.9/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/xulrunner/1.9/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -r1.9 PLIST-main
--- 1.9/pkg/PLIST-main 12 Nov 2010 09:08:02 -0000 1.9
+++ 1.9/pkg/PLIST-main 12 Jan 2011 10:44:20 -0000
@@ -2,7 +2,7 @@
@option no-default-conflict
@conflict xulrunner->=1.9
@unexec xulrunner1.9 --unregister-global
-...@bin bin/${MOZILLA_PROJECT}
+bin/${MOZILLA_PROJECT}
${MOZILLA_PROJECT}/
${MOZILLA_PROJECT}/chrome/
${MOZILLA_PROJECT}/chrome/classic.jar
@@ -217,7 +217,6 @@
${MOZILLA_PROJECT}/icons/
${MOZILLA_PROJECT}/icons/document.png
@lib ${MOZILLA_PROJECT}/libmozjs.so.${LIBmozjs_VERSION}
-...@lib ${MOZILLA_PROJECT}/libsqlite3.so.${LIBsqlite3_VERSION}
@lib ${MOZILLA_PROJECT}/libxpcom.so.${LIBxpcom_VERSION}
@lib ${MOZILLA_PROJECT}/libxul.so.${LIBxul_VERSION}
${MOZILLA_PROJECT}/modules/
? .git
? .gitignore
? configure-sqlite
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/Makefile,v
retrieving revision 1.113
diff -u -r1.113 Makefile
--- Makefile 5 Jan 2011 08:22:30 -0000 1.113
+++ Makefile 12 Jan 2011 10:17:31 -0000
@@ -12,13 +12,13 @@
MULTI_PACKAGES = -main -lightning
PKGNAME-main = ${PKGNAME}
-REVISION-main = 0
+REVISION-main = 1
PKGNAME-lightning = lightning-1.0beta2
EPOCH-lightning = 0
REVISION-lightning = 11
# need to be in synch with SO_VERSION in mail/enigmail/thunderbird
-SO_VERSION = 17.0
+SO_VERSION = 17.1
# 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
@@ -32,7 +32,7 @@
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 \
+ gfxpsshar gkgfx gtkxtbin ldap60 ldif60 mozjs prldap60 ssldap60 \
thebes xpcom xpcom_core xul nullplugin unixprintplugin
FLAVOR ?=
@@ -60,10 +60,8 @@
CONFIGURE_STYLE = autoconf no-autoheader
-#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
-
+LIB_DEPENDS-main = ${LIB_DEPENDS}
+WANTLIB-main = ${WANTLIB}
LIB_DEPENDS-lightning = ${BUILD_PKGPATH},-main
WANTLIB-lightning = mozilla-thunderbird/mozjs mozilla-thunderbird/xpcom c m
stdc++ nspr4 plc4 plds4
BUILD_DEPENDS += archivers/unzip #to unzip xpi
Index: patches/patch-mozilla_storage_src_mozStorageConnection_cpp
===================================================================
RCS file: patches/patch-mozilla_storage_src_mozStorageConnection_cpp
diff -N patches/patch-mozilla_storage_src_mozStorageConnection_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-mozilla_storage_src_mozStorageConnection_cpp 12 Jan 2011
10:17:31 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+force the use of secure_delete instead of using internal sqlite copy
+--- mozilla/storage/src/mozStorageConnection.cpp.orig Tue Jan 11 22:46:42 2011
++++ mozilla/storage/src/mozStorageConnection.cpp Tue Jan 11 22:47:26 2011
+@@ -383,6 +383,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
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -r1.3 PLIST-main
--- pkg/PLIST-main 11 Nov 2010 09:30:36 -0000 1.3
+++ pkg/PLIST-main 12 Jan 2011 10:17:31 -0000
@@ -335,7 +335,6 @@
@lib ${MOZILLA_PROJECT}/libldif60.so.${LIBldif60_VERSION}
@lib ${MOZILLA_PROJECT}/libmozjs.so.${LIBmozjs_VERSION}
@lib ${MOZILLA_PROJECT}/libprldap60.so.${LIBprldap60_VERSION}
-...@lib ${MOZILLA_PROJECT}/libsqlite3.so.${LIBsqlite3_VERSION}
@lib ${MOZILLA_PROJECT}/libssldap60.so.${LIBssldap60_VERSION}
@lib ${MOZILLA_PROJECT}/libthebes.so.${LIBthebes_VERSION}
@lib ${MOZILLA_PROJECT}/libxpcom.so.${LIBxpcom_VERSION}
? .git
? .gitignore
? notes
? old
? todo
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/seamonkey/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- Makefile 5 Jan 2011 08:22:30 -0000 1.69
+++ Makefile 12 Jan 2011 11:08:56 -0000
@@ -10,13 +10,13 @@
MULTI_PACKAGES = -main -lightning
PKGNAME-main = ${PKGNAME}
-REVISION-main = 0
+REVISION-main = 1
PKGNAME-lightning = lightning-seamonkey-1.0beta1
REVISION-lightning = 11
EPOCH-lightning = 0
# must be in sync with SO_VERSION in main/enigmail/seamonkey
-SO_VERSION= 16.0
+SO_VERSION= 16.1
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = accessibility appcomps auth autoconfig caps chardet chrome
commandlines \
@@ -27,7 +27,7 @@
storagecomps suite system-pref tkautocomplete toolkitcomps txmgr uconv \
ucvmath universalchardet unixproxy webbrwsr widget_gtk2 windowds \
xpautocomplete xpconnect xpinstall zipwriter gfxpsshar gkgfx gtkxtbin \
- jsj ldap60 ldif60 mozjs prldap60 sqlite3 ssldap60 thebes xpcom \
+ jsj ldap60 ldif60 mozjs prldap60 ssldap60 thebes xpcom \
xpcom_core xul nullplugin unixprintplugin
Index: patches/patch-mozilla_storage_src_mozStorageConnection_cpp
===================================================================
RCS file: patches/patch-mozilla_storage_src_mozStorageConnection_cpp
diff -N patches/patch-mozilla_storage_src_mozStorageConnection_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-mozilla_storage_src_mozStorageConnection_cpp 12 Jan 2011
11:08:56 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- mozilla/storage/src/mozStorageConnection.cpp.orig Tue Nov 23 21:19:55 2010
++++ mozilla/storage/src/mozStorageConnection.cpp Wed Jan 12 11:09:43 2011
+@@ -184,6 +184,13 @@ mozStorageConnection::Initialize(nsIFile *aDatabaseFil
+ 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
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/www/seamonkey/pkg/PLIST-main,v
retrieving revision 1.14
diff -u -r1.14 PLIST-main
--- pkg/PLIST-main 11 Nov 2010 09:55:05 -0000 1.14
+++ pkg/PLIST-main 12 Jan 2011 11:08:56 -0000
@@ -547,7 +547,6 @@
@lib ${MOZILLA_PROJECT}/libldif60.so.${LIBldif60_VERSION}
@lib ${MOZILLA_PROJECT}/libmozjs.so.${LIBmozjs_VERSION}
@lib ${MOZILLA_PROJECT}/libprldap60.so.${LIBprldap60_VERSION}
-...@lib ${MOZILLA_PROJECT}/libsqlite3.so.${LIBsqlite3_VERSION}
@lib ${MOZILLA_PROJECT}/libssldap60.so.${LIBssldap60_VERSION}
@lib ${MOZILLA_PROJECT}/libthebes.so.${LIBthebes_VERSION}
@lib ${MOZILLA_PROJECT}/libxpcom.so.${LIBxpcom_VERSION}
? foo
Index: Makefile
===================================================================
RCS file: /cvs/ports/productivity/sunbird/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 19 Sep 2010 19:22:46 -0000 1.11
+++ Makefile 12 Jan 2011 09:44:35 -0000
@@ -8,14 +8,12 @@
MOZILLA_CODENAME = calendar
DISTNAME = lightning-sunbird-1.0b1.source
-REVISION = 1
+REVISION = 2
EPOCH = 0
CATEGORIES = productivity mail
-# need to be in synch with SO_VERSION in
-# mail/mozilla-thunderbird and www/seamonkey for lighting to work
-SO_VERSION = 16.0
+SO_VERSION = 16.1
MOZILLA_LIBS = calbasecomps accessibility auth autoconfig caps chardet chrome \
commandlines cookie docshell embedcomponents fileview gkgfxthebes \
@@ -24,7 +22,7 @@
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
Index: patches/patch-mozilla_storage_src_mozStorageConnection_cpp
===================================================================
RCS file: patches/patch-mozilla_storage_src_mozStorageConnection_cpp
diff -N patches/patch-mozilla_storage_src_mozStorageConnection_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-mozilla_storage_src_mozStorageConnection_cpp 12 Jan 2011
09:44:35 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- 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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/productivity/sunbird/pkg/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- pkg/PLIST 27 Jul 2010 16:52:36 -0000 1.1
+++ pkg/PLIST 12 Jan 2011 09:44:35 -0000
@@ -341,7 +341,6 @@
@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}
Index: seamonkey/Makefile
===================================================================
RCS file: /cvs/ports/mail/enigmail/seamonkey/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- seamonkey/Makefile 25 Aug 2010 06:34:50 -0000 1.3
+++ seamonkey/Makefile 12 Jan 2011 10:18:46 -0000
@@ -4,11 +4,11 @@
VERSION = 1.0.1
PKGNAME = enigmail-seamonkey-${VERSION}
-REVISION = 3
+REVISION = 4
# must be in sync with SO_VERSION in
# www/seamonkey
-SHARED_LIBS = enigmime 16.0
+SHARED_LIBS = enigmime 16.1
MOZAPP_PKGPATH = www/seamonkey
MOZAPP_DIR = seamonkey
Index: thunderbird/Makefile
===================================================================
RCS file: /cvs/ports/mail/enigmail/thunderbird/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- thunderbird/Makefile 25 Aug 2010 06:34:50 -0000 1.3
+++ thunderbird/Makefile 12 Jan 2011 10:18:46 -0000
@@ -3,12 +3,12 @@
COMMENT = GnuPG extension for Thunderbird
VERSION = 1.1.2
-REVISION = 1
+REVISION = 2
# must be in sync with SO_VERSION in
# mail/mozilla-thunderbird
-SHARED_LIBS = enigmime 17.0 \
- ipc 17.0
+SHARED_LIBS = enigmime 17.1 \
+ ipc 17.1
MOZAPP_PKGPATH = mail/mozilla-thunderbird
MOZAPP_DIR = mozilla-thunderbird
