Further cleanups after libffi 3.1 removal

Related: #1891914

libffi-3.1-aarch64-fix-exec-stack.patch

@@ -1,11 +0,0 @@
---- a/src/aarch64/sysv.S
-+++ b/src/aarch64/sysv.S
-@@ -396,3 +396,8 @@
- #ifdef __ELF__
-         .size CNAME(ffi_closure_SYSV), .-CNAME(ffi_closure_SYSV)
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+	.section .note.GNU-stack,"",%progbits
-+#endif
-+

libffi-3.1-fix-exec-stack.patch

@@ -1,31 +0,0 @@
-From 978c9540154d320525488db1b7049277122f736d Mon Sep 17 00:00:00 2001
-From: Samuli Suominen <ssuominen@gentoo.org>
-Date: Sat, 31 May 2014 08:53:10 -0400
-Subject: [PATCH] Add missing GNU stack markings in win32.S
-
----
- src/x86/win32.S | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/x86/win32.S b/src/x86/win32.S
-index daf0e79..e42baf2 100644
---- a/src/x86/win32.S
-+++ b/src/x86/win32.S
-@@ -1,5 +1,6 @@
- /* -----------------------------------------------------------------------
--   win32.S - Copyright (c) 1996, 1998, 2001, 2002, 2009  Red Hat, Inc.
-+   win32.S - Copyright (c) 2014  Anthony Green
-+	     Copyright (c) 1996, 1998, 2001, 2002, 2009  Red Hat, Inc.
- 	     Copyright (c) 2001  John Beniton
- 	     Copyright (c) 2002  Ranjit Mathew
- 	     Copyright (c) 2009  Daniel Witte
-@@ -1304,3 +1305,6 @@ L_ffi_closure_SYSV_inner$stub:
- 
- #endif /* !_MSC_VER */
- 
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
--- 
-1.9.3
-

libffi-3.1-fix-include-path.patch

@@ -1,17 +0,0 @@
-diff -up libffi-3.1/libffi.pc.in.fixpath libffi-3.1/libffi.pc.in
---- libffi-3.1/libffi.pc.in.fixpath	2014-04-25 19:45:13.000000000 +0200
-+++ libffi-3.1/libffi.pc.in	2014-06-12 12:06:06.000000000 +0200
-@@ -1,11 +1,10 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--toolexeclibdir=@toolexeclibdir@
--includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includedir=@includedir@
- 
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces
- Version: @PACKAGE_VERSION@
--Libs: -L${toolexeclibdir} -lffi
-+Libs: -L${libdir} -lffi
- Cflags: -I${includedir}

libffi-3.1-libffi_tmpdir.patch

@@ -1,17 +0,0 @@
-Most temp file directories need to be hardened against execution, but
-libffi needs execute privileges.  Add a libffi-specific temp directory
-that can be set up by sysadmins as needed with suitable permissions.
-This both ensures that libffi will have a valid temp directory to use
-as well as preventing attempts to access other directories.
-
-diff -rup a/src/closures.c b/src/closures.c
---- a/src/closures.c	2014-05-11 09:54:19.000000000 -0400
-+++ b/src/closures.c	2020-04-29 20:50:00.454853909 -0400
-@@ -362,6 +362,7 @@ static struct
-   const char *arg;
-   int repeat;
- } open_temp_exec_file_opts[] = {
-+  { open_temp_exec_file_env, "LIBFFI_TMPDIR", 0 },
-   { open_temp_exec_file_env, "TMPDIR", 0 },
-   { open_temp_exec_file_dir, "/tmp", 0 },
-   { open_temp_exec_file_dir, "/var/tmp", 0 },

libffi-aarch64-rhbz1174037.patch

@@ -1,11 +0,0 @@
---- libffi-3.1/src/aarch64/ffi.c.orig	2014-04-25 18:45:13.000000000 +0100
-+++ libffi-3.1/src/aarch64/ffi.c	2015-01-15 02:36:56.314906455 +0000
-@@ -728,7 +728,7 @@
- 	      state.ngrn = N_X_ARG_REG;
- 
- 	      memcpy (allocate_to_stack (&state, stack, ty->alignment,
--					 ty->size), ecif->avalue + i, ty->size);
-+					 ty->size), ecif->avalue[i], ty->size);
- 	    }
- 	  break;
- 

libffi.spec

@@ -57,12 +57,7 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%if %{without compat}
 %setup -q
-%else
-# Setup libffi-3.4.2 and compat-libffi3.1 sources.
-%setup -q -b 3
-%endif
 
 %build
 # For now we disable the static templates to avoid ghc and

sources

@@ -1,2 +1 @@
 SHA512 (libffi-3.4.2.tar.gz) = 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1
-SHA512 (libffi-3.1.tar.gz) = 8994973d75facf5ad928c270e17b1a56e24d1543af75b93731a0048e747df27e4190a736b6dc2dca7d43de1d7e88891220304802c10fcccdcebee9c9ffd3d1b9