Revert "file: 5.45 -> 5.46", to fix Zip files regressions
This reverts commit 75d2d3c2926a4184f1124f53f42e7794b5c5777a, after multiple complains best summarized here: https://github.com/NixOS/nixpkgs/pull/402318#issuecomment-2881163359
This commit is contained in:
parent
73f89b34da
commit
7377f9e6ad
38
pkgs/tools/misc/file/32-bit-time_t.patch
Normal file
38
pkgs/tools/misc/file/32-bit-time_t.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
https://github.com/file/file/commit/218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1.patch
|
||||||
|
|
||||||
|
From 218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christos Zoulas <christos@zoulas.com>
|
||||||
|
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 */
|
||||||
@ -16,14 +16,14 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "file";
|
pname = "file";
|
||||||
version = "5.46";
|
version = "5.45";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
urls = [
|
urls = [
|
||||||
"https://astron.com/pub/file/file-${finalAttrs.version}.tar.gz"
|
"https://astron.com/pub/file/file-${finalAttrs.version}.tar.gz"
|
||||||
"https://distfiles.macports.org/file/file-${finalAttrs.version}.tar.gz"
|
"https://distfiles.macports.org/file/file-${finalAttrs.version}.tar.gz"
|
||||||
];
|
];
|
||||||
hash = "sha256-ycx3x8VgxUMTXtxVWvYJ1WGdvvARmX6YjOQKPXXYYIg=";
|
hash = "sha256-/Jf1ECm7DiyfTjv/79r2ePDgOe6HK53lwAKm0Jx4TYI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
@ -32,6 +32,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
"man"
|
"man"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Upstream patch to fix 32-bit tests.
|
||||||
|
#
|
||||||
|
# It is included in 5.46+, but we are not updating to it or a later version until:
|
||||||
|
#
|
||||||
|
# https://bugs.astron.com/view.php?id=622
|
||||||
|
#
|
||||||
|
# is resolved. See also description of the bug here:
|
||||||
|
#
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/402318#issuecomment-2881163359
|
||||||
|
./32-bit-time_t.patch
|
||||||
|
];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user