From 737eff7166e2812249a4e786a73e683673d7e228 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 23 Oct 2012 06:04:17 +0200
Subject: [PATCH] chromium: Update beta and dev releases.

beta: 23.0.1271.26 -> 23.0.1271.40
dev: 24.0.1284.2 -> 24.0.1297.0

Both are building successful and the BPF seccomp sandbox fix has been dropped as
it has finally been applied upstream.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix         | 11 +----------
 .../networking/browsers/chromium/sources.nix         | 12 ++++++------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index acfb43e7caa..cb0561fa09a 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -88,14 +88,6 @@ let
     pre23 = versionOlder sourceInfo.version "23.0.0.0";
   in optional pre23 ./enable_seccomp.patch;
 
-  maybeBpfTemporaryFix = let
-    patch = fetchurl {
-      url = "https://chromiumcodereview.appspot.com/download/issue11073003_6001_7001.diff";
-      sha256 = "bf61871cdaa8fea27ce15482a17048f67b426a55813c3832f9bd39ec47a9eb06";
-    };
-    needPatch = !versionOlder sourceInfo.version "23.0.1271.0";
-  in optional needPatch patch;
-
 in stdenv.mkDerivation rec {
   name = "${packageName}-${version}";
   packageName = "chromium";
@@ -129,8 +121,7 @@ in stdenv.mkDerivation rec {
 
   patches = optional cfg.cups ./cups_allow_deprecated.patch
          ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch
-         ++ maybeSeccompPatch
-         ++ maybeBpfTemporaryFix;
+         ++ maybeSeccompPatch;
 
   postPatch = optionalString cfg.openssl ''
     cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index dbb0de72f30..b8d010340b3 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,14 +1,14 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "24.0.1284.2";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1284.2.tar.bz2";
-    sha256 = "0lp3r4n3d71wy2ndzcfwvrp9vc1ii98pxip1c8hfinz994ca1ykx";
+    version = "24.0.1297.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1297.0.tar.bz2";
+    sha256 = "1qwqpj5xnv9fsi8k79c6fzlry32h47w6chxabz3l819c008yrqa4";
   };
   beta = {
-    version = "23.0.1271.26";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.26.tar.bz2";
-    sha256 = "1iimpmm5lm5rvak49320lmmvwqr8xv4znp4h1pf65jzzx0apbgkh";
+    version = "23.0.1271.40";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.40.tar.bz2";
+    sha256 = "151yp9rw7v693mw4glmswl7ls2yx3zk0sz1n646brs5wrnbci9l0";
   };
   stable = {
     version = "22.0.1229.94";