mirror of
https://git.freebsd.org/ports.git
synced 2025-07-13 23:39:20 -04:00
0557b9315d
- Update Firefox ESR to 24.6.0 - Update libxul to 24.6.0 - Update NSS to 3.16.1 - Update NSPR to 4.10.6 - Update Thunderbird to 24.6.0 - Convert USE_BZIP2 to USES - Backport ff31 fix against crashing DEBUG build on newegg.com [1] - Add a note in UPDATING to not build audio/soundtouch with INTEGER_SAMPLES [2] - Use arc4random_buf(3) to generate UUIDs (version 4) - Fix debugger detection used by Telemetry and the slow script dialog - Add STAGE support [3] PR: ports/189991 [1] PR: ports/189217 [2] PR: ports/189488 [2] Submitted by: bapt [3] Sumbitted by: Jan Beich Security: http://www.vuxml.org/freebsd/888a0262-f0d9-11e3-ba0c-b4b52fce4ce8.html
41 lines
2 KiB
Text
41 lines
2 KiB
Text
diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
|
|
index 4b21361..cb3be32 100644
|
|
--- dom/system/OSFileConstants.cpp
|
|
+++ dom/system/OSFileConstants.cpp
|
|
@@ -596,7 +596,7 @@ static const dom::ConstantSpec gLibcProperties[] =
|
|
|
|
{ "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },
|
|
|
|
- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) },
|
|
+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) },
|
|
{ "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) },
|
|
|
|
#endif // defined(XP_UNIX)
|
|
diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
|
|
index b59fca4..0cf220b 100644
|
|
--- toolkit/components/osfile/modules/osfile_unix_back.jsm
|
|
+++ toolkit/components/osfile/modules/osfile_unix_back.jsm
|
|
@@ -228,8 +228,8 @@
|
|
let statvfs = new SharedAll.HollowStructure("statvfs",
|
|
Const.OSFILE_SIZEOF_STATVFS);
|
|
|
|
- statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
|
|
- "f_bsize", Type.unsigned_long.implementation);
|
|
+ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
|
|
+ "f_frsize", Type.unsigned_long.implementation);
|
|
statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
|
|
"f_bavail", Type.fsblkcnt_t.implementation);
|
|
|
|
diff --git toolkit/components/osfile/modules/osfile_unix_front.jsm toolkit/components/osfile/modules/osfile_unix_front.jsm
|
|
index 99e5e9b..de642c5 100644
|
|
--- toolkit/components/osfile/modules/osfile_unix_front.jsm
|
|
+++ toolkit/components/osfile/modules/osfile_unix_front.jsm
|
|
@@ -373,7 +373,7 @@
|
|
throw_on_negative("statvfs", UnixFile.statvfs(sourcePath, fileSystemInfoPtr));
|
|
|
|
let bytes = new Type.uint64_t.implementation(
|
|
- fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
|
|
+ fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
|
|
|
|
return bytes.value;
|
|
};
|