1 |
commit: 9deb0bf5a36359f9c7864e3c2625f203e6e26738 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 31 11:54:02 2021 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 31 11:54:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9deb0bf5 |
7 |
|
8 |
dev-db/redis: security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/773328 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
dev-db/redis/Manifest | 2 - |
15 |
dev-db/redis/redis-5.0.9-r1.ebuild | 162 ---------------------------------- |
16 |
dev-db/redis/redis-6.0.9-r100.ebuild | 164 ----------------------------------- |
17 |
3 files changed, 328 deletions(-) |
18 |
|
19 |
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest |
20 |
index dd22bd2a200..5a55bebdeb6 100644 |
21 |
--- a/dev-db/redis/Manifest |
22 |
+++ b/dev-db/redis/Manifest |
23 |
@@ -1,5 +1,3 @@ |
24 |
DIST redis-5.0.12.tar.gz 1995069 BLAKE2B 03bb5956fb1206ecfa7f621b22b3101d1ebad62c40ce52157fb802ecfa5c32ca493ff03a1cf909a1b0f1acdac83b3a939ab2042fbf092fea983cabe35d00f4c3 SHA512 f0ab161762006926064ba2176ea63bb2fa416fa386b44ca55a8edad9169627fcd1c4bd9c699fec585aefc68506deb0796f6a89844c21e74d2bdb19ca1638bbe7 |
25 |
-DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38659001421f96040e8a64a4a304e9dc1f06d82802ce1c92515d166cfd37c2f347df4c4cda0c2c4c2bb10d27c5 SHA512 d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13 |
26 |
DIST redis-6.0.12.tar.gz 2276349 BLAKE2B ab49b0278420c65fc995a90e850130971ccaf3df34a08a5cc10a8c211239eba8449b87fe67684189c71816cf259a70a23a77935ec61e8baa787daa61cb994201 SHA512 9dd8e3bed51e1356470e1bf08892f771744c0c9418ff874c16ea932ad1f471a908ffd8479efe1f32531d7f63cd7af5224273ce50f2fe7aa26c47716e0e78330b |
27 |
-DIST redis-6.0.9.tar.gz 2261418 BLAKE2B 93e64e2c682320d11e468021fd13a2888dd6b15430c15eaaa9468242d9b4d8b60e29dfe656e677774dc88ed751471284d1adf94c723521085019b375785abe7a SHA512 ebae2b09637fdbdc71dd22b72ccea24e2c21beb81c6ff5c4bae8b341886a7d847ce868f52dc917079bab8aa250ff61c83efe8acbb8a1cbc5e285c7842b0aefa3 |
28 |
DIST redis-6.2.1.tar.gz 2438367 BLAKE2B 8717630771eafaf8a15dd371d46475f81f15bbcdc9a4fabd8f270ab6e09fbfb3ee2a1cddddb6c7778922d3552bcf5ee475eec7ba0623147ec36a5c5422cb0de0 SHA512 7c339cc360fc3125bb67c5748bb4fe940977faa937e3a86294829bde472479a811df8ea0ce4961d8128ec8d4ffba5d5a943c2957589c8da0cfc3f109f82e4af6 |
29 |
|
30 |
diff --git a/dev-db/redis/redis-5.0.9-r1.ebuild b/dev-db/redis/redis-5.0.9-r1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 70f779e9dbd..00000000000 |
33 |
--- a/dev-db/redis/redis-5.0.9-r1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,162 +0,0 @@ |
36 |
-# Copyright 1999-2021 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
- |
41 |
-inherit autotools flag-o-matic systemd toolchain-funcs tmpfiles |
42 |
- |
43 |
-DESCRIPTION="A persistent caching system, key-value and data structures database" |
44 |
-HOMEPAGE="https://redis.io" |
45 |
-SRC_URI="http://download.redis.io/releases/${P}.tar.gz" |
46 |
- |
47 |
-LICENSE="BSD" |
48 |
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" |
49 |
-IUSE="+jemalloc tcmalloc luajit test" |
50 |
-RESTRICT="!test? ( test )" |
51 |
-SLOT="0" |
52 |
- |
53 |
-# Redis does NOT build with Lua 5.2 or newer at this time. |
54 |
-# This should link correctly with both unslotted & slotted Lua, without |
55 |
-# changes. |
56 |
-COMMON_DEPEND=" |
57 |
- luajit? ( dev-lang/luajit:2 ) |
58 |
- !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) |
59 |
- tcmalloc? ( dev-util/google-perftools ) |
60 |
- jemalloc? ( >=dev-libs/jemalloc-5.1:= )" |
61 |
- |
62 |
-RDEPEND=" |
63 |
- ${COMMON_DEPEND} |
64 |
- acct-group/redis |
65 |
- acct-user/redis" |
66 |
- |
67 |
-BDEPEND=" |
68 |
- ${COMMON_DEPEND} |
69 |
- virtual/pkgconfig" |
70 |
- |
71 |
-# Tcl is only needed in the CHOST test env |
72 |
-DEPEND=" |
73 |
- ${COMMON_DEPEND} |
74 |
- test? ( dev-lang/tcl:0= )" |
75 |
- |
76 |
-REQUIRED_USE="?? ( tcmalloc jemalloc )" |
77 |
- |
78 |
-PATCHES=( |
79 |
- "${FILESDIR}"/${PN}-3.2.3-config.patch |
80 |
- "${FILESDIR}"/${PN}-5.0-shared.patch |
81 |
- "${FILESDIR}"/${PN}-5.0-sharedlua.patch |
82 |
- "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch |
83 |
- "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
84 |
-) |
85 |
- |
86 |
-src_prepare() { |
87 |
- default |
88 |
- |
89 |
- # don't call ar directly |
90 |
- sed -e '/^STLIB_MAKE_CMD/s/ar/$(AR)/g' \ |
91 |
- -i deps/hiredis/Makefile || die |
92 |
- |
93 |
- # Copy lua modules into build dir |
94 |
- cp deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c src/ || die |
95 |
- cp deps/lua/src/{fpconv,strbuf}.h 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 tcmalloc; then |
155 |
- myconf="${myconf} USE_TCMALLOC=yes" |
156 |
- elif use jemalloc; then |
157 |
- myconf="${myconf} JEMALLOC_SHARED=yes" |
158 |
- else |
159 |
- myconf="${myconf} MALLOC=yes" |
160 |
- fi |
161 |
- |
162 |
- tc-export AR CC RANLIB |
163 |
- emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" |
164 |
-} |
165 |
- |
166 |
-src_install() { |
167 |
- insinto /etc/ |
168 |
- doins redis.conf sentinel.conf |
169 |
- use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
170 |
- fperms 0644 /etc/{redis,sentinel}.conf |
171 |
- |
172 |
- newconfd "${FILESDIR}/redis.confd-r1" redis |
173 |
- newinitd "${FILESDIR}/redis.initd-5" redis |
174 |
- |
175 |
- systemd_newunit "${FILESDIR}/redis.service-3" redis.service |
176 |
- newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf |
177 |
- |
178 |
- newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel |
179 |
- newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel |
180 |
- |
181 |
- insinto /etc/logrotate.d/ |
182 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
183 |
- |
184 |
- dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
185 |
- |
186 |
- dobin src/redis-cli |
187 |
- dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
188 |
- fperms 0750 /usr/sbin/redis-benchmark |
189 |
- dosym redis-server /usr/sbin/redis-sentinel |
190 |
- |
191 |
- if use prefix; then |
192 |
- diropts -m0750 |
193 |
- else |
194 |
- diropts -m0750 -o redis -g redis |
195 |
- fi |
196 |
- keepdir /var/{log,lib}/redis |
197 |
-} |
198 |
|
199 |
diff --git a/dev-db/redis/redis-6.0.9-r100.ebuild b/dev-db/redis/redis-6.0.9-r100.ebuild |
200 |
deleted file mode 100644 |
201 |
index 8c8e563b825..00000000000 |
202 |
--- a/dev-db/redis/redis-6.0.9-r100.ebuild |
203 |
+++ /dev/null |
204 |
@@ -1,164 +0,0 @@ |
205 |
-# Copyright 1999-2021 Gentoo Authors |
206 |
-# Distributed under the terms of the GNU General Public License v2 |
207 |
- |
208 |
-EAPI=7 |
209 |
- |
210 |
-# Redis does NOT build with Lua 5.2 or newer at this time: |
211 |
-# - 5.3 and 5.4 give: |
212 |
-# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" |
213 |
-# - 5.2 fails with: |
214 |
-# scripting.c:(.text+0x1f9b): undefined reference to `lua_open' |
215 |
-# because lua_open became lua_newstate in 5.2 |
216 |
-LUA_COMPAT=( lua5-1 luajit ) |
217 |
- |
218 |
-inherit autotools flag-o-matic lua-single systemd toolchain-funcs tmpfiles |
219 |
- |
220 |
-DESCRIPTION="A persistent caching system, key-value and data structures database" |
221 |
-HOMEPAGE="https://redis.io" |
222 |
-SRC_URI="http://download.redis.io/releases/${P}.tar.gz" |
223 |
- |
224 |
-LICENSE="BSD" |
225 |
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" |
226 |
-IUSE="+jemalloc tcmalloc test" |
227 |
-RESTRICT="!test? ( test )" |
228 |
-SLOT="0" |
229 |
- |
230 |
-COMMON_DEPEND=" |
231 |
- ${LUA_DEPS} |
232 |
- jemalloc? ( >=dev-libs/jemalloc-5.1:= ) |
233 |
- tcmalloc? ( dev-util/google-perftools ) |
234 |
-" |
235 |
- |
236 |
-RDEPEND=" |
237 |
- ${COMMON_DEPEND} |
238 |
- acct-group/redis |
239 |
- acct-user/redis |
240 |
-" |
241 |
- |
242 |
-BDEPEND=" |
243 |
- ${COMMON_DEPEND} |
244 |
- virtual/pkgconfig |
245 |
-" |
246 |
- |
247 |
-# Tcl is only needed in the CHOST test env |
248 |
-DEPEND=" |
249 |
- ${COMMON_DEPEND} |
250 |
- test? ( dev-lang/tcl:0= )" |
251 |
- |
252 |
-REQUIRED_USE="?? ( jemalloc tcmalloc ) |
253 |
- ${LUA_REQUIRED_USE}" |
254 |
- |
255 |
-PATCHES=( |
256 |
- "${FILESDIR}"/${PN}-3.2.3-config.patch |
257 |
- "${FILESDIR}"/${PN}-5.0-shared.patch |
258 |
- "${FILESDIR}"/${PN}-6.0.9-sharedlua.patch |
259 |
- "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch |
260 |
- "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
261 |
-) |
262 |
- |
263 |
-src_prepare() { |
264 |
- default |
265 |
- |
266 |
- # unstable on jemalloc |
267 |
- > tests/unit/memefficiency.tcl || die |
268 |
- |
269 |
- # Copy lua modules into build dir |
270 |
- cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
271 |
- cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
272 |
- # Append cflag for lua_cjson |
273 |
- # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
274 |
- append-cflags "-DENABLE_CJSON_GLOBAL" |
275 |
- |
276 |
- # now we will rewrite present Makefiles |
277 |
- local makefiles="" MKF |
278 |
- for MKF in $(find -name 'Makefile' | cut -b 3-); do |
279 |
- mv "${MKF}" "${MKF}.in" |
280 |
- sed -i -e 's:$(CC):@CC@:g' \ |
281 |
- -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
282 |
- -e 's: $(DEBUG)::g' \ |
283 |
- -e 's:$(OBJARCH)::g' \ |
284 |
- -e 's:ARCH:TARCH:g' \ |
285 |
- -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
286 |
- "${MKF}.in" \ |
287 |
- || die "Sed failed for ${MKF}" |
288 |
- makefiles+=" ${MKF}" |
289 |
- done |
290 |
- # autodetection of compiler and settings; generates the modified Makefiles |
291 |
- cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
292 |
- |
293 |
- # Use the correct pkgconfig name for Lua. |
294 |
- # The upstream configure script handles luajit specially, and is not |
295 |
- # effected by these changes. |
296 |
- sed -i \ |
297 |
- -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
298 |
- -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
299 |
- -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \ |
300 |
- configure.ac || die "Sed failed for configure.ac" |
301 |
- eautoreconf |
302 |
-} |
303 |
- |
304 |
-src_configure() { |
305 |
- econf $(use_with lua_single_target_luajit luajit) |
306 |
- |
307 |
- # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
308 |
- # also, don't define ANSI/c99 for lua twice |
309 |
- sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
310 |
-} |
311 |
- |
312 |
-src_compile() { |
313 |
- local myconf="" |
314 |
- |
315 |
- if use jemalloc; then |
316 |
- myconf+="MALLOC=jemalloc" |
317 |
- elif use tcmalloc; then |
318 |
- myconf+="MALLOC=tcmalloc" |
319 |
- else |
320 |
- myconf+="MALLOC=libc" |
321 |
- fi |
322 |
- |
323 |
- tc-export AR CC RANLIB |
324 |
- emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" |
325 |
-} |
326 |
- |
327 |
-src_test() { |
328 |
- # Known to fail with FEATURES=usersandbox |
329 |
- if has usersandbox ${FEATURES}; then |
330 |
- ewarn "You are emerging ${P} with 'usersandbox' enabled." \ |
331 |
- "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" |
332 |
- fi |
333 |
- |
334 |
- emake check |
335 |
-} |
336 |
- |
337 |
-src_install() { |
338 |
- insinto /etc/ |
339 |
- doins redis.conf sentinel.conf |
340 |
- use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
341 |
- fperms 0644 /etc/{redis,sentinel}.conf |
342 |
- |
343 |
- newconfd "${FILESDIR}/redis.confd-r1" redis |
344 |
- newinitd "${FILESDIR}/redis.initd-5" redis |
345 |
- |
346 |
- systemd_newunit "${FILESDIR}/redis.service-3" redis.service |
347 |
- newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf |
348 |
- |
349 |
- newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel |
350 |
- newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel |
351 |
- |
352 |
- insinto /etc/logrotate.d/ |
353 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
354 |
- |
355 |
- dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
356 |
- |
357 |
- dobin src/redis-cli |
358 |
- dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
359 |
- fperms 0750 /usr/sbin/redis-benchmark |
360 |
- dosym redis-server /usr/sbin/redis-sentinel |
361 |
- |
362 |
- if use prefix; then |
363 |
- diropts -m0750 |
364 |
- else |
365 |
- diropts -m0750 -o redis -g redis |
366 |
- fi |
367 |
- keepdir /var/{log,lib}/redis |
368 |
-} |