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

[Sébastien Luttringer]

    Date: Monday, April 12, 2021 @ 16:21:58
  Author: seblu
Revision: 412367

upgpkg: file 5.40-2

- fix FS#70261

Added:
  file/trunk/0001-Revert-Add-checksum-for-XZ.patch
Modified:
  file/trunk/PKGBUILD
Deleted:
  file/trunk/file-5.38-seccomp-tcgets.patch

---------------------------------------+
 0001-Revert-Add-checksum-for-XZ.patch |   31 +++++++++++++++++++++++++++++++
 PKGBUILD                              |    8 +++++---
 file-5.38-seccomp-tcgets.patch        |   28 ----------------------------
 3 files changed, 36 insertions(+), 31 deletions(-)

Added: 0001-Revert-Add-checksum-for-XZ.patch
===================================================================
--- 0001-Revert-Add-checksum-for-XZ.patch	                        (rev 0)
+++ 0001-Revert-Add-checksum-for-XZ.patch	2021-04-12 16:21:58 UTC (rev 412367)
@@ -0,0 +1,31 @@
+From b258a4e460569678cd554236cb75027897a42858 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu at seblu.net>
+Date: Mon, 12 Apr 2021 18:15:33 +0200
+Subject: [PATCH] Revert "Add checksum for XZ"
+
+This reverts commit 3ebd747de661b244f1acec29495d676dd52e71d5.
+---
+ magic/Magdir/compress | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/magic/Magdir/compress b/magic/Magdir/compress
+index 64d11a73..a364a880 100644
+--- a/magic/Magdir/compress
++++ b/magic/Magdir/compress
+@@ -264,12 +264,7 @@
+ >>5	lequad		!0xffffffffffffffff	non-streamed, size %lld
+ 
+ # http://tukaani.org/xz/xz-file-format.txt
+-0	ustring		\xFD7zXZ\x00		XZ compressed data, checksum
+->7	byte&0xf	0x0			NONE
+->7	byte&0xf	0x1			CRC32
+->7	byte&0xf	0x4			CRC64
+->7	byte&0xf	0xa			SHA-256
+-
++0	ustring		\xFD7zXZ\x00		XZ compressed data
+ !:strength * 2
+ !:mime	application/x-xz
+ 
+-- 
+2.31.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-12 15:06:06 UTC (rev 412366)
+++ PKGBUILD	2021-04-12 16:21:58 UTC (rev 412367)
@@ -4,7 +4,7 @@
 
 pkgname=file
 pkgver=5.40
-pkgrel=1
+pkgrel=2
 pkgdesc='File type identification utility'
 arch=('x86_64')
 license=('custom')
@@ -12,10 +12,12 @@
 url='https://www.darwinsys.com/file/'
 depends=('glibc' 'zlib' 'xz' 'bzip2' 'libseccomp' 'libseccomp.so')
 provides=('libmagic.so')
-source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc})
+source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc}
+        '0001-Revert-Add-checksum-for-XZ.patch')
 validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas
 sha256sums=('167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57'
-            'SKIP')
+            'SKIP'
+            'bd3633ffb41e4a8f9831bcda6e8e4589f67647ec33240d68d5a53bac4a82b594')
 
 prepare() {
   cd $pkgname-$pkgver

Deleted: file-5.38-seccomp-tcgets.patch
===================================================================
--- file-5.38-seccomp-tcgets.patch	2021-04-12 15:06:06 UTC (rev 412366)
+++ file-5.38-seccomp-tcgets.patch	2021-04-12 16:21:58 UTC (rev 412367)
@@ -1,28 +0,0 @@
-From 78573ec1c43346064661169c5c8df32e7c3bd6d6 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos at zoulas.com>
-Date: Fri, 17 Jan 2020 17:12:58 +0000
-Subject: [PATCH] PR/130: tobias: adjust seccomp for ioctl on hardwired
- terminal
-
----
- src/seccomp.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/seccomp.c b/src/seccomp.c
-index ebf3ea1cb..0ba17233b 100644
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -186,8 +186,12 @@ enable_sandbox_full(void)
- 	ALLOW_IOCTL_RULE(FIONREAD);
- #endif
- #ifdef TIOCGWINSZ
--	// musl libc may call ioctl TIOCGWINSZ when calling stdout
-+	// musl libc may call ioctl TIOCGWINSZ on stdout
- 	ALLOW_IOCTL_RULE(TIOCGWINSZ);
-+#endif
-+#ifdef TCGETS
-+	// glibc may call ioctl TCGETS on stdout on physical terminal
-+	ALLOW_IOCTL_RULE(TCGETS);
- #endif
- 	ALLOW_RULE(lseek);
-  	ALLOW_RULE(_llseek);