diff --git a/.gitignore b/.gitignore index 42928e5..6b5d61b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /libffi-3.0.11-rc2.tar.gz /libffi-3.0.13.tar.gz /libffi-3.1.tar.gz +/libffi-3.4.2.tar.gz diff --git a/libffi-3.1-aarch64-fix-exec-stack.patch b/libffi-3.1-aarch64-fix-exec-stack.patch deleted file mode 100644 index e20c920..0000000 --- a/libffi-3.1-aarch64-fix-exec-stack.patch +++ /dev/null @@ -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 -+ diff --git a/libffi-3.1-fix-exec-stack.patch b/libffi-3.1-fix-exec-stack.patch deleted file mode 100644 index 4c2a59f..0000000 --- a/libffi-3.1-fix-exec-stack.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 978c9540154d320525488db1b7049277122f736d Mon Sep 17 00:00:00 2001 -From: Samuli Suominen -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 - diff --git a/libffi-aarch64-rhbz1174037.patch b/libffi-aarch64-rhbz1174037.patch deleted file mode 100644 index dbf6308..0000000 --- a/libffi-aarch64-rhbz1174037.patch +++ /dev/null @@ -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; - diff --git a/mingw-libffi.spec b/mingw-libffi.spec index ee6cd2a..941a175 100644 --- a/mingw-libffi.spec +++ b/mingw-libffi.spec @@ -1,21 +1,18 @@ -%?mingw_package_header +%{?mingw_package_header} Name: mingw-libffi -Version: 3.1 -Release: 13%{?dist} +Version: 3.4.2 +Release: 1%{?dist} Summary: A portable foreign function interface library for MinGW License: BSD URL: http://sourceware.org/libffi -Source0: ftp://sourceware.org/pub/libffi/libffi-%{version}.tar.gz - -Patch0: libffi-3.1-fix-exec-stack.patch -Patch1: libffi-aarch64-rhbz1174037.patch -Patch2: libffi-3.1-aarch64-fix-exec-stack.patch +Source0: https://github.com/libffi/libffi/releases/download/v%{version}/libffi-%{version}.tar.gz BuildArch: noarch -BuildRequires: make +BuildRequires: make + BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-binutils BuildRequires: mingw32-gcc @@ -59,7 +56,7 @@ Summary: A portable foreign function interface static library for MinGW Foreign function interface static library for MinGW. -%?mingw_debug_package +%{?mingw_debug_package} %prep @@ -67,45 +64,49 @@ Foreign function interface static library for MinGW. %build %mingw_configure --enable-shared -%mingw_make %{?_smp_mflags} +%mingw_make %install -%mingw_make_install DESTDIR=$RPM_BUILD_ROOT +%mingw_make_install -rm -rf $RPM_BUILD_ROOT%{mingw32_infodir} -rm -rf $RPM_BUILD_ROOT%{mingw64_infodir} -rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} -rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} +rm -rf %{buildroot}%{mingw32_infodir} +rm -rf %{buildroot}%{mingw64_infodir} +rm -rf %{buildroot}%{mingw32_mandir} +rm -rf %{buildroot}%{mingw64_mandir} # Drop all .la files -find $RPM_BUILD_ROOT -name "*.la" -delete +find %{buildroot} -name "*.la" -delete %files -n mingw32-libffi %license LICENSE -%doc README -%{mingw32_bindir}/libffi-6.dll +%{mingw32_bindir}/libffi-8.dll +%{mingw32_includedir}/ffi.h +%{mingw32_includedir}/ffitarget.h %{mingw32_libdir}/libffi.dll.a -%{mingw32_libdir}/pkgconfig/*.pc -%{mingw32_libdir}/libffi-%{version} +%{mingw32_libdir}/pkgconfig/libffi.pc %files -n mingw32-libffi-static %{mingw32_libdir}/libffi.a %files -n mingw64-libffi %license LICENSE -%doc README -%{mingw64_bindir}/libffi-6.dll +%{mingw64_bindir}/libffi-8.dll +%{mingw64_includedir}/ffi.h +%{mingw64_includedir}/ffitarget.h %{mingw64_libdir}/libffi.dll.a -%{mingw64_libdir}/pkgconfig/*.pc -%{mingw64_libdir}/libffi-%{version} +%{mingw64_libdir}/pkgconfig/libffi.pc %files -n mingw64-libffi-static %{mingw64_libdir}/libffi.a %changelog +* Fri Oct 01 2021 Richard W.M. Jones - 3.4.2-1.el9 +- Manually synch package with Fedora Rawhide + resolves: rhbz#1996712 + * Mon Aug 09 2021 Mohan Boddu - 3.1-13 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/sources b/sources index cb624ab..07baa76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libffi-3.1.tar.gz) = 8994973d75facf5ad928c270e17b1a56e24d1543af75b93731a0048e747df27e4190a736b6dc2dca7d43de1d7e88891220304802c10fcccdcebee9c9ffd3d1b9 +SHA512 (libffi-3.4.2.tar.gz) = 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1