From 8a8c4287e7c22c86c24900d110d4ed429938b252 Mon Sep 17 00:00:00 2001 From: tb Date: Sat, 21 Jan 2023 12:27:30 +0000 Subject: [PATCH] gnutls: unbreak i386 by removing patches added by accident. --- ...ch-lib_accelerated_x86_elf_aes-ssse3-x86_s | 20 ------------------- .../patch-lib_accelerated_x86_elf_aesni-x86_s | 11 ---------- ...lib_accelerated_x86_elf_sha256-ssse3-x86_s | 19 ------------------ ...lib_accelerated_x86_elf_sha512-ssse3-x86_s | 11 ---------- 4 files changed, 61 deletions(-) delete mode 100644 security/gnutls/patches/patch-lib_accelerated_x86_elf_aes-ssse3-x86_s delete mode 100644 security/gnutls/patches/patch-lib_accelerated_x86_elf_aesni-x86_s delete mode 100644 security/gnutls/patches/patch-lib_accelerated_x86_elf_sha256-ssse3-x86_s delete mode 100644 security/gnutls/patches/patch-lib_accelerated_x86_elf_sha512-ssse3-x86_s diff --git a/security/gnutls/patches/patch-lib_accelerated_x86_elf_aes-ssse3-x86_s b/security/gnutls/patches/patch-lib_accelerated_x86_elf_aes-ssse3-x86_s deleted file mode 100644 index f242e64e45f..00000000000 --- a/security/gnutls/patches/patch-lib_accelerated_x86_elf_aes-ssse3-x86_s +++ /dev/null @@ -1,20 +0,0 @@ -Index: lib/accelerated/x86/elf/aes-ssse3-x86.s ---- lib/accelerated/x86/elf/aes-ssse3-x86.s.orig -+++ lib/accelerated/x86/elf/aes-ssse3-x86.s -@@ -10,7 +10,7 @@ - # - # *** This file is auto-generated *** - # --.text -+.rodata - .align 64 - .L_vpaes_consts: - .long 218628480,235210255,168496130,67568393 -@@ -67,6 +67,7 @@ - .byte 83,83,69,51,44,32,77,105,107,101,32,72,97,109,98,117 - .byte 114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105 - .byte 118,101,114,115,105,116,121,41,0 -+.previous - .align 64 - .type _vpaes_preheat,@function - .align 16 diff --git a/security/gnutls/patches/patch-lib_accelerated_x86_elf_aesni-x86_s b/security/gnutls/patches/patch-lib_accelerated_x86_elf_aesni-x86_s deleted file mode 100644 index bfe034c8488..00000000000 --- a/security/gnutls/patches/patch-lib_accelerated_x86_elf_aesni-x86_s +++ /dev/null @@ -1,11 +0,0 @@ -Index: lib/accelerated/x86/elf/aesni-x86.s ---- lib/accelerated/x86/elf/aesni-x86.s.orig -+++ lib/accelerated/x86/elf/aesni-x86.s -@@ -3263,6 +3263,7 @@ aesni_set_decrypt_key: - .L134dec_key_ret: - ret - .size aesni_set_decrypt_key,.-.L_aesni_set_decrypt_key_begin -+.rodata - .align 64 - .Lkey_const: - .long 202313229,202313229,202313229,202313229 diff --git a/security/gnutls/patches/patch-lib_accelerated_x86_elf_sha256-ssse3-x86_s b/security/gnutls/patches/patch-lib_accelerated_x86_elf_sha256-ssse3-x86_s deleted file mode 100644 index 98152455482..00000000000 --- a/security/gnutls/patches/patch-lib_accelerated_x86_elf_sha256-ssse3-x86_s +++ /dev/null @@ -1,19 +0,0 @@ -Index: lib/accelerated/x86/elf/sha256-ssse3-x86.s ---- lib/accelerated/x86/elf/sha256-ssse3-x86.s.orig -+++ lib/accelerated/x86/elf/sha256-ssse3-x86.s -@@ -466,6 +466,7 @@ sha256_block_data_order: - popl %ebx - popl %ebp - ret -+.rodata - .align 64 - .L001K256: - .long 1116352408,1899447441,3049323471,3921009573,961987163,1508970993,2453635748,2870763221,3624381080,310598401,607225278,1426881987,1925078388,2162078206,2614888103,3248222580,3835390401,4022224774,264347078,604807628,770255983,1249150122,1555081692,1996064986,2554220882,2821834349,2952996808,3210313671,3336571891,3584528711,113926993,338241895,666307205,773529912,1294757372,1396182291,1695183700,1986661051,2177026350,2456956037,2730485921,2820302411,3259730800,3345764771,3516065817,3600352804,4094571909,275423344,430227734,506948616,659060556,883997877,958139571,1322822218,1537002063,1747873779,1955562222,2024104815,2227730452,2361852424,2428436474,2756734187,3204031479,3329325298 -@@ -475,6 +476,7 @@ sha256_block_data_order: - .byte 67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97 - .byte 112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103 - .byte 62,0 -+.previous - .align 16 - .L008unrolled: - leal -96(%esp),%esp diff --git a/security/gnutls/patches/patch-lib_accelerated_x86_elf_sha512-ssse3-x86_s b/security/gnutls/patches/patch-lib_accelerated_x86_elf_sha512-ssse3-x86_s deleted file mode 100644 index 294163ffcd1..00000000000 --- a/security/gnutls/patches/patch-lib_accelerated_x86_elf_sha512-ssse3-x86_s +++ /dev/null @@ -1,11 +0,0 @@ -Index: lib/accelerated/x86/elf/sha512-ssse3-x86.s ---- lib/accelerated/x86/elf/sha512-ssse3-x86.s.orig -+++ lib/accelerated/x86/elf/sha512-ssse3-x86.s -@@ -511,6 +511,7 @@ sha512_block_data_order: - popl %ebx - popl %ebp - ret -+.rodata - .align 64 - .L001K512: - .long 3609767458,1116352408