1 |
commit: 3847c69473d324465e9eb6e88bf18db02da1a898 |
2 |
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Oct 24 18:39:07 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 26 16:17:33 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3847c694 |
7 |
|
8 |
dev-db/redis: bump to 6.0.8 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/750965 |
11 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/18024 |
13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
14 |
|
15 |
dev-db/redis/Manifest | 1 + |
16 |
dev-db/redis/redis-6.0.8.ebuild | 174 ++++++++++++++++++++++++++++++++++++++++ |
17 |
2 files changed, 175 insertions(+) |
18 |
|
19 |
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest |
20 |
index 7d3e23dd97d..f3d40c434ae 100644 |
21 |
--- a/dev-db/redis/Manifest |
22 |
+++ b/dev-db/redis/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38659001421f96040e8a64a4a304e9dc1f06d82802ce1c92515d166cfd37c2f347df4c4cda0c2c4c2bb10d27c5 SHA512 d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13 |
25 |
DIST redis-6.0.6.tar.gz 2228781 BLAKE2B 42396f464611cd5d83a79a97d2e4f74c0adabf9338802ec748c24f6ea46d42c6e51fedecc5cd26c7cff6b2a3c7a26bbbf79db7a54a6cbeff388587d186268796 SHA512 bb60aff6e495b201fed814eb134e6ce2825429ef6bd52215c7369eec941318ba460d60ad7b0cef3684b3f992823d465869177dc1d0eb16886bfed598dff74f65 |
26 |
+DIST redis-6.0.8.tar.gz 2247528 BLAKE2B b243e7e1bd1fff16fcbf5d50e71c757204e304c14a7f5303c79d7fc6eaa29ba07d6765bdbeead050f03af0ca8c8e439b61d5089b983fd22b9ad081f307d62f98 SHA512 49d1ef623c330716c035f6dfd5a4754af4d53b6ec5ea7366fecf9dd90290968893e9f2375e191e7075db563180044c30e58a63624d352ecb5413449c6136e21a |
27 |
|
28 |
diff --git a/dev-db/redis/redis-6.0.8.ebuild b/dev-db/redis/redis-6.0.8.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..a342091beee |
31 |
--- /dev/null |
32 |
+++ b/dev-db/redis/redis-6.0.8.ebuild |
33 |
@@ -0,0 +1,174 @@ |
34 |
+# Copyright 1999-2020 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+ |
39 |
+inherit autotools flag-o-matic systemd toolchain-funcs |
40 |
+ |
41 |
+DESCRIPTION="A persistent caching system, key-value and data structures database" |
42 |
+HOMEPAGE="https://redis.io" |
43 |
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz" |
44 |
+ |
45 |
+LICENSE="BSD" |
46 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" |
47 |
+IUSE="+jemalloc luajit tcmalloc test" |
48 |
+RESTRICT="!test? ( test )" |
49 |
+SLOT="0" |
50 |
+ |
51 |
+# Redis does NOT build with Lua 5.2 or newer at this time. |
52 |
+# This should link correctly with both unslotted & slotted Lua, without |
53 |
+# changes. |
54 |
+COMMON_DEPEND=" |
55 |
+ jemalloc? ( >=dev-libs/jemalloc-5.1:= ) |
56 |
+ luajit? ( dev-lang/luajit:2 ) |
57 |
+ !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) |
58 |
+ tcmalloc? ( dev-util/google-perftools ) |
59 |
+" |
60 |
+ |
61 |
+RDEPEND=" |
62 |
+ ${COMMON_DEPEND} |
63 |
+ acct-group/redis |
64 |
+ acct-user/redis |
65 |
+" |
66 |
+ |
67 |
+BDEPEND=" |
68 |
+ ${COMMON_DEPEND} |
69 |
+ virtual/pkgconfig |
70 |
+" |
71 |
+ |
72 |
+# Tcl is only needed in the CHOST test env |
73 |
+DEPEND=" |
74 |
+ ${COMMON_DEPEND} |
75 |
+ test? ( dev-lang/tcl:0= )" |
76 |
+ |
77 |
+REQUIRED_USE="?? ( jemalloc tcmalloc )" |
78 |
+ |
79 |
+PATCHES=( |
80 |
+ "${FILESDIR}"/${PN}-3.2.3-config.patch |
81 |
+ "${FILESDIR}"/${PN}-5.0-shared.patch |
82 |
+ "${FILESDIR}"/${PN}-6.0.3-sharedlua.patch |
83 |
+ "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch |
84 |
+ "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
85 |
+) |
86 |
+ |
87 |
+src_prepare() { |
88 |
+ default |
89 |
+ |
90 |
+ # unstable on jemalloc |
91 |
+ > tests/unit/memefficiency.tcl || die |
92 |
+ |
93 |
+ # Copy lua modules into build dir |
94 |
+ cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
95 |
+ cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
96 |
+ # Append cflag for lua_cjson |
97 |
+ # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
98 |
+ append-cflags "-DENABLE_CJSON_GLOBAL" |
99 |
+ |
100 |
+ # now we will rewrite present Makefiles |
101 |
+ local makefiles="" MKF |
102 |
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do |
103 |
+ mv "${MKF}" "${MKF}.in" |
104 |
+ sed -i -e 's:$(CC):@CC@:g' \ |
105 |
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
106 |
+ -e 's: $(DEBUG)::g' \ |
107 |
+ -e 's:$(OBJARCH)::g' \ |
108 |
+ -e 's:ARCH:TARCH:g' \ |
109 |
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
110 |
+ "${MKF}.in" \ |
111 |
+ || die "Sed failed for ${MKF}" |
112 |
+ makefiles+=" ${MKF}" |
113 |
+ done |
114 |
+ # autodetection of compiler and settings; generates the modified Makefiles |
115 |
+ cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
116 |
+ |
117 |
+ # Use the correct pkgconfig name for Lua |
118 |
+ if false && has_version 'dev-lang/lua:5.3'; then |
119 |
+ # Lua5.3 gives: |
120 |
+ #lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" |
121 |
+ LUAPKGCONFIG=lua5.3 |
122 |
+ elif false && has_version 'dev-lang/lua:5.2'; then |
123 |
+ # Lua5.2 fails with: |
124 |
+ # scripting.c:(.text+0x1f9b): undefined reference to `lua_open' |
125 |
+ # Because lua_open because lua_newstate in 5.2 |
126 |
+ LUAPKGCONFIG=lua5.2 |
127 |
+ elif has_version 'dev-lang/lua:5.1'; then |
128 |
+ LUAPKGCONFIG=lua5.1 |
129 |
+ else |
130 |
+ LUAPKGCONFIG=lua |
131 |
+ fi |
132 |
+ # The upstream configure script handles luajit specially, and is not |
133 |
+ # effected by these changes. |
134 |
+ einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}" |
135 |
+ sed -i \ |
136 |
+ -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
137 |
+ -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
138 |
+ -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \ |
139 |
+ configure.ac || die "Sed failed for configure.ac" |
140 |
+ eautoreconf |
141 |
+} |
142 |
+ |
143 |
+src_configure() { |
144 |
+ econf $(use_with luajit) |
145 |
+ |
146 |
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
147 |
+ # also, don't define ANSI/c99 for lua twice |
148 |
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
149 |
+} |
150 |
+ |
151 |
+src_compile() { |
152 |
+ local myconf="" |
153 |
+ |
154 |
+ if use jemalloc; then |
155 |
+ myconf+="MALLOC=jemalloc" |
156 |
+ elif use tcmalloc; then |
157 |
+ myconf+="MALLOC=tcmalloc" |
158 |
+ else |
159 |
+ myconf+="MALLOC=libc" |
160 |
+ fi |
161 |
+ |
162 |
+ tc-export AR CC RANLIB |
163 |
+ emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" |
164 |
+} |
165 |
+ |
166 |
+src_test() { |
167 |
+ # Known to fail with FEATURES=usersandbox |
168 |
+ if has usersandbox ${FEATURES}; then |
169 |
+ ewarn "You are emerging ${P} with 'usersandbox' enabled." \ |
170 |
+ "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" |
171 |
+ fi |
172 |
+ |
173 |
+ emake check |
174 |
+} |
175 |
+ |
176 |
+src_install() { |
177 |
+ insinto /etc/ |
178 |
+ doins redis.conf sentinel.conf |
179 |
+ use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
180 |
+ fperms 0644 /etc/{redis,sentinel}.conf |
181 |
+ |
182 |
+ newconfd "${FILESDIR}/redis.confd-r1" redis |
183 |
+ newinitd "${FILESDIR}/redis.initd-5" redis |
184 |
+ |
185 |
+ systemd_newunit "${FILESDIR}/redis.service-3" redis.service |
186 |
+ systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles-2" redis.conf |
187 |
+ |
188 |
+ newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel |
189 |
+ newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel |
190 |
+ |
191 |
+ insinto /etc/logrotate.d/ |
192 |
+ newins "${FILESDIR}/${PN}.logrotate" ${PN} |
193 |
+ |
194 |
+ dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
195 |
+ |
196 |
+ dobin src/redis-cli |
197 |
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
198 |
+ fperms 0750 /usr/sbin/redis-benchmark |
199 |
+ dosym redis-server /usr/sbin/redis-sentinel |
200 |
+ |
201 |
+ if use prefix; then |
202 |
+ diropts -m0750 |
203 |
+ else |
204 |
+ diropts -m0750 -o redis -g redis |
205 |
+ fi |
206 |
+ keepdir /var/{log,lib}/redis |
207 |
+} |