From e4b9f141e31db1e069e3bcf5b1fb81af77b0cace Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 12 Jul 2022 13:33:15 +0100 Subject: gentoo auto-resync : 12:07:2022 - 13:33:15 --- dev-db/redis/Manifest | 8 +- dev-db/redis/redis-6.2.7-r1.ebuild | 2 +- dev-db/redis/redis-7.0.1-r1.ebuild | 2 + dev-db/redis/redis-7.0.2.ebuild | 2 + dev-db/redis/redis-7.0.3.ebuild | 186 +++++++++++++++++++++++++++++++++++++ 5 files changed, 196 insertions(+), 4 deletions(-) create mode 100644 dev-db/redis/redis-7.0.3.ebuild (limited to 'dev-db/redis') diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 89ec52dd8400..b1854e5e483a 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -21,9 +21,11 @@ DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682e DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953 DIST redis-7.0.1.tar.gz 2955839 BLAKE2B 67ff36e5e78ab9a90d4404d0f0bddbe9b539166c826d8a1b314bb32cdece7d40caf5eff57302cd641548ed3b1e19aff1b657ed31a20233550636708b6386c2db SHA512 e61d27695fd2d439f204612b97a3ea245ebf92d418949460f7144026191ade4fac1647717bbb48a2b3e238856f0392af08b4fdb4358d04f2ccd1088ff9d3dac4 DIST redis-7.0.2.tar.gz 2956784 BLAKE2B 418f6114662c9b9b67dc7f28f89f58fefee3eb5fec84a6193ca50034366c963986a56d1c96dadfdd88a88ea1ddd4542ed910b89c8a81c95b38aa4f7bdc5ae571 SHA512 bc8d679ecaad0220318b87be70476653f42b76815af61ff6f4e8885f5a5d17d41cea754fbf448f9e18e9a9f90227c5ac198fa9bc523370752f590ba01418a1b0 +DIST redis-7.0.3.tar.gz 2962858 BLAKE2B f523d96140e8ede263a5697ec8d88d02ee309a482b861ecbcdbd9063d94da4b1a801c3b8f01f50863a132b0dd33bfe09ec9b3f1c8ea2d12ea8a6f22d7f770263 SHA512 d4419c596577d58195478ff2414bedcfd81658067de733781fe8d41b79938c4dacb46b456779b94e30343d1e717140579b73db1715a6d721827afe1842d548e3 EBUILD redis-6.0.16.ebuild 5642 BLAKE2B 72f2aea7b428ea59a05d51f8f10e7447408757f3cf322cd2d37ed605812816f135baac4507543254de0d1f3d89a2da9d261d2012b6c3805b4a87fab064465e32 SHA512 1f6c69e96eb98e4389d55cee8dbd40ad0cab84aad60edc65df2b940968392ed052a489ad25662e44a5c14a5c878f08b2566097d0c20c200f8c74b0b2d5f327ee EBUILD redis-6.2.6.ebuild 5398 BLAKE2B ea426c3c1f29e7e471fcd0435dd494713111d63d585f870e0d6c86e662e4023bacac5134c95c52ead1fcc3a8886db83a42a2f719fa035f46dde3dd333c725c92 SHA512 2b066233d5211973a19fc7d7c1d01892e818a560be746754166dcd836c46c370a61e0e92592452345c98d00dd455cb9af6bd2eff0f6375d9fcef15e46e433b1e -EBUILD redis-6.2.7-r1.ebuild 5482 BLAKE2B 820c3b7261a84cc6ae2313ef9adad5a43787b308b36b20525ee3ec3d1587095b979ebb4a00775c37aa6f54b2520de7fe204582120436fef94717fc7d101001e6 SHA512 2d28ededbd610a0d9d8d61229c67ebc747464b77214daff069a2acdea45d86170de1fe70cd465aa444dad72d7e466e46d8397c82643857a11d9347b0ecdf6396 -EBUILD redis-7.0.1-r1.ebuild 4829 BLAKE2B 5530e81a11e62fa3118c7d89a956483856409527d0d28d48ed05dc05996c36389ae9910690808fe1e74e4741852c47e48f36ec23357988821b588827fbfb53ad SHA512 69cb7349fba737e14f4d93e8b5b5f4aaf9dae13b6661e6355103ce95c252bbf624444983e2f9373c1bfd40b35303652c752b8fc8616d3aca917eb16eca450181 -EBUILD redis-7.0.2.ebuild 4836 BLAKE2B d80fa0129b047a147ecb11c343ccf5b300d3026a9f8dece4740843341f84d53b3d675090c35f75afe3e0fd5b02546a5f2ae15ac4f2a113ecf4370c4c43fdc2c7 SHA512 21d2332d96868e95d48cbebe3e9f42c433194f198db6c27361356f61927eaad0d6c3cc21a83d1b16affa40ecdf2cfbc56328682311b3e84d596b260ab2672350 +EBUILD redis-6.2.7-r1.ebuild 5481 BLAKE2B 4f9f82ee193aa8d500bd851acf6b0076ae9ed256de46a90cc89b376b83e2fbc45b55b6180d513eab368d20395e21e962d73ad5820e66298eef1faaa7468367ba SHA512 1df4903f6b64d7dcc10b21a7cc0912f2f672df496a2e8fb363138df7951913210fea8fba9127d358bfdb857947ae699e63dbd099c2d7a151f288884f9f9a5cd5 +EBUILD redis-7.0.1-r1.ebuild 4890 BLAKE2B 8c43af6454f8fee44e4c2cce7ce8ce646ebca1e23ab0938b566022bc0318d4a73708d65763c52f76d61801eed811f90ba8178c28d981cc58910c6f3e641204fa SHA512 7126a2675572dce2a15b25753641fbd6a1c90b04a635e0ac1dbb28a44137219311abba357b7975b4f16ea20888a70b6d1eb5419e6d7ce5479303164ffe88efb3 +EBUILD redis-7.0.2.ebuild 4897 BLAKE2B d8e801fc98a00d63681e6e4a08a80e576ee77fc5e8008bc6c60b947e3f41738a96c9e0156611c7daf7c147c9b7f053c0ecdc2ed829b017e022d581e77f69b8e2 SHA512 74e9242961d40ff97002cca7faf7a86a59937a0246958831d078b087c232bd650b993e9c73b7cde6e309e12ae3b19cc5424239946163e0eacf281be72c5e4296 +EBUILD redis-7.0.3.ebuild 4900 BLAKE2B d0c337b9a1df1c70aa2f520419fb1c7e3cccc823d93d64972ec7968d6cf55c8b87a0fd5caab90ac7031556f72da54d6030fc0262fa11c1731df120d099ea3f0b SHA512 95cd2589fe38f59c068ff16245c93c0695330b67070dc686545b17637d810eff90bc632589cfa4f65c8ee6e77741a5d8fca4b3e4ad62aac39169153278f75545 MISC metadata.xml 616 BLAKE2B 7d97d6490b18f6505729b0ec0c06fafbc8be3fb81c4f0b3aedcb44bbf557ca53c4465d0dac11e52396853e471d426b117e0d4c34407806e8bd31149e12ddad87 SHA512 8ff1a9be0ff3a6c09bb6f77cc83937c0e045ae666cec3994d9f3bf290260337faeeb2d28266e789d1812b4dc481a19afd198c0a207ee107afd2368b9d176fb70 diff --git a/dev-db/redis/redis-6.2.7-r1.ebuild b/dev-db/redis/redis-6.2.7-r1.ebuild index a15818f6a3db..72e740691b1a 100644 --- a/dev-db/redis/redis-6.2.7-r1.ebuild +++ b/dev-db/redis/redis-6.2.7-r1.ebuild @@ -22,7 +22,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="+jemalloc selinux ssl systemd tcmalloc test" RESTRICT="!test? ( test )" diff --git a/dev-db/redis/redis-7.0.1-r1.ebuild b/dev-db/redis/redis-7.0.1-r1.ebuild index f43853ced40b..2fdb9e772f89 100644 --- a/dev-db/redis/redis-7.0.1-r1.ebuild +++ b/dev-db/redis/redis-7.0.1-r1.ebuild @@ -117,6 +117,8 @@ src_compile() { 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 diff --git a/dev-db/redis/redis-7.0.2.ebuild b/dev-db/redis/redis-7.0.2.ebuild index 3e4ee296d8aa..9ab76d9dd7cc 100644 --- a/dev-db/redis/redis-7.0.2.ebuild +++ b/dev-db/redis/redis-7.0.2.ebuild @@ -117,6 +117,8 @@ src_compile() { 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 diff --git a/dev-db/redis/redis-7.0.3.ebuild b/dev-db/redis/redis-7.0.3.ebuild new file mode 100644 index 000000000000..c9f9d38f3cb8 --- /dev/null +++ b/dev-db/redis/redis-7.0.3.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2022 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 ~x86-solaris" +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 +) + +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." +} -- cgit v1.2.3