commit: 90364e6635ed57f043f482a2bfb9c2a5d9d41e91 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Fri Oct 3 10:27:34 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 10:36:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90364e66
dev-db/redis: add 6.2.20 Bug: https://bugs.gentoo.org/963695 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> dev-db/redis/Manifest | 1 + dev-db/redis/redis-6.2.20.ebuild | 195 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 3f5203845443..27408a64ecd2 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,6 +1,7 @@ DIST redis-6.2.16.tar.gz 2496391 BLAKE2B e00eac16fbebc54bbd24dc6622cb1add7c0511df419a84d5f9a4aae28b2a5ec4d9a4b865999fe4ab1bfeff582dce8f7c01c5352c7389c3a2ebbffc728246033b SHA512 486bb949c5adce9d2ad176c2638d2425a6a03910098e6adf1bdaecd3459d148c2899e4827ed39cbe8d7300ffcffe99b475575bb87ab93a330549077284fd8fd7 DIST redis-6.2.18.tar.gz 2519115 BLAKE2B 21051520d764ae36842ccbe34390625c5308d061d2a7ed7c2392d74ca6a1638dec0ecc7cd58ecbadcd1ce620b4d6c03ae3fe6915111be5e305308c456c047d13 SHA512 7d463438dc5a0d59e4aee9cb6ffaa28f1e5f7e0a4a658faf0ccc6f4a94740ac800b4e3735c70c39caf6c710baf17f0e727dc50b5f458acd953685f6c7671d348 DIST redis-6.2.19.tar.gz 2520086 BLAKE2B 267755d1d7733696168fa867f0ba05a019d816108a7d677794231848246be001ac872ff8fe327d2ceda937f4497039b3263c699dda6a9b29df94a634bbd09c27 SHA512 1f95d0fea8e8968ae1494e4ebd979f3b874eb243665a9c65fa35a012f69f8210992c302475b7ebe14ddeeb43ab8611a626ee1d72dd4cf81b037c4a6b797a2214 +DIST redis-6.2.20.tar.gz 2522008 BLAKE2B 2be15abca923655b1ff4438fa39088a9dfacc427193991638b8a378ba419703df37e97a6be624638b49e75a1fe658fd40dc384086b92a22b6c9c09192a8f033a SHA512 8bf1b9b63bac8ce51167d1e843bc9a544bda5981c364c5edafa3d59bfc51eb7a41ded8f3cc929d6fba967af78b651590b50f05e037220a2208f8a93661e83040 DIST redis-7.2.10.tar.gz 3436033 BLAKE2B 43e1aa03ecbedb74f29c4c726ee63c1e815a8eb5d47e76b59a9f82f887442e14cca630e2c13181f184749c219329778c8631b62d9986636e55e57bd2adfd8564 SHA512 57a261c06e3034b6fe669e26f3f1d152f2931f1c93ff4f2f4f4750cfc4b96c33f22547e491a36bc1f2441fe4cdcf3a6fab45be5a6fb0d384e3134f2dd0a4594f DIST redis-7.2.6.tar.gz 3391023 BLAKE2B 8dae8c370a905ff8622f1458387eea4cc61e451d827de8a4b61a65aff0517ff2ec714eadcd03e1b683c0940cc98390ce7c2eb451bd25c3ecaeaf21ac1fb2230a SHA512 758a1cbf77eee6222b3490757c58b9a1065b727b65d9bd6332cb41a816b6ab2827924eaca003fb5b818f847f7a00d9ce2f46365969ce946110119872368cc938 DIST redis-7.2.8.tar.gz 3433914 BLAKE2B 6ec5a6c8f1ebb4dca9b07fdc3b3221a661c18fb74548bec1e278c5e9d59775fe42eb5d71d6d17ca34996ab13f4cf30aab6adb92936d8405382f61e79f62e6041 SHA512 a916383f0a82b540ef2bd55869d96d239cfd22aee8887485c8b0309df0d4fc89f869d50a4124b82f3f36b4513c55e994e3c66bff190bdcde0d40d381fa2a72a8 diff --git a/dev-db/redis/redis-6.2.20.ebuild b/dev-db/redis/redis-6.2.20.ebuild new file mode 100644 index 000000000000..020bac82ceb3 --- /dev/null +++ b/dev-db/redis/redis-6.2.20.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2025 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://github.com/redis/redis/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+jemalloc selinux ssl systemd tcmalloc test" +RESTRICT="!test? ( test )" + +DEPEND=" + ${LUA_DEPS} + jemalloc? ( >=dev-libs/jemalloc-5.1:= ) + ssl? ( dev-libs/openssl:0= ) + systemd? ( sys-apps/systemd:= ) + tcmalloc? ( dev-util/google-perftools ) +" + +RDEPEND=" + ${DEPEND} + acct-group/redis + acct-user/redis + selinux? ( sec-policy/selinux-redis ) +" + +BDEPEND=" + acct-group/redis + acct-user/redis + virtual/pkgconfig + 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." +}
