diff --git a/file/PKGBUILD b/file/PKGBUILD index c58752201f..28d5042774 100644 --- a/file/PKGBUILD +++ b/file/PKGBUILD @@ -5,7 +5,7 @@ pkgname=file pkgver=5.45 -pkgrel=1 +pkgrel=1.2 pkgdesc='File type identification utility' arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) license=('custom') @@ -13,10 +13,18 @@ url='https://www.darwinsys.com/file/' depends=('glibc' 'zlib' 'xz' 'bzip2' 'libseccomp' 'libseccomp.so' 'zstd' 'libzstd.so') provides=('libmagic.so') options=('!emptydirs') -source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc}) +source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc} + file-5.45-32-bit-time_t-deux.patch + file-5.45-32-bit-time_t.patch + file-5.45-seccomp-sandbox.patch + file-5.45-weak-magic-shell.patch) validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas sha256sums=('fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82' - 'SKIP') + 'SKIP' + 'c6fd7ce3d90dad6378169b4f6ee09db637148b2f92651aaca59953d5140a104f' + 'bacf14d3aa5c2cd160ab1fcf9e2d25ca2bb6d0643a793176e93031bbbc646335' + 'a6b67702ab2e0ed9d518849abfc8b73b6f5835b3f9fb5be6e52bf049f6c6780d' + '1447ff7f9cdd5005c63f78266f3fa9be9b02279c01ae05a2cffe994efd00c6ac') prepare() { cd $pkgname-$pkgver @@ -29,6 +37,8 @@ prepare() { echo "Applying patch $src..." patch -Np1 < "../$src" done + + autoreconf -fiv } build() { @@ -37,12 +47,16 @@ build() { # Fix linking libmagic (vfork needs libpthread) CFLAGS+=" -pthread" + case "${CARCH}" in + powerpc) _configure_flags=(--disable-libseccomp) ;; + *) _configure_flags=(--enable-libseccomp) ;; + esac + ./configure \ --prefix=/usr \ --datadir=/usr/share/file \ - --enable-fsect-man5 \ - --enable-libseccomp - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + --enable-fsect-man5 ${_configure_flags[@]} + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } diff --git a/file/file-5.45-32-bit-time_t-deux.patch b/file/file-5.45-32-bit-time_t-deux.patch new file mode 100644 index 0000000000..8c1e093414 --- /dev/null +++ b/file/file-5.45-32-bit-time_t-deux.patch @@ -0,0 +1,29 @@ +https://github.com/file/file/commit/8dc5513908381a14981b16a85d59ba054bf4df52 + +From 8dc5513908381a14981b16a85d59ba054bf4df52 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Mon, 31 Jul 2023 15:56:12 +0000 +Subject: [PATCH] Check if we support _TIME_BITS. (Werner Fink) + +--- a/configure.ac ++++ b/configure.ac +@@ -152,6 +152,18 @@ AC_TYPE_UINT64_T + AC_TYPE_INT64_T + AC_TYPE_INTPTR_T + AC_TYPE_UINTPTR_T ++m4_ifdef([AC_SYS_YEAR2038], [AC_SYS_YEAR2038], [ ++# GNU libc only allows setting _TIME_BITS when FILE_OFFSET_BITS is also set. ++# GNU libc defines __TIMESIZE on systems where _TIME_BITS can be set. ++AS_IF([test X"$ac_cv_sys_file_offset_bits" = X"64"], [ ++ AC_CHECK_DECL(__TIMESIZE, [ ++ AC_DEFINE([_TIME_BITS], [64], [Number of bits in a timestamp, on hosts where this is settable.]) ++ ], [], [ ++AC_INCLUDES_DEFAULT ++#include ++ ]) ++ ]) ++]) + AC_FUNC_MMAP + AC_FUNC_FORK + AC_FUNC_MBRTOWC + diff --git a/file/file-5.45-32-bit-time_t.patch b/file/file-5.45-32-bit-time_t.patch new file mode 100644 index 0000000000..c86a46207e --- /dev/null +++ b/file/file-5.45-32-bit-time_t.patch @@ -0,0 +1,34 @@ +https://mailman.astron.com/pipermail/file/2023-July/001206.html +https://github.com/file/file/commit/218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1 + +From 218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Fri, 28 Jul 2023 14:38:25 +0000 +Subject: [PATCH] deal with 32 bit time_t + +--- 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 */ + diff --git a/file/file-5.45-seccomp-sandbox.patch b/file/file-5.45-seccomp-sandbox.patch new file mode 100644 index 0000000000..d5f499d395 --- /dev/null +++ b/file/file-5.45-seccomp-sandbox.patch @@ -0,0 +1,56 @@ +From b05f904dc5df267f90c6489817a379cb7f7f62ee Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 19 Oct 2023 13:58:20 -0400 +Subject: [PATCH] seccomp: allow syscalls used by Gentoo's LD_PRELOAD sandbox + +Bug: https://bugs.gentoo.org/728978 +Bug: https://bugs.gentoo.org/889046 +Bug: https://bugs.gentoo.org/915890 +--- + src/seccomp.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/seccomp.c b/src/seccomp.c +index 87d4c49e..f1804660 100644 +--- a/src/seccomp.c ++++ b/src/seccomp.c +@@ -174,6 +174,9 @@ enable_sandbox_full(void) + ALLOW_RULE(exit_group); + #ifdef __NR_faccessat + ALLOW_RULE(faccessat); ++#endif ++#ifdef __NR_faccessat2 ++ ALLOW_RULE(faccessat2); + #endif + ALLOW_RULE(fcntl); + ALLOW_RULE(fcntl64); +@@ -185,9 +188,26 @@ enable_sandbox_full(void) + ALLOW_RULE(fstatat64); + #endif + ALLOW_RULE(futex); ++ ALLOW_RULE(getcwd); + ALLOW_RULE(getdents); + #ifdef __NR_getdents64 + ALLOW_RULE(getdents64); ++#endif ++ ALLOW_RULE(getegid); ++#ifdef __NR_getegid32 ++ ALLOW_RULE(getegid32); ++#endif ++ ALLOW_RULE(geteuid); ++#ifdef __NR_geteuid32 ++ ALLOW_RULE(geteuid32); ++#endif ++ ALLOW_RULE(getgid); ++#ifdef __NR_getgid32 ++ ALLOW_RULE(getgid32); ++#endif ++ ALLOW_RULE(getuid); ++#ifdef __NR_getuid32 ++ ALLOW_RULE(getuid32); + #endif + #ifdef FIONREAD + // called in src/compress.c under sread +-- +2.42.0 + diff --git a/file/file-5.45-weak-magic-shell.patch b/file/file-5.45-weak-magic-shell.patch new file mode 100644 index 0000000000..cdcab736b6 --- /dev/null +++ b/file/file-5.45-weak-magic-shell.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/908401 +https://bugs.astron.com/view.php?id=457 +https://github.com/file/file/commit/1fc9175166fc5c5117838a1dcfb309b7c595eb56 + +From 1fc9175166fc5c5117838a1dcfb309b7c595eb56 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Sun, 30 Jul 2023 16:31:47 +0000 +Subject: [PATCH] Comment out weak magic + +--- a/magic/Magdir/printer ++++ b/magic/Magdir/printer +@@ -1,6 +1,6 @@ + + #------------------------------------------------------------------------------ +-# $File: printer,v 1.34 2023/06/16 19:27:12 christos Exp $ ++# $File: printer,v 1.35 2023/07/30 16:31:47 christos Exp $ + # printer: file(1) magic for printer-formatted files + # + +@@ -230,8 +230,9 @@ + 0 string PS4 + >0 use hpgl + # la.hp +-0 string BP +->0 use hpgl ++# Too weak ++#0 string BP ++#>0 use hpgl + # miter.hp + # Plot Absolute x,y{,x,y{...}}; x and y in range between -32767 and 32768 like: PA4000,3000; + 0 string PA +@@ -241,8 +242,9 @@ + #>2 regex \^([-]{0,1}[0-9]{1,5}) COORDINATE=%s + >>0 use hpgl + # pw.hpg number of pens x +-0 string NP +->0 use hpgl ++# Too weak ++#0 string NP ++#>0 use hpgl + # win_1.hp + #0 string \003INCA WHAT_IS_THAT + #>0 use hpgl