summaryrefslogtreecommitdiff
path: root/devel/xulrunner/patches/patch-al
diff options
context:
space:
mode:
Diffstat (limited to 'devel/xulrunner/patches/patch-al')
-rw-r--r--devel/xulrunner/patches/patch-al35
1 files changed, 12 insertions, 23 deletions
diff --git a/devel/xulrunner/patches/patch-al b/devel/xulrunner/patches/patch-al
index dd29f65dacc..ed885f1afd0 100644
--- a/devel/xulrunner/patches/patch-al
+++ b/devel/xulrunner/patches/patch-al
@@ -1,27 +1,16 @@
-$NetBSD: patch-al,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $
+$NetBSD: patch-al,v 1.1.1.1.8.1 2010/09/11 14:59:16 spz Exp $
-# Reported upstream as https://bugzilla.mozilla.org/show_bug.cgi?id=471179
-
---- nsprpub/pr/src/misc/prsystem.c.orig 2009-06-29 18:15:07.000000000 +0200
-+++ nsprpub/pr/src/misc/prsystem.c
-@@ -284,6 +284,20 @@ PR_IMPLEMENT(PRUint64) PR_GetPhysicalMem
- long pageCount = sysconf(_SC_PHYS_PAGES);
- bytes = (PRUint64) pageSize * pageCount;
+--- storage/src/mozStorageConnection.cpp.orig 2010-08-24 21:32:09.000000000 +0000
++++ storage/src/mozStorageConnection.cpp
+@@ -405,6 +405,11 @@ Connection::initialize(nsIFile *aDatabas
+ break;
+ }
-+#elif defined(NETBSD)
-+
-+ int mib[2];
-+ int rc;
-+ uint64_t memSize;
-+ size_t len = sizeof(memSize);
-+
-+ mib[0] = CTL_HW;
-+ mib[1] = HW_PHYSMEM64;
-+ rc = sysctl( mib, 2, &memSize, &len, NULL, 0 );
-+ if ( -1 != rc ) {
-+ bytes = memSize;
-+ }
++ // XXX tnn: the configure script demands that sqlite3 is compiled with
++ // SECURE_DELETE on by default. sqlite3 in pkgsrc does not have that,
++ // so instead we enable secure_delete manually here.
++ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING("PRAGMA secure_delete = 1;"));
+
- #elif defined(HPUX)
+ return NS_OK;
+ }
- struct pst_static info;