From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D883D15806C for ; Sat, 12 Jul 2025 05:56:36 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B6C10342021 for ; Sat, 12 Jul 2025 05:56:36 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 9ADF311055E; Sat, 12 Jul 2025 05:56:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 86CF711055E for ; Sat, 12 Jul 2025 05:56:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 372B3341F9D for ; Sat, 12 Jul 2025 05:56:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8C793081 for ; Sat, 12 Jul 2025 05:56:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1752299698.abeb93758bf6148f497e4fbd592534fb5bf2e762.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/redict/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/redict/Manifest dev-db/redict/redict-7.3.4.ebuild X-VCS-Directories: dev-db/redict/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: abeb93758bf6148f497e4fbd592534fb5bf2e762 X-VCS-Branch: master Date: Sat, 12 Jul 2025 05:56:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5a94fb59-3d6c-47a0-a598-b3883ccecddf X-Archives-Hash: d4b162f2c71d514042af5351025c920a commit: abeb93758bf6148f497e4fbd592534fb5bf2e762 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Fri Jul 11 18:17:13 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 12 05:54:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abeb9375 dev-db/redict: add 7.3.4 Fixes CVE-2025-48367 Bug: https://bugs.gentoo.org/959657 Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Part-of: https://github.com/gentoo/gentoo/pull/42960 Signed-off-by: Sam James gentoo.org> dev-db/redict/Manifest | 1 + dev-db/redict/redict-7.3.4.ebuild | 160 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+) diff --git a/dev-db/redict/Manifest b/dev-db/redict/Manifest index 27cdd6376164..6f8695f2d7f9 100644 --- a/dev-db/redict/Manifest +++ b/dev-db/redict/Manifest @@ -1 +1,2 @@ DIST redict-7.3.3.tar.gz 3415184 BLAKE2B 848c328725b8c07ba82e040c26edf6ba4902b6b55bc06fa3c0bb7adeb2b8f14e302f126f2759469552712e806b9bc15956d4b11ab49ac1e57223caff05e7925f SHA512 7fbdee54f26d59d74bab2b9fa619cb7c0135aebb38ff891423f4963ca593e20018f9f789288eb3ebc769f02a05da3fe35033f75d42902bb99421cae5689f5e88 +DIST redict-7.3.4.tar.gz 3415845 BLAKE2B e30b62845e371a7f0b21e5070561d27fa1d89f09ec9b462a509176a40c2c46fde598cbc0b58e3f02444f7d68b0c041f2db65893ab08ce7bad619da788b4e1e29 SHA512 6f3bcdc965d6c761874d32bb107854d7375c5bccbee5a71f438b4ec176136b0f55b864bd9448898f92dc0c7e5b6e188139b8456ee88c2293e600fa854f36b621 diff --git a/dev-db/redict/redict-7.3.4.ebuild b/dev-db/redict/redict-7.3.4.ebuild new file mode 100644 index 000000000000..002e106a3641 --- /dev/null +++ b/dev-db/redict/redict-7.3.4.ebuild @@ -0,0 +1,160 @@ +# Copyright 2024-2025 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 edo multiprocessing systemd tmpfiles toolchain-funcs + +DESCRIPTION="A persistent caching system, key-value, and data structures database" +HOMEPAGE="https://redict.io" + +SRC_URI="https://codeberg.org/redict/redict/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + +S=${WORKDIR}/${PN} + +LICENSE="BSD Boost-1.0 LGPL-3" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="+jemalloc ssl systemd tcmalloc test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="?? ( jemalloc tcmalloc )" + +RDEPEND=" + acct-group/redict + acct-user/redict + dev-libs/hiredict:0=[ssl?] + jemalloc? ( >=dev-libs/jemalloc-5.1:=[stats] ) + ssl? ( dev-libs/openssl:0= ) + systemd? ( sys-apps/systemd:= ) + tcmalloc? ( dev-util/google-perftools ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lang/tcl:0= + ssl? ( dev-tcltk/tls ) + ) +" + +PATCHES=( + "${FILESDIR}"/redict-7.3.0-config.patch + "${FILESDIR}"/redict-sentinel-7.3.0-config.patch + "${FILESDIR}"/redict-7.3.0-system-jemalloc.patch + "${FILESDIR}"/redict-7.3.0-system-hiredict.patch +) + +src_prepare() { + default + + # Respect user CFLAGS in bundled lua + sed -i '/LUA_CFLAGS/s: -O2::g' deps/Makefile || die +} + +_build() { + tc-export AR CC RANLIB + local myconf=( + AR="${AR}" + CC="${CC}" + RANLIB="${RANLIB}" + CFLAGS="${CFLAGS}" + LDFLAGS="${LDFLAGS}" + V=1 # verbose + OPTIMIZATION= + DEBUG= + DEBUG_FLAGS= + BUILD_TLS=$(usex ssl) + USE_SYSTEMD=$(usex systemd) + USE_SYSTEM_HIREDICT=yes + ) + + if use jemalloc; then + myconf+=( + MALLOC=jemalloc + USE_SYSTEM_JEMALLOC=yes + ) + elif use tcmalloc; then + myconf+=( MALLOC=tcmalloc ) + else + myconf+=( MALLOC=libc ) + fi + + emake -C src "${myconf[@]}" "$@" +} + +src_compile() { + _build +} + +src_test() { + local runtestargs=( + --clients "$(makeopts_jobs)" # see bug #649868 + + --skiptest "Active defrag eval scripts" # see bug #851654 + --skiptest "FUNCTION - redict version api" # test fails due to release mishap on 7.3.1, remove on bump + ) + + 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/redict + doins redict.conf sentinel.conf + use prefix || fowners -R redict:redict /etc/redict /etc/redict/{redict,sentinel}.conf + + newconfd "${FILESDIR}/redict.confd" redict + newinitd "${FILESDIR}/redict.initd" redict + + systemd_newunit "${FILESDIR}/redict.service" redict.service + newtmpfiles "${FILESDIR}/redict.tmpfiles" redict.conf + + newconfd "${FILESDIR}/redict-sentinel.confd" redict-sentinel + newinitd "${FILESDIR}/redict-sentinel.initd" redict-sentinel + + insinto /etc/logrotate.d/ + newins "${FILESDIR}/redict.logrotate" "${PN}" + + _build DESTDIR="${ED}" PREFIX="/usr" install + + if use prefix; then + diropts -m0750 + else + diropts -m0750 -o redict -g redict + fi + keepdir /var/{log,lib}/redict +} + +pkg_postinst() { + tmpfiles_process redict.conf + + if has_version dev-db/redis && [[ -z "${REPLACING_VERSIONS}" ]]; then + ewarn "Redict uses different configuration files than redis:" + ewarn "/etc/redict/{redict,sentinel}.conf" + ewarn "Please apply your changes to the new configuration files." + fi +}