diff --git a/backport-fix-tramp-ensure-file-descriptor-is-closed-on-exec.patch b/backport-fix-tramp-ensure-file-descriptor-is-closed-on-exec.patch deleted file mode 100644 index 4168ad5ebc3f7bf3b0ed6bc4e689cf8d5bfc1717..0000000000000000000000000000000000000000 --- a/backport-fix-tramp-ensure-file-descriptor-is-closed-on-exec.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 60671187688ae3b295ab0e1dd77a8d6dd7a805a2 Mon Sep 17 00:00:00 2001 -From: Anthony Green -Date: Fri, 11 Jul 2025 03:17:18 -0400 -Subject: [PATCH] fix(tramp): ensure file descriptor is closed on exec. Thanks - to Florian Weimer. - -c# Please enter the commit message for your changes. Lines starting ---- - src/tramp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tramp.c b/src/tramp.c -index 8ec084868..31180efb6 100644 ---- a/src/tramp.c -+++ b/src/tramp.c -@@ -236,7 +236,7 @@ ffi_tramp_get_libffi (void) - if (!found) - return 0; - -- tramp_globals.fd = open (file, O_RDONLY); -+ tramp_globals.fd = open (file, O_RDONLY | O_CLOEXEC); - if (tramp_globals.fd == -1) - return 0; diff --git a/libffi-3.5.1.tar.gz b/libffi-3.5.1.tar.gz deleted file mode 100644 index 2bdbdc2a59bb4c9545639ebf3bcd158b96f11403..0000000000000000000000000000000000000000 Binary files a/libffi-3.5.1.tar.gz and /dev/null differ diff --git a/libffi-3.5.2.tar.gz b/libffi-3.5.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4114e777ca7a782e759077dc6a76df62e09b1c89 Binary files /dev/null and b/libffi-3.5.2.tar.gz differ diff --git a/libffi-Add-sw64-architecture.patch b/libffi-Add-sw64-architecture.patch index 0d64a998c6489041ad66d405621b2c1bc3db9f2c..b775379feb467ce74d79cb4d951e04bc7a55fb8d 100644 --- a/libffi-Add-sw64-architecture.patch +++ b/libffi-Add-sw64-architecture.patch @@ -15,21 +15,21 @@ diff --git a/Makefile.am b/Makefile.am index 1f8aa9c..4abcb35 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -62,6 +62,7 @@ noinst_HEADERS = src/aarch64/ffitarget.h src/aarch64/internal.h \ +@@ -67,6 +67,7 @@ noinst_HEADERS = src/aarch64/ffitarget.h src/aarch64/internal.h \ src/s390/ffitarget.h src/s390/internal.h src/sh/ffitarget.h \ src/sh64/ffitarget.h src/sparc/ffitarget.h \ src/sparc/internal.h src/tile/ffitarget.h src/vax/ffitarget.h \ + src/sw64/ffitarget.h src/sw64/internal.h \ - src/wasm32/ffitarget.h \ + src/wasm/ffitarget.h \ src/x86/ffitarget.h src/x86/internal.h src/x86/internal64.h \ src/x86/asmnames.h src/xtensa/ffitarget.h src/dlmalloc.c \ -@@ -92,6 +93,7 @@ EXTRA_libffi_la_SOURCES = src/aarch64/ffi.c src/aarch64/sysv.S \ +@@ -97,6 +98,7 @@ EXTRA_libffi_la_SOURCES = src/aarch64/ffi.c src/aarch64/sysv.S \ src/s390/sysv.S src/sh/ffi.c src/sh/sysv.S src/sh64/ffi.c \ src/sh64/sysv.S src/sparc/ffi.c src/sparc/ffi64.c \ src/sparc/v8.S src/sparc/v9.S src/tile/ffi.c src/tile/tile.S \ + src/sw64/ffi.c src/sw64/sysv.S \ src/vax/ffi.c src/vax/elfbsd.S src/x86/ffi.c src/x86/sysv.S \ - src/wasm32/ffi.c \ + src/wasm/ffi.c \ src/x86/ffiw64.c src/x86/win64.S src/x86/ffi64.c \ diff --git a/config.guess b/config.guess index f6d217a..2e53d17 100644 @@ -60,7 +60,7 @@ index 2c5120f..4b28003 100644 | thumbv7* \ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ diff --git a/configure.host b/configure.host -index c69a49c..eb4a869 100644 +index 4e10c3e..4fffaea 100644 --- a/configure.host +++ b/configure.host @@ -250,6 +250,13 @@ case "${host}" in diff --git a/libffi.spec b/libffi.spec index 645cf1a4c9a2f67ebb99949f76e0fb571e3557cb..3f98459d3cae52bd6238bdc0cc2147d5fb63b1fe 100644 --- a/libffi.spec +++ b/libffi.spec @@ -1,6 +1,6 @@ Name: libffi -Version: 3.5.1 -Release: 2 +Version: 3.5.2 +Release: 1 Summary: A Portable Foreign Function Interface Library License: MIT URL: https://sourceware.org/libffi @@ -10,7 +10,6 @@ Source2: ffitarget-multilib.h Patch1: fix-AARCH64EB-support.patch Patch2: libffi-Add-sw64-architecture.patch -Patch3: backport-fix-tramp-ensure-file-descriptor-is-closed-on-exec.patch BuildRequires: gcc gcc-c++ dejagnu BuildRequires: make @@ -81,6 +80,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir %{_infodir}/libffi.info* %changelog +* Sun Aug 17 2025 Funda Wang - 3.5.2-1 +- update to 3.5.2 + * Fri Jul 18 2025 liuzhilin - 3.5.1-2 - backport fix(tramp): ensure file descriptor is closed on exec