From e8ed1255ae8a3cdec0755178bf96694493ca058f Mon Sep 17 00:00:00 2001 From: si-gui <245140120@qq.com> Date: Wed, 30 Sep 2020 15:30:24 +0800 Subject: [PATCH] Modify aarch64 architecture jemalloc page size from 4k to 64k --- ...itecture-jemalloc-page-size-from-4k-to-64k.patch | 13 +++++++++++++ redis.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 modify-aarch64-architecture-jemalloc-page-size-from-4k-to-64k.patch diff --git a/modify-aarch64-architecture-jemalloc-page-size-from-4k-to-64k.patch b/modify-aarch64-architecture-jemalloc-page-size-from-4k-to-64k.patch new file mode 100644 index 0000000..bedaaca --- /dev/null +++ b/modify-aarch64-architecture-jemalloc-page-size-from-4k-to-64k.patch @@ -0,0 +1,13 @@ +diff --git a/deps/Makefile b/deps/Makefile +index e148a33..f1855f3 100644 +--- a/deps/Makefile ++++ b/deps/Makefile +@@ -77,7 +77,7 @@ JEMALLOC_LDFLAGS= $(LDFLAGS) + + jemalloc: .make-prerequisites + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) +- cd jemalloc && ./configure --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" ++ cd jemalloc && ./configure --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" --with-lg-page=16 + cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a + + .PHONY: jemalloc diff --git a/redis.spec b/redis.spec index bd1c85f..d477fc4 100644 --- a/redis.spec +++ b/redis.spec @@ -1,6 +1,6 @@ Name: redis Version: 4.0.11 -Release: 10 +Release: 11 Summary: A persistent key-value database License: BSD and MIT URL: https://redis.io @@ -17,6 +17,9 @@ Patch0003: CVE-2020-14147.patch Patch0004: improved-HyperLogLog-cardinality-estimation.patch Patch0005: Aesthetic-changes-to-PR.patch Patch0006: CVE-2019-10193.patch +%ifarch aarch64 +Patch0007: modify-aarch64-architecture-jemalloc-page-size-from-4k-to-64k.patch +%endif BuildRequires: systemd Requires: /bin/awk @@ -88,6 +91,9 @@ exit 0 %{_unitdir}/%{name}-sentinel.service %changelog +* Wed Sep 30 2020 Jiapeng Zhang - 4.0.11-11 +- modify aarch64 architecture jemalloc page size from 4k to 64k + * Mon Sep 21 2020 wangyue - 4.0.11-10 - fix CVE-2019-10193 -- Gitee