From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 48E60158094 for ; Sun, 10 Jul 2022 12:53:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80CE4E07AE; Sun, 10 Jul 2022 12:53:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 59421E07AE for ; Sun, 10 Jul 2022 12:53:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D18F340DF0 for ; Sun, 10 Jul 2022 12:53:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE69F105 for ; Sun, 10 Jul 2022 12:53:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1657457612.03485050cb1becab6da142ab138b15d3fd118ccd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/redis/files/, dev-db/redis/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/redis/Manifest dev-db/redis/files/redis-5.0-sharedlua.patch dev-db/redis/files/redis-sentinel.confd dev-db/redis/files/redis-sentinel.initd dev-db/redis/files/redis.confd-r1 dev-db/redis/files/redis.initd-5 dev-db/redis/files/redis.service-3 dev-db/redis/files/redis.tmpfiles dev-db/redis/redis-5.0.14.ebuild X-VCS-Directories: dev-db/redis/ dev-db/redis/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 03485050cb1becab6da142ab138b15d3fd118ccd X-VCS-Branch: master Date: Sun, 10 Jul 2022 12:53:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 19ecb09d-371b-4f35-90ae-2ccde2492f94 X-Archives-Hash: 97e16d0d6b009155b7637d278758784f commit: 03485050cb1becab6da142ab138b15d3fd118ccd Author: Petr Vaněk atlas cz> AuthorDate: Sun Jul 10 09:58:27 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 10 12:53:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03485050 dev-db/redis: drop 5.0.14, EOL 5.0 line is not supported by upstream anymore and it suffers with known vulnerabilities. Bug: https://bugs.gentoo.org/841404 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> dev-db/redis/Manifest | 1 - dev-db/redis/files/redis-5.0-sharedlua.patch | 60 ---------- dev-db/redis/files/redis-sentinel.confd | 16 --- dev-db/redis/files/redis-sentinel.initd | 22 ---- dev-db/redis/files/redis.confd-r1 | 20 ---- dev-db/redis/files/redis.initd-5 | 25 ---- dev-db/redis/files/redis.service-3 | 14 --- dev-db/redis/files/redis.tmpfiles | 2 - dev-db/redis/redis-5.0.14.ebuild | 170 --------------------------- 9 files changed, 330 deletions(-) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 2941f463918f..a7c720cf4851 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,4 +1,3 @@ -DIST redis-5.0.14.tar.gz 2000179 BLAKE2B 77d3ed09a81450dbf806edd017785b82c50bb059aab44c82bc4ab784b7f03d5c58f9372b96c857831f84d278771dcf223f42ca05af790f0dc10ecdde211fd149 SHA512 513299ae8b967a659d54812fab4dfdfaf0081b20136a3d89b6a761e93548583c96436fedb84baa4d23385b42110ef615527efc3690b873f5bec7793403fe7eaf DIST redis-6.0.16.tar.gz 2288647 BLAKE2B f3552cc0d27cbc5cf6556792da9a75d01ff70d372484c95d2af8b24ec902a8086b9c3f4e53513df982fe135963432bfb527334926dd494e50d2cc618ab813f39 SHA512 83bb72448f9943e3d015cb4d961eb2eae21602ef1f90ca52ca8ab7c6918b0ab979db9f61f3981df27b2286894f4864f4588c3a52fa988e30e9419b0967998845 DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682ea49de761c4bb4089a2efd814926f2f8823dca1826b4a61dd9ccf79abb22878c9463ac92870481b43d8a7fff7 SHA512 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022 DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953 diff --git a/dev-db/redis/files/redis-5.0-sharedlua.patch b/dev-db/redis/files/redis-5.0-sharedlua.patch deleted file mode 100644 index 3e14f41733b0..000000000000 --- a/dev-db/redis/files/redis-5.0-sharedlua.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c -index c26c0d7..fa50c41 100644 ---- a/deps/lua/src/lua_cjson.c -+++ b/deps/lua/src/lua_cjson.c -@@ -46,7 +46,7 @@ - #include "strbuf.h" - #include "fpconv.h" - --#include "../../../src/solarisfixes.h" -+#include "solarisfixes.h" - - #ifndef CJSON_MODNAME - #define CJSON_MODNAME "cjson" -diff --git a/src/Makefile b/src/Makefile -index 773d3b2..2d120d4 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') - uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') - uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua -+DEPENDENCY_TARGETS=hiredis linenoise - NODEPS:=clean distclean - - # Default settings -@@ -66,6 +66,7 @@ endif - FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm -+FINAL_LIBS+=@LUA_LIBS@ - DEBUG=-g -ggdb - - ifeq ($(uname_S),SunOS) -@@ -107,7 +108,7 @@ endif - endif - endif - # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise @LUA_CFLAGS@ - - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -145,6 +146,7 @@ endif - REDIS_SERVER_NAME=redis-server - REDIS_SENTINEL_NAME=redis-sentinel - 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 -+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o - REDIS_CLI_NAME=redis-cli - 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 - REDIS_BENCHMARK_NAME=redis-benchmark -@@ -196,7 +198,7 @@ endif - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/dev-db/redis/files/redis-sentinel.confd b/dev-db/redis/files/redis-sentinel.confd deleted file mode 100644 index f465a5c3e91f..000000000000 --- a/dev-db/redis/files/redis-sentinel.confd +++ /dev/null @@ -1,16 +0,0 @@ -# Redis-sentinel user. -REDIS_SENTINEL_USER="redis" - -# Redis-sentinel group. -REDIS_SENTINEL_GROUP="redis" - -# Redis-sentinel configuration file. -REDIS_SENTINEL_CONF="/etc/sentinel.conf" - -# Redis-sentinel working directory. -REDIS_SENTINEL_DIR="/tmp" - -# Specify the network service that corresponds to the "bind" setting -# in your sentinel.conf. For example, if you bind to 127.0.0.1, this should -# be set to "net.lo" which provides the loopback interface. -rc_need="net.lo" diff --git a/dev-db/redis/files/redis-sentinel.initd b/dev-db/redis/files/redis-sentinel.initd deleted file mode 100644 index 6a22d08db697..000000000000 --- a/dev-db/redis/files/redis-sentinel.initd +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: ${REDIS_SENTINEL_DIR:=/tmp} -: ${REDIS_SENTINEL_CONF:=/etc/sentinel.conf} -: ${REDIS_SENTINEL_USER:=redis} -: ${REDIS_SENTINEL_GROUP:=redis} -: ${REDIS_SENTINEL_TIMEOUT:=30} - -command="/usr/sbin/redis-sentinel" -command_args="${REDIS_SENTINEL_CONF}" -command_background="true" -command_user="${REDIS_SENTINEL_USER}:${REDIS_SENTINEL_GROUP}" -pidfile="/run/${RC_SVCNAME}.pid" -retry="${REDIS_SENTINEL_TIMEOUT}" -start_stop_daemon_args="--chdir \"${REDIS_SENTINEL_DIR}\"" - -depend() { - use localmount logger - after keepalived redis -} diff --git a/dev-db/redis/files/redis.confd-r1 b/dev-db/redis/files/redis.confd-r1 deleted file mode 100644 index 1f4ff23f211b..000000000000 --- a/dev-db/redis/files/redis.confd-r1 +++ /dev/null @@ -1,20 +0,0 @@ -# Redis user. -REDIS_USER="redis" - -# Redis group. -REDIS_GROUP="redis" - -# Redis configuration file. -REDIS_CONF="/etc/redis.conf" - -# Redis dump directory. -REDIS_DIR="/var/lib/redis" - -# Redis options. -# (Redis expects the first argument to be the configuration file.) -REDIS_OPTS="${REDIS_CONF}" - -# Specify the network service that corresponds to the "bind" setting -# in your redis.conf. For example, if you bind to 127.0.0.1, this should -# be set to "net.lo" which provides the loopback interface. -rc_need="net.lo" diff --git a/dev-db/redis/files/redis.initd-5 b/dev-db/redis/files/redis.initd-5 deleted file mode 100644 index bfeeb6925ec0..000000000000 --- a/dev-db/redis/files/redis.initd-5 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: ${REDIS_DIR:=/var/lib/redis} -: ${REDIS_CONF:=/etc/redis.conf} -: ${REDIS_OPTS:="${REDIS_CONF}"} -: ${REDIS_USER:=redis} -: ${REDIS_GROUP:=redis} -: ${REDIS_TIMEOUT:=30} - -# https://bugs.gentoo.org/631002#c10 -# Force '--daemonize no' to override the config file -command="/usr/sbin/redis-server" -command_args="${REDIS_OPTS} --daemonize no" -command_background="true" -command_user="${REDIS_USER}:${REDIS_GROUP}" -pidfile="/run/${RC_SVCNAME}.pid" -retry="${REDIS_TIMEOUT}" -start_stop_daemon_args="--chdir \"${REDIS_DIR}\"" - -depend() { - use localmount logger - after keepalived -} diff --git a/dev-db/redis/files/redis.service-3 b/dev-db/redis/files/redis.service-3 deleted file mode 100644 index 1c733fcec172..000000000000 --- a/dev-db/redis/files/redis.service-3 +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=A persistent key-value database -After=syslog.target network.target - -[Service] -Type=simple -PIDFile=/run/redis/redis.pid -ExecStart=/usr/sbin/redis-server /etc/redis.conf -User=redis -Group=redis - -[Install] -WantedBy=multi-user.target - diff --git a/dev-db/redis/files/redis.tmpfiles b/dev-db/redis/files/redis.tmpfiles deleted file mode 100644 index 657d8a551d4b..000000000000 --- a/dev-db/redis/files/redis.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -# redis runtime directory -d /var/run/redis 0755 redis root - diff --git a/dev-db/redis/redis-5.0.14.ebuild b/dev-db/redis/redis-5.0.14.ebuild deleted file mode 100644 index 5064cb59f2ec..000000000000 --- a/dev-db/redis/redis-5.0.14.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs - -DESCRIPTION="A persistent caching system, key-value and data structures database" -HOMEPAGE="https://redis.io" -SRC_URI="http://download.redis.io/releases/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="+jemalloc tcmalloc luajit selinux test" -RESTRICT="!test? ( test )" - -# Redis does NOT build with Lua 5.2 or newer at this time. -COMMON_DEPEND=" - luajit? ( dev-lang/luajit:2 ) - !luajit? ( dev-lang/lua:5.1 ) - tcmalloc? ( dev-util/google-perftools ) - jemalloc? ( >=dev-libs/jemalloc-5.1:= )" - -RDEPEND=" - ${COMMON_DEPEND} - acct-group/redis - acct-user/redis - selinux? ( sec-policy/selinux-redis )" - -BDEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig" - -# Tcl is only needed in the CHOST test env -DEPEND=" - ${COMMON_DEPEND} - test? ( dev-lang/tcl:0= )" - -REQUIRED_USE="?? ( tcmalloc jemalloc )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.2.3-config.patch - "${FILESDIR}"/${PN}-5.0-shared.patch - "${FILESDIR}"/${PN}-5.0-sharedlua.patch - "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch - "${FILESDIR}"/${PN}-sentinel-5.0-config.patch - "${FILESDIR}"/${PN}-5.0-luajit-2.1-fix.patch -) - -src_prepare() { - default - - # don't call ar directly - sed -e '/^STLIB_MAKE_CMD/s/ar/$(AR)/g' \ - -i deps/hiredis/Makefile || die - - # Copy lua modules into build dir - cp deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c src/ || die - cp deps/lua/src/{fpconv,strbuf}.h src/ || die - # Append cflag for lua_cjson - # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 - append-cflags "-DENABLE_CJSON_GLOBAL" - - # now we will rewrite present Makefiles - local makefiles="" MKF - for MKF in $(find -name 'Makefile' | cut -b 3-); do - mv "${MKF}" "${MKF}.in" - sed -i -e 's:$(CC):@CC@:g' \ - -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ - -e 's: $(DEBUG)::g' \ - -e 's:$(OBJARCH)::g' \ - -e 's:ARCH:TARCH:g' \ - -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ - "${MKF}.in" \ - || die "Sed failed for ${MKF}" - makefiles+=" ${MKF}" - done - # autodetection of compiler and settings; generates the modified Makefiles - cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die - - # Use the correct pkgconfig name for Lua - if false && has_version 'dev-lang/lua:5.3'; then - # Lua5.3 gives: - #lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" - LUAPKGCONFIG=lua5.3 - elif false && has_version 'dev-lang/lua:5.2'; then - # Lua5.2 fails with: - # scripting.c:(.text+0x1f9b): undefined reference to `lua_open' - # Because lua_open because lua_newstate in 5.2 - LUAPKGCONFIG=lua5.2 - elif has_version 'dev-lang/lua:5.1'; then - LUAPKGCONFIG=lua5.1 - else - LUAPKGCONFIG=lua - fi - # The upstream configure script handles luajit specially, and is not - # affected by these changes. - einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}" - sed -i \ - -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ - -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ - -e "/PKG_CHECK_MODULES.*\/s,lua5.1,${LUAPKGCONFIG},g" \ - configure.ac || die "Sed failed for configure.ac" - eautoreconf -} - -src_configure() { - econf $(use_with luajit) - - # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 - # also, don't define ANSI/c99 for lua twice - sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die -} - -src_compile() { - local myconf="" - - if use tcmalloc; then - myconf="${myconf} USE_TCMALLOC=yes" - elif use jemalloc; then - myconf="${myconf} JEMALLOC_SHARED=yes" - else - myconf="${myconf} MALLOC=yes" - fi - - tc-export AR CC RANLIB - emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" -} - -src_test() { - edo ./runtest --clients "$(makeopts_jobs)" -} - -src_install() { - insinto /etc/ - doins redis.conf sentinel.conf - use prefix || fowners redis:redis /etc/{redis,sentinel}.conf - fperms 0644 /etc/{redis,sentinel}.conf - - newconfd "${FILESDIR}/redis.confd-r1" redis - newinitd "${FILESDIR}/redis.initd-5" redis - - systemd_newunit "${FILESDIR}/redis.service-3" redis.service - newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf - - newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel - newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md - - dobin src/redis-cli - dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb - fperms 0750 /usr/sbin/redis-benchmark - dosym redis-server /usr/sbin/redis-sentinel - - if use prefix; then - diropts -m0750 - else - diropts -m0750 -o redis -g redis - fi - keepdir /var/{log,lib}/redis -} - -pkg_postinst() { - tmpfiles_process redis.conf -}