From 1a256280f70812d1ae23f0ce2a2569291b6609da Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 25 Sep 2022 05:33:01 +0100 Subject: gentoo auto-resync : 25:09:2022 - 05:33:00 --- dev-db/Manifest.gz | Bin 15753 -> 15755 bytes dev-db/mariadb-connector-c/Manifest | 4 +- .../mariadb-connector-c-3.2.5.ebuild | 24 +++ .../mariadb-connector-c-9999.ebuild | 24 +++ dev-db/redis/Manifest | 8 +- dev-db/redis/files/redis-6.2.1-sharedlua.patch | 60 ------- .../files/redis-7.0.4-replica-tests-fix.patch | 61 +++++++ dev-db/redis/redis-6.2.6.ebuild | 194 --------------------- dev-db/redis/redis-7.0.4.ebuild | 1 + dev-db/redis/redis-7.0.5.ebuild | 1 + 10 files changed, 116 insertions(+), 261 deletions(-) delete mode 100644 dev-db/redis/files/redis-6.2.1-sharedlua.patch create mode 100644 dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch delete mode 100644 dev-db/redis/redis-6.2.6.ebuild (limited to 'dev-db') diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 4977c2b8724e..15fd6d3bf8eb 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest index 96546a012b6d..c9cfddfc9597 100644 --- a/dev-db/mariadb-connector-c/Manifest +++ b/dev-db/mariadb-connector-c/Manifest @@ -3,6 +3,6 @@ AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32 DIST mariadb-connector-c-3.2.5-src.tar.gz 992580 BLAKE2B c850dfbb2241e78475b5f9e9aa0fcb69bc9cc0d17a9092da36e720ec63e3fbdb0add32e6c4508a136fcb43d0825bea7346c0d6ce8a40ae10357ef3d3b6b7bea0 SHA512 5068c95ff15969c6b1d0e2e095fe0bdca3382f478012c852a9745a9bbbfc7586b1eeaa93a55fbadb236499a336133667f4638082814c97ff6b3bbc750c5e59dc EBUILD mariadb-connector-c-3.1.13.ebuild 2075 BLAKE2B 7630d175e9b2601ce4698f8ce76a90fd74919e7a88b08fb896b779be12ed2cca55bce66f6f36a9eb37acab0c6d6afe231dd238597c88235b341e9c9fe1088cf4 SHA512 c5ca7f78b640767b14927546cc67ef8a2dd12355f25abaceed29addbfb234bbaf34183e8cb309da917ca1cfb5043708ac8b0f577e75028cfe6593b08b8a9fa83 -EBUILD mariadb-connector-c-3.2.5.ebuild 2084 BLAKE2B 72be38d1219b801ef6b86b49e22adab4bee2df00ac03e92d23035fca1d707b5954b0621d4a1f98fa8530edb1a6b10c78d11f893d9553b6e15ff3232bb974e236 SHA512 6fe41393d3eb5e96318100ccdbd1f5aa44f3a32f80c02dbfb95fe20a5603ec176477d55c97627cb47770c86b609c5e7f1037521bf82ccf38e6e44d60ff5f4319 -EBUILD mariadb-connector-c-9999.ebuild 2090 BLAKE2B bdac01b7202eb1fb998411bf22e570deb43ad05d4ead8ee5bb4547493ae59a4c50f972595295dd2aead36fc00658692b9338f94896d3ba3ca58238d3ed98d0de SHA512 f5503942d0205d377cc86ca1c3274ed1624ba1e15d91ac484ca2f2a72d01a2d0bf27c61fee8e517b564de34e7127d91255de0efb6572ba58958498672dcbdb64 +EBUILD mariadb-connector-c-3.2.5.ebuild 3426 BLAKE2B d7be2e66e6b9aed0a524fdee3a504c81ce094885dbc3185310f2dddf9bb7c1ee2d0a774724680ef970f168f6b43ac4e725436c593b6b58c092989f18f3c52597 SHA512 a1f1f5bef90a87d94d41385a216d8bfd8e1a10967b7703f5b314238b70de3f7fd498ac71ea0fe1de8aa80efd0131d154f32b8bdf8d7006bb1dd37ddaf1c811b3 +EBUILD mariadb-connector-c-9999.ebuild 3432 BLAKE2B 524853571cfca22510a952f196be08dc2a598a70688a4db5b1c01e9d971ed77fc4ceead4074ddf8504dbf72e5354cee8112f2e97d3d5088b2a31f8eb31dd3a68 SHA512 51356292ce94046b4cb444c8b43402a5c069a820b732e2f4a156c9e7af7a21d978cdab339a53e5f161b3d8cfd08ac2347aa14e4688270eeb73e021dfbf37fa25 MISC metadata.xml 244 BLAKE2B 4123aca5430915cc6801ba9b4e57e1ff48f31a4bacaa785c4dfbbf2d1aadf14f274684cad9b24a09e875a7f621b33bd9bd3333f7ababbd44aa173d4ace98b46e SHA512 380cbd85bebb869f4a2ec1e3518dc6ac5abed1fa5364172e7436098dbd910e738c4d59ee18aa7cf387b354020ed5782732e43702dc83c1857d46b720d623143d diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild index f5de26435990..17e775c57359 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild @@ -43,12 +43,28 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] ) ) " +BDEPEND="test? ( dev-db/mariadb[server] )" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/gentoo-layout-3.0.patch "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch ) +src_prepare() { + # These tests the remote_io plugin which requires network access + sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, NULL},//g' "unittest/libmariadb/misc.c" || die + + # These tests don't work with --skip-grant-tables + sed -i 's/{"test_conc366", test_conc366, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die + sed -i 's/{"test_conc66", test_conc66, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die + + # [Warning] Aborted connection 2078 to db: 'test' user: 'root' host: '' (Got an error reading communication packets) + # Not sure about this one - might also require network access + sed -i 's/{"test_default_auth", test_default_auth, TEST_CONNECTION_NONE, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die + + cmake_src_prepare +} + multilib_src_configure() { # bug 508724 mariadb cannot use ld.gold tc-ld-disable-gold @@ -70,6 +86,14 @@ multilib_src_configure() { cmake_src_configure } +multilib_src_test() { + mkdir -vp "${T}/mysql/data" || die + mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die + mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking & + while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do sleep 1 ; done + cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die +} + multilib_src_install_all() { if ! use static-libs ; then find "${ED}" -name "*.a" -delete || die diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild index f31b6bb77e17..9799342c7442 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild @@ -43,12 +43,28 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] ) ) " +BDEPEND="test? ( dev-db/mariadb[server] )" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/gentoo-layout-3.0.patch "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch ) +src_prepare() { + # These tests the remote_io plugin which requires network access + sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, NULL},//g' "unittest/libmariadb/misc.c" || die + + # These tests don't work with --skip-grant-tables + sed -i 's/{"test_conc366", test_conc366, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die + sed -i 's/{"test_conc66", test_conc66, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die + + # [Warning] Aborted connection 2078 to db: 'test' user: 'root' host: '' (Got an error reading communication packets) + # Not sure about this one - might also require network access + sed -i 's/{"test_default_auth", test_default_auth, TEST_CONNECTION_NONE, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die + + cmake_src_prepare +} + multilib_src_configure() { # bug 508724 mariadb cannot use ld.gold tc-ld-disable-gold @@ -70,6 +86,14 @@ multilib_src_configure() { cmake_src_configure } +multilib_src_test() { + mkdir -vp "${T}/mysql/data" || die + mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die + mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking & + while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do sleep 1 ; done + cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die +} + multilib_src_install_all() { if ! use static-libs ; then find "${ED}" -name "*.a" -delete || die diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index b9f2f123e072..7b23b99d3e8a 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -6,9 +6,9 @@ AUX redis-5.0-shared.patch 883 BLAKE2B 71a490d5c40d873db7d363c4f3cab966bf8e92fa8 AUX redis-5.0.8-ppc-atomic.patch 495 BLAKE2B a995c1b1e327416705151dd888b98fe02fdea8126359f3ffa2cce4d5794d7677ffc4dc7f628d076bc0ed341dac4010ffb9409ee25113fe9cac2298658e94802e SHA512 f4f2c2aad5d09e9fafa58946fdc79aa49d8f16ce6d389dd653522295dc397796c58c87f4fb92016af8c261aa4b00a7eab09d33a19eded496807444d234a9abd9 AUX redis-6.0.12-sharedlua.patch 2897 BLAKE2B 10a23bd3b2fab8b1697a2d3da55e5e0776f34a02f3f3ceea24c76dd95b85d2fa1751b69c67aceaad0797adb4d0375a6826698f266c095d525864645901dbbb55 SHA512 302569a9d626c4914719a0d4b5608809e236a55935557c74f7beb2baae9948329176672e04dba28cd50c0ecfe1115432a268c461c05f54d0493168e701c6a622 AUX redis-6.2.1-config.patch 1477 BLAKE2B bc87272e52b44fc58e7e8b08b5d97e53c9ba22eab02f89c3803d02e526c6c5eb1df5d1565021d96dabf8b9936dfc0b2c27c9dd148d1968d98d31d10470687741 SHA512 da2a2f4321fc4f5fef4db1e399bd6a011c18a997b28c4355ed4284d07c24a5038f086f7dcbb26d4534d800baf9be0634cf53466524a8323d16ad542042d89d98 -AUX redis-6.2.1-sharedlua.patch 3010 BLAKE2B 5d7863b4916229dbb20fd0a852557afefd9b8bcc097ce6aec6cb6fafff08b2428848b35ea2a0ff1ccd5195f14b812f3710df500a6d9acb74c32937d620a3a5b1 SHA512 2d9f78435c8d1e5e284e7410471dbda11af776816d824df20c8b3de9763d06ce0be4d9f62111b1195fe97c42d1d8ff5f2af0d75296f9666137579374c5b1bb87 AUX redis-6.2.3-ppc-atomic.patch 465 BLAKE2B 9324bb198f03a3e5043986adaac170f30f378f5835a53e1c749ccf3392edcfecb22f4f7ae2b325ced3b06bf20535a243daa138073014a109e6e54b27d736dde5 SHA512 803ea4e1dfcb2f87187a0294051bf91f4e67a9b7de421dca20fe8b574741dc454f83fe1eadac7a4ef5d29b7a707a9dc2a56479f8d86c9e82de6332b21101456f AUX redis-7.0.4-no-which.patch 1876 BLAKE2B 9461bdfac73c21d338fbac0a41d64ecb4c14f993b2932ae2df35317529cec399ef9163ce8ebae012dd215d755c3d5a2527bb6f8647ffb0cc6365e1a67a19a331 SHA512 eb22bb26642f1c602bb2fd4b08af7de9036c0acc5fb2a4139608bec10962031f0515f31fc18c7dcd1f8352359fc381a752ac6f63adc01b46df853019bd886d16 +AUX redis-7.0.4-replica-tests-fix.patch 2183 BLAKE2B a5452adf9776c9dd6c443020264e65a4a1e9c148451f133e1e117208118b63507e6641ce60ada4cedc469869085f03dff7b84836fd7f924d6c37a5aacaa612ee SHA512 0ccfe595a76f8570fe735cbebbf887c505ac264f5419a0b34e8c618ff6d082100651042d42de4989e560838e8c8526a4ab6071ff3bbdc6c9eaf3daa1d56672b5 AUX redis-sentinel-5.0-config.patch 706 BLAKE2B 0fa0166bbb3460e783e85b90acf4c606b83e271d8e9828bb5b3a39b623508b21dac33369ac25b645169271822e9c5deb6ea7294e40fc8d1a5ceec5129c174505 SHA512 2dee5666d50fc5d9b6021735a95c9a9647ba99c562e348785381d5a05f1388c3fb9e8c4a15b0de771cf73fb80e5e29f1df25805df749457a2ce4f2e3f2e0e9e8 AUX redis-sentinel.confd-r1 476 BLAKE2B e06aba8c65637a02dd7c778e7ddeb1ee8f25abbe24cea6d9ab90aee0ab512d36ad342dc4aba73c792533c561a00413a6432c6a635246e2fa7f44d2c4cf244972 SHA512 be2bdfa5efa5c55294da382e0d648c06788e77df150acbb2004ac3fe88d8545992787df4a5dd585e5e5fed9a9018e55e03e5f048601d5401795c37a476232c9f AUX redis-sentinel.initd-r1 654 BLAKE2B 064f7ac04ead49052aa221d295067df5cd23081bf7a65546d680281eeb4fcf0fe42c4d756917b0aa05f110be84b142d23410ba4829e1d82725826f788107f235 SHA512 b483902f343a52a4f285d7aed6a56c3bd8e820eb5f3e8805c4bd93c0df009e944e6479fea6060bc07b493d655d995ae8e6f91548c2e512215a5966abdb0aa6a6 @@ -18,13 +18,11 @@ AUX redis.logrotate 105 BLAKE2B 1281fd86d399b40aaaa69d1fe170b2c49523c074e14b1290 AUX redis.service-4 255 BLAKE2B e51cfbb7ce6586e7c16003e3b470be036e9c28b408c4ad71e90d084f5ee843eb2b0b60552735099564f99fc4b4c318980f2e1dde7ac69b32a54a636e663a7cd5 SHA512 786fb60e628146d5024fbee2c17bee26276f58b8d2f15c8eb0a416b1b2e870a1d82e7a1ef7155b7a489da8c89d6feae5b1207597bf6fcb929d7bcfddcae25937 AUX redis.tmpfiles-2 57 BLAKE2B 1e0577c1828bb693cf820f3ba5e77d7d748adf4df2d1910d465ce097765308c7b7ea729526404120d04a79b547e865df93f7bfce1e63341c73563496f1dce691 SHA512 3de050ce044b7daf71219ec61dee2bc31acef161319b87ec2963b23c72e8a4807f1302c4932897664a63ef94507449f6ab75ce18d59f5e1a4558c330a7042e43 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 DIST redis-7.0.4.tar.gz 2963216 BLAKE2B 95ad18547b4be0b199fccc4b0f534b00d2f442609b604b02ef83f44cef4283048d1f8b89e383a14208a00842eb3d6655649d32169a2a6586ed6fac1792e19d5a SHA512 7edecfa667b30584666be0a2dbcb2ac25a6764fa5b8db49ab421602ad20272eeab99ccff0b7c2f789c30a0425d80b774515b03c849e517451cbe597d37eb0247 DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202b57d6da3a38150a02d738a414c6696e261b8ab88033e117aee4f02308aab9ca4a5f382d66ec3a10f3e020580 SHA512 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753 EBUILD redis-6.0.16.ebuild 5642 BLAKE2B 72f2aea7b428ea59a05d51f8f10e7447408757f3cf322cd2d37ed605812816f135baac4507543254de0d1f3d89a2da9d261d2012b6c3805b4a87fab064465e32 SHA512 1f6c69e96eb98e4389d55cee8dbd40ad0cab84aad60edc65df2b940968392ed052a489ad25662e44a5c14a5c878f08b2566097d0c20c200f8c74b0b2d5f327ee -EBUILD redis-6.2.6.ebuild 5398 BLAKE2B ea426c3c1f29e7e471fcd0435dd494713111d63d585f870e0d6c86e662e4023bacac5134c95c52ead1fcc3a8886db83a42a2f719fa035f46dde3dd333c725c92 SHA512 2b066233d5211973a19fc7d7c1d01892e818a560be746754166dcd836c46c370a61e0e92592452345c98d00dd455cb9af6bd2eff0f6375d9fcef15e46e433b1e EBUILD redis-6.2.7-r1.ebuild 5475 BLAKE2B c99ba8acc70ebf1295cf7cc4af5de7da7d1a64c44829a3f29f8b574c5cc418776a98879eb2199ee320da1e88b4e6db7dea0028be4557af7d1a847bd1afea77a2 SHA512 6406fe4209e5a79ab517ef29b73d31d69069a8569f0fc9fede9872b80ec607bcde4cc2e663bf19cd59497303d30ecbb4815a52a1b08f501f1cd1fcf442319f3e -EBUILD redis-7.0.4.ebuild 4935 BLAKE2B 9536f1e862c60c0a13ee2974edc625ee9d0bab696be556a3c742a27243bf7bcb3e71e871b2954b5f97429aa7b4d5abcc5e8e62aacb9128b5ebb60a686efba57c SHA512 406ce31093d914843264a56fd05f0af1890ef56caca2de09473db03990b8070f004b1ccb5bfe4d933dd2e0c721a1d7200acb313ff71cb8769be1c4813a9b5a21 -EBUILD redis-7.0.5.ebuild 4942 BLAKE2B e14276f6d5208a3f18916801706f9f53fa054fa69db020714080addb8c1a872e17d60b0e483342eeeb2c8ad943f5546e58cbb8449c76d2c7b1447152b63fa4eb SHA512 1f81dad70c0cd444983068e41db70aa72847aa5d650365594710a13fd7bbe54bb9700c613c01b79fd449e2f11696cd59c3a0f335dc6433f4a92d9fd0e8d237c2 +EBUILD redis-7.0.4.ebuild 4986 BLAKE2B 8045126e373f5fc3151c06cb6ce7baec24674c8700f49a9e858c6b14365138a3a3f7d505b9c425a128672c6dfce0ab87d70b79dfbe7f848bd09be4d7686a2859 SHA512 fa48baeaec8e4a9e25b4883f754d5ee9f62653c07da2836338f4fb219ae035f4485b376b075e78420185fd795957c4ecbd8de38a911ae55079243621bc306b15 +EBUILD redis-7.0.5.ebuild 4993 BLAKE2B 7e15f9ec8d630eb9b7c706a799f259581ae7ddaf0902fee96c4e2e3fd50ebeb42f68b24b18d51e1c8a565183385a814c2e846117dff5b62f7858540598ab3325 SHA512 8a6a74aa07c4d6e950aac3dce5d75ea111e34bbb49ee76a074a8b874ca0f31d84364fe93af25355b6787f6fdabd427754355acf01821cd1f5813bf4886e2d430 MISC metadata.xml 692 BLAKE2B 884fa6be2c816c04a9a24db6d1e47f5e84da00a47cf7cf8a757b3a6d7a1d769597107db2c32904e9d1306cf5450fedc04bbcfb75a14a89c0d6bcdf4dbe85636e SHA512 48a675be7e6a294dea1cdde0a6988793150b8ad36fc0e9402476221012292d549916d8186e2ea97ca1be660f9d60a9c889cb8cb6e30fecaeed1525bf9003de88 diff --git a/dev-db/redis/files/redis-6.2.1-sharedlua.patch b/dev-db/redis/files/redis-6.2.1-sharedlua.patch deleted file mode 100644 index cf8aa8532d77..000000000000 --- a/dev-db/redis/files/redis-6.2.1-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 6f0fd84..6546b5d 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 hdr_histogram -+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram - NODEPS:=clean distclean - - # Default settings -@@ -84,6 +84,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 - - # Linux ARM needs -latomic at linking time -@@ -186,7 +187,7 @@ endif - endif - endif - # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise @LUA_CFLAGS@ -I../deps/hdr_histogram - - # Determine systemd support and/or build preference (defaulting to auto-detection) - BUILD_WITH_SYSTEMD=no -@@ -268,6 +269,7 @@ endif - REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX) - REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX) - 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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.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$(PROG_SUFFIX) - REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o - REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -@@ -321,7 +323,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-7.0.4-replica-tests-fix.patch b/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch new file mode 100644 index 000000000000..55da00137b46 --- /dev/null +++ b/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch @@ -0,0 +1,61 @@ +From e7144693e2446f21ee68c95676ecf65d1351d13e Mon Sep 17 00:00:00 2001 +From: Binbin +Date: Wed, 27 Jul 2022 19:58:25 +0800 +Subject: [PATCH] Fix bgsaveerr issue in psync wrong offset test (#11043) + +The kill above is sometimes successful and sometimes already too late. +The PING in pysnc wrong offset test got rejected by bgsaveerr because +lastbgsave_status is C_ERR. + +In theory, using diskless can avoid PING being affected, because when +the replica is dropped, we will kill the child with SIGUSR1, and this +will not affect lastbgsave_status. + +Anyway, this kill is not particularly needed here, dropping the kill +is the best one, since we do have the waitForBgsave, so just let it +take care of the bgsave. No need for fast termination. +--- + +This patch is backported from upstream, see PR #11043. + +Upstream-PR: https://github.com/redis/redis/pull/11043 + +diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl +index d60c91918..457c3150e 100644 +--- a/tests/integration/replication.tcl ++++ b/tests/integration/replication.tcl +@@ -1289,7 +1289,6 @@ start_server {tags {"repl" "external:skip"}} { + verify_log_message 0 "*Replica generated a reply to command 'ping', disconnecting it: *" $lines + + $rd close +- catch {exec kill -9 [get_child_pid 0]} + waitForBgsave r + } + +@@ -1307,7 +1306,6 @@ start_server {tags {"repl" "external:skip"}} { + verify_log_message 0 "*Replica generated a reply to command 'xinfo|help', disconnecting it: *" $lines + + $rd close +- catch {exec kill -9 [get_child_pid 0]} + waitForBgsave r + } + +@@ -1328,7 +1326,6 @@ start_server {tags {"repl" "external:skip"}} { + verify_log_message 0 "*Replica can't interact with the keyspace*" $lines + + $rd close +- catch {exec kill -9 [get_child_pid 0]} + waitForBgsave r + } + +@@ -1347,7 +1344,6 @@ start_server {tags {"repl" "external:skip"}} { + verify_log_message 0 "*Replica generated a reply to command 'slowlog|get', disconnecting it: *" $lines + + $rd close +- catch {exec kill -9 [get_child_pid 0]} + waitForBgsave r + } + +-- +2.35.1 + diff --git a/dev-db/redis/redis-6.2.6.ebuild b/dev-db/redis/redis-6.2.6.ebuild deleted file mode 100644 index 364e49a7adb2..000000000000 --- a/dev-db/redis/redis-6.2.6.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# 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 ) - -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.1-sharedlua.patch - "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch - "${FILESDIR}"/${PN}-sentinel-5.0-config.patch - "${FILESDIR}"/${PN}-5.0-luajit-2.1-fix.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.*\/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.4.ebuild b/dev-db/redis/redis-7.0.4.ebuild index 773c003e309f..2cf77ae9969e 100644 --- a/dev-db/redis/redis-7.0.4.ebuild +++ b/dev-db/redis/redis-7.0.4.ebuild @@ -53,6 +53,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch "${FILESDIR}"/${PN}-sentinel-5.0-config.patch "${FILESDIR}"/${PN}-7.0.4-no-which.patch + "${FILESDIR}"/${PN}-7.0.4-replica-tests-fix.patch ) src_prepare() { diff --git a/dev-db/redis/redis-7.0.5.ebuild b/dev-db/redis/redis-7.0.5.ebuild index d16e991e2f8b..6df6a3e08780 100644 --- a/dev-db/redis/redis-7.0.5.ebuild +++ b/dev-db/redis/redis-7.0.5.ebuild @@ -53,6 +53,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch "${FILESDIR}"/${PN}-sentinel-5.0-config.patch "${FILESDIR}"/${PN}-7.0.4-no-which.patch + "${FILESDIR}"/${PN}-7.0.4-replica-tests-fix.patch ) src_prepare() { -- cgit v1.2.3