diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2016-06-07 20:28:41 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2016-06-07 20:28:41 +0000 |
| commit | 45d3cc73dc908af3262c6a714cb755edd03f071a (patch) | |
| tree | 564e40b2ccfe669385077be2c94de93ac0c15fe3 /www/chromium/files/patch-crypto_nss__util.cc | |
| parent | Update to 6.0p1. Notable fixes: (diff) | |
www/chromium: update to 51.0.2704.84
A lot of patch files are renamed in this update.
Submitted by: Timothy Vaccarelli
Obtained from: https://github.com/LeFroid/
MFH: 2016Q2
Security: http://vuxml.freebsd.org/freebsd/c039a761-2c29-11e6-8912-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/1a6bbb95-24b8-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/4dfafa16-24ba-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/7da1da96-24bb-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/6d8505f0-0614-11e6-b39c-00262d5ed8ee.html
Notes
Notes:
svn path=/head/; revision=416521
Diffstat (limited to 'www/chromium/files/patch-crypto_nss__util.cc')
| -rw-r--r-- | www/chromium/files/patch-crypto_nss__util.cc | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/www/chromium/files/patch-crypto_nss__util.cc b/www/chromium/files/patch-crypto_nss__util.cc new file mode 100644 index 000000000000..959c18c16d41 --- /dev/null +++ b/www/chromium/files/patch-crypto_nss__util.cc @@ -0,0 +1,33 @@ +--- crypto/nss_util.cc.orig 2016-05-11 19:02:22 UTC ++++ crypto/nss_util.cc +@@ -15,7 +15,7 @@ + + #include "crypto/nss_util_internal.h" + +-#if defined(OS_OPENBSD) ++#if defined(OS_BSD) + #include <sys/mount.h> + #include <sys/param.h> + #endif +@@ -147,7 +147,7 @@ char* PKCS11PasswordFunc(PK11SlotInfo* s + // detection when database_dir is on NFS. See http://crbug.com/48585. + // + // TODO(wtc): port this function to other USE_NSS_CERTS platforms. It is +-// defined only for OS_LINUX and OS_OPENBSD simply because the statfs structure ++// defined only for OS_LINUX and OS_BSD simply because the statfs structure + // is OS-specific. + // + // Because this function sets an environment variable it must be run before we +@@ -158,10 +158,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(con + base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN; + if (base::GetFileSystemType(database_dir, &fs_type)) + db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS); +-#elif defined(OS_OPENBSD) ++#elif defined(OS_BSD) + struct statfs buf; + if (statfs(database_dir.value().c_str(), &buf) == 0) +- db_on_nfs = (strcmp(buf.f_fstypename, MOUNT_NFS) == 0); ++ db_on_nfs = (strcmp(buf.f_fstypename, "nfs") == 0); + #else + NOTIMPLEMENTED(); + #endif |