[packages/file] up to 5.40

[atler]

commit a7e5502b2915dce3e164c5e6639cc205708c89bb
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Apr 19 15:41:15 2021 +0200

    up to 5.40

 file.spec            |  8 +++-----
 name-use-count.patch |  3 ++-
 wasm.patch           | 23 -----------------------
 3 files changed, 5 insertions(+), 29 deletions(-)
---
diff --git a/file.spec b/file.spec
index bf04d69..b114b17 100644
--- a/file.spec
+++ b/file.spec
@@ -29,12 +29,12 @@ Summary(uk.UTF-8):	Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):	判定文件类型的工具。
 Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	5.39
-Release:	5
+Version:	5.40
+Release:	1
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	1c450306053622803a25647d88f80f25
+# Source0-md5:	72540ea1cc8c6e1dee35d6100ec66589
 Source1:	http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	6a45bcaefd19b94db36a1b2b7c5b806b
 Source2:	%{name}-zisofs.magic
@@ -45,7 +45,6 @@ Patch1:		searchpath.patch
 Patch2:		automake.patch
 Patch3:		%{name}-gettext-no-random-translations.patch
 Patch4:		name-use-count.patch
-Patch5:		wasm.patch
 URL:		http://www.darwinsys.com/file/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -278,7 +277,6 @@ Wiązania Pythona 3 do biblioteki libmagic.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %if "%{_ver_lt '%{cc_version}' '3.4'}" == "1"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
diff --git a/name-use-count.patch b/name-use-count.patch
index c6751e8..2e0c6b7 100644
--- a/name-use-count.patch
+++ b/name-use-count.patch
@@ -1,11 +1,12 @@
 --- file-5.39/src/file.h~	2020-06-15 03:01:01.000000000 +0300
 +++ file-5.39/src/file.h	2020-06-21 14:52:44.027423622 +0300
-@@ -459,7 +459,7 @@
+@@ -459,8 +459,8 @@
  #define	FILE_ELF_PHNUM_MAX		2048
  #define	FILE_ELF_SHNUM_MAX		32768
  #define	FILE_INDIR_MAX			50
 -#define	FILE_NAME_MAX			50
 +#define	FILE_NAME_MAX			256
  #define	FILE_REGEX_MAX			8192
+ #define	FILE_ENCODING_MAX		(64 * 1024)
  };
  
diff --git a/wasm.patch b/wasm.patch
deleted file mode 100644
index 508f933..0000000
--- a/wasm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 85b7ab83257b3191a1a7ca044589a092bcef2bb3 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos at zoulas.com>
-Date: Thu, 25 Jun 2020 16:52:48 +0000
-Subject: [PATCH] Include # (alternate format) to the list of uninteresting
- formats Reported by Werner Fink
-
----
- src/funcs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/funcs.c b/src/funcs.c
-index 299b8f022..ecbfa28c5 100644
---- a/src/funcs.c
-+++ b/src/funcs.c
-@@ -93,7 +93,7 @@ file_checkfmt(char *msg, size_t mlen, const char *fmt)
- 		if (*++p == '%')
- 			continue;
- 		// Skip uninteresting.
--		while (strchr("0.'+- ", *p) != NULL)
-+		while (strchr("#0.'+- ", *p) != NULL)
- 			p++;
- 		if (*p == '*') {
- 			if (msg)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/a7e5502b2915dce3e164c5e6639cc205708c89bb