[packages/file] up to 5.45
atler
atler at pld-linux.org
Fri Jul 28 14:41:09 CEST 2023
commit 02b7513d7cfba94ab3d3f5ff9d8b71c073dbb6c7
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Jul 28 13:51:10 2023 +0200
up to 5.45
file.spec | 8 ++---
name-use-count.patch | 2 +-
perl-package-version.patch | 76 ----------------------------------------------
3 files changed, 4 insertions(+), 82 deletions(-)
---
diff --git a/file.spec b/file.spec
index d06f62a..978c639 100644
--- a/file.spec
+++ b/file.spec
@@ -34,12 +34,12 @@ Summary(uk.UTF-8): Утиліта для визначення типів фай
Summary(zh_CN.UTF-8): 判定文件类型的工具。
Summary(zh_TW.UTF-8): 用於決定檔案類型的一個工具程式。
Name: file
-Version: 5.44
-Release: 3
+Version: 5.45
+Release: 1
License: distributable
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: a60d586d49d015d842b9294864a89c7a
+# Source0-md5: 26b2a96d4e3a8938827a1e572afd527a
Source1: http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 6a45bcaefd19b94db36a1b2b7c5b806b
Source2: %{name}-zisofs.magic
@@ -49,7 +49,6 @@ Patch0: searchpath.patch
Patch1: automake.patch
Patch2: %{name}-gettext-no-random-translations.patch
Patch3: name-use-count.patch
-Patch4: perl-package-version.patch
URL: http://www.darwinsys.com/file/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -291,7 +290,6 @@ Wiązania Pythona 3 do biblioteki libmagic.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -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 3389627..13344fe 100644
--- a/name-use-count.patch
+++ b/name-use-count.patch
@@ -1,8 +1,8 @@
--- 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 @@
- #define FILE_ELF_PHNUM_MAX 2048
#define FILE_ELF_SHNUM_MAX 32768
+ #define FILE_ELF_SHSIZE_MAX (128 * 1024 * 1024)
#define FILE_INDIR_MAX 50
-#define FILE_NAME_MAX 50
+#define FILE_NAME_MAX 256
diff --git a/perl-package-version.patch b/perl-package-version.patch
deleted file mode 100644
index f8f39bf..0000000
--- a/perl-package-version.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From c5a6327f5c95eae5537f0de8b1b6e62b03146cb1 Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus at fastmail.com>
-Date: Wed, 5 Jul 2023 12:09:50 +0200
-Subject: [PATCH 1/2] perl: use [:space:] class instead of fixed spaces
-
----
- magic/Magdir/perl | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/magic/Magdir/perl b/magic/Magdir/perl
-index c391d4a7..db1d633e 100644
---- a/magic/Magdir/perl
-+++ b/magic/Magdir/perl
-@@ -34,12 +34,12 @@
- # by Dmitry V. Levin and Alexey Tourbin
- # check the first line
- 0 search/8192 package
-->0 regex \^package[\ \t]+[0-9A-Za-z_:]+\ *; Perl5 module source text
-+>0 regex \^package[[:space:]]+[0-9A-Za-z_:]+[[:space:]]*; Perl5 module source text
- !:strength + 40
- # not 'p', check other lines
- 0 search/8192 !p
-->0 regex \^package[\ \t]+[0-9A-Za-z_:]+\ *;
-->>0 regex \^1\ *;|\^(use|sub|my)\ .*[(;{=] Perl5 module source text
-+>0 regex \^package[[:space:]]+[0-9A-Za-z_:]+[[:space:]]*;
-+>>0 regex \^1[[:space:]]*;|\^(use|sub|my)[[:space:]].*[(;{=] Perl5 module source text
- !:strength + 75
-
- # Perl POD documents
---
-2.41.0
-
-From b99012a91068e255c2e3fa7c42eafc27dedccdc4 Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus at fastmail.com>
-Date: Wed, 5 Jul 2023 12:12:06 +0200
-Subject: [PATCH 2/2] perl: detect files with version after package name
-
-as per https://perldoc.perl.org/functions/package perl allows to give
-version after package name so in addition to:
-
-package <package-name>;
-
-add support for detecting:
-
-package <package-name> <version>;
-
-where <version> is version string consisting of numbers and dotts,
-optionally prefixed with 'v'. Examples:
-
-1.2.3
-v1.0
----
- magic/Magdir/perl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/magic/Magdir/perl b/magic/Magdir/perl
-index db1d633e..d4e8080e 100644
---- a/magic/Magdir/perl
-+++ b/magic/Magdir/perl
-@@ -34,11 +34,11 @@
- # by Dmitry V. Levin and Alexey Tourbin
- # check the first line
- 0 search/8192 package
-->0 regex \^package[[:space:]]+[0-9A-Za-z_:]+[[:space:]]*; Perl5 module source text
-+>0 regex \^package[[:space:]]+[0-9A-Za-z_:]+[[:space:]]*([[:space:]]v?[0-9][0-9.]*)?[[:space:]]*; Perl5 module source text
- !:strength + 40
- # not 'p', check other lines
- 0 search/8192 !p
-->0 regex \^package[[:space:]]+[0-9A-Za-z_:]+[[:space:]]*;
-+>0 regex \^package[[:space:]]+[0-9A-Za-z_:]+[[:space:]]*([[:space:]]v?[0-9][0-9.]*)?[[:space:]]*;
- >>0 regex \^1[[:space:]]*;|\^(use|sub|my)[[:space:]].*[(;{=] Perl5 module source text
- !:strength + 75
-
---
-2.41.0
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/02b7513d7cfba94ab3d3f5ff9d8b71c073dbb6c7
More information about the pld-cvs-commit
mailing list