core/file to 5.40-1

This commit is contained in:
Kevin Mihelich 2021-03-31 20:56:21 +00:00
parent d17b30a469
commit abc08ea08f
2 changed files with 2 additions and 32 deletions

View file

@ -1,30 +0,0 @@
From 84221b0370a8b49e0fa2dbd88c89fb6e87ec95bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu@seblu.net>
Date: Fri, 24 Jan 2020 17:07:11 +0100
Subject: [PATCH] Revert "Don't depend on the execute bit to determine pie
executable or shared object."
This reverts commit d653309de04ed10fdeda79f2c6ca7a7e96e122f1.
---
magic/Magdir/elf | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/magic/Magdir/elf b/magic/Magdir/elf
index b5a2e00b..a35b615d 100644
--- a/magic/Magdir/elf
+++ b/magic/Magdir/elf
@@ -50,8 +50,9 @@
!:mime application/x-object
>16 leshort 2 executable,
!:mime application/x-executable
->16 leshort 3 shared object,
-!:mime application/x-sharedlib
+>16 leshort 3 ${x?pie executable:shared object},
+
+!:mime application/x-${x?pie-executable:sharedlib}
>16 leshort 4 core file,
!:mime application/x-coredump
# OS-specific
--
2.25.0

View file

@ -7,7 +7,7 @@
# - configure with --disable-libseccomp
pkgname=file
pkgver=5.39
pkgver=5.40
pkgrel=1
pkgdesc='File type identification utility'
arch=('x86_64')
@ -18,7 +18,7 @@ depends=('glibc' 'zlib' 'xz' 'bzip2')
provides=('libmagic.so')
source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc})
validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas
sha256sums=('f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1'
sha256sums=('167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57'
'SKIP')
prepare() {