1 |
commit: 23040f93869d3b935312c475084c834d3be62558 |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Oct 18 12:12:27 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 26 13:17:44 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23040f93 |
7 |
|
8 |
dev-db/redis: bump to 5.0.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/668950 |
11 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
14 |
|
15 |
dev-db/redis/Manifest | 1 + |
16 |
dev-db/redis/files/redis-5.0-sharedlua.patch | 4 +- |
17 |
dev-db/redis/files/redis-sentinel-5.0-config.patch | 21 +++- |
18 |
dev-db/redis/redis-5.0.0.ebuild | 138 +++++++++++++++++++++ |
19 |
4 files changed, 156 insertions(+), 8 deletions(-) |
20 |
|
21 |
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest |
22 |
index 448029e338f..0a88d5bb999 100644 |
23 |
--- a/dev-db/redis/Manifest |
24 |
+++ b/dev-db/redis/Manifest |
25 |
@@ -7,5 +7,6 @@ DIST redis-4.0.6.tar.gz 1723533 BLAKE2B 94c2a9b7eeaa676efaac75cd5c143b0f4b02440b |
26 |
DIST redis-4.0.7.tar.gz 1729488 BLAKE2B 7a5337b868e4da4a7387b31bc9d6bd4c86abd701b9ba999f64296ed5188cbba7208ced466973a500730ca03e70a9a85fbab2fb4700fdc977e58defc0126487d1 SHA512 6f317d9e76224b2a2b047dc8f56b126ea85ee5c6112c4c6238cb5cdfa3a83756bff3a82b106b00d1124a93d210a900d836587b8d9563916f19274de0e84c4c6b |
27 |
DIST redis-4.0.8.tar.gz 1729973 BLAKE2B 32d82a07beba9ea8f0b08a8fc69da548a1974e5839f052a9803ffb0f52ef920df9b128092e061b5e693581a50efef4a1212c1f6310dc8492eff5ca841ff3b03a SHA512 11c126ddef3bedbceb02ee7a80a61374e081da8087055d77970b0097066a6f1c5e0c4f0d246c9851f8c3beca22f185c184669a9dc4f1c7c229f8cd2c34196ab6 |
28 |
DIST redis-4.0.9.tar.gz 1737022 BLAKE2B 35a83d146062f5b14c023d7fd9f28d743ba6bec3e0e4bf9ce8e065a706bbd7508ffbcb8b1b4d18f6b6774589b5456540ba8717b9f449fcbd758c0f57dbd505a3 SHA512 a6cf63cb361f0a87da3955ba628190dc04cad342f7a664d18e44416ee67dd86ed6e3a46b9701e994f1417e56b819b3c6fc595f363c10bb4b83d5033919d29598 |
29 |
+DIST redis-5.0.0.tar.gz 1947721 BLAKE2B c776796a2efe3efd9f9b70dc9be06c10695a5f3cb40765b64f7adddbe5e77eb68650986d8c705e947d1aa46f0f909a2aa2743f43a12ba6c30615e5f9fc2ca55b SHA512 818277cf8c14eb5f0b864e936f657c8021a3614a76dda8975d82b20ab4e3983731363b7b527fb504fd41292304de079f78702503fca867ac6f45a97a391eec07 |
30 |
DIST redis-5.0_rc4.tar.gz 1937238 BLAKE2B b8f768b83e27476bc038fc554193680f4873eb2405f238e0a6f2053cf68c4a9e6c45546730a263463b805d6811334c1ba056be0230676f19d0562d488a3d4c97 SHA512 75b308bca026fe3b7cff1a92df3990bab5bb7ffe24cdfbc263f4d522ebe7ec8d86a9ed66da1778fe67c08a39b6f0c83cb10c5a332818c6ad04621d01c4aa6add |
31 |
DIST redis-5.0_rc5.tar.gz 1941761 BLAKE2B 294cf455e40bbbcfb87972fd4130854ced714369dcfc08a77e9be693d1b819f3c5dfe8b407582726e8bd140be3965f9c6cab03cd28002004ed1e634a0827a060 SHA512 173e529bec234339be3b6c2c5c360085a186a66c4d08a4dfeb51aa689ab61ba1d8ab2914af5ba4923799b17bc09a05a488ce6e6cfae7fa7faa5c5a55e38c111c |
32 |
|
33 |
diff --git a/dev-db/redis/files/redis-5.0-sharedlua.patch b/dev-db/redis/files/redis-5.0-sharedlua.patch |
34 |
index 76971cf4571..3e14f41733b 100644 |
35 |
--- a/dev-db/redis/files/redis-5.0-sharedlua.patch |
36 |
+++ b/dev-db/redis/files/redis-5.0-sharedlua.patch |
37 |
@@ -12,7 +12,7 @@ index c26c0d7..fa50c41 100644 |
38 |
#ifndef CJSON_MODNAME |
39 |
#define CJSON_MODNAME "cjson" |
40 |
diff --git a/src/Makefile b/src/Makefile |
41 |
-index f5525bd..cecd8d0 100644 |
42 |
+index 773d3b2..2d120d4 100644 |
43 |
--- a/src/Makefile |
44 |
+++ b/src/Makefile |
45 |
@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') |
46 |
@@ -44,7 +44,7 @@ index f5525bd..cecd8d0 100644 |
47 |
@@ -145,6 +146,7 @@ endif |
48 |
REDIS_SERVER_NAME=redis-server |
49 |
REDIS_SENTINEL_NAME=redis-sentinel |
50 |
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o |
51 |
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o |
52 |
+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o |
53 |
REDIS_CLI_NAME=redis-cli |
54 |
REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o |
55 |
|
56 |
diff --git a/dev-db/redis/files/redis-sentinel-5.0-config.patch b/dev-db/redis/files/redis-sentinel-5.0-config.patch |
57 |
index 53299f11840..099b4eef818 100644 |
58 |
--- a/dev-db/redis/files/redis-sentinel-5.0-config.patch |
59 |
+++ b/dev-db/redis/files/redis-sentinel-5.0-config.patch |
60 |
@@ -1,10 +1,19 @@ |
61 |
diff --git a/sentinel.conf b/sentinel.conf |
62 |
-index 3703c73..964ffa3 100644 |
63 |
+index bc9a705..05e58d3 100644 |
64 |
--- a/sentinel.conf |
65 |
+++ b/sentinel.conf |
66 |
-@@ -222,3 +222,5 @@ sentinel deny-scripts-reconfig yes |
67 |
- # case, so writing "config guessme" is the same in the example above. |
68 |
- # |
69 |
- # SENTINEL SET can also be used in order to perform this configuration at runtime. |
70 |
-+ |
71 |
+@@ -28,12 +28,12 @@ daemonize no |
72 |
+ # When running daemonized, Redis Sentinel writes a pid file in |
73 |
+ # /var/run/redis-sentinel.pid by default. You can specify a custom pid file |
74 |
+ # location here. |
75 |
+-pidfile /var/run/redis-sentinel.pid |
76 |
++pidfile /run/redis-sentinel.pid |
77 |
+ |
78 |
+ # Specify the log file name. Also the empty string can be used to force |
79 |
+ # Sentinel to log on the standard output. Note that if you use standard |
80 |
+ # output for logging but daemonize, logs will be sent to /dev/null |
81 |
+-logfile "" |
82 |
+logfile "/var/log/redis/sentinel.log" |
83 |
+ |
84 |
+ # sentinel announce-ip <ip> |
85 |
+ # sentinel announce-port <port> |
86 |
|
87 |
diff --git a/dev-db/redis/redis-5.0.0.ebuild b/dev-db/redis/redis-5.0.0.ebuild |
88 |
new file mode 100644 |
89 |
index 00000000000..2b13aad0139 |
90 |
--- /dev/null |
91 |
+++ b/dev-db/redis/redis-5.0.0.ebuild |
92 |
@@ -0,0 +1,138 @@ |
93 |
+# Copyright 1999-2018 Gentoo Authors |
94 |
+# Distributed under the terms of the GNU General Public License v2 |
95 |
+ |
96 |
+EAPI=6 |
97 |
+ |
98 |
+inherit autotools eapi7-ver flag-o-matic systemd toolchain-funcs user |
99 |
+ |
100 |
+DESCRIPTION="A persistent caching system, key-value and data structures database" |
101 |
+HOMEPAGE="https://redis.io" |
102 |
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz" |
103 |
+ |
104 |
+LICENSE="BSD" |
105 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" |
106 |
+IUSE="+jemalloc tcmalloc luajit test" |
107 |
+SLOT="0" |
108 |
+ |
109 |
+# Redis does NOT build with Lua 5.2 or newer at this time. |
110 |
+# This should link correctly with both unslotted & slotted Lua, without |
111 |
+# changes. |
112 |
+RDEPEND=" |
113 |
+ luajit? ( dev-lang/luajit:2 ) |
114 |
+ !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) |
115 |
+ tcmalloc? ( dev-util/google-perftools ) |
116 |
+ jemalloc? ( >=dev-libs/jemalloc-5.1:= )" |
117 |
+ |
118 |
+DEPEND=" |
119 |
+ ${RDEPEND} |
120 |
+ virtual/pkgconfig |
121 |
+ test? ( dev-lang/tcl:0= )" |
122 |
+ |
123 |
+REQUIRED_USE="?? ( tcmalloc jemalloc )" |
124 |
+ |
125 |
+pkg_setup() { |
126 |
+ enewgroup redis 75 |
127 |
+ enewuser redis 75 -1 /var/lib/redis redis |
128 |
+} |
129 |
+ |
130 |
+src_prepare() { |
131 |
+ eapply \ |
132 |
+ "${FILESDIR}"/${PN}-3.2.3-config.patch \ |
133 |
+ "${FILESDIR}"/${PN}-5.0-shared.patch \ |
134 |
+ "${FILESDIR}"/${PN}-5.0-sharedlua.patch \ |
135 |
+ "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
136 |
+ eapply_user |
137 |
+ |
138 |
+ # Copy lua modules into build dir |
139 |
+ cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
140 |
+ cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
141 |
+ # Append cflag for lua_cjson |
142 |
+ # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
143 |
+ append-cflags "-DENABLE_CJSON_GLOBAL" |
144 |
+ |
145 |
+ # now we will rewrite present Makefiles |
146 |
+ local makefiles="" MKF |
147 |
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do |
148 |
+ mv "${MKF}" "${MKF}.in" |
149 |
+ sed -i -e 's:$(CC):@CC@:g' \ |
150 |
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
151 |
+ -e 's: $(DEBUG)::g' \ |
152 |
+ -e 's:$(OBJARCH)::g' \ |
153 |
+ -e 's:ARCH:TARCH:g' \ |
154 |
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
155 |
+ "${MKF}.in" \ |
156 |
+ || die "Sed failed for ${MKF}" |
157 |
+ makefiles+=" ${MKF}" |
158 |
+ done |
159 |
+ # autodetection of compiler and settings; generates the modified Makefiles |
160 |
+ cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
161 |
+ |
162 |
+ # Use the correct pkgconfig name for Lua |
163 |
+ has_version 'dev-lang/lua:5.1' \ |
164 |
+ && LUAPKGCONFIG=lua5.1 \ |
165 |
+ || LUAPKGCONFIG=lua |
166 |
+ sed -i \ |
167 |
+ -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
168 |
+ -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
169 |
+ -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \ |
170 |
+ configure.ac || die "Sed failed for configure.ac" |
171 |
+ eautoreconf |
172 |
+} |
173 |
+ |
174 |
+src_configure() { |
175 |
+ econf \ |
176 |
+ $(use_with luajit) |
177 |
+ |
178 |
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
179 |
+ # also, don't define ANSI/c99 for lua twice |
180 |
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
181 |
+} |
182 |
+ |
183 |
+src_compile() { |
184 |
+ tc-export CC AR RANLIB |
185 |
+ |
186 |
+ local myconf="" |
187 |
+ |
188 |
+ if use tcmalloc; then |
189 |
+ myconf="${myconf} USE_TCMALLOC=yes" |
190 |
+ elif use jemalloc; then |
191 |
+ myconf="${myconf} JEMALLOC_SHARED=yes" |
192 |
+ else |
193 |
+ myconf="${myconf} MALLOC=yes" |
194 |
+ fi |
195 |
+ |
196 |
+ emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" |
197 |
+} |
198 |
+ |
199 |
+src_install() { |
200 |
+ insinto /etc/ |
201 |
+ doins redis.conf sentinel.conf |
202 |
+ use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
203 |
+ fperms 0644 /etc/{redis,sentinel}.conf |
204 |
+ |
205 |
+ newconfd "${FILESDIR}/redis.confd-r1" redis |
206 |
+ newinitd "${FILESDIR}/redis.initd-5" redis |
207 |
+ |
208 |
+ systemd_newunit "${FILESDIR}/redis.service-2" redis.service |
209 |
+ systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf |
210 |
+ |
211 |
+ newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel |
212 |
+ newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel |
213 |
+ |
214 |
+ insinto /etc/logrotate.d/ |
215 |
+ newins "${FILESDIR}/${PN}.logrotate" ${PN} |
216 |
+ |
217 |
+ dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
218 |
+ |
219 |
+ dobin src/redis-cli |
220 |
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
221 |
+ fperms 0750 /usr/sbin/redis-benchmark |
222 |
+ dosym redis-server /usr/sbin/redis-sentinel |
223 |
+ |
224 |
+ if use prefix; then |
225 |
+ diropts -m0750 |
226 |
+ else |
227 |
+ diropts -m0750 -o redis -g redis |
228 |
+ fi |
229 |
+ keepdir /var/{log,lib}/redis |
230 |
+} |