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>2019-08-18 17:40:23 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2019-08-18 17:40:23 +0200
commit4509fb1bdf85a1d6a6fb3c68cdb57fefad0d284a (patch)
treec04e1163e0b54a955f7fe84e3b7c22718dd0823a
parent8290023372694cd94a5d717fd21d90d124b16dc5 (diff)
core/gnutls: patching assembly code by hand in case the perl script is not generating the code
-rw-r--r--core/gnutls/PKGBUILD2
-rw-r--r--core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch12
2 files changed, 13 insertions, 1 deletions
diff --git a/core/gnutls/PKGBUILD b/core/gnutls/PKGBUILD
index 379ac6be..560b3924 100644
--- a/core/gnutls/PKGBUILD
+++ b/core/gnutls/PKGBUILD
@@ -1,7 +1,7 @@
# see https://gitlab.com/gnutls/gnutls/issues/818
source+=('gnutls-3.6.9-nonPIC-assembly.patch')
-sha256sums+=('3a31503c695b445f2551313e822d8010a0220ba632df2e68e94c78bb5345c147')
+sha256sums+=('b5dc46a39f6853b0deb5d61da0553d836f672b011d595e2c6558d5d11aa7a927')
prepare() {
cd $pkgname-$pkgver
diff --git a/core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch b/core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch
index e55aeec9..b18f52a5 100644
--- a/core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch
+++ b/core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch
@@ -21,3 +21,15 @@ diff -rauN gnutls-3.6.9/cfg.mk gnutls-3.6.9-nonPIC-assembly-patch/cfg.mk
cat $<.license $@.tmp > $@ && rm -f $@.tmp
echo "" >> $@
echo ".section .note.GNU-stack,\"\",%progbits" >> $@
+diff -rauN gnutls-3.6.9/lib/accelerated/x86/elf/aesni-x86.s gnutls-3.6.9-nonPIC-assembly-patch/lib/accelerated/x86/elf/aesni-x86.s
+--- gnutls-3.6.9/lib/accelerated/x86/elf/aesni-x86.s 2019-06-28 21:06:07.000000000 +0200
++++ gnutls-3.6.9-nonPIC-assembly-patch/lib/accelerated/x86/elf/aesni-x86.s 2019-08-18 17:36:49.498546884 +0200
+@@ -2892,7 +2892,7 @@
+ .L112pic:
+ popl %ebx
+ leal .Lkey_const-.L112pic(%ebx),%ebx
+- leal _gnutls_x86_cpuid_s,%ebp
++ leal _gnutls_x86_cpuid_s-.Lkey_const(%ebx),%ebp
+ movups (%eax),%xmm0
+ xorps %xmm4,%xmm4
+ movl 4(%ebp),%ebp