commit:     7ed12424ea11da83586d192d7e878795e81f92cd
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  3 09:50:19 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Oct  3 15:35:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed12424

dev-db/redis: add 6.2.16

Bug: https://bugs.gentoo.org/940609
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-db/redis/Manifest            |   1 +
 dev-db/redis/redis-6.2.16.ebuild | 192 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 193 insertions(+)

diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index ef3e8f21d9b1..c06bff0f11a4 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,4 +1,5 @@
 DIST redis-6.2.14.tar.gz 2496149 BLAKE2B 
689a0c3b558e07f43f8b1480fbf7a083184bbc0ccde0b184dc8a1d89ed22bec9694b7c8605ff729c9e9d582e8cf47c8f9cd9ee0794ea15e07cdb0b886e93c116
 SHA512 
140d4b23c20d459b65be8c61996e281222f978b51c52cb048039d741801e4027775ad89ed354dc0dce3d47703a08610adafaf6253fea2f973d5b9d20bc1e59ce
+DIST redis-6.2.16.tar.gz 2496391 BLAKE2B 
e00eac16fbebc54bbd24dc6622cb1add7c0511df419a84d5f9a4aae28b2a5ec4d9a4b865999fe4ab1bfeff582dce8f7c01c5352c7389c3a2ebbffc728246033b
 SHA512 
486bb949c5adce9d2ad176c2638d2425a6a03910098e6adf1bdaecd3459d148c2899e4827ed39cbe8d7300ffcffe99b475575bb87ab93a330549077284fd8fd7
 DIST redis-7.0.15.tar.gz 2994329 BLAKE2B 
fa1bc85c89cb6a6fb18710a4d29c20db44a80ce445d217f39a234a2aad1d79031e9d1fc45415af7b0eb1c169bd88f45f1fe60cab35de38c6fadc839e2a27676d
 SHA512 
83d58f98085f91754f6d87810e7da0d6cf11ffbe11a0f5d3581d5b2c63d2a752ba6b4eda921a04031aedc56ecebe349cd468ab5ad837493f55d2cac0ab3d015a
 DIST redis-7.2.5.tar.gz 3386454 BLAKE2B 
5a0e5b0162f684ecd6db4a782a18a3c7bf272ec1ce38e2d2a4b5bc3966d968170f5b968e7f9946fd50d2b942c52298430eeccb386bbb443201eda6ac180c7f2b
 SHA512 
e064a0f380e3a00ab8eb2f10ed7317fd6aa27d64cf00792fab80465036f92d17b166050e71b8a779fdf024528ac736cb54722316811f99951c4e386f4ab2245d
 DIST redis-7.4.0.tar.gz 3525325 BLAKE2B 
232e5d8db368e1a6c13e044ea40b4f4cd2b1f8f8d02319e408c8b0cfdbc6e4630ca2d38af080c5ccd1a4564da06f8cc761b54b00362f515edb11dc13c4853f78
 SHA512 
f5cd7566664f41a038f1078cd746b0a143ae543e035c363ae1ba60639830cc244d1536c84a95ce897b277bd0c4aad91a569e209dbb7917b7a2319805901a49d1

diff --git a/dev-db/redis/redis-6.2.16.ebuild b/dev-db/redis/redis-6.2.16.ebuild
new file mode 100644
index 000000000000..09d489d803f8
--- /dev/null
+++ b/dev-db/redis/redis-6.2.16.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2024 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/$(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."
+}

Reply via email to