5 files changed, 264 insertions, 0 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index d521d3a3962f..387ee7919136 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index e719dcd50bdb..cad3c28fc675 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -7,7 +7,9 @@ AUX redis-6.2.7-cve-2022-3647.patch 5982 BLAKE2B 3f8116d170bcf6cc8ed1f67086e9c84
 AUX redis-7.0.4-no-which.patch 1876 BLAKE2B 9461bdfac73c21d338fbac0a41d64ecb4c14f993b2932ae2df35317529cec399ef9163ce8ebae012dd215d755c3d5a2527bb6f8647ffb0cc6365e1a67a19a331 SHA512 eb22bb26642f1c602bb2fd4b08af7de9036c0acc5fb2a4139608bec10962031f0515f31fc18c7dcd1f8352359fc381a752ac6f63adc01b46df853019bd886d16
 AUX redis-7.0.4-replica-tests-fix.patch 2183 BLAKE2B a5452adf9776c9dd6c443020264e65a4a1e9c148451f133e1e117208118b63507e6641ce60ada4cedc469869085f03dff7b84836fd7f924d6c37a5aacaa612ee SHA512 0ccfe595a76f8570fe735cbebbf887c505ac264f5419a0b34e8c618ff6d082100651042d42de4989e560838e8c8526a4ab6071ff3bbdc6c9eaf3daa1d56672b5
 AUX redis-7.0.5-cve-2022-3647.patch 5965 BLAKE2B e5abd4079c280e9ff1b3e80d4cf3224b53d426dc51411e7c05772603da3a43b3880bd114c970c9833991f61464845a45ff5f6b28832032692783d96f91e5efc6 SHA512 164c400b0b431b3b5ff738c88db691bc0e6cb9be1ab4170b2ffec1f03c704ce1f6851ce9d80e5a6a76534183e8b1b58b53654433208793a018d807ab3de9b268
+AUX redis-7.2.0-system-jemalloc.patch 879 BLAKE2B c511606969b5f9876fa6481f0e6abf441732342299e0be3b0517541ca428ddc745a1692a0f703c5fe62442c5c2e5697e86d37b4e771f433d9dc9bfa5fa19f100 SHA512 605b3f4f41b8539e50a0fa1aa924e6d1fa7e8a80dfc03ed46a33c8b25a3bb43b4ab668c991150afd1dea5d86b8252c00c03f1582b3b0f47242127dc149819463
 AUX redis-sentinel-5.0-config.patch 706 BLAKE2B 0fa0166bbb3460e783e85b90acf4c606b83e271d8e9828bb5b3a39b623508b21dac33369ac25b645169271822e9c5deb6ea7294e40fc8d1a5ceec5129c174505 SHA512 2dee5666d50fc5d9b6021735a95c9a9647ba99c562e348785381d5a05f1388c3fb9e8c4a15b0de771cf73fb80e5e29f1df25805df749457a2ce4f2e3f2e0e9e8
+AUX redis-sentinel-7.2.0-config.patch 959 BLAKE2B c94c2a291a4ccc42272115528bf774978cae88d8f0e4f5dd17d2f3f407a719afa9381e76a589f654563393966d24d76d01282b92bb0a7d6106fa9dabb6f12a14 SHA512 6ad97df345bf07f4d3bd8fc05d52d4e495a723ecaeec961b7e3b27e94a89ac949b5a52fd62f4a4a1ec2e2b4e962878ab65e0a47f742c8bfd0e83b076455d8811
 AUX redis-sentinel.confd-r1 476 BLAKE2B e06aba8c65637a02dd7c778e7ddeb1ee8f25abbe24cea6d9ab90aee0ab512d36ad342dc4aba73c792533c561a00413a6432c6a635246e2fa7f44d2c4cf244972 SHA512 be2bdfa5efa5c55294da382e0d648c06788e77df150acbb2004ac3fe88d8545992787df4a5dd585e5e5fed9a9018e55e03e5f048601d5401795c37a476232c9f
 AUX redis-sentinel.initd-r1 654 BLAKE2B 064f7ac04ead49052aa221d295067df5cd23081bf7a65546d680281eeb4fcf0fe42c4d756917b0aa05f110be84b142d23410ba4829e1d82725826f788107f235 SHA512 b483902f343a52a4f285d7aed6a56c3bd8e820eb5f3e8805c4bd93c0df009e944e6479fea6060bc07b493d655d995ae8e6f91548c2e512215a5966abdb0aa6a6
 AUX redis.confd-r2 517 BLAKE2B 2b1834796373e28d759058f2867d88d506d1b4ca34f143abc38b4fb55c602dab44aca9ecbdb5ddfb7fd2400be1d86108b7521d6cbedda5be73eecf48cdef73de SHA512 64dfb4d4de21f5415cce1b031b627b9d42b10b10ad4de6a5f60b9a617f9e688b449b527d34ce9caba1c4817ac31246a684ca15e2b04e6d9458d5e59cd739fc09
@@ -21,10 +23,12 @@ DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc37
 DIST redis-7.0.12.tar.gz 2992216 BLAKE2B 3aad6063d1d757568ebf249868b7728be49483c1e59f55cc84bc6407b1e9957abc68160f2ba2c4479679304cbe3878beba018cfbf89f818c015d3b1481ce9225 SHA512 27ed0ab054d262028d236694f323387e3ef0e007de782545878011a7535e188152ed0af898dea4d6c0a7fa385849bbce6a0d85661780cb0e69c7d89dea3825b8
 DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202b57d6da3a38150a02d738a414c6696e261b8ab88033e117aee4f02308aab9ca4a5f382d66ec3a10f3e020580 SHA512 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753
 DIST redis-7.0.9.tar.gz 2984823 BLAKE2B 9c2e79f40ad14f6412ec4bc79507a32f8780bf4b3a311b87dd309e74b6367536f1c91b8026efc6acb3d750ca7c49687a74660c66d104caa439ef385db3eab230 SHA512 e984a19583e4aae0a5dce85a434d3255f4f13725eba0f11a1fe1a1189b17035152a26b65f1a3a8834f0dd8218f4a65986c918f96386120ea9419bd02366c8293
+DIST redis-7.2.0.tar.gz 3381269 BLAKE2B 75b5ec65497d8214c7db7244921611c5948f5720a48fd4890b7daf3f71fdb108b0b447c7b0b59d8e62537926277044b265b607c425e1faa7e411804970c96a21 SHA512 ea362a9cbbb23806fbd48eb6c4d8be555050351a878571111da95e61d2bacf4ba2e653e7d2a8d80da04ebafb5c33f8f113b3dffc3400880dbd3baeded0e8d1c3
 EBUILD redis-6.2.11.ebuild 5464 BLAKE2B b547569a766280a8c85cf4fe8fa16d38948d9f1063e51ebfdb11b3b752297241d8eb337071ef1c8c844bd89312756492cf2d0bd38d920d4c8c043f12dead2c47 SHA512 0c84be5a2bb580c1bb26c8e32bdbc2e786b9b899f985fdbf88984041bfe999728f1539b6a91e714de53c6bdb816555386017a779087d69fa2f9eb0ebe071ac2c
 EBUILD redis-6.2.13.ebuild 5465 BLAKE2B 434998689d42dcac8fe8805062b1b84e5e3388373fb979ef2c1d4e02c993da7032cd591d51140ef99eadf54263f2ffe6a1fe8d7c6183c2d7a098cb4d935794ac SHA512 a26909e160940ce707310b0530da40361cf4838a920284a054d528d14ee621112a6aa1384b4c5cef5bb896c0ae9f0c989aaaa017fbcd6c24252b021a7c9aa28e
 EBUILD redis-6.2.7-r2.ebuild 5528 BLAKE2B e77326005ef3d17e28747e1dd6cd9b8b5a65b99289054bdea20450fcd036d93943ce2e94ba5c9bf45b5b192d05390f66d88ca29b12279532506ea44b660d4373 SHA512 278ad6ec04d2e011da078246291eeb66a766d698cddc78905b470e05f63521fa17e5d9f3671e6a210a28bac980afbe210b55f469925bf397231d254dbe42e976
 EBUILD redis-7.0.12.ebuild 4925 BLAKE2B 6291aaf1a5febec7560c891659b70fda268986c0b7007f66c5fa12291cf0eac573373c9f3749d0d5cd2fedc0e5b879b390da3e557fe0d8922bf817ca5af73de5 SHA512 17daa5bb0863b69e1726170578fa5ff2f6d28665d7e17b996030ba7388c9414a036f160775a3be5fe14d3d18374aac67d7bd1f2dbe6316ef84711322fcf60ac6
 EBUILD redis-7.0.5-r1.ebuild 5039 BLAKE2B 8509bc4db6d48b333febfeaa39f32d593c53fffe1590a14d02b4cd665884bd380b2dcd7e468d6236eac341727e845587d3566825d944a905b7a13ced90ab148d SHA512 3a2f0bf36bb2be00a82df191f66732fa4d923d6f1762ca2fed52617911dff985d13d10c1b2acbf093c5e60692bc9a55e7bcf85391540137b2fb50ef5de2068c7
 EBUILD redis-7.0.9.ebuild 4924 BLAKE2B 1c6bf4a166ba27d0bd90340aa3639246e6a186eaf8a45a25b6e2a0c0e914344681a4d63893b0be718c56279d861542523d67f5f8c1929483f06974336f1dc3ef SHA512 1953bc97320faedf4072dffee12420c84b228a2d08ff6ae2df3d945571f5135d91e52fe7270121674788c2a0e068eba1f52f36f3943fa095f13e314b64ec3e47
+EBUILD redis-7.2.0.ebuild 5083 BLAKE2B 269888722ddf41c7275d9015261768e6e605e84a564a74bcabd982ecc57e46c47e71524110791082b19a84979ce6535b0a664adc2c0fbcd1fcf73ba4333b9727 SHA512 0d51df5760862a5f868e8ccc85b0a208d0ea4321a030612e504bf829995611163d3b3e2e21ce96d1bcb58762f1e6f1c0ce8aa928a374eae83078c41bd42893e9
 MISC metadata.xml 692 BLAKE2B 884fa6be2c816c04a9a24db6d1e47f5e84da00a47cf7cf8a757b3a6d7a1d769597107db2c32904e9d1306cf5450fedc04bbcfb75a14a89c0d6bcdf4dbe85636e SHA512 48a675be7e6a294dea1cdde0a6988793150b8ad36fc0e9402476221012292d549916d8186e2ea97ca1be660f9d60a9c889cb8cb6e30fecaeed1525bf9003de88
diff --git a/dev-db/redis/files/redis-7.2.0-system-jemalloc.patch b/dev-db/redis/files/redis-7.2.0-system-jemalloc.patch
new file mode 100644
index 000000000000..cc2c51a50ea9
--- /dev/null
+++ b/dev-db/redis/files/redis-7.2.0-system-jemalloc.patch
@@ -0,0 +1,33 @@
+Rebased from original redis-5.0-shared.patch
+
+diff --git a/src/Makefile b/src/Makefile
+index ecbd2753d..275446338 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -65,10 +65,7 @@ PYTHON := $(shell which python3 || which python)
+ endif
+ 
+ # Default allocator defaults to Jemalloc on Linux and libc otherwise
+-MALLOC=libc
+-ifeq ($(uname_S),Linux)
+-	MALLOC=jemalloc
+-endif
++MALLOC?=jemalloc
+ 
+ # To get ARM stack traces if Redis crashes we need a special C flag.
+ ifneq (,$(filter aarch64 armv%,$(uname_M)))
+@@ -266,9 +263,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
+ endif
+ 
+ ifeq ($(MALLOC),jemalloc)
+-	DEPENDENCY_TARGETS+= jemalloc
+-	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+-	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
++	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
++	FINAL_LIBS+= -ljemalloc -ldl
+ endif
+ 
+ # LIBSSL & LIBCRYPTO
+-- 
+2.41.0
+
diff --git a/dev-db/redis/files/redis-sentinel-7.2.0-config.patch b/dev-db/redis/files/redis-sentinel-7.2.0-config.patch
new file mode 100644
index 000000000000..db9df6786c19
--- /dev/null
+++ b/dev-db/redis/files/redis-sentinel-7.2.0-config.patch
@@ -0,0 +1,27 @@
+Rebased from original redis-sentinel-5.0-config.patch
+
+diff --git a/sentinel.conf b/sentinel.conf
+index b7b3604f0..a1d7bfea9 100644
+--- a/sentinel.conf
++++ b/sentinel.conf
+@@ -17,7 +17,7 @@ daemonize no
+ # When running daemonized, Redis Sentinel writes a pid file in
+ # /var/run/redis-sentinel.pid by default. You can specify a custom pid file
+ # location here.
+-pidfile /var/run/redis-sentinel.pid
++pidfile /run/redis-sentinel.pid
+ 
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -31,7 +31,7 @@ loglevel notice
+ # Specify the log file name. Also the empty string can be used to force
+ # Sentinel to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile "/var/log/redis/sentinel.log"
+ 
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+-- 
+2.41.0
+
diff --git a/dev-db/redis/redis-7.2.0.ebuild b/dev-db/redis/redis-7.2.0.ebuild
new file mode 100644
index 000000000000..81c1123f7888
--- /dev/null
+++ b/dev-db/redis/redis-7.2.0.ebuild
@@ -0,0 +1,200 @@
+# 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 multiprocessing systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="
+	https://redis.io
+	https://github.com/redis/redis
+"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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}-7.2.0-system-jemalloc.patch
+	"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-7.2.0-config.patch
+	"${FILESDIR}"/${PN}-7.0.4-no-which.patch
+)
+
+src_prepare() {
+	default
+
+	# Respect user CFLAGS in bundled lua
+	sed -i '/LUA_CFLAGS/s: -O2::g' deps/Makefile || die
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	local mysedconf=(
+		-e 's:$(CC):@CC@:g'
+		-e 's:$(CFLAGS):@AM_CFLAGS@:g'
+		-e 's: $(DEBUG)::g'
+
+		-e 's:-Werror ::g'
+		-e 's:-Werror=deprecated-declarations ::g'
+	)
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i "${mysedconf[@]}" "${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() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		AR="${AR}"
+		CC="${CC}"
+		RANLIB="${RANLIB}"
+
+		V=1 # verbose
+
+		# OPTIMIZATION defaults to -O3. Let's respect user CFLAGS by setting it
+		# to empty value.
+		OPTIMIZATION=''
+		# Disable debug flags in bundled hiredis
+		DEBUG_FLAGS=''
+
+		BUILD_TLS=$(usex ssl)
+		USE_SYSTEMD=$(usex systemd)
+	)
+
+	if use jemalloc; then
+		myconf+=( MALLOC=jemalloc )
+	elif use tcmalloc; then
+		myconf+=( MALLOC=tcmalloc )
+	else
+		myconf+=( MALLOC=libc )
+	fi
+
+	emake "${myconf[@]}"
+}
+
+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."
+}