diff options
| -rw-r--r-- | main/redis/APKBUILD | 17 | ||||
| -rw-r--r-- | main/redis/makefile-dont-duplicate-binary.patch | 5 |
2 files changed, 13 insertions, 9 deletions
diff --git a/main/redis/APKBUILD b/main/redis/APKBUILD index f773bfa9c3..6537cad029 100644 --- a/main/redis/APKBUILD +++ b/main/redis/APKBUILD @@ -1,7 +1,7 @@ # Contributor: V.Krishn <vkrishn4@gmail.com> # Maintainer: TBK <alpine@jjtc.eu> pkgname=redis -pkgver=4.0.13 +pkgver=5.0.4 pkgrel=0 pkgdesc="Advanced key-value store" url="https://redis.io/" @@ -28,11 +28,12 @@ prepare() { default_prepare cd "$builddir" - # disable broken tests - # see: https://github.com/antirez/redis/issues/2814 - # https://github.com/antirez/redis/issues/3810 - sed -i -e '/integration\/aof/d' \ - -e '/integration\/logging/d' \ + # Disable broken tests: + # integration/logging.tcl is not working because musl does not provide BACKTRACE like glibc + # https://github.com/antirez/redis/blob/5.0.4/src/config.h#L64-L67 + # https://github.com/antirez/redis/issues/5943 + sed -i -e '/integration\/logging/d' \ + -e '/unit\/maxmemory/d' \ tests/test_helper.tcl } @@ -73,8 +74,8 @@ package() { var/log/redis } -sha512sums="c220420bf6cb2781a3fb9e002188b1663743c89c262fd5aff02e585c969b56e7691fe1073e7427e6d38cf7b5a096f86b83af84cfa6b01a5bdf56048789e0bb70 redis-4.0.13.tar.gz -5fd8a478771642b9c0dc285f1d95896f7680b94c7edab0ce60ad19ba0c2979028c7d9b0afb846dbf3e1be146ec5ded52ebb059a5b25b0a8e52bf8e57f18c0cf4 makefile-dont-duplicate-binary.patch +sha512sums="336929c81a476e2a23a64f867823d70c3aab66fb0098eef2e61630be6522ff2f6af680169ffcae35d559758b2c6b56f88c5a953a538291fea886449cba33b8ad redis-5.0.4.tar.gz +0bfe894843a0b0b1800c5ff1c570cbc631d0bf94e5911210ae8780f57e661c8a61bb7309181fb8492392747deb340025a5380db168418aaf46b273a8120a4169 makefile-dont-duplicate-binary.patch c8a35e3c30be99fef8678acb2502f424bcca478dcc1ef1750f8c8c8e9e9c462f97586159f32ebba84b6a4eb398a9d568e3200241fb0de1f96293c9fdaafb06c9 redis.conf.patch d9bbb3fcc69022633d7fea3227c41d8777422ce9778623efb6aa539468fc51d2d1de09d364e21c7c8b45c61e7bbc7aaaf22745257d60ea937f77a8673facf286 sentinel.conf.patch f6dcdad1edd6b5fb6aa28ba774bfc8aba035f316695da261fb2ad291b76f00f177479f9d74434d06c26bd15f131edc9a2f55c9880758cf0987800d2031069738 redis.initd diff --git a/main/redis/makefile-dont-duplicate-binary.patch b/main/redis/makefile-dont-duplicate-binary.patch index 881e0a582c..085fcc4cc7 100644 --- a/main/redis/makefile-dont-duplicate-binary.patch +++ b/main/redis/makefile-dont-duplicate-binary.patch @@ -4,7 +4,7 @@ See https://github.com/antirez/redis/pull/3494 --- a/src/Makefile +++ b/src/Makefile -@@ -287,6 +287,6 @@ +@@ -307,9 +307,9 @@ $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN) $(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN) $(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN) @@ -13,3 +13,6 @@ See https://github.com/antirez/redis/pull/3494 @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME) + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME) + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME) + + uninstall: + rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)} |