commit c46308ecc19e1d1c05df4dece2c9d6883227ff67
Author: Jan Palus <[email protected]>
Date: Thu Nov 28 17:13:10 2024 +0100
up to 5.46
disable lrzip explicitly -- lrzip upstream dropped library completely in
0.650. maybe consider enabling with lrzip-next.
file.spec | 13 +++++--------
m3u-mime-type.patch | 12 ------------
name-use-count.patch | 4 ++--
searchpath.patch | 2 +-
time_t-32bit.patch | 36 ------------------------------------
5 files changed, 8 insertions(+), 59 deletions(-)
---
diff --git a/file.spec b/file.spec
index 4af0c28..e4f5a4e 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.45
-Release: 4
+Version: 5.46
+Release: 1
License: distributable
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: 26b2a96d4e3a8938827a1e572afd527a
+# Source0-md5: 459da2d4b534801e2e2861611d823864
Source1:
http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 6a45bcaefd19b94db36a1b2b7c5b806b
Source2: %{name}-zisofs.magic
@@ -49,8 +49,6 @@ Patch0: searchpath.patch
Patch1: automake.patch
Patch2: %{name}-gettext-no-random-translations.patch
Patch3: name-use-count.patch
-Patch4: time_t-32bit.patch
-Patch5: m3u-mime-type.patch
URL: http://www.darwinsys.com/file/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -292,8 +290,6 @@ Wiązania Pythona 3 do biblioteki libmagic.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%if "%{_ver_lt '%{cc_version}' '3.4'}" == "1"
%{__sed} -i -e 's,-Wextra,,' configure.ac
@@ -318,7 +314,8 @@ cp -a python py3
%{!?with_seccomp:--disable-libseccomp} \
--disable-silent-rules \
--enable-fsect-man5 \
- %{?with_static_libs:--enable-static}
+ %{?with_static_libs:--enable-static} \
+ --disable-lrziplib
%{__make}
diff --git a/m3u-mime-type.patch b/m3u-mime-type.patch
deleted file mode 100644
index 4fead64..0000000
--- a/m3u-mime-type.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/magic/Magdir/audio b/magic/Magdir/audio
-index b99a15c4..7d32fe45 100644
---- a/magic/Magdir/audio
-+++ b/magic/Magdir/audio
-@@ -644,6 +644,7 @@
- 0 string [Equalizer\ preset] XMMS equalizer preset
- # .m3u
- 0 search/1 #EXTM3U M3U playlist text
-+!:mime audio/x-mpegurl
- # .pls
- 0 search/1 [playlist] PLS playlist text
- # licq.conf
diff --git a/name-use-count.patch b/name-use-count.patch
index 13344fe..640fd67 100644
--- a/name-use-count.patch
+++ b/name-use-count.patch
@@ -4,8 +4,8 @@
#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 100
+#define FILE_NAME_MAX 256
#define FILE_REGEX_MAX 8192
#define FILE_ENCODING_MAX (64 * 1024)
- #if defined(HAVE_NEWLOCALE) && defined(HAVE_USELOCALE) &&
defined(HAVE_FREELOCALE)
+ #define FILE_MAGWARN_MAX 64
diff --git a/searchpath.patch b/searchpath.patch
index d816223..1003c69 100644
--- a/searchpath.patch
+++ b/searchpath.patch
@@ -31,6 +31,6 @@ still use ~/.magic by default
if (map == NULL) {
- if (ms->flags & MAGIC_CHECK)
+ if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0)
- file_magwarn(NULL, "using regular magic file `%s'", fn);
+ file_magwarn(ms, "using regular magic file `%s'", fn);
map = apprentice_load(ms, fn, action);
if (map == NULL)
diff --git a/time_t-32bit.patch b/time_t-32bit.patch
deleted file mode 100644
index bb5ebc0..0000000
--- a/time_t-32bit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <[email protected]>
-Date: Fri, 28 Jul 2023 14:38:25 +0000
-Subject: [PATCH] deal with 32 bit time_t
-
----
- src/file.h | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/file.h b/src/file.h
-index 2e0494d2f..78f574ea1 100644
---- a/src/file.h
-+++ b/src/file.h
-@@ -27,7 +27,7 @@
- */
- /*
- * file.h - definitions for file(1) program
-- * @(#)$File: file.h,v 1.247 2023/07/27 19:40:22 christos Exp $
-+ * @(#)$File: file.h,v 1.248 2023/07/28 14:38:25 christos Exp $
- */
-
- #ifndef __file_h__
-@@ -159,9 +159,11 @@
- /*
- * Dec 31, 23:59:59 9999
- * we need to make sure that we don't exceed 9999 because some libc
-- * implementations like muslc crash otherwise
-+ * implementations like muslc crash otherwise. If you are unlucky
-+ * to be running on a system with a 32 bit time_t, then it is even less.
- */
--#define MAX_CTIME CAST(time_t, 0x3afff487cfULL)
-+#define MAX_CTIME \
-+ CAST(time_t, sizeof(time_t) > 4 ? 0x3afff487cfULL : 0x7fffffffULL)
-
- #define FILE_BADSIZE CAST(size_t, ~0ul)
- #define MAXDESC 64 /* max len of text description/MIME
type */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/c46308ecc19e1d1c05df4dece2c9d6883227ff67
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
