1 |
commit: fae2f8bbf4986d941600dbf5bb1f7909559c81a1 |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Aug 23 00:08:54 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 23 00:22:20 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae2f8bb |
7 |
|
8 |
dev-db/redis: bump to 4.0.11 |
9 |
|
10 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
dev-db/redis/Manifest | 1 + |
14 |
dev-db/redis/redis-4.0.11.ebuild | 141 +++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 142 insertions(+) |
16 |
|
17 |
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest |
18 |
index ee015a0effc..eae411b86c7 100644 |
19 |
--- a/dev-db/redis/Manifest |
20 |
+++ b/dev-db/redis/Manifest |
21 |
@@ -1,6 +1,7 @@ |
22 |
DIST redis-3.2.12.tar.gz 1551468 BLAKE2B 85483de2588e4161521fe958225a53ab4357d0db83954c22f755d5d512e6e2126f9e7fdc1032353bd491353af3805c806b89546f886fe78fa5e5d2dc1446420b SHA512 eec64a17e331ac220ba425a495127b3873048dc2597a6508962469c0c99763deffcec97254915e2b1f3867eb556b917e8861baa9609c727d0abb254a90d87cdc |
23 |
DIST redis-3.2.8.tar.gz 1547237 BLAKE2B fb03e263ad7b135dff38e018d9b830c4992cf331efc7c23c10b087c47e597abedb52f259d4dd9a9ee1d661685157fc29a2022d74bc21d406bb10c9b7dfab8b7e SHA512 7334faf73af3644f7f9dcaddd322955d5df1e88a1640b509ae623f322615a20f6dc143eb57dd89ff3a278557df309ac4215c3fb458235682ce28e16c817068ba |
24 |
DIST redis-4.0.10.tar.gz 1738465 BLAKE2B 572cbb3d2d5d7209f81ebd53ee68f40b404d0e4623bd1864845bf1f47135d4e097a6974d346ffd845d848c39ace6d3fb9f1a347e0c9d16d06d22aed7a8b3ae7b SHA512 0978dabaf637e61889d492fd3629acd58ca8fb0c0088cdd7036ffd1a7ed3f018c107039d4c96bd61d0b7d35757df2366d051f57d77ffb5642aca0e5651b30603 |
25 |
+DIST redis-4.0.11.tar.gz 1739656 BLAKE2B d94f380ad1600e58942cc5b27b512984396cdbb06ea6e947c7d7ce5b8ecdb8a2a56c6356af2caa82a96887a610716c9575b78eb2f46da89efb940febc1c30f22 SHA512 f0054af9ca2143731a397b2b21285387707b7f40d9326ba15225feb1a2ff470fab5194308342f63bbe1081f84c7e9ef19543c5a8e3eae49e17bfc515c64201f0 |
26 |
DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5a5b6afb725cb87934fbcb62107085671fd1072d1142ce8e92f069e6b6064c9f4468335bc6997897c8f494471 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4 |
27 |
DIST redis-4.0.6.tar.gz 1723533 BLAKE2B 94c2a9b7eeaa676efaac75cd5c143b0f4b02440b5a21ecc9b2a68cc27ad4abc1fc4d7dbc903dea5d956ce737ca434ea5b5bdde4a35df3a3689da60c5fb0bddf1 SHA512 784aad612664df666c36f969cb6a9ab794f004abcf9aa761bd1f5f0f8fdb248d5b38f48a59b68c2de7d2a344755f1537efc9d5847de0d662302699ed94d40813 |
28 |
DIST redis-4.0.7.tar.gz 1729488 BLAKE2B 7a5337b868e4da4a7387b31bc9d6bd4c86abd701b9ba999f64296ed5188cbba7208ced466973a500730ca03e70a9a85fbab2fb4700fdc977e58defc0126487d1 SHA512 6f317d9e76224b2a2b047dc8f56b126ea85ee5c6112c4c6238cb5cdfa3a83756bff3a82b106b00d1124a93d210a900d836587b8d9563916f19274de0e84c4c6b |
29 |
|
30 |
diff --git a/dev-db/redis/redis-4.0.11.ebuild b/dev-db/redis/redis-4.0.11.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..a8d59c405e6 |
33 |
--- /dev/null |
34 |
+++ b/dev-db/redis/redis-4.0.11.ebuild |
35 |
@@ -0,0 +1,141 @@ |
36 |
+# Copyright 1999-2018 Gentoo Foundation |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=6 |
40 |
+ |
41 |
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user |
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-macos ~x86-solaris" |
49 |
+IUSE="+jemalloc tcmalloc luajit test" |
50 |
+SLOT="0" |
51 |
+ |
52 |
+# Redis does NOT build with Lua 5.2 or newer at this time. |
53 |
+# This should link correctly with both unslotted & slotted Lua, without |
54 |
+# changes. |
55 |
+RDEPEND=" |
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 |
+ jemalloc? ( >=dev-libs/jemalloc-3.2 )" |
60 |
+ |
61 |
+DEPEND=" |
62 |
+ ${RDEPEND} |
63 |
+ virtual/pkgconfig |
64 |
+ >=sys-devel/autoconf-2.63 |
65 |
+ test? ( dev-lang/tcl:0= )" |
66 |
+ |
67 |
+REQUIRED_USE="?? ( tcmalloc jemalloc )" |
68 |
+ |
69 |
+S="${WORKDIR}/${PN}-${PV/_/-}" |
70 |
+ |
71 |
+pkg_setup() { |
72 |
+ enewgroup redis 75 |
73 |
+ enewuser redis 75 -1 /var/lib/redis redis |
74 |
+} |
75 |
+ |
76 |
+src_prepare() { |
77 |
+ eapply \ |
78 |
+ "${FILESDIR}"/${PN}-3.2.3-config.patch \ |
79 |
+ "${FILESDIR}"/${PN}-4.0.1-shared.patch \ |
80 |
+ "${FILESDIR}"/${PN}-4.0.1-sharedlua.patch \ |
81 |
+ "${FILESDIR}"/${PN}-sentinel-4.0.6-config.patch |
82 |
+ eapply_user |
83 |
+ |
84 |
+ # Copy lua modules into build dir |
85 |
+ cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
86 |
+ cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
87 |
+ # Append cflag for lua_cjson |
88 |
+ # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
89 |
+ append-cflags "-DENABLE_CJSON_GLOBAL" |
90 |
+ |
91 |
+ # now we will rewrite present Makefiles |
92 |
+ local makefiles="" MKF |
93 |
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do |
94 |
+ mv "${MKF}" "${MKF}.in" |
95 |
+ sed -i -e 's:$(CC):@CC@:g' \ |
96 |
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
97 |
+ -e 's: $(DEBUG)::g' \ |
98 |
+ -e 's:$(OBJARCH)::g' \ |
99 |
+ -e 's:ARCH:TARCH:g' \ |
100 |
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
101 |
+ "${MKF}.in" \ |
102 |
+ || die "Sed failed for ${MKF}" |
103 |
+ makefiles+=" ${MKF}" |
104 |
+ done |
105 |
+ # autodetection of compiler and settings; generates the modified Makefiles |
106 |
+ cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
107 |
+ |
108 |
+ # Use the correct pkgconfig name for Lua |
109 |
+ has_version 'dev-lang/lua:5.1' \ |
110 |
+ && LUAPKGCONFIG=lua5.1 \ |
111 |
+ || LUAPKGCONFIG=lua |
112 |
+ sed -i \ |
113 |
+ -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
114 |
+ -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
115 |
+ -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \ |
116 |
+ configure.ac || die "Sed failed for configure.ac" |
117 |
+ eautoreconf |
118 |
+} |
119 |
+ |
120 |
+src_configure() { |
121 |
+ econf \ |
122 |
+ $(use_with luajit) |
123 |
+ |
124 |
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
125 |
+ # also, don't define ANSI/c99 for lua twice |
126 |
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
127 |
+} |
128 |
+ |
129 |
+src_compile() { |
130 |
+ tc-export CC AR RANLIB |
131 |
+ |
132 |
+ local myconf="" |
133 |
+ |
134 |
+ if use tcmalloc; then |
135 |
+ myconf="${myconf} USE_TCMALLOC=yes" |
136 |
+ elif use jemalloc; then |
137 |
+ myconf="${myconf} JEMALLOC_SHARED=yes" |
138 |
+ else |
139 |
+ myconf="${myconf} MALLOC=yes" |
140 |
+ fi |
141 |
+ |
142 |
+ emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" |
143 |
+} |
144 |
+ |
145 |
+src_install() { |
146 |
+ insinto /etc/ |
147 |
+ doins redis.conf sentinel.conf |
148 |
+ use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
149 |
+ fperms 0644 /etc/{redis,sentinel}.conf |
150 |
+ |
151 |
+ newconfd "${FILESDIR}/redis.confd-r1" redis |
152 |
+ newinitd "${FILESDIR}/redis.initd-5" redis |
153 |
+ |
154 |
+ systemd_newunit "${FILESDIR}/redis.service-2" redis.service |
155 |
+ systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf |
156 |
+ |
157 |
+ newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel |
158 |
+ newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel |
159 |
+ |
160 |
+ insinto /etc/logrotate.d/ |
161 |
+ newins "${FILESDIR}/${PN}.logrotate" ${PN} |
162 |
+ |
163 |
+ dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
164 |
+ |
165 |
+ dobin src/redis-cli |
166 |
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
167 |
+ fperms 0750 /usr/sbin/redis-benchmark |
168 |
+ dosym redis-server /usr/sbin/redis-sentinel |
169 |
+ |
170 |
+ if use prefix; then |
171 |
+ diropts -m0750 |
172 |
+ else |
173 |
+ diropts -m0750 -o redis -g redis |
174 |
+ fi |
175 |
+ keepdir /var/{log,lib}/redis |
176 |
+} |