[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/15.0.874.106_r107270-1-6-g62ac34f

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit dc3b8be34d266c2df21cbcd14ccc59da22f1264d
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Wed Dec 7 08:56:10 2011 +0100

    Revert "Merge 104421 - Fix library paths for preloading NSS on Ubuntu 11.10."
    
    Closes: #647992
    Thanks: Jonathan Nieder

diff --git a/debian/patches/nss-workaround.patch b/debian/patches/nss-workaround.patch
new file mode 100644
index 0000000..7cffcb5
--- /dev/null
+++ b/debian/patches/nss-workaround.patch
@@ -0,0 +1,47 @@
+Subject: Revert "Merge 104421 - Fix library paths for preloading NSS on Ubuntu 11.10."
+
+This backs out the change introduced by r104798, which allowed NSS to
+actually be initialized, where "initialized" means "trip a sandboxing
+bug and take down the renderer".
+
+Works around: http://bugs.debian.org/647992
+
+--- a/src/crypto/nss_util.cc
++++ b/src/crypto/nss_util.cc
+@@ -29,7 +29,6 @@
+ #include "base/native_library.h"
+ #include "base/stringprintf.h"
+ #include "base/threading/thread_restrictions.h"
+-#include "build/build_config.h"
+ #include "crypto/scoped_nss_types.h"
+ 
+ // USE_NSS means we use NSS for everything crypto-related.  If USE_NSS is not
+@@ -601,18 +600,9 @@ void LoadNSSLibraries() {
+   // Use relative path to Search PATH for the library files.
+   paths.push_back(FilePath());
+ 
+-  // For Debian derivatives NSS libraries are located here.
++  // For Debian derivaties NSS libraries are located here.
+   paths.push_back(FilePath("/usr/lib/nss"));
+ 
+-  // Ubuntu 11.10 (Oneiric) places the libraries here.
+-#if defined(ARCH_CPU_X86_64)
+-  paths.push_back(FilePath("/usr/lib/x86_64-linux-gnu/nss"));
+-#elif defined(ARCH_CPU_X86)
+-  paths.push_back(FilePath("/usr/lib/i386-linux-gnu/nss"));
+-#elif defined(ARCH_CPU_ARMEL)
+-  paths.push_back(FilePath("/usr/lib/arm-linux-gnueabi/nss"));
+-#endif
+-
+   // A list of library files to load.
+   std::vector<std::string> libs;
+   libs.push_back("libsoftokn3.so");
+@@ -635,7 +625,7 @@ void LoadNSSLibraries() {
+   if (loaded == libs.size()) {
+     VLOG(3) << "NSS libraries loaded.";
+   } else {
+-    LOG(ERROR) << "Failed to load NSS libraries.";
++    LOG(WARNING) << "Failed to load NSS libraries.";
+   }
+ #endif
+ }
diff --git a/debian/patches/series b/debian/patches/series
index ad74c53..ef71ca9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,5 +16,6 @@ webkit-version.patch
 #javascript-i18n.patch
 #icu.patch
 cups1.5.patch
-#system_v8.patch
+system_v8.patch
 #protobuf.patch
+nss-workaround.patch

-- 
Git repository for pkg-chromium