update to 2.4.1

4 files changed, 140 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00945c1a8cbe..da28f70c96d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rethinkdb
 	pkgdesc = Distributed NoSQL database for realtime applications
-	pkgver = 2.4.0
-	pkgrel = 8
+	pkgver = 2.4.1
+	pkgrel = 1
 	url = https://www.rethinkdb.com
 	install = rethinkdb.install
 	arch = x86_64
@@ -16,14 +16,14 @@ pkgbase = rethinkdb
 	noextract = node-v6.11.0.tar.gz
 	options = !emptydirs
 	backup = etc/rethinkdb/instances.d/default.conf
-	source = rethinkdb::git+https://github.com/rethinkdb/rethinkdb.git#commit=3ca96904192806817c73c3d533d774585ef90759
+	source = rethinkdb::git+https://github.com/rethinkdb/rethinkdb.git#tag=v2.4.1
 	source = https://nodejs.org/dist/v6.11.0/node-v6.11.0.tar.gz
 	source = rethinkdb@.service
 	source = rethinkdb.sysusers.d
 	source = rethinkdb.tmpfiles.d
 	source = mksnapshot_crash_fix.patch
 	source = v8_g++7_build_fix.patch::https://github.com/nodejs/node/commit/66c1197f3aefd5b9f36533e6b617f2046acc2c0f.patch
-	source = build_fix.patch
+	source = fix_assets.patch
 	sha512sums = SKIP
 	sha512sums = a298232f6393735f2d459eb23f78089dd7eb1bae4907dfe61b286ceb8f93d3131c2dd45f09643089d00e2a4bef0f35739c9c8984f88b34c0ab515793f38eda46
 	sha512sums = d0e86e86010fafcfdad7a58fe9ed9e93deefb1ab803aa283f60cccaf7a0ee11990c59b9ab01872b1c97b08418d7b53064e938b428e50a310442b32aa385277d9
@@ -31,7 +31,7 @@ pkgbase = rethinkdb
 	sha512sums = 112bc0f9ecfdfae6efba5d8cc3f773085b3f345d33d350188dc70609c425e6c656a0a3069ae5c66cdc684a94fd442e990a88c0ca8d1875f085f660c76c3d7250
 	sha512sums = 8deea735b2c7b6fc0221a49e818d4347869330fa9e35a94c15d54f7bc64ac0b8a573906fea6cc64c05a177f3065c96d8b4d0e2a3724b6137d7f12ba7a7b419f7
 	sha512sums = 15f1f9508adef9cd14320b6649f3b766a0dd8dd478290424e9af6343a7fd64e246aafbbf2f19109e5812decb2f15dcb283fec57875bc50a540737441a0fd248d
-	sha512sums = c5199d545ad4c77523b39a30c3b859c03261910c3226dfdf6c0d73c491ee96190745bc09ec349c49c4f41c7c52da9c2e59b9456a32bfe8d4aa78c1e29dd486bc
+	sha512sums = b71d9a4ee892fadcc9471bd2bed31515b1cec796a19fa1fa616045088d21c0be6feba287e80b5c086a9e8a88dce5a9bcb7dbb367b92c4ff171aa8fa5de192cf7
 
 pkgname = rethinkdb
 
diff --git a/PKGBUILD b/PKGBUILD
index a0102f0e5e7a..68232f9f3927 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
-# Maintainer: Celogeek <private-4zokpdq6@mrhyde.xyz>
+# Maintainer: Celogeek <arch-aur-f5d67e@celogeek.com>
 # Contributor: Jean Lucas <jean@4ray.co>
 # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>
 # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Sigmund Lahn <sigmund@lahn.no>
 
 pkgname=rethinkdb
-pkgver=2.4.0
+pkgver=2.4.1
 _node=6.11.0
-pkgrel=8
+pkgrel=1
 pkgdesc='Distributed NoSQL database for realtime applications'
 arch=(x86_64)
 url=https://www.rethinkdb.com
@@ -18,14 +18,14 @@ backup=(etc/rethinkdb/instances.d/default.conf)
 install=rethinkdb.install
 options=(!emptydirs)
 source=(
-  $pkgname::git+https://github.com/rethinkdb/rethinkdb.git#commit=3ca96904192806817c73c3d533d774585ef90759
+  $pkgname::git+https://github.com/rethinkdb/rethinkdb.git#tag=v$pkgver
   https://nodejs.org/dist/v$_node/node-v$_node.tar.gz
   rethinkdb@.service
   rethinkdb.sysusers.d
   rethinkdb.tmpfiles.d
   mksnapshot_crash_fix.patch
   v8_g++7_build_fix.patch::https://github.com/nodejs/node/commit/66c1197f3aefd5b9f36533e6b617f2046acc2c0f.patch
-  build_fix.patch
+  fix_assets.patch
 )
 noextract=(node-v$_node.tar.gz)
 sha512sums=('SKIP'
@@ -35,7 +35,7 @@ sha512sums=('SKIP'
             '112bc0f9ecfdfae6efba5d8cc3f773085b3f345d33d350188dc70609c425e6c656a0a3069ae5c66cdc684a94fd442e990a88c0ca8d1875f085f660c76c3d7250'
             '8deea735b2c7b6fc0221a49e818d4347869330fa9e35a94c15d54f7bc64ac0b8a573906fea6cc64c05a177f3065c96d8b4d0e2a3724b6137d7f12ba7a7b419f7'
             '15f1f9508adef9cd14320b6649f3b766a0dd8dd478290424e9af6343a7fd64e246aafbbf2f19109e5812decb2f15dcb283fec57875bc50a540737441a0fd248d'
-            'c5199d545ad4c77523b39a30c3b859c03261910c3226dfdf6c0d73c491ee96190745bc09ec349c49c4f41c7c52da9c2e59b9456a32bfe8d4aa78c1e29dd486bc')
+            'b71d9a4ee892fadcc9471bd2bed31515b1cec796a19fa1fa616045088d21c0be6feba287e80b5c086a9e8a88dce5a9bcb7dbb367b92c4ff171aa8fa5de192cf7')
 
 prepare() {
   # There are a ton of hard dependencies on Python 2
@@ -50,7 +50,7 @@ prepare() {
   cd $pkgname
 
   patch -p0 < ../mksnapshot_crash_fix.patch
-  patch -p1 < ../build_fix.patch
+  patch -p1 < ../fix_assets.patch
 
   PATH="$srcdir"/bin:$PATH ./configure \
     --prefix=/usr \
diff --git a/build_fix.patch b/build_fix.patch
deleted file mode 100644
index 219a51c464d1..000000000000
--- a/build_fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/clustering/immediate_consistency/history.hpp b/src/clustering/immediate_consistency/history.hpp
-index 1c0568866d..6dcfac1901 100644
---- a/src/clustering/immediate_consistency/history.hpp
-+++ b/src/clustering/immediate_consistency/history.hpp
-@@ -4,6 +4,7 @@
- 
- #include <map>
- #include <set>
-+#include <stdexcept>
- 
- #include "concurrency/signal.hpp"
- #include "containers/uuid.hpp"
-diff --git a/src/crypto/random.cc b/src/crypto/random.cc
-index 8f7381b6c7..3939a4f40c 100644
---- a/src/crypto/random.cc
-+++ b/src/crypto/random.cc
-@@ -1,10 +1,14 @@
- // Copyright 2010-2016 RethinkDB, all rights reserved.
-+#include <stdlib.h>
-+#include <sys/types.h>
-+
- #include "crypto/random.hpp"
- 
- #include <openssl/rand.h>
- 
- #include "crypto/error.hpp"
- 
-+
- namespace crypto {
- 
- void detail::random_bytes(unsigned char *data, size_t size) {
diff --git a/fix_assets.patch b/fix_assets.patch
new file mode 100644
index 000000000000..529095c2feb3
--- /dev/null
+++ b/fix_assets.patch
@@ -0,0 +1,128 @@
+diff --git a/src/gen/web_assets.cc b/src/gen/web_assets.cc
+index 4acf0f24d6..f77973c5a4 100644
+--- a/src/gen/web_assets.cc
++++ b/src/gen/web_assets.cc
+@@ -222,70 +222,70 @@ std::map<std::string, const std::string> static_web_assets = {
+       "        <meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n"
+       "\n"
+       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"cluster.css?v=2.4."
+-      "0-8-g07da06-dirty\" />\n"
++      "1\" />\n"
+       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"js/chosen/chosen.c"
+-      "ss?v=2.4.0-8-g07da06-dirty\" />\n"
++      "ss?v=2.4.1\" />\n"
+       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"js/codemirror/code"
+-      "mirror.css?v=2.4.0-8-g07da06-dirty\" />\n"
++      "mirror.css?v=2.4.1\" />\n"
+       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"js/codemirror/ambi"
+-      "ance.css?v=2.4.0-8-g07da06-dirty\" />\n"
++      "ance.css?v=2.4.1\" />\n"
+       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"fonts/stylesheet.c"
+-      "ss?v=2.4.0-8-g07da06-dirty\" />\n"
++      "ss?v=2.4.1\" />\n"
+       "        <link rel=\"stylesheet\" type=\"text/css\" href=\"js/nanoscroller/na"
+-      "noscroller.css?v=2.4.0-8-g07da06-dirty\" />\n"
++      "noscroller.css?v=2.4.1\" />\n"
+       "\n"
+       "        <script type=\"text/javascript\" src=\"js/jquery-1.7.2.min.js?v=2.4."
+-      "0-8-g07da06-dirty\"></script>\n"
++      "1\"></script>\n"
+       "        <script type=\"text/javascript\" src=\"js/ZeroClipboard.min.js?v=2.4"
+-      ".0-8-g07da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"js/underscore-min.js?v=2.4.0-"
+-      "8-g07da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"js/backbone.js?v=2.4.0-8-g07d"
+-      "a06-dirty\"></script>\n"
++      ".1\"></script>\n"
++      "        <script type=\"text/javascript\" src=\"js/underscore-min.js?v=2.4.1\""
++      "></script>\n"
++      "        <script type=\"text/javascript\" src=\"js/backbone.js?v=2.4.1\"></sc"
++      "ript>\n"
+       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-modal."
+-      "js?v=2.4.0-8-g07da06-dirty\"></script>\n"
++      "js?v=2.4.1\"></script>\n"
+       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-alert."
+-      "js?v=2.4.0-8-g07da06-dirty\"></script>\n"
++      "js?v=2.4.1\"></script>\n"
+       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-typeah"
+-      "ead.js?v=2.4.0-8-g07da06-dirty\"></script>\n"
++      "ead.js?v=2.4.1\"></script>\n"
+       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-button"
+-      ".js?v=2.4.0-8-g07da06-dirty\"></script>\n"
++      ".js?v=2.4.1\"></script>\n"
+       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-dropdo"
+-      "wn.js?v=2.4.0-8-g07da06-dirty\"></script>\n"
++      "wn.js?v=2.4.1\"></script>\n"
+       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-toolti"
+-      "p.js?v=2.4.0-8-g07da06-dirty\"></script>\n"
++      "p.js?v=2.4.1\"></script>\n"
+       "        <script type=\"text/javascript\" src=\"js/bootstrap/bootstrap-popove"
+-      "r.js?v=2.4.0-8-g07da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"js/jquery.form.js?v=2.4.0-8-g"
+-      "07da06-dirty\"></script>\n"
++      "r.js?v=2.4.1\"></script>\n"
++      "        <script type=\"text/javascript\" src=\"js/jquery.form.js?v=2.4.1\"><"
++      "/script>\n"
+       "        <script type=\"text/javascript\" src=\"js/nanoscroller/jquery.nanosc"
+-      "roller.min.js?v=2.4.0-8-g07da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"js/jquery.color.js?v=2.4.0-8-"
+-      "g07da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"js/jquery.timeago.js?v=2.4.0-"
+-      "8-g07da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"js/date-en-US.js?v=2.4.0-8-g0"
+-      "7da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"js/d3.v2.min.js?v=2.4.0-8-g07"
+-      "da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"js/rdb_cubism.v1.js?v=2.4.0-8"
+-      "-g07da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"js/xdate.js?v=2.4.0-8-g07da06"
+-      "-dirty\"></script>\n"
++      "roller.min.js?v=2.4.1\"></script>\n"
++      "        <script type=\"text/javascript\" src=\"js/jquery.color.js?v=2.4.1\">"
++      "</script>\n"
++      "        <script type=\"text/javascript\" src=\"js/jquery.timeago.js?v=2.4.1\""
++      "></script>\n"
++      "        <script type=\"text/javascript\" src=\"js/date-en-US.js?v=2.4.1\"></"
++      "script>\n"
++      "        <script type=\"text/javascript\" src=\"js/d3.v2.min.js?v=2.4.1\"></s"
++      "cript>\n"
++      "        <script type=\"text/javascript\" src=\"js/rdb_cubism.v1.js?v=2.4.1\""
++      "></script>\n"
++      "        <script type=\"text/javascript\" src=\"js/xdate.js?v=2.4.1\"></scrip"
++      "t>\n"
+       "        <script type=\"text/javascript\" src=\"js/chosen/chosen.jquery.min.j"
+-      "s?v=2.4.0-8-g07da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"cluster-min.js?v=2.4.0-8-g07d"
+-      "a06-dirty\"></script>\n"
++      "s?v=2.4.1\"></script>\n"
++      "        <script type=\"text/javascript\" src=\"cluster-min.js?v=2.4.1\"></sc"
++      "ript>\n"
+       "        <script type=\"text/javascript\" src=\"js/codemirror/codemirror.js?v"
+-      "=2.4.0-8-g07da06-dirty\"></script>\n"
++      "=2.4.1\"></script>\n"
+       "        <script type=\"text/javascript\" src=\"js/codemirror/javascript.js?v"
+-      "=2.4.0-8-g07da06-dirty\"></script>\n"
++      "=2.4.1\"></script>\n"
+       "        <script type=\"text/javascript\" src=\"js/codemirror/matchbrackets.j"
+-      "s?v=2.4.0-8-g07da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"js/reql_docs.js?v=2.4.0-8-g07"
+-      "da06-dirty\"></script>\n"
+-      "        <script type=\"text/javascript\" src=\"js/tableview.js?v=2.4.0-8-g07"
+-      "da06-dirty\"></script>\n"
++      "s?v=2.4.1\"></script>\n"
++      "        <script type=\"text/javascript\" src=\"js/reql_docs.js?v=2.4.1\"></s"
++      "cript>\n"
++      "        <script type=\"text/javascript\" src=\"js/tableview.js?v=2.4.1\"></s"
++      "cript>\n"
+       "\n"
+       "    </head>\n"
+       "    <body>\n"
+@@ -26328,7 +26328,7 @@ std::map<std::string, const std::string> static_web_assets = {
+       "ternal/admin-deps_2.0.4/node_modules/rethinkdb-webui/node_modules/browserify"
+       "/node_modules/buffer/index.js\"}],\"rethinkdb-version\":[function(require,mo"
+       "dule,exports){\n"
+-      "module.exports=\"2.4.0-8-g07da06-dirty\";\n"
++      "module.exports=\"2.4.1\";\n"
+       "},{}],\"rethinkdb\":[function(require,module,exports){\n"
+       "var error,net,rethinkdb;net=require(\"./net\"),rethinkdb=require(\"./ast\"),"
+       "error=require(\"./errors\"),rethinkdb.connect=net.connect,rethinkdb.Error=er"