Hi,

  Move to system sqlite3. Should get rid of those fugly warnings.
  Untested as it requires the sqlite3 update.

  f.-

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.160
diff -N -u -p Makefile
--- Makefile    22 Nov 2010 08:36:49 -0000      1.160
+++ Makefile    22 Nov 2010 10:15:59 -0000
@@ -7,7 +7,7 @@ MOZILLA_VERSION =       3.6.12
 MOZILLA_BRANCH =       1.9.2
 MOZILLA_PROJECT =      mozilla-firefox
 MOZILLA_CODENAME =     browser
-REVISION =             0
+REVISION =             1
 
 SO_VERSION =   22.1
 # NOTE: Must bump minor version if any shlib's are removed from the
@@ -36,11 +36,10 @@ USE_GROFF = Yes
 NO_REGRESS =   Yes
 
 CONFIGURE_STYLE =      autoconf no-autoheader
-CONFIGURE_ARGS +=      --enable-official-branding
+CONFIGURE_ARGS +=      --enable-official-branding \
+                       --enable-system-sqlite
 # --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-security_nss_lib_softoken_sdb_c
===================================================================
RCS file: patches/patch-security_nss_lib_softoken_sdb_c
diff -N -u -p patches/patch-security_nss_lib_softoken_sdb_c
--- /dev/null   22 Nov 2010 03:16:00 -0000
+++ patches/patch-security_nss_lib_softoken_sdb_c       22 Nov 2010 10:15:59 
-0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- security/nss/lib/softoken/sdb.c.orig       Mon Nov 22 09:35:19 2010
++++ security/nss/lib/softoken/sdb.c    Mon Nov 22 09:40:01 2010
+@@ -614,6 +614,14 @@ sdb_openDB(const char *name, sqlite3 **sqlDB, int flag
+       *sqlDB = NULL;
+       return sqlerr;
+     }
++
++    sqlerr = sqlite3_exec(sqlDB, "PRAGMA secure_delete = ON", NULL, 0, NULL);
++    if (sqlerr != SQLITE_OK) {
++      sqlite3_close(*sqlDB);
++      *sqlDB = NULL;
++      return sqlerr;
++    }
++
+     return SQLITE_OK;
+ }
+ 
Index: patches/patch-storage_src_mozStorageConnection_cpp
===================================================================
RCS file: patches/patch-storage_src_mozStorageConnection_cpp
diff -N -u -p patches/patch-storage_src_mozStorageConnection_cpp
--- /dev/null   22 Nov 2010 03:16:00 -0000
+++ patches/patch-storage_src_mozStorageConnection_cpp  22 Nov 2010 10:15:59 
-0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- storage/src/mozStorageConnection.cpp.orig  Wed Oct 27 04:01:37 2010
++++ storage/src/mozStorageConnection.cpp       Mon Nov 22 10:05:44 2010
+@@ -383,6 +383,15 @@ 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

Reply via email to