Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/redis/
Date: Thu, 28 Apr 2022 02:18:11
Message-Id: 1651112278.e8db611a4cadc177118641ff3146f1ea46f12808.sam@gentoo
1 commit: e8db611a4cadc177118641ff3146f1ea46f12808
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 28 02:14:54 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 28 02:17:58 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8db611a
7
8 dev-db/redis: add 6.2.7
9
10 Bug: https://bugs.gentoo.org/841404
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-db/redis/Manifest | 1 +
14 dev-db/redis/redis-6.2.7.ebuild | 190 ++++++++++++++++++++++++++++++++++++++++
15 2 files changed, 191 insertions(+)
16
17 diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
18 index ac46e3ff43fc..4462f4e2632a 100644
19 --- a/dev-db/redis/Manifest
20 +++ b/dev-db/redis/Manifest
21 @@ -1,3 +1,4 @@
22 DIST redis-5.0.14.tar.gz 2000179 BLAKE2B 77d3ed09a81450dbf806edd017785b82c50bb059aab44c82bc4ab784b7f03d5c58f9372b96c857831f84d278771dcf223f42ca05af790f0dc10ecdde211fd149 SHA512 513299ae8b967a659d54812fab4dfdfaf0081b20136a3d89b6a761e93548583c96436fedb84baa4d23385b42110ef615527efc3690b873f5bec7793403fe7eaf
23 DIST redis-6.0.16.tar.gz 2288647 BLAKE2B f3552cc0d27cbc5cf6556792da9a75d01ff70d372484c95d2af8b24ec902a8086b9c3f4e53513df982fe135963432bfb527334926dd494e50d2cc618ab813f39 SHA512 83bb72448f9943e3d015cb4d961eb2eae21602ef1f90ca52ca8ab7c6918b0ab979db9f61f3981df27b2286894f4864f4588c3a52fa988e30e9419b0967998845
24 DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682ea49de761c4bb4089a2efd814926f2f8823dca1826b4a61dd9ccf79abb22878c9463ac92870481b43d8a7fff7 SHA512 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022
25 +DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953
26
27 diff --git a/dev-db/redis/redis-6.2.7.ebuild b/dev-db/redis/redis-6.2.7.ebuild
28 new file mode 100644
29 index 000000000000..a40a02c92f80
30 --- /dev/null
31 +++ b/dev-db/redis/redis-6.2.7.ebuild
32 @@ -0,0 +1,190 @@
33 +# Copyright 1999-2022 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=8
37 +
38 +# Redis does NOT build with Lua 5.2 or newer at this time:
39 +# - 5.3 and 5.4 give:
40 +# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
41 +# - 5.2 fails with:
42 +# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
43 +# because lua_open became lua_newstate in 5.2
44 +#LUA_COMPAT=( lua5-1 luajit )
45 +
46 +# Upstream have deviated too far from vanilla Lua, adding their own APIs
47 +# like lua_enablereadonlytable
48 +inherit autotools flag-o-matic systemd toolchain-funcs tmpfiles
49 +
50 +DESCRIPTION="A persistent caching system, key-value and data structures database"
51 +HOMEPAGE="https://redis.io"
52 +SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
53 +
54 +LICENSE="BSD"
55 +SLOT="0"
56 +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
57 +IUSE="+jemalloc ssl systemd tcmalloc test"
58 +RESTRICT="!test? ( test )"
59 +
60 +COMMON_DEPEND="
61 + ${LUA_DEPS}
62 + jemalloc? ( >=dev-libs/jemalloc-5.1:= )
63 + ssl? ( dev-libs/openssl:0= )
64 + systemd? ( sys-apps/systemd:= )
65 + tcmalloc? ( dev-util/google-perftools )
66 +"
67 +
68 +RDEPEND="
69 + ${COMMON_DEPEND}
70 + acct-group/redis
71 + acct-user/redis
72 +"
73 +
74 +BDEPEND="
75 + ${COMMON_DEPEND}
76 + virtual/pkgconfig
77 +"
78 +
79 +# Tcl is only needed in the CHOST test env
80 +DEPEND="
81 + ${COMMON_DEPEND}
82 + test? (
83 + dev-lang/tcl:0=
84 + ssl? ( dev-tcltk/tls )
85 + )"
86 +
87 +REQUIRED_USE="?? ( jemalloc tcmalloc )
88 + ${LUA_REQUIRED_USE}"
89 +
90 +PATCHES=(
91 + "${FILESDIR}"/${PN}-6.2.1-config.patch
92 + "${FILESDIR}"/${PN}-5.0-shared.patch
93 + "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
94 + "${FILESDIR}"/${PN}-sentinel-5.0-config.patch
95 +)
96 +
97 +src_prepare() {
98 + default
99 +
100 + # unstable on jemalloc
101 + > tests/unit/memefficiency.tcl || die
102 +
103 + # Copy lua modules into build dir
104 + #cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
105 + #cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
106 + # Append cflag for lua_cjson
107 + # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
108 + append-cflags "-DENABLE_CJSON_GLOBAL"
109 +
110 + # now we will rewrite present Makefiles
111 + local makefiles="" MKF
112 + for MKF in $(find -name 'Makefile' | cut -b 3-); do
113 + mv "${MKF}" "${MKF}.in"
114 + sed -i -e 's:$(CC):@CC@:g' \
115 + -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
116 + -e 's: $(DEBUG)::g' \
117 + -e 's:$(OBJARCH)::g' \
118 + -e 's:ARCH:TARCH:g' \
119 + -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
120 + "${MKF}.in" \
121 + || die "Sed failed for ${MKF}"
122 + makefiles+=" ${MKF}"
123 + done
124 + # autodetection of compiler and settings; generates the modified Makefiles
125 + cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
126 +
127 + # Use the correct pkgconfig name for Lua.
128 + # The upstream configure script handles luajit specially, and is not
129 + # effected by these changes.
130 + # -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \
131 + sed -i \
132 + -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
133 + -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
134 + configure.ac || die "Sed failed for configure.ac"
135 + eautoreconf
136 +}
137 +
138 +src_configure() {
139 + econf #$(use_with lua_single_target_luajit luajit)
140 +
141 + # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
142 + # also, don't define ANSI/c99 for lua twice
143 + sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
144 +}
145 +
146 +src_compile() {
147 + local myconf=""
148 +
149 + if use jemalloc; then
150 + myconf+="MALLOC=jemalloc"
151 + elif use tcmalloc; then
152 + myconf+="MALLOC=tcmalloc"
153 + else
154 + myconf+="MALLOC=libc"
155 + fi
156 +
157 + if use ssl; then
158 + myconf+=" BUILD_TLS=yes"
159 + fi
160 +
161 + export USE_SYSTEMD=$(usex systemd)
162 +
163 + tc-export AR CC RANLIB
164 + emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
165 +}
166 +
167 +src_test() {
168 + # Known to fail with FEATURES=usersandbox
169 + if has usersandbox ${FEATURES}; then
170 + ewarn "You are emerging ${P} with 'usersandbox' enabled." \
171 + "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
172 + fi
173 +
174 + if use ssl; then
175 + ./utils/gen-test-certs.sh
176 + ./runtest --tls
177 + else
178 + ./runtest
179 + fi
180 +}
181 +
182 +src_install() {
183 + insinto /etc/redis
184 + doins redis.conf sentinel.conf
185 + use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
186 + fperms 0750 /etc/redis
187 + fperms 0644 /etc/redis/{redis,sentinel}.conf
188 +
189 + newconfd "${FILESDIR}/redis.confd-r2" redis
190 + newinitd "${FILESDIR}/redis.initd-6" redis
191 +
192 + systemd_newunit "${FILESDIR}/redis.service-4" redis.service
193 + newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
194 +
195 + newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
196 + newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
197 +
198 + insinto /etc/logrotate.d/
199 + newins "${FILESDIR}/${PN}.logrotate" ${PN}
200 +
201 + dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
202 +
203 + dobin src/redis-cli
204 + dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
205 + fperms 0750 /usr/sbin/redis-benchmark
206 + dosym redis-server /usr/sbin/redis-sentinel
207 +
208 + if use prefix; then
209 + diropts -m0750
210 + else
211 + diropts -m0750 -o redis -g redis
212 + fi
213 + keepdir /var/{log,lib}/redis
214 +}
215 +
216 +pkg_postinst() {
217 + tmpfiles_process redis.conf
218 +
219 + ewarn "The default redis configuration file location changed to:"
220 + ewarn " /etc/redis/{redis,sentinel}.conf"
221 + ewarn "Please apply your changes to the new configuration files."
222 +}