chromium: Drop seccomp patch for version 21.

Version 22 is the current version of the stable channel, so we don't need to
carry around a patch for earlier versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2012-10-08 07:30:16 +02:00
parent 17fe198695
commit 58a4edd294
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
3 changed files with 12 additions and 34 deletions

View file

@ -81,10 +81,8 @@ let
];
maybeSeccompPatch = let
pre22 = versionOlder sourceInfo.version "22.0.0.0";
pre23 = versionOlder sourceInfo.version "23.0.0.0";
patch = if pre22 then ./enable_seccomp.patch else ./enable_seccomp22.patch;
in optional pre23 patch;
in optional pre23 ./enable_seccomp.patch;
maybeBpfTemporaryFix = let
patch = fetchurl {

View file

@ -1,12 +1,12 @@
diff --git a/content/common/seccomp_sandbox.h b/content/common/seccomp_sandbox.h
index a07d6f3..a622a35 100644
--- a/content/common/seccomp_sandbox.h
+++ b/content/common/seccomp_sandbox.h
@@ -29,15 +29,9 @@ static bool SeccompSandboxEnabled() {
// TODO(evan): turn on for release too once we've flushed out all the bugs,
// allowing us to delete this file entirely and just rely on the "disabled"
// switch.
-#ifdef NDEBUG
diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc
index d4618e5..108f846 100644
--- a/content/common/sandbox_linux.cc
+++ b/content/common/sandbox_linux.cc
@@ -38,15 +38,9 @@ void LogSandboxStarted(const std::string& sandbox_name) {
// Implement the command line enabling logic for seccomp-legacy.
bool IsSeccompLegacyDesired() {
#if defined(SECCOMP_SANDBOX)
-#if defined(NDEBUG)
- // Off by default; allow turning on with a switch.
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableSeccompSandbox);
@ -15,6 +15,6 @@ index a07d6f3..a622a35 100644
return !CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableSeccompSandbox);
-#endif // NDEBUG
}
#endif // SECCOMP_SANDBOX
return false;
}

View file

@ -1,20 +0,0 @@
diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc
index d4618e5..108f846 100644
--- a/content/common/sandbox_linux.cc
+++ b/content/common/sandbox_linux.cc
@@ -38,15 +38,9 @@ void LogSandboxStarted(const std::string& sandbox_name) {
// Implement the command line enabling logic for seccomp-legacy.
bool IsSeccompLegacyDesired() {
#if defined(SECCOMP_SANDBOX)
-#if defined(NDEBUG)
- // Off by default; allow turning on with a switch.
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableSeccompSandbox);
-#else
// On by default; allow turning off with a switch.
return !CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableSeccompSandbox);
-#endif // NDEBUG
#endif // SECCOMP_SANDBOX
return false;
}