summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2019-05-27 23:32:45 +0200
committerAlexys Jacob <ultrabug@gentoo.org>2019-05-27 23:32:45 +0200
commitea0400ccb86203c88a110216b3220df19c5f6f87 (patch)
treed4c1bf9c6da77ce050039ab45e6f41400c8eaa24 /dev-db
parentsys-cluster/moosefs: last rite drop (diff)
downloadgentoo-ea0400ccb86203c88a110216b3220df19c5f6f87.tar.gz
gentoo-ea0400ccb86203c88a110216b3220df19c5f6f87.tar.bz2
gentoo-ea0400ccb86203c88a110216b3220df19c5f6f87.zip
dev-db/rethinkdb: last rite drop
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/rethinkdb/Manifest1
-rw-r--r--dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch37
-rw-r--r--dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch162
-rw-r--r--dev-db/rethinkdb/files/rethinkdb.confd12
-rw-r--r--dev-db/rethinkdb/files/rethinkdb.initd49
-rw-r--r--dev-db/rethinkdb/files/rethinkdb.service13
-rw-r--r--dev-db/rethinkdb/files/rethinkdb.tmpfilesd1
-rw-r--r--dev-db/rethinkdb/metadata.xml16
-rw-r--r--dev-db/rethinkdb/rethinkdb-2.3.6.ebuild139
9 files changed, 0 insertions, 430 deletions
diff --git a/dev-db/rethinkdb/Manifest b/dev-db/rethinkdb/Manifest
deleted file mode 100644
index 454b1185670..00000000000
--- a/dev-db/rethinkdb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rethinkdb-2.3.6.tgz 76787356 BLAKE2B 291f5ff7f2574329e3c96a838a2b4a5f801fae5221612f97d9c6ac250f07e8b8495ce55e9b59fa6085328ef9b9061f63c90db088175458102d2ab319b08c3be1 SHA512 653177750f7439fa1d61a121e488d578be1eab90f87c7d17ad52b9793d8543f22bbe98f8d501c2ab2d7048c65118096430fe7bde945d87c7a3228905af801af2
diff --git a/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch b/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch
deleted file mode 100644
index e3d5eac88a4..00000000000
--- a/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Bug: https://bugs.gentoo.org/594220
-Commit: https://github.com/rethinkdb/rethinkdb/commit/871bd3705a1f29c4ab07a096d562a4b06231a97c
-
-From 871bd3705a1f29c4ab07a096d562a4b06231a97c Mon Sep 17 00:00:00 2001
-From: Etienne Laurin <etienne@atnnn.com>
-Date: Wed, 16 Nov 2016 04:17:41 +0000
-Subject: [PATCH] Workaround for building V8 with GCC 6.2
-
----
- mk/support/pkg/v8.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/mk/support/pkg/v8.sh b/mk/support/pkg/v8.sh
-index dc339ad0715..97f4d336c03 100644
---- a/mk/support/pkg/v8.sh
-+++ b/mk/support/pkg/v8.sh
-@@ -44,8 +44,10 @@ pkg_install () {
- arm*) arch=arm; arch_gypflags=$raspberry_pi_gypflags ;;
- *) arch=native ;;
- esac
-+
- mode=release
-- pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= $arch_gypflags" V=1
-+ pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= -Dv8_use_snapshot=false $arch_gypflags" V=1
-+
- for lib in `find "$build_dir/out/$arch.$mode" -maxdepth 1 -name \*.a` `find "$build_dir/out/$arch.$mode/obj.target" -name \*.a`; do
- name=`basename $lib`
- cp $lib "$install_dir/lib/${name/.$arch/}"
-@@ -56,7 +58,7 @@ pkg_install () {
- pkg_link-flags () {
- # These are the necessary libraries recommended by the docs:
- # https://developers.google.com/v8/get_started#hello
-- for lib in libv8_{base,libbase,snapshot,libplatform}; do
-+ for lib in libv8_{base,nosnapshot,libbase,libplatform}; do
- echo "$install_dir/lib/$lib.a"
- done
- for lib in libicu{i18n,uc,data}; do
diff --git a/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch b/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch
deleted file mode 100644
index b79850b0b6b..00000000000
--- a/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-Bug: https://bugs.gentoo.org/594998
-Issue: https://github.com/rethinkdb/rethinkdb/issues/6336
-Patch: https://git.alpinelinux.org/cgit/aports/tree/community/rethinkdb/libressl.patch?id=146fb0d67a1b861d5c776d97f533efe0bb26af7a
-
-From d52a694a806c1a8b6dd4d7d17d0671a96240449a Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 4 Jan 2017 15:31:40 +0100
-Subject: [PATCH] Improve OpenSSL compatibility
-
-Refactor the conditionals for openssl 1.1 support so we avoid multiple
-if/else and add a check for LibreSSL as well.
----
- src/crypto/hash.cc | 13 +++++--------
- src/crypto/hmac.cc | 34 ++++++++++++++++++----------------
- src/crypto/initialization_guard.cc | 15 ++++++---------
- 3 files changed, 29 insertions(+), 33 deletions(-)
-
-diff --git a/src/crypto/hash.cc b/src/crypto/hash.cc
-index 4427dfddeb..e035f695fc 100644
---- a/src/crypto/hash.cc
-+++ b/src/crypto/hash.cc
-@@ -8,27 +8,24 @@
-
- #include "crypto/error.hpp"
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define EVP_MD_CTX_new EVP_MD_CTX_create
-+#define EVP_MD_CTX_free EVP_MD_CTX_destroy
-+#endif
-+
- namespace crypto {
-
- class evp_md_ctx_wrapper_t {
- public:
- evp_md_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-- m_evp_md_ctx = EVP_MD_CTX_create();
--#else
- m_evp_md_ctx = EVP_MD_CTX_new();
--#endif
- if (m_evp_md_ctx == nullptr) {
- throw openssl_error_t(ERR_get_error());
- }
- }
-
- ~evp_md_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-- EVP_MD_CTX_destroy(m_evp_md_ctx);
--#else
- EVP_MD_CTX_free(m_evp_md_ctx);
--#endif
- }
-
- EVP_MD_CTX *get() {
-diff --git a/src/crypto/hmac.cc b/src/crypto/hmac.cc
-index 2ac4314e24..0e3f91a0c1 100644
---- a/src/crypto/hmac.cc
-+++ b/src/crypto/hmac.cc
-@@ -7,43 +7,45 @@
-
- #include "crypto/error.hpp"
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+
-+inline HMAC_CTX *HMAC_CTX_new() {
-+ HMAC_CTX *tmp = (HMAC_CTX *)OPENSSL_malloc(sizeof(HMAC_CTX));
-+ if (tmp)
-+ HMAC_CTX_init(tmp);
-+ return tmp;
-+}
-+
-+inline void HMAC_CTX_free(HMAC_CTX *ctx) {
-+ if (ctx) {
-+ HMAC_CTX_cleanup(ctx);
-+ OPENSSL_free(ctx);
-+ }
-+}
-+
-+#endif
-+
- namespace crypto {
-
- class hmac_ctx_wrapper_t {
- public:
- hmac_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-- HMAC_CTX_init(&m_hmac_ctx);
--#else
- m_hmac_ctx = HMAC_CTX_new();
- if (m_hmac_ctx == nullptr) {
- throw openssl_error_t(ERR_get_error());
- }
--#endif
- }
-
- ~hmac_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-- HMAC_CTX_cleanup(&m_hmac_ctx);
--#else
- HMAC_CTX_free(m_hmac_ctx);
--#endif
- }
-
- HMAC_CTX *get() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-- return &m_hmac_ctx;
--#else
- return m_hmac_ctx;
--#endif
- }
-
- private:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-- HMAC_CTX m_hmac_ctx;
--#else
- HMAC_CTX *m_hmac_ctx;
--#endif
- };
-
- std::array<unsigned char, SHA256_DIGEST_LENGTH> detail::hmac_sha256(
-diff --git a/src/crypto/initialization_guard.cc b/src/crypto/initialization_guard.cc
-index ba0503efc6..f76ffd96da 100644
---- a/src/crypto/initialization_guard.cc
-+++ b/src/crypto/initialization_guard.cc
-@@ -14,16 +14,17 @@
- #include "arch/io/concurrency.hpp"
- #include "arch/runtime/runtime.hpp"
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define OPENSSL_init_ssl(x, y) SSL_library_init()
-+#define OPENSSL_init_crypto(x, y) SSL_load_error_strings()
-+#define OPENSSL_cleanup ERR_free_strings
-+#endif
-+
- namespace crypto {
-
- initialization_guard_t::initialization_guard_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-- SSL_library_init();
-- SSL_load_error_strings();
--#else
- OPENSSL_init_ssl(0, nullptr);
- OPENSSL_init_crypto(0, nullptr);
--#endif
-
- // Make OpenSSL thread-safe by registering the required callbacks
- CRYPTO_THREADID_set_callback([](CRYPTO_THREADID *thread_out) {
-@@ -49,11 +50,7 @@ initialization_guard_t::initialization_guard_t() {
- }
-
- initialization_guard_t::~initialization_guard_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-- ERR_free_strings();
--#else
- OPENSSL_cleanup();
--#endif
- }
-
- } // namespace crypto
---
-2.11.0
-
diff --git a/dev-db/rethinkdb/files/rethinkdb.confd b/dev-db/rethinkdb/files/rethinkdb.confd
deleted file mode 100644
index af65794a44b..00000000000
--- a/dev-db/rethinkdb/files/rethinkdb.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# !! IMPORTANT !!
-#
-# This file is ONLY used to override some of the init script configuration.
-#
-# You should NOT use this file to configure your rethinkdb instance,
-# see the /etc/rethinkdb/default.conf.sample file instead.
-#
-# Available init script modifiers :
-# - config_file : the configuration file to use (default : /etc/rethinkdb/instance.d/<instance-name>.conf)
-# - user : the user used to run your rethinkdb instance (default : rethinkdb)
-# - group : the group used to run your rethinkdb instance (default : rethinkdb)
-# - run_dir : the run directory for your PID files (default : /run/rethinkdb) \ No newline at end of file
diff --git a/dev-db/rethinkdb/files/rethinkdb.initd b/dev-db/rethinkdb/files/rethinkdb.initd
deleted file mode 100644
index 9f55aa49c8e..00000000000
--- a/dev-db/rethinkdb/files/rethinkdb.initd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-instance_name=${SVCNAME/*.}
-config_file=${config_file:-/etc/rethinkdb/instances.d/${instance_name}.conf}
-run_dir=${run_dir:-/run/rethinkdb}
-
-command="/usr/bin/rethinkdb"
-command_args="--config-file ${config_file}"
-command_background="true"
-pidfile=${run_dir}/${instance_name}.pid
-user=${user:-rethinkdb}
-group=${group:-rethinkdb}
-start_stop_daemon_args="--user ${user} --group ${group} --wait 2000"
-
-depend() {
- use net
-}
-
-start_pre() {
- checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
- if [ "${instance_name}" == "rethinkdb" ]; then
- eerror "You should not run this default init script directly"
- eerror "Create a symlink to an instance name"
- eerror "and create a configuration file in /etc/rethinkdb/instances.d/"
- eerror "then run this instance init script instead."
- return 1
- fi
- if [ ! -f ${config_file} ]; then
- eerror "Missing configuration file ${config_file}"
- return 1
- else
- # respect configured directory or set a default
- directory=$(egrep -e '^directory=' "${config_file}" | cut -d'=' -f2)
- if [ -z "${directory}" ]; then
- directory=/var/lib/rethinkdb/instances.d/"${instance_name}"
- fi
- checkpath -d -m 0750 -o "${user}":"${group}" "${directory}"
- command_args="${command_args} --directory ${directory}"
-
- # respect configured log-file or set a default
- log_file=$(egrep -e '^log_file=' "${config_file}" | cut -d'=' -f2)
- if [ -z "${log_file}" ]; then
- log_file=/var/log/rethinkdb/"${instance_name}".log
- fi
- command_args="${command_args} --log-file ${log_file}"
- fi
-}
diff --git a/dev-db/rethinkdb/files/rethinkdb.service b/dev-db/rethinkdb/files/rethinkdb.service
deleted file mode 100644
index 09645c2ae6a..00000000000
--- a/dev-db/rethinkdb/files/rethinkdb.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[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
-
diff --git a/dev-db/rethinkdb/files/rethinkdb.tmpfilesd b/dev-db/rethinkdb/files/rethinkdb.tmpfilesd
deleted file mode 100644
index 694501e8ab5..00000000000
--- a/dev-db/rethinkdb/files/rethinkdb.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /run/rethinkdb 0755 rethinkdb rethinkdb - \ No newline at end of file
diff --git a/dev-db/rethinkdb/metadata.xml b/dev-db/rethinkdb/metadata.xml
deleted file mode 100644
index 48fd46f6600..00000000000
--- a/dev-db/rethinkdb/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>ultrabug@gentoo.org</email>
- <name>Ultrabug</name>
- </maintainer>
- <use>
- <flag name="tcmalloc">
- Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations.
- </flag>
- </use>
- <upstream>
- <bugs-to>https://github.com/rethinkdb/rethinkdb/issues</bugs-to>
- </upstream>
-</pkgmetadata>
diff --git a/dev-db/rethinkdb/rethinkdb-2.3.6.ebuild b/dev-db/rethinkdb/rethinkdb-2.3.6.ebuild
deleted file mode 100644
index 3c1b8ac0ee8..00000000000
--- a/dev-db/rethinkdb/rethinkdb-2.3.6.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit python-utils-r1 systemd user
-
-DESCRIPTION="The open-source database for the realtime web."
-HOMEPAGE="https://www.rethinkdb.com"
-LICENSE="AGPL-3"
-SLOT="0"
-SRC_URI="https://download.rethinkdb.com/dist/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +jemalloc tcmalloc"
-
-# TODO: rly need some webui libs ?
-DEPEND=">=dev-libs/re2-0.2016.05.01
- dev-cpp/gtest
- dev-libs/boost
- dev-libs/protobuf-c
- net-misc/curl
- sys-libs/libunwind
- sys-libs/ncurses:=
- jemalloc? ( >=dev-libs/jemalloc-4.0 )
- tcmalloc? ( dev-util/google-perftools )"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="?? ( tcmalloc jemalloc )"
-
-pkg_setup() {
- enewgroup rethinkdb
- enewuser rethinkdb -1 -1 /var/lib/${PN} rethinkdb
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.5-gcc6.patch
- "${FILESDIR}"/${PN}-2.3.5-libressl.patch
-)
-
-src_prepare() {
- default
-
- # don't use predefined configuration
- rm configure.default
-
- # fix doc and init script auto installation
- sed -e 's/ install-docs / /g' -e 's/ install-init / /g' -i mk/install.mk || die
-
- # default config for Gentoo
- # fix default pid-file path
- # fix default directory path
- # fix default log-file path
- sed -e 's@/var/run/@/run/@g' \
- -e 's@/var/lib/rethinkdb/@/var/lib/rethinkdb/instances.d/@g' \
- -e 's@/var/log/rethinkdb@/var/log/rethinkdb/default.log@g' \
- -i packaging/assets/config/default.conf.sample || die
-
- # proper CXX declaration
- sed -e "s/CXX=\$(.*/CXX=$(tc-getCXX)/g" -i configure || die
-
- # respect user CXXFLAGS optimizations
- sed -e 's/-O3//g' -i src/build.mk || die
-}
-
-src_configure() {
- local conf_opts=(
- --prefix="/usr"
- --sysconfdir="/etc"
- --localstatedir="/var"
- --static=none
- --dynamic=gtest
- --dynamic=re2
- )
- if use jemalloc; then
- conf_opts+=(--with-jemalloc)
- elif use tcmalloc; then
- conf_opts+=(--with-tcmalloc)
- else
- conf_opts+=(--with-system-malloc)
- fi
- ./configure "${conf_opts[@]}"
-}
-
-src_compile() {
- python_export python2.7 EPYTHON
- emake VERBOSE=1
-}
-
-src_install() {
- emake DESTDIR="${D}" VERBOSE=1 install
-
- for x in /var/{lib,log}/${PN}; do
- keepdir "${x}"
- fowners rethinkdb:rethinkdb "${x}"
- done
-
- newconfd "${FILESDIR}/rethinkdb.confd" rethinkdb
- newinitd "${FILESDIR}/rethinkdb.initd" rethinkdb
-
- systemd_newunit "${FILESDIR}/"${PN}.service "rethinkdb@.service"
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd "rethinkdb.conf"
-
- use doc && dodoc COPYRIGHT NOTES.md README.md
-}
-
-pkg_config() {
- einfo "This will prepare a new RethinkDB instance. Press Control-C to abort."
-
- einfo "Enter the name for the new instance: "
- read instance_name
- [[ -z "${instance_name}" ]] && die "Invalid instance name"
-
- local instance_data="/var/lib/rethinkdb/instances.d/${instance_name}"
- local instance_config="/etc/rethinkdb/instances.d/${instance_name}.conf"
- if [[ -e "${instance_data}" || -e "${instance_config}" ]]; then
- eerror "An instance with the same name already exists:"
- eerror "Check ${instance_data} or ${instance_config}."
- die "Instance already exists"
- fi
-
- /usr/bin/rethinkdb create -d "${instance_data}" &>/dev/null \
- || die "Creating instance failed"
- chown -R rethinkdb:rethinkdb "${instance_data}" \
- || die "Correcting permissions for instance failed"
- cp /etc/rethinkdb/default.conf.sample "${instance_config}" \
- || die "Creating configuration file failed"
- sed -e "s:^# \(directory=\).*$:\1${instance_data}:" \
- -i "${instance_config}" \
- || die "Modifying configuration file failed"
- ln -s /etc/init.d/rethinkdb "/etc/init.d/rethinkdb.${instance_name}" \
- || die "Creating init script symlink failed"
-
- einfo "Successfully created the instance at ${instance_data}."
- einfo "To change the default settings edit the configuration file:"
- einfo "${instance_config}"
- einfo " "
- einfo "To start your instance, run:"
- einfo "/etc/init.d/rethinkdb.${instance_name} start"
-}