commit: 739ed70ce636cdfd087fe75226b3f610dc757ec8 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Tue Feb 28 17:11:12 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 4 07:18:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739ed70c
dev-db/redis: drop 6.2.8, 7.0.7 Bug: https://bugs.gentoo.org/891169 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-db/redis/Manifest | 2 - dev-db/redis/redis-6.2.8.ebuild | 195 ---------------------------------------- dev-db/redis/redis-7.0.7.ebuild | 187 -------------------------------------- 3 files changed, 384 deletions(-) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 8a85bc81838d..cc7a291a9bd7 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,6 +1,4 @@ DIST redis-6.2.10.tar.gz 2490833 BLAKE2B 289f424f4a119bc6fb05d227999dd027e22ea91e868a876a6501a271bf015dd66699a3b93074ba9c7e13bdb48c01fa60edb56c4d6e7300ada365f2f50c04225e SHA512 307d7e8f2d07ed82c64959dc56847be5a1d7cc17e04cc9a7266053d61221f782acadbb26662eab60751fcbc1be6b0f2e03b688972308dfcb47511bc9f35bb27a DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953 -DIST redis-6.2.8.tar.gz 2489670 BLAKE2B 6a05754dcf7e6ed8934f665c0dab544f6e393cbd5e55d5043e2055c15dcbaf1da16a63b5503c8b69fc9ad85c81fd92078e3175bff33d7481e21581176e06e3bd SHA512 b07009628211b21c3cf64c215515d3ce51b19ad5f69740c5f4566db58402ec7a9a43ee4c32bc944e0f2fbcd747703eb43c2444bd75c43ffa82b044f8c74c8d83 DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202b57d6da3a38150a02d738a414c6696e261b8ab88033e117aee4f02308aab9ca4a5f382d66ec3a10f3e020580 SHA512 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753 -DIST redis-7.0.7.tar.gz 2979019 BLAKE2B fddf0c1aa9f9052b0e8efdac6958b7fae5006f06833da2b9ae016c4ac195a950e97ad0b70dc7a721cc80c2cf653ae7d1a352694b79ba432e611f77fb42d1d15e SHA512 56e33cf80439efa54694f26037ed8520fe51b25dbdfe57875d916c8f921131c71324b1dd1e974d0f9d523752d05e0f028cc8dd783ec8fa6d5d7e60b3081f78c0 DIST redis-7.0.8.tar.gz 2981212 BLAKE2B 38610104697de649bfac43a845ccd27826a1cbf88dbfc331360864d6763b4cb86981b8d94ae01d54f914d6919cf2b9cae977ea09833e61a09c02e0fcd9f1440a SHA512 d760fce02203265551198082f75b1e6be78a2cdb3d464e518d65a31839a3b6e45401c6bca6a091f59e121212aee7363d5e83c25365ab347a66b807015b32eeb6 diff --git a/dev-db/redis/redis-6.2.8.ebuild b/dev-db/redis/redis-6.2.8.ebuild deleted file mode 100644 index a15818f6a3db..000000000000 --- a/dev-db/redis/redis-6.2.8.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Redis does NOT build with Lua 5.2 or newer at this time: -# - 5.3 and 5.4 give: -# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" -# - 5.2 fails with: -# scripting.c:(.text+0x1f9b): undefined reference to `lua_open' -# because lua_open became lua_newstate in 5.2 -LUA_COMPAT=( lua5-1 luajit ) - -# Upstream have deviated too far from vanilla Lua, adding their own APIs -# like lua_enablereadonlytable, but we still need the eclass and such -# for bug #841422. -inherit autotools edo flag-o-matic lua-single multiprocessing systemd tmpfiles toolchain-funcs - -DESCRIPTION="A persistent caching system, key-value, and data structures database" -HOMEPAGE="https://redis.io"; -SRC_URI="https://download.redis.io/releases/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="+jemalloc selinux ssl systemd tcmalloc test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - ${LUA_DEPS} - jemalloc? ( >=dev-libs/jemalloc-5.1:= ) - ssl? ( dev-libs/openssl:0= ) - systemd? ( sys-apps/systemd:= ) - tcmalloc? ( dev-util/google-perftools ) -" - -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= - ssl? ( dev-tcltk/tls ) - )" - -REQUIRED_USE="?? ( jemalloc tcmalloc ) - ${LUA_REQUIRED_USE}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.2.1-config.patch - "${FILESDIR}"/${PN}-5.0-shared.patch - "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch - "${FILESDIR}"/${PN}-sentinel-5.0-config.patch -) - -src_prepare() { - default - - # Copy lua modules into build dir - #cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die - #cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/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. - # The upstream configure script handles luajit specially, and is not - # affected by these changes. - sed -i \ - -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ - -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ - -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \ - configure.ac || die "Sed failed for configure.ac" - eautoreconf -} - -src_configure() { - econf #$(use_with lua_single_target_luajit 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 jemalloc; then - myconf+="MALLOC=jemalloc" - elif use tcmalloc; then - myconf+="MALLOC=tcmalloc" - else - myconf+="MALLOC=libc" - fi - - if use ssl; then - myconf+=" BUILD_TLS=yes" - fi - - export USE_SYSTEMD=$(usex systemd) - - tc-export AR CC RANLIB - emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" -} - -src_test() { - local runtestargs=( - --clients "$(makeopts_jobs)" # see bug #649868 - ) - - if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then - ewarn "unit/oom-score-adj test will be skipped." \ - "It is known to fail with FEATURES usersandbox or -userpriv. See bug #756382." - - # unit/oom-score-adj was introduced in version 6.2.0 - runtestargs+=( --skipunit unit/oom-score-adj ) # see bug #756382 - fi - - if use ssl; then - edo ./utils/gen-test-certs.sh - runtestargs+=( --tls ) - fi - - edo ./runtest "${runtestargs[@]}" -} - -src_install() { - insinto /etc/redis - doins redis.conf sentinel.conf - use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf - fperms 0750 /etc/redis - fperms 0644 /etc/redis/{redis,sentinel}.conf - - newconfd "${FILESDIR}/redis.confd-r2" redis - newinitd "${FILESDIR}/redis.initd-6" redis - - systemd_newunit "${FILESDIR}/redis.service-4" redis.service - newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf - - newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel - newinitd "${FILESDIR}/redis-sentinel.initd-r1" 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 - - ewarn "The default redis configuration file location changed to:" - ewarn " /etc/redis/{redis,sentinel}.conf" - ewarn "Please apply your changes to the new configuration files." -} diff --git a/dev-db/redis/redis-7.0.7.ebuild b/dev-db/redis/redis-7.0.7.ebuild deleted file mode 100644 index d16e991e2f8b..000000000000 --- a/dev-db/redis/redis-7.0.7.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated -# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable - -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="https://download.redis.io/releases/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="+jemalloc selinux ssl systemd tcmalloc test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - jemalloc? ( >=dev-libs/jemalloc-5.1:= ) - ssl? ( dev-libs/openssl:0= ) - systemd? ( sys-apps/systemd:= ) - tcmalloc? ( dev-util/google-perftools ) -" - -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= - ssl? ( dev-tcltk/tls ) - )" - -REQUIRED_USE="?? ( jemalloc tcmalloc )" - -PATCHES=( - "${FILESDIR}"/${PN}-6.2.1-config.patch - "${FILESDIR}"/${PN}-5.0-shared.patch - "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch - "${FILESDIR}"/${PN}-sentinel-5.0-config.patch - "${FILESDIR}"/${PN}-7.0.4-no-which.patch -) - -src_prepare() { - default - - # 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-7.0 configure.ac || die - - sed -i \ - -e "/^AC_INIT/s|, __PV__, |, $PV, |" \ - -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ - configure.ac || die "Sed failed for configure.ac" - eautoreconf -} - -src_configure() { - econf - - # 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 jemalloc; then - myconf+="MALLOC=jemalloc" - elif use tcmalloc; then - myconf+="MALLOC=tcmalloc" - else - myconf+="MALLOC=libc" - fi - - if use ssl; then - myconf+=" BUILD_TLS=yes" - fi - - export USE_SYSTEMD=$(usex systemd) - - tc-export AR CC RANLIB - emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" -} - -src_test() { - local runtestargs=( - --clients "$(makeopts_jobs)" # see bug #649868 - - --skiptest "Active defrag eval scripts" # see bug #851654 - ) - - if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then - ewarn "oom-score-adj related tests will be skipped." \ - "They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382." - - runtestargs+=( - # unit/oom-score-adj was introduced in version 6.2.0 - --skipunit unit/oom-score-adj # see bug #756382 - - # Following test was added in version 7.0.0 to unit/introspection. - # It also tries to adjust OOM score. - --skiptest "CONFIG SET rollback on apply error" - ) - fi - - if use ssl; then - edo ./utils/gen-test-certs.sh - runtestargs+=( --tls ) - fi - - edo ./runtest "${runtestargs[@]}" -} - -src_install() { - insinto /etc/redis - doins redis.conf sentinel.conf - use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf - fperms 0750 /etc/redis - fperms 0644 /etc/redis/{redis,sentinel}.conf - - newconfd "${FILESDIR}/redis.confd-r2" redis - newinitd "${FILESDIR}/redis.initd-6" redis - - systemd_newunit "${FILESDIR}/redis.service-4" redis.service - newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf - - newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel - newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - dodoc 00-RELEASENOTES BUGS CONTRIBUTING.md 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 - - ewarn "The default redis configuration file location changed to:" - ewarn " /etc/redis/{redis,sentinel}.conf" - ewarn "Please apply your changes to the new configuration files." -}
