diff --git a/file-5.34-identiflocale.patch b/file-5.34-identiflocale.patch deleted file mode 100644 index e761ba7..0000000 --- a/file-5.34-identiflocale.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 378925d9936b09ed3a85d6c9b96f49a4ef8f75bf Mon Sep 17 00:00:00 2001 -From: odubaj -Date: Thu, 11 Oct 2018 10:11:06 +0200 -Subject: [PATCH] fixed bug missidentifying glibc locale files - -Information about glibc locale files taken from C library -Link here: https://sourceware.org/git/?p=glibc.git;a=blob;f=locale/localeinfo.h;h=68822a63#l32 - ---- - magic/Magdir/glibc | 20 ++++++++++++++++++++ - magic/Makefile.am | 1 + - 2 files changed, 21 insertions(+) - create mode 100644 magic/Magdir/glibc - -diff --git a/magic/Magdir/glibc b/magic/Magdir/glibc -new file mode 100644 -index 0000000..76b607f ---- /dev/null -+++ b/magic/Magdir/glibc -@@ -0,0 +1,20 @@ -+ -+#------------------------------------------------------------------------------ -+# $File$ -+# glibc locale files -+# -+ -+0 belong 0x20070920 glibc locale file LC_CTYPE -+0 belong 0x14110320 glibc locale file LC_NUMERIC -+0 belong 0x17110320 glibc locale file LC_TIME -+0 belong 0x17100520 glibc locale file LC_COLLATE -+0 belong 0x11110320 glibc locale file LC_MONETARY -+0 belong 0x10110320 glibc locale file LC_MESSAGES -+0 belong 0x13110320 glibc locale file LC_ALL -+0 belong 0x12110320 glibc locale file LC_PAPER -+0 belong 0x1d110320 glibc locale file LC_NAME -+0 belong 0x1c110320 glibc locale file LC_ADDRESS -+0 belong 0x1f110320 glibc locale file LC_TELEPHONE -+0 belong 0x1e110320 glibc locale file LC_MEASUREMENT -+0 belong 0x19110320 glibc locale file LC_IDENTIFICATION -+ -diff --git a/magic/Makefile.am b/magic/Makefile.am -index 69c9dec..d6657a6 100644 ---- a/magic/Makefile.am -+++ b/magic/Makefile.am -@@ -105,6 +105,7 @@ $(MAGIC_FRAGMENT_DIR)/gcc \ - $(MAGIC_FRAGMENT_DIR)/gconv \ - $(MAGIC_FRAGMENT_DIR)/geo \ - $(MAGIC_FRAGMENT_DIR)/geos \ -+$(MAGIC_FRAGMENT_DIR)/glibc \ - $(MAGIC_FRAGMENT_DIR)/gimp \ - $(MAGIC_FRAGMENT_DIR)/gnome \ - $(MAGIC_FRAGMENT_DIR)/gnu \ --- -2.17.1 - diff --git a/file-5.34-readelf.patch b/file-5.34-readelf.patch deleted file mode 100644 index 9135dc3..0000000 --- a/file-5.34-readelf.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9ec8a9d418059f6a2db0a8b5dd9c3242b4ab8b0a Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Thu, 26 Jul 2018 17:39:05 +0200 -Subject: [PATCH] magic: fix printing of details about ELF binaries - -This commit fixes a regression introduced by the following commit: -https://github.com/file/file/commit/e2adab14 - -Without this patch: -/usr/bin/curl: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV) -/usr/bin/true: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 3.2.0, BuildID[sha1]=57291d41021b27733e8eb00ee1e561a98c11e2d2, stripped - -With this patch: -/usr/bin/curl: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 3.2.0, BuildID[sha1]=fd7ce380cd8dff1f52c1a4c1f3d8635cb20dda23, stripped, too many notes (256) -/usr/bin/true: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 3.2.0, BuildID[sha1]=57291d41021b27733e8eb00ee1e561a98c11e2d2, stripped ---- - src/funcs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/funcs.c b/src/funcs.c -index 0bf92fe1..4ddf5afe 100644 ---- a/src/funcs.c -+++ b/src/funcs.c -@@ -268,7 +268,7 @@ file_buffer(struct magic_set *ms, int fd, const char *inname __attribute__ ((__u - - rv = file_tryelf(ms, &b); - rbuf = file_pop_buffer(ms, pb); -- if (rv != 1) { -+ if (rv == -1) { - free(rbuf); - rbuf = NULL; - } --- -2.14.4 - diff --git a/file-5.34.tar.gz.asc b/file-5.34.tar.gz.asc deleted file mode 100644 index a20e766..0000000 --- a/file-5.34.tar.gz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iEYEABECAAYFAltYEXYACgkQcREqsWyzOzpnxwCfXZkGLqYAncdftwkXdBzWNGeM -bEkAoLHe7Q7/a0vgs1QI4ChwOnJbMkJA -=F+1u ------END PGP SIGNATURE----- diff --git a/file-5.35.tar.gz.asc b/file-5.35.tar.gz.asc new file mode 100644 index 0000000..6352579 --- /dev/null +++ b/file-5.35.tar.gz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iEYEABECAAYFAlvJGcMACgkQcREqsWyzOzpYYQCgsAWYc53UEoPl3kkJpFPn7wzX +IAQAnjfEPZBlmALT0+8OOy1jvP1Xgswb +=wYfS +-----END PGP SIGNATURE----- diff --git a/file.spec b/file.spec index d526cd8..a4a01c1 100644 --- a/file.spec +++ b/file.spec @@ -14,8 +14,8 @@ Summary: A utility for determining file types Name: file -Version: 5.34 -Release: 6%{?dist} +Version: 5.35 +Release: 1%{?dist} License: BSD Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -26,15 +26,9 @@ Patch0: file-localmagic.patch Patch1: file-4.17-rpm-name.patch Patch2: file-5.04-volume_key.patch -# fix printing of details about ELF binaries -Patch3: file-5.34-readelf.patch - # add magic for eBPF objects (#1648667) Patch4: file-5.34-ebpf-magic.patch -# fix misidentifying locale files -Patch5: file-5.34-identiflocale.patch - URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -211,6 +205,9 @@ cd %{py3dir} %endif %changelog +* Tue Dec 04 2018 Kamil Dudka - 5.35-1 +- update to new version 5.35 + * Wed Nov 21 2018 Ondrej Dubaj - 5.34-6 - Fixed missidentifying locale files bug (#1527398) diff --git a/sources b/sources index 14777a4..73093fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (file-5.34.tar.gz) = 57849f8496fd356a66e5559804fdd907059dc2e2f75ede470a25c65b1c499481aad3d7978454b15a15e94c07c9d6795864e8705304a2281dacf1c4e31501bed8 +SHA512 (file-5.35.tar.gz) = cbecc52e9209be8bc090752d0672efa181625d4e1e688e63edd1f5657b29bad69364a477fb4ed85d1fa413b8002c8578c86153d2acaaecce78446c0ca6ea9e38