[arch-commits] Commit in rethinkdb/repos (12 files)

Anatol Pomozov anatolik at archlinux.org
Wed Nov 12 17:30:06 UTC 2014


    Date: Wednesday, November 12, 2014 @ 18:30:06
  Author: anatolik
Revision: 122449

archrelease: copy trunk to community-testing-i686, community-testing-x86_64

Added:
  rethinkdb/repos/community-testing-i686/
  rethinkdb/repos/community-testing-i686/PKGBUILD
    (from rev 122448, rethinkdb/trunk/PKGBUILD)
  rethinkdb/repos/community-testing-i686/boost_1.56_compat.patch
    (from rev 122448, rethinkdb/trunk/boost_1.56_compat.patch)
  rethinkdb/repos/community-testing-i686/rethinkdb-tmpfile.conf
    (from rev 122448, rethinkdb/trunk/rethinkdb-tmpfile.conf)
  rethinkdb/repos/community-testing-i686/rethinkdb.install
    (from rev 122448, rethinkdb/trunk/rethinkdb.install)
  rethinkdb/repos/community-testing-i686/rethinkdb.service
    (from rev 122448, rethinkdb/trunk/rethinkdb.service)
  rethinkdb/repos/community-testing-x86_64/
  rethinkdb/repos/community-testing-x86_64/PKGBUILD
    (from rev 122448, rethinkdb/trunk/PKGBUILD)
  rethinkdb/repos/community-testing-x86_64/boost_1.56_compat.patch
    (from rev 122448, rethinkdb/trunk/boost_1.56_compat.patch)
  rethinkdb/repos/community-testing-x86_64/rethinkdb-tmpfile.conf
    (from rev 122448, rethinkdb/trunk/rethinkdb-tmpfile.conf)
  rethinkdb/repos/community-testing-x86_64/rethinkdb.install
    (from rev 122448, rethinkdb/trunk/rethinkdb.install)
  rethinkdb/repos/community-testing-x86_64/rethinkdb.service
    (from rev 122448, rethinkdb/trunk/rethinkdb.service)

--------------------------------------------------+
 community-testing-i686/PKGBUILD                  |   67 +++++++++++++++++++++
 community-testing-i686/boost_1.56_compat.patch   |   13 ++++
 community-testing-i686/rethinkdb-tmpfile.conf    |    1 
 community-testing-i686/rethinkdb.install         |   37 +++++++++++
 community-testing-i686/rethinkdb.service         |   12 +++
 community-testing-x86_64/PKGBUILD                |   67 +++++++++++++++++++++
 community-testing-x86_64/boost_1.56_compat.patch |   13 ++++
 community-testing-x86_64/rethinkdb-tmpfile.conf  |    1 
 community-testing-x86_64/rethinkdb.install       |   37 +++++++++++
 community-testing-x86_64/rethinkdb.service       |   12 +++
 10 files changed, 260 insertions(+)

Copied: rethinkdb/repos/community-testing-i686/PKGBUILD (from rev 122448, rethinkdb/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD	                        (rev 0)
+++ community-testing-i686/PKGBUILD	2014-11-12 17:30:06 UTC (rev 122449)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Anatol Pomozov <anatol.pomozov at gmail.com>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Sigmund Lahn <sigmund at lahn.no>
+
+pkgname=rethinkdb
+pkgver=1.15.2
+_tag=rethinkdb-$pkgver
+pkgrel=1
+pkgdesc='An open-source distributed database built with love.'
+arch=(i686 x86_64)
+url='http://www.rethinkdb.com/'
+license=(AGPL)
+depends=(protobuf ncurses gperftools curl)
+makedepends=(boost python2 wget)
+backup=(etc/rethinkdb/instances.d/default.conf)
+install=rethinkdb.install
+options=(!emptydirs)
+source=(
+  http://download.rethinkdb.com/dist/$_tag.tgz
+  rethinkdb-tmpfile.conf
+  rethinkdb.service
+  boost_1.56_compat.patch
+)
+sha256sums=('c33fd37e52933d8eafce9f774c96e2fc218adbb54a4781c51851988aaf4afdba'
+            '656d3a42e75d087e723f71aa320fdd91cbbb82071ef72eb11fd3e4a619b429a4'
+            'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2'
+            '1c55b12df452ceb2470d3ec48dde21bcdc2785be371f6f0858af034e282b1f21')
+
+prepare() {
+  cd $_tag
+  # boost 1.56 workaround https://github.com/rethinkdb/rethinkdb/issues/3044
+  rm src/unittest/print_secondary.cc
+  patch -p1 < ../boost_1.56_compat.patch
+}
+
+build() {
+  cd $_tag
+  export PYTHON=/usr/bin/python2
+  ./configure CXXFLAGS="-DBOOST_VARIANT_DO_NOT_USE_VARIADIC_TEMPLATES" --fetch v8 --dynamic all --enable-precompiled-web --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+check() {
+  cd $_tag
+
+  make build/release/rethinkdb-unittest
+  ./build/release/rethinkdb-unittest
+  # some tests might be flaky on btrfs filesystem!
+}
+
+package() {
+  cd $_tag
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir"/rethinkdb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/rethinkdb.conf
+  install -Dm644 "$srcdir"/rethinkdb.service "$pkgdir"/usr/lib/systemd/system/rethinkdb at .service
+
+  # create 'default' database instance
+  mv "$pkgdir"/etc/rethinkdb/default.conf.sample "$pkgdir"/etc/rethinkdb/instances.d/default.conf
+  sed -e 's|# directory=/var/lib/rethinkdb|directory=/var/lib/rethinkdb|' \
+      -e 's|# pid-file=/var/run/rethinkdb/rethinkdb.pid|pid-file=/var/run/rethinkdb/default.pid|' \
+      -i "$pkgdir"/etc/rethinkdb/instances.d/default.conf
+
+  # Arch uses systemd, no need for init.d scripts
+  rm -r "$pkgdir"/etc/init.d
+}

Copied: rethinkdb/repos/community-testing-i686/boost_1.56_compat.patch (from rev 122448, rethinkdb/trunk/boost_1.56_compat.patch)
===================================================================
--- community-testing-i686/boost_1.56_compat.patch	                        (rev 0)
+++ community-testing-i686/boost_1.56_compat.patch	2014-11-12 17:30:06 UTC (rev 122449)
@@ -0,0 +1,13 @@
+diff --git a/src/clustering/reactor/reactor_be_primary.cc b/src/clustering/reactor/reactor_be_primary.cc
+index 3f583fc..945f78b 100644
+--- a/src/clustering/reactor/reactor_be_primary.cc
++++ b/src/clustering/reactor/reactor_be_primary.cc
+@@ -290,7 +290,7 @@ void do_backfill(
+
+ bool check_that_we_see_our_broadcaster(const boost::optional<boost::optional<broadcaster_business_card_t> > &maybe_a_
+     guarantee(maybe_a_business_card, "Not connected to ourselves\n");
+-    return maybe_a_business_card.get();
++    return static_cast<bool>(maybe_a_business_card.get());
+ }
+
+ bool reactor_t::attempt_backfill_from_peers(directory_entry_t *directory_entry,

Copied: rethinkdb/repos/community-testing-i686/rethinkdb-tmpfile.conf (from rev 122448, rethinkdb/trunk/rethinkdb-tmpfile.conf)
===================================================================
--- community-testing-i686/rethinkdb-tmpfile.conf	                        (rev 0)
+++ community-testing-i686/rethinkdb-tmpfile.conf	2014-11-12 17:30:06 UTC (rev 122449)
@@ -0,0 +1 @@
+d /run/rethinkdb 0755 rethinkdb rethinkdb -
\ No newline at end of file

Copied: rethinkdb/repos/community-testing-i686/rethinkdb.install (from rev 122448, rethinkdb/trunk/rethinkdb.install)
===================================================================
--- community-testing-i686/rethinkdb.install	                        (rev 0)
+++ community-testing-i686/rethinkdb.install	2014-11-12 17:30:06 UTC (rev 122449)
@@ -0,0 +1,37 @@
+post_install() {
+  groupadd rethinkdb &>/dev/null
+  useradd -g rethinkdb -d /var/lib/rethinkdb -s /bin/false rethinkdb &>/dev/null
+
+  if type -P systemd-tmpfiles &> /dev/null; then
+    systemd-tmpfiles --create rethinkdb.conf
+  fi
+
+  if [ -d /var/lib/rethinkdb ]; then
+    echo "Database directory '/var/lib/rethinkdb' already exists. If you want to recreate default database then delete the directory and run 'rethinkdb create -d /var/lib/rethinkdb/default'."
+  fi
+
+  if [ ! -d /var/lib/rethinkdb/default ]; then
+    mkdir -p /var/lib/rethinkdb
+    /usr/bin/rethinkdb create -d /var/lib/rethinkdb/default
+  fi
+  chown -R rethinkdb:rethinkdb /var/lib/rethinkdb
+}
+
+post_upgrade() {
+  IFS='.' read -a new_version <<< "$1"
+  IFS='.' read -a old_version <<< "$2"
+
+  if [ "${old_version[0]}" != "${new_version[0]}" -o "${old_version[1]}" != "${new_version[1]}" ]; then
+    echo "This release changed data storage format. Please upgrade your data using following information http://rethinkdb.com/docs/migration/"
+  fi
+
+  getent group rethinkdb >/dev/null 2>&1 || groupadd rethinkdb &>/dev/null
+  getent passwd rethinkdb >/dev/null 2>&1 || useradd -g rethinkdb -d /var/lib/rethinkdb -s /bin/false rethinkdb &>/dev/null
+}
+
+post_remove() {
+  getent passwd rethinkdb >/dev/null && userdel rethinkdb
+  getent group rethinkdb >/dev/null && groupdel rethinkdb
+
+  echo "RethinkDB data directory '/var/lib/rethinkdb' is left untouched. Remove it if you really sure you won't need your data in the future."
+}

Copied: rethinkdb/repos/community-testing-i686/rethinkdb.service (from rev 122448, rethinkdb/trunk/rethinkdb.service)
===================================================================
--- community-testing-i686/rethinkdb.service	                        (rev 0)
+++ community-testing-i686/rethinkdb.service	2014-11-12 17:30:06 UTC (rev 122449)
@@ -0,0 +1,12 @@
+[Unit]
+Description=RethinkDB database server for instance '%i'
+
+[Service]
+User=rethinkdb
+Group=rethinkdb
+ExecStart=/usr/bin/rethinkdb serve --config-file /etc/rethinkdb/instances.d/%i.conf
+KillMode=process
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

Copied: rethinkdb/repos/community-testing-x86_64/PKGBUILD (from rev 122448, rethinkdb/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2014-11-12 17:30:06 UTC (rev 122449)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Anatol Pomozov <anatol.pomozov at gmail.com>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Sigmund Lahn <sigmund at lahn.no>
+
+pkgname=rethinkdb
+pkgver=1.15.2
+_tag=rethinkdb-$pkgver
+pkgrel=1
+pkgdesc='An open-source distributed database built with love.'
+arch=(i686 x86_64)
+url='http://www.rethinkdb.com/'
+license=(AGPL)
+depends=(protobuf ncurses gperftools curl)
+makedepends=(boost python2 wget)
+backup=(etc/rethinkdb/instances.d/default.conf)
+install=rethinkdb.install
+options=(!emptydirs)
+source=(
+  http://download.rethinkdb.com/dist/$_tag.tgz
+  rethinkdb-tmpfile.conf
+  rethinkdb.service
+  boost_1.56_compat.patch
+)
+sha256sums=('c33fd37e52933d8eafce9f774c96e2fc218adbb54a4781c51851988aaf4afdba'
+            '656d3a42e75d087e723f71aa320fdd91cbbb82071ef72eb11fd3e4a619b429a4'
+            'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2'
+            '1c55b12df452ceb2470d3ec48dde21bcdc2785be371f6f0858af034e282b1f21')
+
+prepare() {
+  cd $_tag
+  # boost 1.56 workaround https://github.com/rethinkdb/rethinkdb/issues/3044
+  rm src/unittest/print_secondary.cc
+  patch -p1 < ../boost_1.56_compat.patch
+}
+
+build() {
+  cd $_tag
+  export PYTHON=/usr/bin/python2
+  ./configure CXXFLAGS="-DBOOST_VARIANT_DO_NOT_USE_VARIADIC_TEMPLATES" --fetch v8 --dynamic all --enable-precompiled-web --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+check() {
+  cd $_tag
+
+  make build/release/rethinkdb-unittest
+  ./build/release/rethinkdb-unittest
+  # some tests might be flaky on btrfs filesystem!
+}
+
+package() {
+  cd $_tag
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir"/rethinkdb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/rethinkdb.conf
+  install -Dm644 "$srcdir"/rethinkdb.service "$pkgdir"/usr/lib/systemd/system/rethinkdb at .service
+
+  # create 'default' database instance
+  mv "$pkgdir"/etc/rethinkdb/default.conf.sample "$pkgdir"/etc/rethinkdb/instances.d/default.conf
+  sed -e 's|# directory=/var/lib/rethinkdb|directory=/var/lib/rethinkdb|' \
+      -e 's|# pid-file=/var/run/rethinkdb/rethinkdb.pid|pid-file=/var/run/rethinkdb/default.pid|' \
+      -i "$pkgdir"/etc/rethinkdb/instances.d/default.conf
+
+  # Arch uses systemd, no need for init.d scripts
+  rm -r "$pkgdir"/etc/init.d
+}

Copied: rethinkdb/repos/community-testing-x86_64/boost_1.56_compat.patch (from rev 122448, rethinkdb/trunk/boost_1.56_compat.patch)
===================================================================
--- community-testing-x86_64/boost_1.56_compat.patch	                        (rev 0)
+++ community-testing-x86_64/boost_1.56_compat.patch	2014-11-12 17:30:06 UTC (rev 122449)
@@ -0,0 +1,13 @@
+diff --git a/src/clustering/reactor/reactor_be_primary.cc b/src/clustering/reactor/reactor_be_primary.cc
+index 3f583fc..945f78b 100644
+--- a/src/clustering/reactor/reactor_be_primary.cc
++++ b/src/clustering/reactor/reactor_be_primary.cc
+@@ -290,7 +290,7 @@ void do_backfill(
+
+ bool check_that_we_see_our_broadcaster(const boost::optional<boost::optional<broadcaster_business_card_t> > &maybe_a_
+     guarantee(maybe_a_business_card, "Not connected to ourselves\n");
+-    return maybe_a_business_card.get();
++    return static_cast<bool>(maybe_a_business_card.get());
+ }
+
+ bool reactor_t::attempt_backfill_from_peers(directory_entry_t *directory_entry,

Copied: rethinkdb/repos/community-testing-x86_64/rethinkdb-tmpfile.conf (from rev 122448, rethinkdb/trunk/rethinkdb-tmpfile.conf)
===================================================================
--- community-testing-x86_64/rethinkdb-tmpfile.conf	                        (rev 0)
+++ community-testing-x86_64/rethinkdb-tmpfile.conf	2014-11-12 17:30:06 UTC (rev 122449)
@@ -0,0 +1 @@
+d /run/rethinkdb 0755 rethinkdb rethinkdb -
\ No newline at end of file

Copied: rethinkdb/repos/community-testing-x86_64/rethinkdb.install (from rev 122448, rethinkdb/trunk/rethinkdb.install)
===================================================================
--- community-testing-x86_64/rethinkdb.install	                        (rev 0)
+++ community-testing-x86_64/rethinkdb.install	2014-11-12 17:30:06 UTC (rev 122449)
@@ -0,0 +1,37 @@
+post_install() {
+  groupadd rethinkdb &>/dev/null
+  useradd -g rethinkdb -d /var/lib/rethinkdb -s /bin/false rethinkdb &>/dev/null
+
+  if type -P systemd-tmpfiles &> /dev/null; then
+    systemd-tmpfiles --create rethinkdb.conf
+  fi
+
+  if [ -d /var/lib/rethinkdb ]; then
+    echo "Database directory '/var/lib/rethinkdb' already exists. If you want to recreate default database then delete the directory and run 'rethinkdb create -d /var/lib/rethinkdb/default'."
+  fi
+
+  if [ ! -d /var/lib/rethinkdb/default ]; then
+    mkdir -p /var/lib/rethinkdb
+    /usr/bin/rethinkdb create -d /var/lib/rethinkdb/default
+  fi
+  chown -R rethinkdb:rethinkdb /var/lib/rethinkdb
+}
+
+post_upgrade() {
+  IFS='.' read -a new_version <<< "$1"
+  IFS='.' read -a old_version <<< "$2"
+
+  if [ "${old_version[0]}" != "${new_version[0]}" -o "${old_version[1]}" != "${new_version[1]}" ]; then
+    echo "This release changed data storage format. Please upgrade your data using following information http://rethinkdb.com/docs/migration/"
+  fi
+
+  getent group rethinkdb >/dev/null 2>&1 || groupadd rethinkdb &>/dev/null
+  getent passwd rethinkdb >/dev/null 2>&1 || useradd -g rethinkdb -d /var/lib/rethinkdb -s /bin/false rethinkdb &>/dev/null
+}
+
+post_remove() {
+  getent passwd rethinkdb >/dev/null && userdel rethinkdb
+  getent group rethinkdb >/dev/null && groupdel rethinkdb
+
+  echo "RethinkDB data directory '/var/lib/rethinkdb' is left untouched. Remove it if you really sure you won't need your data in the future."
+}

Copied: rethinkdb/repos/community-testing-x86_64/rethinkdb.service (from rev 122448, rethinkdb/trunk/rethinkdb.service)
===================================================================
--- community-testing-x86_64/rethinkdb.service	                        (rev 0)
+++ community-testing-x86_64/rethinkdb.service	2014-11-12 17:30:06 UTC (rev 122449)
@@ -0,0 +1,12 @@
+[Unit]
+Description=RethinkDB database server for instance '%i'
+
+[Service]
+User=rethinkdb
+Group=rethinkdb
+ExecStart=/usr/bin/rethinkdb serve --config-file /etc/rethinkdb/instances.d/%i.conf
+KillMode=process
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target


More information about the arch-commits mailing list