1 |
commit: 17588ea8937ace6c0280cf05885d9ec2eeb607c6 |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jul 2 07:03:49 2019 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 11 21:27:55 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17588ea8 |
7 |
|
8 |
dev-db/redis: bump to 5.0.5 |
9 |
|
10 |
Fixes: https://github.com/gentoo/gentoo/pull/12372 |
11 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
12 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
13 |
|
14 |
dev-db/redis/Manifest | 1 + |
15 |
dev-db/redis/redis-5.0.5.ebuild | 155 ++++++++++++++++++++++++++++++++++++++++ |
16 |
2 files changed, 156 insertions(+) |
17 |
|
18 |
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest |
19 |
index 3c5420a9b64..8d23c64f950 100644 |
20 |
--- a/dev-db/redis/Manifest |
21 |
+++ b/dev-db/redis/Manifest |
22 |
@@ -6,3 +6,4 @@ DIST redis-4.0.14.tar.gz 1740967 BLAKE2B d9122565ba890416d8936db936bc1410af840cc |
23 |
DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5a5b6afb725cb87934fbcb62107085671fd1072d1142ce8e92f069e6b6064c9f4468335bc6997897c8f494471 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4 |
24 |
DIST redis-5.0.3.tar.gz 1959445 BLAKE2B d1c3247d77aa3b1076d0e1a0dcce74dcfb14a0ad3776603ef8154d7868f9f3efcf2138cb08581eee1974e9d76658d07456d6e9795391321b1f1f8bca7f9d40f5 SHA512 5915b14502438bf7c3f56e38640dda54b095bd87501aefa6e386c9cef48e8d1e625e980643d128d91b8cab26dd51d5d99ca66fa638dc04e5ba315fe43f11f58b |
25 |
DIST redis-5.0.4.tar.gz 1966337 BLAKE2B 9195e970d7c987c2540da3a89f4fc33620f6a45ed243fa24715fe20f174d5e569e5ff940834176b3f26b13d9cca95f1d2914d65ad71f295787553c6bb8552089 SHA512 336929c81a476e2a23a64f867823d70c3aab66fb0098eef2e61630be6522ff2f6af680169ffcae35d559758b2c6b56f88c5a953a538291fea886449cba33b8ad |
26 |
+DIST redis-5.0.5.tar.gz 1975750 BLAKE2B 3a0463685ae30f9d38e96d7324ae624474f02311e22e186460834920babc35ff343d84e8cb78a2cee0d45d9ba1c01944c783c88892b6580d83bc1cdec64a3e94 SHA512 78215ec02b7184e05788c7a368146ea53095a877a0e09174b4c9f175aeb9ba9174023c19e33bf62e4513b848e1841538d398e7c0a651c5c947255c1691cb4586 |
27 |
|
28 |
diff --git a/dev-db/redis/redis-5.0.5.ebuild b/dev-db/redis/redis-5.0.5.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..07c6466e9a1 |
31 |
--- /dev/null |
32 |
+++ b/dev-db/redis/redis-5.0.5.ebuild |
33 |
@@ -0,0 +1,155 @@ |
34 |
+# Copyright 1999-2019 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 user |
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 tcmalloc luajit test" |
48 |
+SLOT="0" |
49 |
+ |
50 |
+# Redis does NOT build with Lua 5.2 or newer at this time. |
51 |
+# This should link correctly with both unslotted & slotted Lua, without |
52 |
+# changes. |
53 |
+RDEPEND=" |
54 |
+ luajit? ( dev-lang/luajit:2 ) |
55 |
+ !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) |
56 |
+ tcmalloc? ( dev-util/google-perftools ) |
57 |
+ jemalloc? ( >=dev-libs/jemalloc-5.1:= )" |
58 |
+ |
59 |
+BDEPEND=" |
60 |
+ ${RDEPEND} |
61 |
+ virtual/pkgconfig" |
62 |
+ |
63 |
+# Tcl is only needed in the CHOST test env |
64 |
+DEPEND="${RDEPEND} |
65 |
+ test? ( dev-lang/tcl:0= )" |
66 |
+ |
67 |
+REQUIRED_USE="?? ( tcmalloc jemalloc )" |
68 |
+ |
69 |
+pkg_setup() { |
70 |
+ enewgroup redis 75 |
71 |
+ enewuser redis 75 -1 /var/lib/redis redis |
72 |
+} |
73 |
+ |
74 |
+src_prepare() { |
75 |
+ eapply \ |
76 |
+ "${FILESDIR}"/${PN}-3.2.3-config.patch \ |
77 |
+ "${FILESDIR}"/${PN}-5.0-shared.patch \ |
78 |
+ "${FILESDIR}"/${PN}-5.0-sharedlua.patch \ |
79 |
+ "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
80 |
+ eapply_user |
81 |
+ |
82 |
+ # Copy lua modules into build dir |
83 |
+ cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
84 |
+ cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
85 |
+ # Append cflag for lua_cjson |
86 |
+ # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
87 |
+ append-cflags "-DENABLE_CJSON_GLOBAL" |
88 |
+ |
89 |
+ # now we will rewrite present Makefiles |
90 |
+ local makefiles="" MKF |
91 |
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do |
92 |
+ mv "${MKF}" "${MKF}.in" |
93 |
+ sed -i -e 's:$(CC):@CC@:g' \ |
94 |
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
95 |
+ -e 's: $(DEBUG)::g' \ |
96 |
+ -e 's:$(OBJARCH)::g' \ |
97 |
+ -e 's:ARCH:TARCH:g' \ |
98 |
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
99 |
+ "${MKF}.in" \ |
100 |
+ || die "Sed failed for ${MKF}" |
101 |
+ makefiles+=" ${MKF}" |
102 |
+ done |
103 |
+ # autodetection of compiler and settings; generates the modified Makefiles |
104 |
+ cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
105 |
+ |
106 |
+ # Use the correct pkgconfig name for Lua |
107 |
+ if false && has_version 'dev-lang/lua:5.3'; then |
108 |
+ # Lua5.3 gives: |
109 |
+ #lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" |
110 |
+ LUAPKGCONFIG=lua5.3 |
111 |
+ elif false && has_version 'dev-lang/lua:5.2'; then |
112 |
+ # Lua5.2 fails with: |
113 |
+ # scripting.c:(.text+0x1f9b): undefined reference to `lua_open' |
114 |
+ # Because lua_open because lua_newstate in 5.2 |
115 |
+ LUAPKGCONFIG=lua5.2 |
116 |
+ elif has_version 'dev-lang/lua:5.1'; then |
117 |
+ LUAPKGCONFIG=lua5.1 |
118 |
+ else |
119 |
+ LUAPKGCONFIG=lua |
120 |
+ fi |
121 |
+ # The upstream configure script handles luajit specially, and is not |
122 |
+ # effected by these changes. |
123 |
+ einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}" |
124 |
+ sed -i \ |
125 |
+ -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
126 |
+ -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
127 |
+ -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \ |
128 |
+ configure.ac || die "Sed failed for configure.ac" |
129 |
+ eautoreconf |
130 |
+} |
131 |
+ |
132 |
+src_configure() { |
133 |
+ econf \ |
134 |
+ $(use_with luajit) |
135 |
+ |
136 |
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
137 |
+ # also, don't define ANSI/c99 for lua twice |
138 |
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
139 |
+} |
140 |
+ |
141 |
+src_compile() { |
142 |
+ tc-export CC AR RANLIB |
143 |
+ |
144 |
+ local myconf="" |
145 |
+ |
146 |
+ if use tcmalloc; then |
147 |
+ myconf="${myconf} USE_TCMALLOC=yes" |
148 |
+ elif use jemalloc; then |
149 |
+ myconf="${myconf} JEMALLOC_SHARED=yes" |
150 |
+ else |
151 |
+ myconf="${myconf} MALLOC=yes" |
152 |
+ fi |
153 |
+ |
154 |
+ emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" |
155 |
+} |
156 |
+ |
157 |
+src_install() { |
158 |
+ insinto /etc/ |
159 |
+ doins redis.conf sentinel.conf |
160 |
+ use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
161 |
+ fperms 0644 /etc/{redis,sentinel}.conf |
162 |
+ |
163 |
+ newconfd "${FILESDIR}/redis.confd-r1" redis |
164 |
+ newinitd "${FILESDIR}/redis.initd-5" redis |
165 |
+ |
166 |
+ systemd_newunit "${FILESDIR}/redis.service-3" redis.service |
167 |
+ systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles-2" redis.conf |
168 |
+ |
169 |
+ newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel |
170 |
+ newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel |
171 |
+ |
172 |
+ insinto /etc/logrotate.d/ |
173 |
+ newins "${FILESDIR}/${PN}.logrotate" ${PN} |
174 |
+ |
175 |
+ dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
176 |
+ |
177 |
+ dobin src/redis-cli |
178 |
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
179 |
+ fperms 0750 /usr/sbin/redis-benchmark |
180 |
+ dosym redis-server /usr/sbin/redis-sentinel |
181 |
+ |
182 |
+ if use prefix; then |
183 |
+ diropts -m0750 |
184 |
+ else |
185 |
+ diropts -m0750 -o redis -g redis |
186 |
+ fi |
187 |
+ keepdir /var/{log,lib}/redis |
188 |
+} |