aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.eu>2021-03-02 21:54:26 +0100
committerLeo <thinkabit.ukim@gmail.com>2021-03-03 00:15:06 +0000
commit7193250ffdba6388d6fd5f55b9d3ab381dc37c7d (patch)
treefb860bf9cb61cb57d5c992214308bfdfad9b01e0
parent3f173483241dd20891a3e90ef47f82c9a1c67275 (diff)
downloadaports-7193250ffdba6388d6fd5f55b9d3ab381dc37c7d.tar.gz
aports-7193250ffdba6388d6fd5f55b9d3ab381dc37c7d.tar.bz2
aports-7193250ffdba6388d6fd5f55b9d3ab381dc37c7d.tar.xz
main/redis: upgrade to 6.2.1
-rw-r--r--main/redis/APKBUILD14
-rw-r--r--main/redis/musl-zmalloc.patch23
-rw-r--r--main/redis/upstream-musl-changes.patch134
3 files changed, 5 insertions, 166 deletions
diff --git a/main/redis/APKBUILD b/main/redis/APKBUILD
index e73db7bd11..19ae822a31 100644
--- a/main/redis/APKBUILD
+++ b/main/redis/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Eivind Uggedal <eu@eju.no>
# Maintainer: TBK <alpine@jjtc.eu>
pkgname=redis
-pkgver=6.2.0
+pkgver=6.2.1
pkgrel=0
pkgdesc="Advanced key-value store"
url="https://redis.io/"
@@ -21,8 +21,6 @@ source="https://download.redis.io/releases/redis-$pkgver.tar.gz
$pkgname.confd
$pkgname-sentinel.initd
$pkgname.logrotate
- musl-zmalloc.patch
- upstream-musl-changes.patch
"
# secfixes:
@@ -41,8 +39,8 @@ build() {
mips|mipsel*) _libatomic="-latomic";;
esac
- make PREFIX=/usr \
- INSTALL_BIN="$pkgdir"/usr/bin \
+ export CFLAGS="$CFLAGS -DUSE_MALLOC_USABLE_SIZE"
+ make USE_JEMALLOC=no \
MALLOC=libc \
FINAL_LIBS="-lm -ldl -pthread $_libatomic" \
all
@@ -72,12 +70,10 @@ package() {
var/log/redis
}
-sha512sums="905cdcbe42b6126c2bfb68a948cb38d232af3d04e620c51897fb80ac43b5b8da1f60e9701377dcd15db8c3eb168ab9c3605d5715d664903e0a620b464d1ac9b8 redis-6.2.0.tar.gz
+sha512sums="7c339cc360fc3125bb67c5748bb4fe940977faa937e3a86294829bde472479a811df8ea0ce4961d8128ec8d4ffba5d5a943c2957589c8da0cfc3f109f82e4af6 redis-6.2.1.tar.gz
7725486329f2aba8fe03a768f6d8ab78cc96ab6f2ca403af56c252ef7978f7628b580587b372969ca5dd6257780ef58571ce6dc5aca468c3b2a299033b41047f redis.conf.patch
a5dc411c2bd7edf61400e29accb375275dd888fda72a8f7e3889be475010c695a22f536be818ef9441e47285c00b451966db924362a7f56806586078c9e3ff8c sentinel.conf.patch
f6dcdad1edd6b5fb6aa28ba774bfc8aba035f316695da261fb2ad291b76f00f177479f9d74434d06c26bd15f131edc9a2f55c9880758cf0987800d2031069738 redis.initd
6752e99df632b14d62a3266929e80c3d667be5c270e4f34e0dcf2b7f9b1754fe0ce9d4569fa413dbbe207e406ff2848a64e0c47629997536ae1d14ca84ebd56b redis.confd
e7a60a090df53eef05d58d73709f07536135a93efb34e48ad933e3859d3d1c0f476975a3232df18f57476bf7fc3b0548471e1c86445878457ac8507b3da71384 redis-sentinel.initd
-bf2def2077a989047e9bfff8a7f754bcdf96e020fd4a470f8967ee1fca601e11f044cfb3742f00e932cc013e0d0b199045d78c8878a0e529715c9f77786d353f redis.logrotate
-e29fb36a43dbd991aa46f469d49f76d6c22354abf11abcfe91c2cc8254c0fe9f997e51288ca37e3d184b89b49cd9ffb42483f8ec35b99aee829bf3ee5b4c5163 musl-zmalloc.patch
-dac37f134b3bc26365ec232a61d9c58443bcb10d46b6d9db742a253cc4fc8f232be2f5e2ce79a80f966376e9c6376b69b3067b55dca88e6b4d2d4608f3ed93d0 upstream-musl-changes.patch"
+bf2def2077a989047e9bfff8a7f754bcdf96e020fd4a470f8967ee1fca601e11f044cfb3742f00e932cc013e0d0b199045d78c8878a0e529715c9f77786d353f redis.logrotate"
diff --git a/main/redis/musl-zmalloc.patch b/main/redis/musl-zmalloc.patch
deleted file mode 100644
index 90e79d05a2..0000000000
--- a/main/redis/musl-zmalloc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Without this change it fails to compile, giving the following error:
-
-zmalloc.c:55:28: error: missing binary operator before token "("
- #define PREFIX_SIZE (sizeof(size_t))
- ^
-zmalloc.c:59:5: note: in expansion of macro 'PREFIX_SIZE'
- #if PREFIX_SIZE > 0
-
---- a/src/zmalloc.h
-+++ b/src/zmalloc.h
-@@ -63,12 +63,10 @@
-
- #ifndef ZMALLOC_LIB
- #define ZMALLOC_LIB "libc"
--#ifdef __GLIBC__
- #include <malloc.h>
- #define HAVE_MALLOC_SIZE 1
- #define zmalloc_size(p) malloc_usable_size(p)
- #endif
--#endif
-
- /* We can enable the Redis defrag capabilities only if we are using Jemalloc
- * and the version used is our special version modified for Redis having
diff --git a/main/redis/upstream-musl-changes.patch b/main/redis/upstream-musl-changes.patch
deleted file mode 100644
index f4ac513a3f..0000000000
--- a/main/redis/upstream-musl-changes.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From aa9ec2dd42c75feb3f6fa18bd229a911acc29f0f Mon Sep 17 00:00:00 2001
-From: Yossi Gottlieb <yossigo@gmail.com>
-Date: Tue, 23 Feb 2021 10:31:52 +0200
-Subject: [PATCH 1/4] Remove linux/version.h dependency.
-
-This introduces unnecessary dependencies, and generally not a good idea
-as the platform we build on may be different than the platform we run
-on.
-
-To determine if sync_file_range exists we can simply rely on header file
-hints.
----
- src/config.h | 15 +--------------
- src/fmacros.h | 1 -
- 2 files changed, 1 insertion(+), 15 deletions(-)
-
-diff --git a/src/config.h b/src/config.h
-index 1d4cb58357a..d19e9de50a2 100644
---- a/src/config.h
-+++ b/src/config.h
-@@ -35,7 +35,6 @@
- #endif
-
- #ifdef __linux__
--#include <linux/version.h>
- #include <features.h>
- #endif
-
-@@ -114,19 +113,7 @@
-
- /* Define rdb_fsync_range to sync_file_range() on Linux, otherwise we use
- * the plain fsync() call. */
--#ifdef __linux__
--#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
--#if (LINUX_VERSION_CODE >= 0x020611 && __GLIBC_PREREQ(2, 6))
--#define HAVE_SYNC_FILE_RANGE 1
--#endif
--#else
--#if (LINUX_VERSION_CODE >= 0x020611)
--#define HAVE_SYNC_FILE_RANGE 1
--#endif
--#endif
--#endif
--
--#ifdef HAVE_SYNC_FILE_RANGE
-+#if (defined(__linux__) && defined(SYNC_FILE_RANGE_WAIT_BEFORE))
- #define rdb_fsync_range(fd,off,size) sync_file_range(fd,off,size,SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE)
- #else
- #define rdb_fsync_range(fd,off,size) fsync(fd)
-diff --git a/src/fmacros.h b/src/fmacros.h
-index 089dc8de7c0..a97d21a475b 100644
---- a/src/fmacros.h
-+++ b/src/fmacros.h
-@@ -60,7 +60,6 @@
-
- #ifdef __linux__
- /* features.h uses the defines above to set feature specific defines. */
--#include <linux/version.h>
- #include <features.h>
- #endif
-
-
-From 0be90eace2d12e60f1f2cc0b38617b178f7508bd Mon Sep 17 00:00:00 2001
-From: Yossi Gottlieb <yossigo@gmail.com>
-Date: Tue, 23 Feb 2021 10:34:58 +0200
-Subject: [PATCH 2/4] Fix setproctitle() on libmusl.
-
-The previous ifdef checks were a bit too strict for no apparent
-reason.
----
- src/config.h | 2 +-
- src/setproctitle.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/config.h b/src/config.h
-index d19e9de50a2..56c1ab6aeac 100644
---- a/src/config.h
-+++ b/src/config.h
-@@ -130,7 +130,7 @@
- #define ESOCKTNOSUPPORT 0
- #endif
-
--#if ((defined __linux && defined(__GLIBC__)) || defined __APPLE__)
-+#if (defined __linux || defined __APPLE__)
- #define USE_SETPROCTITLE
- #define INIT_SETPROCTITLE_REPLACEMENT
- void spt_init(int argc, char *argv[]);
-diff --git a/src/setproctitle.c b/src/setproctitle.c
-index 1c91570eba9..019402348b6 100644
---- a/src/setproctitle.c
-+++ b/src/setproctitle.c
-@@ -232,7 +232,7 @@ void spt_init(int argc, char *argv[]) {
- if (!(SPT.arg0 = strdup(argv[0])))
- goto syerr;
-
--#if __GLIBC__
-+#if __linux__
- if (!(tmp = strdup(program_invocation_name)))
- goto syerr;
-
-
-From 44500d999849dd744e5bb9f8a8e331d96aa88715 Mon Sep 17 00:00:00 2001
-From: Yossi Gottlieb <yossigo@gmail.com>
-Date: Tue, 23 Feb 2021 10:37:16 +0200
-Subject: [PATCH 3/4] Fix tests failure on Linux with no backtrace.
-
----
- tests/integration/logging.tcl | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/tests/integration/logging.tcl b/tests/integration/logging.tcl
-index fd90346449f..fec14ff2bd0 100644
---- a/tests/integration/logging.tcl
-+++ b/tests/integration/logging.tcl
-@@ -1,6 +1,18 @@
- set system_name [string tolower [exec uname -s]]
-+set system_supported 0
-
--if {$system_name eq {linux} || $system_name eq {darwin}} {
-+# We only support darwin or Linux with glibc
-+if {$system_name eq {darwin}} {
-+ set system_supported 1
-+} elseif {$system_name eq {linux}} {
-+ # Avoid the test on libmusl, which does not support backtrace
-+ set ldd [exec ldd src/redis-server]
-+ if {![string match {*libc.musl*} $ldd]} {
-+ set system_supported 1
-+ }
-+}
-+
-+if {$system_supported} {
- set server_path [tmpdir server.log]
- start_server [list overrides [list dir $server_path]] {
- test "Server is able to generate a stack trace on selected systems" {