Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2022-01-26 15:25:35 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2022-01-26 15:25:35 +0100
commitefc8d93ceded1c98c17874bfee2e387553848ef5 (patch)
tree43ba22141d6a5e3bc054310a2757dc8d0fc7e510
parent152c6c69dc1c31a06bf2a24a02ec0b3a8efaefe0 (diff)
core/zstd: noexecstack patch removed, is applied upstream in 1.5.2
-rw-r--r--core/zstd/PKGBUILD15
-rw-r--r--core/zstd/zstd-1.5.1-non-x86_64-noexecstack.patch19
2 files changed, 0 insertions, 34 deletions
diff --git a/core/zstd/PKGBUILD b/core/zstd/PKGBUILD
deleted file mode 100644
index c1f01001..00000000
--- a/core/zstd/PKGBUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-# make sure the stack is not executable on IA-32
-source+=('zstd-1.5.1-non-x86_64-noexecstack.patch')
-sha256sums+=('eb641a066c45a96f20782396a033e4eed3c8411b848a1c89b7682df91aba1a58')
-b2sums+=('6cf6fe41026f67d165cb6513f7ab1779e6b8e48bdd545d89beb7942ce12ecb0ebccf802128a02b6bb32994f22841089a67fa83f8f3a6a7e3f9b05bde8930ce5b')
-
-eval "$(
- {
- declare -f prepare || \
- printf 'prepare() {\n}\n'
- } \
- | sed '
- $i cd $pkgname-$pkgver
- $i patch -p1 -i "$srcdir/zstd-1.5.1-non-x86_64-noexecstack.patch"
- '
-)"
diff --git a/core/zstd/zstd-1.5.1-non-x86_64-noexecstack.patch b/core/zstd/zstd-1.5.1-non-x86_64-noexecstack.patch
deleted file mode 100644
index ebc270b6..00000000
--- a/core/zstd/zstd-1.5.1-non-x86_64-noexecstack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -rauN zstd-1.5.1/lib/decompress/huf_decompress_amd64.S zstd-1.5.1-non-x86_64-noexecstack-patch/lib/decompress/huf_decompress_amd64.S
---- zstd-1.5.1/lib/decompress/huf_decompress_amd64.S 2021-12-20 23:49:18.000000000 +0100
-+++ zstd-1.5.1-non-x86_64-noexecstack-patch/lib/decompress/huf_decompress_amd64.S 2022-01-13 17:06:54.275942263 +0100
-@@ -1,6 +1,5 @@
- #include "../common/portability_macros.h"
-
--#if ZSTD_ENABLE_ASM_X86_64_BMI2
-
- /* Stack marking
- * ref: https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart
-@@ -9,6 +8,8 @@
- .section .note.GNU-stack,"",%progbits
- #endif
-
-+#if ZSTD_ENABLE_ASM_X86_64_BMI2
-+
- /* Calling convention:
- *
- * %rdi contains the first argument: HUF_DecompressAsmArgs*.