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