[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/

["Petr Vaněk" <arkamar@gentoo.org>]

commit:     8942d96c5ff1a45db0922d9e5e4403b050494bf6
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 12:25:59 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 12:27:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8942d96c

dev-db/redis: drop 7.0.5-r1

Bug: https://bugs.gentoo.org/891169
Bug: https://bugs.gentoo.org/898464
Bug: https://bugs.gentoo.org/902501
Bug: https://bugs.gentoo.org/904486
Bug: https://bugs.gentoo.org/910191
Bug: https://bugs.gentoo.org/913741
Bug: https://bugs.gentoo.org/915989
Bug: https://bugs.gentoo.org/921662
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-db/redis/Manifest                              |   1 -
 .../files/redis-7.0.4-replica-tests-fix.patch      |  61 -------
 dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch | 173 -------------------
 dev-db/redis/redis-7.0.5-r1.ebuild                 | 191 ---------------------
 4 files changed, 426 deletions(-)

diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 6136540cfb05..a42beeee7489 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,7 +1,6 @@
 DIST redis-6.2.14.tar.gz 2496149 BLAKE2B 689a0c3b558e07f43f8b1480fbf7a083184bbc0ccde0b184dc8a1d89ed22bec9694b7c8605ff729c9e9d582e8cf47c8f9cd9ee0794ea15e07cdb0b886e93c116 SHA512 140d4b23c20d459b65be8c61996e281222f978b51c52cb048039d741801e4027775ad89ed354dc0dce3d47703a08610adafaf6253fea2f973d5b9d20bc1e59ce
 DIST redis-7.0.14.tar.gz 2994188 BLAKE2B ab4325df8f1af1f7b8c634265a1c7001486c305d4210e72045e6434207e4a447e67d41fa07bd3cd5a57da173e7f9893bf386b18b556156cf559019573a7c4f8b SHA512 31d851dd72cea7d1e48c0df5646c91a2f7b72696067c017936984c49912f6e846ba6469c1ee8e361e362c8683912a25f6eee3993ed1a73cfe70051e84ad79b8b
 DIST redis-7.0.15.tar.gz 2994329 BLAKE2B fa1bc85c89cb6a6fb18710a4d29c20db44a80ce445d217f39a234a2aad1d79031e9d1fc45415af7b0eb1c169bd88f45f1fe60cab35de38c6fadc839e2a27676d SHA512 83d58f98085f91754f6d87810e7da0d6cf11ffbe11a0f5d3581d5b2c63d2a752ba6b4eda921a04031aedc56ecebe349cd468ab5ad837493f55d2cac0ab3d015a
-DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202b57d6da3a38150a02d738a414c6696e261b8ab88033e117aee4f02308aab9ca4a5f382d66ec3a10f3e020580 SHA512 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753
 DIST redis-7.2.1.tar.gz 3383319 BLAKE2B 92784af3d1df338a8af7475ab7c598309f33f682ad4bb0b827f170c9f20c1a0879b433c6325c90dd6ba17e06e95bf7d8a9a665d6706065ff4c4c8c141d9c93c1 SHA512 7df4afd51dceea0edbb999027c84820a6aebdd58d71b2e93a4861120fa2b9c0801a0e61c70e695845dbff4e9b96907a4215dcacf72d3593ad014cfa584b5cad0
 DIST redis-7.2.3.tar.gz 3384816 BLAKE2B 6aaf1bae377f3885affd140365eb0c2c30079fe40d770af1ac75a50647ce811e6c4dccd4b886db315e7b78e60661fa0bee280d707c1c4490f32086d0793069c3 SHA512 2ce4bbb056372f1180ceb1863106d07b021d32af2379f1f5dfc61e930c2cd0303433af22c7231adc8890ab5581cb41be3b792f19a0b1645108735c86d9fdf68e
 DIST redis-7.2.4.tar.gz 3386861 BLAKE2B 852d55f875378248fa15e189308afbe36bca73c2aa2e5423a765a3d6f6895908ac1455148e032f6d1a1087f57af5869bccf8a932684817109f3fcf09b204e639 SHA512 78590fb6680f229905c240ed8ce7a9a7153e5f8563577dbbb26aebf9bfbdcd7495d687f452bd95e0a86c76d772e1c497b506cf8d29bc97b62c9267f7d1e76f72

diff --git a/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch b/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch
deleted file mode 100644
index 55da00137b46..000000000000
--- a/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From e7144693e2446f21ee68c95676ecf65d1351d13e Mon Sep 17 00:00:00 2001
-From: Binbin <binloveplay1314@qq.com>
-Date: Wed, 27 Jul 2022 19:58:25 +0800
-Subject: [PATCH] Fix bgsaveerr issue in psync wrong offset test (#11043)
-
-The kill above is sometimes successful and sometimes already too late.
-The PING in pysnc wrong offset test got rejected by bgsaveerr because
-lastbgsave_status is C_ERR.
-
-In theory, using diskless can avoid PING being affected, because when
-the replica is dropped, we will kill the child with SIGUSR1, and this
-will not affect lastbgsave_status.
-
-Anyway, this kill is not particularly needed here, dropping the kill
-is the best one, since we do have the waitForBgsave, so just let it
-take care of the bgsave. No need for fast termination.
----
-
-This patch is backported from upstream, see PR #11043.
-
-Upstream-PR: https://github.com/redis/redis/pull/11043
-
-diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl
-index d60c91918..457c3150e 100644
---- a/tests/integration/replication.tcl
-+++ b/tests/integration/replication.tcl
-@@ -1289,7 +1289,6 @@ start_server {tags {"repl" "external:skip"}} {
-         verify_log_message 0 "*Replica generated a reply to command 'ping', disconnecting it: *" $lines
- 
-         $rd close
--        catch {exec kill -9 [get_child_pid 0]}
-         waitForBgsave r
-     }
- 
-@@ -1307,7 +1306,6 @@ start_server {tags {"repl" "external:skip"}} {
-         verify_log_message 0 "*Replica generated a reply to command 'xinfo|help', disconnecting it: *" $lines
- 
-         $rd close
--        catch {exec kill -9 [get_child_pid 0]}
-         waitForBgsave r
-     }
- 
-@@ -1328,7 +1326,6 @@ start_server {tags {"repl" "external:skip"}} {
-         verify_log_message 0 "*Replica can't interact with the keyspace*" $lines
- 
-         $rd close
--        catch {exec kill -9 [get_child_pid 0]}
-         waitForBgsave r
-     }
- 
-@@ -1347,7 +1344,6 @@ start_server {tags {"repl" "external:skip"}} {
-         verify_log_message 0 "*Replica generated a reply to command 'slowlog|get', disconnecting it: *" $lines
- 
-         $rd close
--        catch {exec kill -9 [get_child_pid 0]}
-         waitForBgsave r
-     }
- 
--- 
-2.35.1
-

diff --git a/dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch b/dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch
deleted file mode 100644
index 8f5eaff13fed..000000000000
--- a/dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-This is the patch recommended to apply in order to fix CVE-2022-3647.
-
-Upstream-commit: https://github.com/redis/redis/commit/0bf90d944313919eb8e63d3588bf63a367f020a3
-Bug: https://bugs.gentoo.org/877863
-
-diff --git a/src/debug.c b/src/debug.c
-index 8cc811be4..b15ac8780 100644
---- a/src/debug.c
-+++ b/src/debug.c
-@@ -1123,73 +1123,88 @@ void bugReportStart(void) {
- }
- 
- #ifdef HAVE_BACKTRACE
--static void *getMcontextEip(ucontext_t *uc) {
-+
-+/* Returns the current eip and set it to the given new value (if its not NULL) */
-+static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
- #define NOT_SUPPORTED() do {\
-     UNUSED(uc);\
-+    UNUSED(eip);\
-     return NULL;\
- } while(0)
-+#define GET_SET_RETURN(target_var, new_val) do {\
-+    void *old_val = (void*)target_var; \
-+    if (new_val) { \
-+        void **temp = (void**)&target_var; \
-+        *temp = new_val; \
-+    } \
-+    return old_val; \
-+} while(0)
- #if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
-     /* OSX < 10.6 */
-     #if defined(__x86_64__)
--    return (void*) uc->uc_mcontext->__ss.__rip;
-+    GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip);
-     #elif defined(__i386__)
--    return (void*) uc->uc_mcontext->__ss.__eip;
-+    GET_SET_RETURN(uc->uc_mcontext->__ss.__eip, eip);
-     #else
--    return (void*) uc->uc_mcontext->__ss.__srr0;
-+    GET_SET_RETURN(uc->uc_mcontext->__ss.__srr0, eip);
-     #endif
- #elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6)
-     /* OSX >= 10.6 */
-     #if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__)
--    return (void*) uc->uc_mcontext->__ss.__rip;
-+    GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip);
-     #elif defined(__i386__)
--    return (void*) uc->uc_mcontext->__ss.__eip;
-+    GET_SET_RETURN(uc->uc_mcontext->__ss.__eip, eip);
-     #else
-     /* OSX ARM64 */
--    return (void*) arm_thread_state64_get_pc(uc->uc_mcontext->__ss);
-+    void *old_val = (void*)arm_thread_state64_get_pc(uc->uc_mcontext->__ss);
-+    if (eip) {
-+        arm_thread_state64_set_pc_fptr(uc->uc_mcontext->__ss, eip);
-+    }
-+    return old_val;
-     #endif
- #elif defined(__linux__)
-     /* Linux */
-     #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__))
--    return (void*) uc->uc_mcontext.gregs[14]; /* Linux 32 */
-+    GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip);
-     #elif defined(__X86_64__) || defined(__x86_64__)
--    return (void*) uc->uc_mcontext.gregs[16]; /* Linux 64 */
-+    GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip);
-     #elif defined(__ia64__) /* Linux IA64 */
--    return (void*) uc->uc_mcontext.sc_ip;
-+    GET_SET_RETURN(uc->uc_mcontext.sc_ip, eip);
-     #elif defined(__arm__) /* Linux ARM */
--    return (void*) uc->uc_mcontext.arm_pc;
-+    GET_SET_RETURN(uc->uc_mcontext.arm_pc, eip);
-     #elif defined(__aarch64__) /* Linux AArch64 */
--    return (void*) uc->uc_mcontext.pc;
-+    GET_SET_RETURN(uc->uc_mcontext.pc, eip);
-     #else
-     NOT_SUPPORTED();
-     #endif
- #elif defined(__FreeBSD__)
-     /* FreeBSD */
-     #if defined(__i386__)
--    return (void*) uc->uc_mcontext.mc_eip;
-+    GET_SET_RETURN(uc->uc_mcontext.mc_eip, eip);
-     #elif defined(__x86_64__)
--    return (void*) uc->uc_mcontext.mc_rip;
-+    GET_SET_RETURN(uc->uc_mcontext.mc_rip, eip);
-     #else
-     NOT_SUPPORTED();
-     #endif
- #elif defined(__OpenBSD__)
-     /* OpenBSD */
-     #if defined(__i386__)
--    return (void*) uc->sc_eip;
-+    GET_SET_RETURN(uc->sc_eip, eip);
-     #elif defined(__x86_64__)
--    return (void*) uc->sc_rip;
-+    GET_SET_RETURN(uc->sc_rip, eip);
-     #else
-     NOT_SUPPORTED();
-     #endif
- #elif defined(__NetBSD__)
-     #if defined(__i386__)
--    return (void*) uc->uc_mcontext.__gregs[_REG_EIP];
-+    GET_SET_RETURN(uc->uc_mcontext.__gregs[_REG_EIP], eip);
-     #elif defined(__x86_64__)
--    return (void*) uc->uc_mcontext.__gregs[_REG_RIP];
-+    GET_SET_RETURN(uc->uc_mcontext.__gregs[_REG_RIP], eip);
-     #else
-     NOT_SUPPORTED();
-     #endif
- #elif defined(__DragonFly__)
--    return (void*) uc->uc_mcontext.mc_rip;
-+    GET_SET_RETURN(uc->uc_mcontext.mc_rip, eip);
- #else
-     NOT_SUPPORTED();
- #endif
-@@ -1951,6 +1966,10 @@ void dumpCodeAroundEIP(void *eip) {
-     }
- }
- 
-+void invalidFunctionWasCalled() {}
-+
-+typedef void (*invalidFunctionWasCalledType)();
-+
- void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
-     UNUSED(secret);
-     UNUSED(info);
-@@ -1968,13 +1987,30 @@ void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
- 
- #ifdef HAVE_BACKTRACE
-     ucontext_t *uc = (ucontext_t*) secret;
--    void *eip = getMcontextEip(uc);
-+    void *eip = getAndSetMcontextEip(uc, NULL);
-     if (eip != NULL) {
-         serverLog(LL_WARNING,
-         "Crashed running the instruction at: %p", eip);
-     }
- 
--    logStackTrace(getMcontextEip(uc), 1);
-+    if (eip == info->si_addr) {
-+        /* When eip matches the bad address, it's an indication that we crashed when calling a non-mapped
-+         * function pointer. In that case the call to backtrace will crash trying to access that address and we
-+         * won't get a crash report logged. Set it to a valid point to avoid that crash. */
-+
-+        /* This trick allow to avoid compiler warning */
-+        void *ptr;
-+        invalidFunctionWasCalledType *ptr_ptr = (invalidFunctionWasCalledType*)&ptr;
-+        *ptr_ptr = invalidFunctionWasCalled;
-+        getAndSetMcontextEip(uc, ptr);
-+    }
-+
-+    logStackTrace(eip, 1);
-+
-+    if (eip == info->si_addr) {
-+        /* Restore old eip */
-+        getAndSetMcontextEip(uc, eip);
-+    }
- 
-     logRegisters(uc);
- #endif
-@@ -2079,7 +2115,7 @@ void watchdogSignalHandler(int sig, siginfo_t *info, void *secret) {
- 
-     serverLogFromHandler(LL_WARNING,"\n--- WATCHDOG TIMER EXPIRED ---");
- #ifdef HAVE_BACKTRACE
--    logStackTrace(getMcontextEip(uc), 1);
-+    logStackTrace(getAndSetMcontextEip(uc, NULL), 1);
- #else
-     serverLogFromHandler(LL_WARNING,"Sorry: no support for backtrace().");
- #endif
--- 
-2.37.4
-

diff --git a/dev-db/redis/redis-7.0.5-r1.ebuild b/dev-db/redis/redis-7.0.5-r1.ebuild
deleted file mode 100644
index 5a83b8f71fee..000000000000
--- a/dev-db/redis/redis-7.0.5-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2024 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"
-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
-	"${FILESDIR}"/${PN}-7.0.4-replica-tests-fix.patch
-
-	# see bug 877863
-	"${FILESDIR}/${PN}-7.0.5-cve-2022-3647.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."
-}