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

["Sam James" <sam@gentoo.org>]

commit:     cc931041a662369979ebd6d95b157985c8a97311
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed Aug 16 09:05:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 06:22:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc931041

dev-db/redis: add 7.2.0

Two patches were necessary to rebase, the *-shared.patch was renamed to
*-system-jemalloc.patch which better suits the change.

Boost-1.0 was appended to LICENSE because of newly bundled fpconv.

It is not necessary to append -DENABLE_CJSON_GLOBAL to cflags as it is
correctly set in deps/Makefile, thus flag-o-matic is no longer used.

-O2 is stripped from LUA_CLFAGS in order to respect user's CFLAGS.

The "big" sed for all Makefiles was revised, all expressions are moved
to a local mysedconf array, obsolete expressions are removed and it
newly strips recently appended -Werror* flags.

myconf is transformed to an array, with newly added OPTIMIZATION and
DEBUG_FLAGS defined as empty strings in order to respect user's CFLAGS.
USE_SYSTEMD is moved to the array as well.

github link is appended to HOMEPAGE.

Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/32338
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/redis/Manifest                              |   1 +
 .../redis/files/redis-7.2.0-system-jemalloc.patch  |  33 ++++
 .../redis/files/redis-sentinel-7.2.0-config.patch  |  27 +++
 dev-db/redis/redis-7.2.0.ebuild                    | 200 +++++++++++++++++++++
 4 files changed, 261 insertions(+)

diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index e757a6bbb891..0c6286c369d7 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -4,3 +4,4 @@ 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

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."
+}