On Sun, Dec 15, 2024 at 06:12:07PM +0100, Tobias Heider wrote:
> Hey,
>
> looks like our gnutls arm64 patches are broken, I get a segfault when
> starting emacs:
>
> #5 0x0000000bdce7b1c0 in sha1_block_data_order ()
> from /usr/local/lib/libgnutls.so.47.11
> #6 0x0000000bdd00769c in aarch64_sha1_update () from
> /usr/local/lib/libgnutls.so.47.11
> #7 0x0000000bdd007d4c [PAC] in wrap_aarch64_hash_fast ()
> from /usr/local/lib/libgnutls.so.47.11
> #8 0x0000000bdcf154f8 [PAC] in _gnutls_hash_fast ()
>
> Reason seems to be that we turn one .text into .rodata even though it should
> actually
> be .text.
>
> ok?
ok tb
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/gnutls/Makefile,v
> retrieving revision 1.199
> diff -u -p -r1.199 Makefile
> --- Makefile 11 Nov 2024 09:37:18 -0000 1.199
> +++ Makefile 15 Dec 2024 17:09:40 -0000
> @@ -3,7 +3,7 @@ COMMENT= GNU Transport Layer Security l
> V= 3.8.8
> DISTNAME= gnutls-${V}
> EXTRACT_SUFX= .tar.xz
> -REVISION= 0
> +REVISION= 1
>
> CATEGORIES= security
>
> Index: patches/patch-lib_accelerated_aarch64_elf_sha1-armv8_s
> ===================================================================
> RCS file:
> /cvs/ports/security/gnutls/patches/patch-lib_accelerated_aarch64_elf_sha1-armv8_s,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-lib_accelerated_aarch64_elf_sha1-armv8_s
> --- patches/patch-lib_accelerated_aarch64_elf_sha1-armv8_s 10 Jul 2024
> 12:59:10 -0000 1.2
> +++ patches/patch-lib_accelerated_aarch64_elf_sha1-armv8_s 15 Dec 2024
> 17:09:40 -0000
> @@ -1,15 +1,6 @@
> Index: lib/accelerated/aarch64/elf/sha1-armv8.s
> --- lib/accelerated/aarch64/elf/sha1-armv8.s.orig
> +++ lib/accelerated/aarch64/elf/sha1-armv8.s
> -@@ -49,7 +49,7 @@
> - .hidden _gnutls_arm_cpuid_s
> -
> -
> --.text
> -+.rodata
> -
> - .globl sha1_block_data_order
> - .type sha1_block_data_order,%function
> @@ -1125,7 +1125,8 @@ sha1_block_armv8:
> stp x29,x30,[sp,#-16]!
> add x29,sp,#0
>
