diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-01-17 07:14:19 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-17 07:14:19 +0000 |
commit | 66520d3148e31806a52cf7df5b8d91d5cd431670 (patch) | |
tree | 15d0c80d9ee1b1e2a454a9930a03e3d3b7c6cc61 /dev-db | |
parent | 0e82736d0df44565875b055019ded1be0ac5c319 (diff) |
gentoo auto-resync : 17:01:2023 - 07:14:19
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/Manifest.gz | bin | 15431 -> 15437 bytes | |||
-rw-r--r-- | dev-db/mariadb/Manifest | 3 | ||||
-rw-r--r-- | dev-db/mariadb/files/mariadb-10.6.11-include.patch | 66 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.6.11.ebuild | 1 | ||||
-rw-r--r-- | dev-db/redis/Manifest | 4 | ||||
-rw-r--r-- | dev-db/redis/redis-6.2.9.ebuild | 195 | ||||
-rw-r--r-- | dev-db/redis/redis-7.0.8.ebuild | 187 |
7 files changed, 455 insertions, 1 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz Binary files differindex 329ae50704cc..657c98fc5f32 100644 --- a/dev-db/Manifest.gz +++ b/dev-db/Manifest.gz diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 570be39c5e85..596a0b529d6a 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -1,4 +1,5 @@ AUX mariadb-10.6.11-gssapi.patch 1824 BLAKE2B 5d0fefad9ff2d35d06dc4df3bcdd08a737a6f5ab7492673102c031c0e88fdd3fd7eeef977fb4128be170b9c948850e6a69a6d11f972d234cf49f2ea742838478 SHA512 0acee9c539782f11480b8e274576bb3b06cc7b2a914fee2d8f85fb692700b014da1f47e08f5f36d5ed264c9b5f820a123791de5b010fdc25f194dc215e890162 +AUX mariadb-10.6.11-include.patch 2044 BLAKE2B 050729672c228818658f45b02ef5a70a8153eb43b7729569edcd7b0c9420a5b16a57359f153862232c634a817a21d0d6a20028104ef5cfdc53f3de25e7e63425 SHA512 cb8150274538fd2e3c26f9fde8fdbf0e8c31c2c26efe9e99ca97d984ae17fe967aabf315c7aee4d2659c3c477eaac604afc948f44de7475ee248cd502dac0fa5 AUX my.cnf-10.2 140 BLAKE2B 3a56b7e38c3dc00215cae4bdc3270e30e85299d3290c0c995a611e4b8b15e66f40d6ac40ab18369e7863742ab6eda94259be5a7f363a26020c6fce28a7582e94 SHA512 85c650670e364f5f71842d9ab07b59c5de6e26e774e7192102562e56f94ed5f8fbc487cef31c134209c22b72fde38f7f53b7279cead97a8af608436d1ecc8857 AUX my.cnf.distro-client 643 BLAKE2B 5ffd286907ee28c92c85bbcc9a6266555733f1115f2d6b8009183dba6939b978ae8d1b8e0a53e672b8e1a1f621650399231723603fc5f96ef7218db84236e176 SHA512 801f6ab8be3110bb4dc38eaa4367715b8d342b69cadfe13dff987ef6c3aedb67d19449f8f2483e63df5d8b444ca30701b0d96f85e211de6b1e3db923b029acbc AUX my.cnf.distro-server 998 BLAKE2B a7f2977a96d394cb7e24d72d82a1c21095c4b55607e5ca4a2c10619278796c328931a5ec076c15b60afef370c2e5da02ca0c628f330e876b4d2c984eeb54df5f SHA512 d9ab6f7fdfe08e6c242f84410ec680ef6aa6778c4bd55fee67c644e1a7d997446d8ef2129be6fc9833d16fe40cf17e09cdf0cf015f06bb145bbf9cfecb51e882 @@ -21,5 +22,5 @@ EBUILD mariadb-10.4.27.ebuild 42081 BLAKE2B 7dca7c8be92a53cd382a9680f1264cd156b5 EBUILD mariadb-10.5.17.ebuild 42039 BLAKE2B 4b6a08ef9a8673356833f4d9495b07f548a9f9b6e4dfc90af5fab478ef13f91f451bb444b1a132a9d3418b20ea2149621cb24e593529864c7338f1e211fe6284 SHA512 acc33064c0ce6aba4568f79d21e0124d7fcf3eb75755697f0986925fd196a770dc79b91237eaeb051027530da250fff40760477a96f2af476e1991dcb1834e82 EBUILD mariadb-10.5.18.ebuild 42040 BLAKE2B 448c62e184d96dd5771e065e03a5b23dd8fd975661d6e96632d88740928e55b6d71d2793b2657a91411d52652287fecd165266d2ba59bb184eef3b4bd7fba5fb SHA512 5aecb9ef006b8077af9e49d67b24de48048915a738e1528036e0810e5884f2aefa94a7b005044fb275f6ee67e6e7f30bbfbac7cae943307039b195ef9647a1fd EBUILD mariadb-10.6.10.ebuild 42414 BLAKE2B ce19b4626b496ffb7b9390e88e653c5ec38e4e54774d6f5aa4bcd7b14da22250a7d91a84f92738e2cc283424a214862c96e3867d8b360b9e716ab78d4ebf0f0c SHA512 12a7284a5ed095c335a224acffebe5ba8f8968d6d4f5829e57582a36ecc84e28679545b740b490ff966789deb46bf1f1c43f1f241df54b2077fc30c46f72517d -EBUILD mariadb-10.6.11.ebuild 42470 BLAKE2B 94b7544a108e1de979ca9de588df0c59b8df6349c7b00dbdbf49d6a61cd17804d70fd7c74c45ab44f3bb061d693ec76e3fa5e673f74e063e17ada77d3e109949 SHA512 0590699414bd5953bdeb3eca71ada8f93a1abcba7d7e293146a7b7fa3a73cef0101380d6017d33ceca99c2a68c229eb12f34de7a747211ea1f37fd87e8672893 +EBUILD mariadb-10.6.11.ebuild 42522 BLAKE2B a3d8d4b71286bb63465b7b965ff5f9ea7a1c0b8bdeb5cfab8dfd9ab4b5db2c0f54c3783a809a8e654707eb5b4ec2a0977ffe416f8eca3db5414e2bf3e793a992 SHA512 7dc505916fcb24801eec96fad63d8a8f8bf9eaba9c0229f8f559e1ec57cef3e5d33df2fb971983f2166c2059464b5627e5ced092ffd50a3c1e0a64ee20d44b5b MISC metadata.xml 2602 BLAKE2B 7d388158062c76f40bca2feba53f292bbdab51cf0c3dba59ce2b74c3dedcb07cd7d4f1b5b52f7bf42c814dfc817a0670fcd8e39dccb2395337b46be98deda258 SHA512 a53f2612f8aea11cf7037847dc6f8b2acc87f710778b1bc18d7e1821c95061c1b08deefd3019789810eea2e5445b50c604b8686f3d491397793be3cbf86a35be diff --git a/dev-db/mariadb/files/mariadb-10.6.11-include.patch b/dev-db/mariadb/files/mariadb-10.6.11-include.patch new file mode 100644 index 000000000000..600f440b85f0 --- /dev/null +++ b/dev-db/mariadb/files/mariadb-10.6.11-include.patch @@ -0,0 +1,66 @@ +https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/2698 + +From 20b5dbb6171604b151ec2dd8c56bef26cc27d201 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 17 Jan 2023 01:18:41 +0000 +Subject: [PATCH] Add missing includes + +These seem to have all fallen out of a recent Boost update to 1.81 which +dropped some internal includes. All of these uses within columnstore +relied on these transitive includes, so explicitly include what we need +to fix build. + +Signed-off-by: Sam James <sam@gentoo.org> + +--- a/storage/columnstore/columnstore/tools/passwd/secrets.cpp ++++ b/storage/columnstore/columnstore/tools/passwd/secrets.cpp +@@ -12,6 +12,8 @@ + */ + #include "secrets.h" + ++#include <array> ++#include <cstdint> + #include <cctype> + #include <fstream> + #include <pwd.h> +--- a/storage/columnstore/columnstore/storage-manager/src/S3Storage.h ++++ b/storage/columnstore/columnstore/storage-manager/src/S3Storage.h +@@ -18,6 +18,7 @@ + #ifndef S3STORAGE_H_ + #define S3STORAGE_H_ + ++#include <deque> + #include <string> + #include <map> + #include "CloudStorage.h" +--- a/storage/columnstore/columnstore/storage-manager/src/MetadataFile.cpp ++++ b/storage/columnstore/columnstore/storage-manager/src/MetadataFile.cpp +@@ -19,6 +19,7 @@ + * MetadataFile.cpp + */ + #include "MetadataFile.h" ++#include <set> + #include <boost/filesystem.hpp> + #define BOOST_SPIRIT_THREADSAFE + #include <boost/property_tree/ptree.hpp> +--- a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h ++++ b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h +@@ -19,6 +19,7 @@ + + #ifndef HA_MCS_IMPL_IF_H__ + #define HA_MCS_IMPL_IF_H__ ++#include <bitset> + #include <string> + #include <stdint.h> + #ifdef _MSC_VER +--- a/storage/columnstore/columnstore/utils/cloudio/SocketPool.h ++++ b/storage/columnstore/columnstore/utils/cloudio/SocketPool.h +@@ -18,6 +18,8 @@ + #ifndef _SOCKETPOOL_H_ + #define _SOCKETPOOL_H_ + ++#include <deque> ++ + #include <boost/utility.hpp> + #include <boost/thread/mutex.hpp> + #include <boost/thread/condition_variable.hpp> diff --git a/dev-db/mariadb/mariadb-10.6.11.ebuild b/dev-db/mariadb/mariadb-10.6.11.ebuild index 31285154561e..095305883bb9 100644 --- a/dev-db/mariadb/mariadb-10.6.11.ebuild +++ b/dev-db/mariadb/mariadb-10.6.11.ebuild @@ -208,6 +208,7 @@ src_unpack() { src_prepare() { eapply "${WORKDIR}"/mariadb-patches eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch + eapply "${FILESDIR}"/mariadb-10.6.11-include.patch eapply_user diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 96be575c57cd..0593c853eb43 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -17,10 +17,14 @@ AUX redis.service-4 255 BLAKE2B e51cfbb7ce6586e7c16003e3b470be036e9c28b408c4ad71 AUX redis.tmpfiles-2 57 BLAKE2B 1e0577c1828bb693cf820f3ba5e77d7d748adf4df2d1910d465ce097765308c7b7ea729526404120d04a79b547e865df93f7bfce1e63341c73563496f1dce691 SHA512 3de050ce044b7daf71219ec61dee2bc31acef161319b87ec2963b23c72e8a4807f1302c4932897664a63ef94507449f6ab75ce18d59f5e1a4558c330a7042e43 DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953 DIST redis-6.2.8.tar.gz 2489670 BLAKE2B 6a05754dcf7e6ed8934f665c0dab544f6e393cbd5e55d5043e2055c15dcbaf1da16a63b5503c8b69fc9ad85c81fd92078e3175bff33d7481e21581176e06e3bd SHA512 b07009628211b21c3cf64c215515d3ce51b19ad5f69740c5f4566db58402ec7a9a43ee4c32bc944e0f2fbcd747703eb43c2444bd75c43ffa82b044f8c74c8d83 +DIST redis-6.2.9.tar.gz 2490785 BLAKE2B cba48e6bbc31dfa681a852ed6248fd2a32fc905648e8a53dc61222322ab5b547cd747aa71091e8e4b508386dbf791a8e6677fb523dfa5ab7baec0966dc6cedef SHA512 90691765b0a3ebb9669197934c881f2f47343d65c0d6c5583eaf0edc3b97418a7f96cd0993f919909387ed1c2f39ca1827362d682f4f2ceda906176c233aa9f5 DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202b57d6da3a38150a02d738a414c6696e261b8ab88033e117aee4f02308aab9ca4a5f382d66ec3a10f3e020580 SHA512 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753 DIST redis-7.0.7.tar.gz 2979019 BLAKE2B fddf0c1aa9f9052b0e8efdac6958b7fae5006f06833da2b9ae016c4ac195a950e97ad0b70dc7a721cc80c2cf653ae7d1a352694b79ba432e611f77fb42d1d15e SHA512 56e33cf80439efa54694f26037ed8520fe51b25dbdfe57875d916c8f921131c71324b1dd1e974d0f9d523752d05e0f028cc8dd783ec8fa6d5d7e60b3081f78c0 +DIST redis-7.0.8.tar.gz 2981212 BLAKE2B 38610104697de649bfac43a845ccd27826a1cbf88dbfc331360864d6763b4cb86981b8d94ae01d54f914d6919cf2b9cae977ea09833e61a09c02e0fcd9f1440a SHA512 d760fce02203265551198082f75b1e6be78a2cdb3d464e518d65a31839a3b6e45401c6bca6a091f59e121212aee7363d5e83c25365ab347a66b807015b32eeb6 EBUILD redis-6.2.7-r2.ebuild 5541 BLAKE2B ee1a308081b8e6ed74e01d69ab9c4b23d6010a6eaf52a7e64f0ed185fc6595e36f1fec5ecb379af8df28269a9f248ed1f15771e41e959f40d1dfc6b0a8310234 SHA512 575b3dbd3059f9e88a3eb64fbbea92e05bd869eb6e2c49c0a6f6b6d667411d810e1414b3ae8ed43acab025d7a0b4249d357adce5784345605b042d5a225256d2 EBUILD redis-6.2.8.ebuild 5482 BLAKE2B 820c3b7261a84cc6ae2313ef9adad5a43787b308b36b20525ee3ec3d1587095b979ebb4a00775c37aa6f54b2520de7fe204582120436fef94717fc7d101001e6 SHA512 2d28ededbd610a0d9d8d61229c67ebc747464b77214daff069a2acdea45d86170de1fe70cd465aa444dad72d7e466e46d8397c82643857a11d9347b0ecdf6396 +EBUILD redis-6.2.9.ebuild 5482 BLAKE2B a8a55e318d96455854dd1f054188bbc8dca13ed56d6d2a086d7d2c77806c702e7fd9cef681be71a762aa281cf711e37c079632d490d24631b1c94d4f0222b94d SHA512 a876934de8fc153b0cda5678378398c8c78a27728fc9590493159da8de9f268c04cb70c237babeb3a548c1d46f564e2e113764870b2abf86baf05d427d63e480 EBUILD redis-7.0.5-r1.ebuild 5052 BLAKE2B 2104f1b8adbfbc8200fcca092653ecfa73115a0cb275e5ceb37575b11e5c154c58476fdc310f9033f656b2322cb587b5a6b57a39cbafdc4a34d9167389365837 SHA512 78e69a11dbe46d5d8cab70059b9fe0e403bb6f963de06e1c0e707462de38f3fd35a9d32d31f643463829c8d2c273d099980a4b552eb59657e2b1bae7512bdabb EBUILD redis-7.0.7.ebuild 4942 BLAKE2B e14276f6d5208a3f18916801706f9f53fa054fa69db020714080addb8c1a872e17d60b0e483342eeeb2c8ad943f5546e58cbb8449c76d2c7b1447152b63fa4eb SHA512 1f81dad70c0cd444983068e41db70aa72847aa5d650365594710a13fd7bbe54bb9700c613c01b79fd449e2f11696cd59c3a0f335dc6433f4a92d9fd0e8d237c2 +EBUILD redis-7.0.8.ebuild 4942 BLAKE2B b88812826fa1935b06f7ebccba36f528d69eb132d05cb538bc3fed4f19a3a6d020615a6616461cce65f58c16dae238de6a38f4bdbb1629e30185ffb5581cd73e SHA512 8cfd445f091488b3e43311f36d752e54ce352afc26afb88c6e75ced405dbf6543305ed36d73ec3fbd764543aadce04816b99eb5bbcc6763cb320d701bb2c6d4c MISC metadata.xml 692 BLAKE2B 884fa6be2c816c04a9a24db6d1e47f5e84da00a47cf7cf8a757b3a6d7a1d769597107db2c32904e9d1306cf5450fedc04bbcfb75a14a89c0d6bcdf4dbe85636e SHA512 48a675be7e6a294dea1cdde0a6988793150b8ad36fc0e9402476221012292d549916d8186e2ea97ca1be660f9d60a9c889cb8cb6e30fecaeed1525bf9003de88 diff --git a/dev-db/redis/redis-6.2.9.ebuild b/dev-db/redis/redis-6.2.9.ebuild new file mode 100644 index 000000000000..786b4513b599 --- /dev/null +++ b/dev-db/redis/redis-6.2.9.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Redis does NOT build with Lua 5.2 or newer at this time: +# - 5.3 and 5.4 give: +# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" +# - 5.2 fails with: +# scripting.c:(.text+0x1f9b): undefined reference to `lua_open' +# because lua_open became lua_newstate in 5.2 +LUA_COMPAT=( lua5-1 luajit ) + +# Upstream have deviated too far from vanilla Lua, adding their own APIs +# like lua_enablereadonlytable, but we still need the eclass and such +# for bug #841422. +inherit autotools edo flag-o-matic lua-single multiprocessing systemd tmpfiles toolchain-funcs + +DESCRIPTION="A persistent caching system, key-value, and data structures database" +HOMEPAGE="https://redis.io" +SRC_URI="https://download.redis.io/releases/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="+jemalloc selinux ssl systemd tcmalloc test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + ${LUA_DEPS} + jemalloc? ( >=dev-libs/jemalloc-5.1:= ) + ssl? ( dev-libs/openssl:0= ) + systemd? ( sys-apps/systemd:= ) + tcmalloc? ( dev-util/google-perftools ) +" + +RDEPEND=" + ${COMMON_DEPEND} + acct-group/redis + acct-user/redis + selinux? ( sec-policy/selinux-redis ) +" + +BDEPEND=" + ${COMMON_DEPEND} + virtual/pkgconfig +" + +# Tcl is only needed in the CHOST test env +DEPEND=" + ${COMMON_DEPEND} + test? ( + dev-lang/tcl:0= + ssl? ( dev-tcltk/tls ) + )" + +REQUIRED_USE="?? ( jemalloc tcmalloc ) + ${LUA_REQUIRED_USE}" + +PATCHES=( + "${FILESDIR}"/${PN}-6.2.1-config.patch + "${FILESDIR}"/${PN}-5.0-shared.patch + "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch + "${FILESDIR}"/${PN}-sentinel-5.0-config.patch +) + +src_prepare() { + default + + # Copy lua modules into build dir + #cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die + #cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die + # Append cflag for lua_cjson + # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 + append-cflags "-DENABLE_CJSON_GLOBAL" + + # now we will rewrite present Makefiles + local makefiles="" MKF + for MKF in $(find -name 'Makefile' | cut -b 3-); do + mv "${MKF}" "${MKF}.in" + sed -i -e 's:$(CC):@CC@:g' \ + -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ + -e 's: $(DEBUG)::g' \ + -e 's:$(OBJARCH)::g' \ + -e 's:ARCH:TARCH:g' \ + -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ + "${MKF}.in" \ + || die "Sed failed for ${MKF}" + makefiles+=" ${MKF}" + done + # autodetection of compiler and settings; generates the modified Makefiles + cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die + + # Use the correct pkgconfig name for Lua. + # The upstream configure script handles luajit specially, and is not + # affected by these changes. + sed -i \ + -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ + -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ + -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \ + configure.ac || die "Sed failed for configure.ac" + eautoreconf +} + +src_configure() { + econf #$(use_with lua_single_target_luajit luajit) + + # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 + # also, don't define ANSI/c99 for lua twice + sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die +} + +src_compile() { + local myconf="" + + if use jemalloc; then + myconf+="MALLOC=jemalloc" + elif use tcmalloc; then + myconf+="MALLOC=tcmalloc" + else + myconf+="MALLOC=libc" + fi + + if use ssl; then + myconf+=" BUILD_TLS=yes" + fi + + export USE_SYSTEMD=$(usex systemd) + + tc-export AR CC RANLIB + emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" +} + +src_test() { + local runtestargs=( + --clients "$(makeopts_jobs)" # see bug #649868 + ) + + if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then + ewarn "unit/oom-score-adj test will be skipped." \ + "It is known to fail with FEATURES usersandbox or -userpriv. See bug #756382." + + # unit/oom-score-adj was introduced in version 6.2.0 + runtestargs+=( --skipunit unit/oom-score-adj ) # see bug #756382 + fi + + if use ssl; then + edo ./utils/gen-test-certs.sh + runtestargs+=( --tls ) + fi + + edo ./runtest "${runtestargs[@]}" +} + +src_install() { + insinto /etc/redis + doins redis.conf sentinel.conf + use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf + fperms 0750 /etc/redis + fperms 0644 /etc/redis/{redis,sentinel}.conf + + newconfd "${FILESDIR}/redis.confd-r2" redis + newinitd "${FILESDIR}/redis.initd-6" redis + + systemd_newunit "${FILESDIR}/redis.service-4" redis.service + newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf + + newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel + newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel + + insinto /etc/logrotate.d/ + newins "${FILESDIR}/${PN}.logrotate" ${PN} + + dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md + + dobin src/redis-cli + dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb + fperms 0750 /usr/sbin/redis-benchmark + dosym redis-server /usr/sbin/redis-sentinel + + if use prefix; then + diropts -m0750 + else + diropts -m0750 -o redis -g redis + fi + keepdir /var/{log,lib}/redis +} + +pkg_postinst() { + tmpfiles_process redis.conf + + ewarn "The default redis configuration file location changed to:" + ewarn " /etc/redis/{redis,sentinel}.conf" + ewarn "Please apply your changes to the new configuration files." +} diff --git a/dev-db/redis/redis-7.0.8.ebuild b/dev-db/redis/redis-7.0.8.ebuild new file mode 100644 index 000000000000..6351e489f12e --- /dev/null +++ b/dev-db/redis/redis-7.0.8.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated +# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable + +inherit autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs + +DESCRIPTION="A persistent caching system, key-value, and data structures database" +HOMEPAGE="https://redis.io" +SRC_URI="https://download.redis.io/releases/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="+jemalloc selinux ssl systemd tcmalloc test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + jemalloc? ( >=dev-libs/jemalloc-5.1:= ) + ssl? ( dev-libs/openssl:0= ) + systemd? ( sys-apps/systemd:= ) + tcmalloc? ( dev-util/google-perftools ) +" + +RDEPEND=" + ${COMMON_DEPEND} + acct-group/redis + acct-user/redis + selinux? ( sec-policy/selinux-redis ) +" + +BDEPEND=" + ${COMMON_DEPEND} + virtual/pkgconfig +" + +# Tcl is only needed in the CHOST test env +DEPEND=" + ${COMMON_DEPEND} + test? ( + dev-lang/tcl:0= + ssl? ( dev-tcltk/tls ) + )" + +REQUIRED_USE="?? ( jemalloc tcmalloc )" + +PATCHES=( + "${FILESDIR}"/${PN}-6.2.1-config.patch + "${FILESDIR}"/${PN}-5.0-shared.patch + "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch + "${FILESDIR}"/${PN}-sentinel-5.0-config.patch + "${FILESDIR}"/${PN}-7.0.4-no-which.patch +) + +src_prepare() { + default + + # Append cflag for lua_cjson + # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 + append-cflags "-DENABLE_CJSON_GLOBAL" + + # now we will rewrite present Makefiles + local makefiles="" MKF + for MKF in $(find -name 'Makefile' | cut -b 3-); do + mv "${MKF}" "${MKF}.in" + sed -i -e 's:$(CC):@CC@:g' \ + -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ + -e 's: $(DEBUG)::g' \ + -e 's:$(OBJARCH)::g' \ + -e 's:ARCH:TARCH:g' \ + -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ + "${MKF}.in" \ + || die "Sed failed for ${MKF}" + makefiles+=" ${MKF}" + done + # autodetection of compiler and settings; generates the modified Makefiles + cp "${FILESDIR}"/configure.ac-7.0 configure.ac || die + + sed -i \ + -e "/^AC_INIT/s|, __PV__, |, $PV, |" \ + -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ + configure.ac || die "Sed failed for configure.ac" + eautoreconf +} + +src_configure() { + econf + + # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 + # also, don't define ANSI/c99 for lua twice + sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die +} + +src_compile() { + local myconf="" + + if use jemalloc; then + myconf+="MALLOC=jemalloc" + elif use tcmalloc; then + myconf+="MALLOC=tcmalloc" + else + myconf+="MALLOC=libc" + fi + + if use ssl; then + myconf+=" BUILD_TLS=yes" + fi + + export USE_SYSTEMD=$(usex systemd) + + tc-export AR CC RANLIB + emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" +} + +src_test() { + local runtestargs=( + --clients "$(makeopts_jobs)" # see bug #649868 + + --skiptest "Active defrag eval scripts" # see bug #851654 + ) + + if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then + ewarn "oom-score-adj related tests will be skipped." \ + "They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382." + + runtestargs+=( + # unit/oom-score-adj was introduced in version 6.2.0 + --skipunit unit/oom-score-adj # see bug #756382 + + # Following test was added in version 7.0.0 to unit/introspection. + # It also tries to adjust OOM score. + --skiptest "CONFIG SET rollback on apply error" + ) + fi + + if use ssl; then + edo ./utils/gen-test-certs.sh + runtestargs+=( --tls ) + fi + + edo ./runtest "${runtestargs[@]}" +} + +src_install() { + insinto /etc/redis + doins redis.conf sentinel.conf + use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf + fperms 0750 /etc/redis + fperms 0644 /etc/redis/{redis,sentinel}.conf + + newconfd "${FILESDIR}/redis.confd-r2" redis + newinitd "${FILESDIR}/redis.initd-6" redis + + systemd_newunit "${FILESDIR}/redis.service-4" redis.service + newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf + + newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel + newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel + + insinto /etc/logrotate.d/ + newins "${FILESDIR}/${PN}.logrotate" ${PN} + + dodoc 00-RELEASENOTES BUGS CONTRIBUTING.md MANIFESTO README.md + + dobin src/redis-cli + dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb + fperms 0750 /usr/sbin/redis-benchmark + dosym redis-server /usr/sbin/redis-sentinel + + if use prefix; then + diropts -m0750 + else + diropts -m0750 -o redis -g redis + fi + keepdir /var/{log,lib}/redis +} + +pkg_postinst() { + tmpfiles_process redis.conf + + ewarn "The default redis configuration file location changed to:" + ewarn " /etc/redis/{redis,sentinel}.conf" + ewarn "Please apply your changes to the new configuration files." +} |