[arch-commits] Commit in file/trunk (2 files)

[Sébastien Luttringer]

    Date: Friday, January 24, 2020 @ 16:14:54
  Author: seblu
Revision: 373878

upgpkg: file 5.38-3

Fix FS#65256

Added:
  file/trunk/0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch
Modified:
  file/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch |   30 ++++++++++
 PKGBUILD                                                        |    8 +-
 2 files changed, 35 insertions(+), 3 deletions(-)

Added: 0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch
===================================================================
--- 0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch	                        (rev 0)
+++ 0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch	2020-01-24 16:14:54 UTC (rev 373878)
@@ -0,0 +1,30 @@
+From 84221b0370a8b49e0fa2dbd88c89fb6e87ec95bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu at 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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-24 10:03:45 UTC (rev 373877)
+++ PKGBUILD	2020-01-24 16:14:54 UTC (rev 373878)
@@ -4,7 +4,7 @@
 
 pkgname=file
 pkgver=5.38
-pkgrel=2
+pkgrel=3
 pkgdesc='File type identification utility'
 arch=('x86_64')
 license=('custom')
@@ -13,11 +13,13 @@
 depends=('glibc' 'zlib' 'xz' 'bzip2' 'libseccomp' 'libseccomp.so')
 provides=('libmagic.so')
 source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc}
-        file-5.38-seccomp-tcgets.patch)
+        file-5.38-seccomp-tcgets.patch
+        0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch)
 validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas
 sha256sums=('593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34'
             'SKIP'
-            'da6197e89ca53bd4f0d9009fa3a18c6fdb66dc07eb92e6bd77207eadb4548cfe')
+            'da6197e89ca53bd4f0d9009fa3a18c6fdb66dc07eb92e6bd77207eadb4548cfe'
+            '5636b444d147d6598c3defd0ce0a9b28056f2f64b09ef7f032337ed0308b8490')
 
 prepare() {
   cd $pkgname-$pkgver