From f82eba78bf7abe695238a1941b8ab3e456291964 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 27 2023 12:12:03 +0000 Subject: import file-5.33-24.el8 --- diff --git a/SOURCES/file-5.33-static-PIE-binaries-5.patch b/SOURCES/file-5.33-static-PIE-binaries-5.patch new file mode 100644 index 0000000..6597ac1 --- /dev/null +++ b/SOURCES/file-5.33-static-PIE-binaries-5.patch @@ -0,0 +1,13 @@ +diff --git a/src/readelf.c b/src/readelf.c +index d836e68..6d4b40b 100644 +--- a/src/readelf.c ++++ b/src/readelf.c +@@ -69,7 +69,7 @@ toomany(struct magic_set *ms, const char *name, uint16_t num) + { + if (file_printf(ms, ", too many %s (%u)", name, num) == -1) + return -1; +- return 0; ++ return 1; + } + + private uint16_t diff --git a/SPECS/file.spec b/SPECS/file.spec index 9b74df1..001d59a 100644 --- a/SPECS/file.spec +++ b/SPECS/file.spec @@ -15,7 +15,7 @@ Summary: A utility for determining file types Name: file Version: 5.33 -Release: 23%{?dist} +Release: 24%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -101,6 +101,8 @@ Patch27: file-5.33-static-PIE-binaries-2.patch Patch28: file-5.33-static-PIE-binaries-3.patch # upstream commit: 363d7fcf703ad3ebf37b45693b2c9e43eb8b4176 (#2071581) Patch29: file-5.33-static-PIE-binaries-4.patch +# upstream commit: 9c3137904e59d68debb97fceaced46a691ba241a (#2071581) +Patch30: file-5.33-static-PIE-binaries-5.patch URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} @@ -273,6 +275,9 @@ cd %{py3dir} %endif %changelog +* Wed Feb 22 2023 Vincent Mihalkovic - 5.33-24 +- fix detection of static-pie binaries (#2071581) + * Wed Feb 01 2023 Vincent Mihalkovic - 5.33-23 - fix detection of static-pie binaries (#2071581)