Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (77c76560c03b17c08256b723f09c1a15195ea2dd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (77c76560c03b17c08256b723f09c1a15195ea2dd)
  • Date: Sat, 8 May 2021 22:02:03 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

utils/file/DETAILS |
1
utils/file/HISTORY |
5 +
utils/file/PRE_BUILD |
4 +
utils/file/patches/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch |
33 ++++++++++
4 files changed, 43 insertions(+)

New commits:
commit 77c76560c03b17c08256b723f09c1a15195ea2dd
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

file: fix XZ detection

diff --git a/utils/file/DETAILS b/utils/file/DETAILS
index c46686b..d7541e4 100755
--- a/utils/file/DETAILS
+++ b/utils/file/DETAILS
@@ -1,5 +1,6 @@
SPELL=file
VERSION=5.40
+ PATCHLEVEL=1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/file/HISTORY b/utils/file/HISTORY
index cf77f54..60ebedb 100644
--- a/utils/file/HISTORY
+++ b/utils/file/HISTORY
@@ -1,3 +1,8 @@
+2021-05-08 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD,
patches/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch:
+ fixed recognition of .xz files
+
2021-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: 5.40

diff --git a/utils/file/PRE_BUILD b/utils/file/PRE_BUILD
new file mode 100755
index 0000000..005bf6d
--- /dev/null
+++ b/utils/file/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git
a/utils/file/patches/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch
b/utils/file/patches/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch
new file mode 100644
index 0000000..c71d2f8
--- /dev/null
+++ b/utils/file/patches/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch
@@ -0,0 +1,33 @@
+From 94ab14414606b794b7ccf60595493cd8715e195b Mon Sep 17 00:00:00 2001
+From: ProgAndy <code AT progandy.de>
+Date: Fri, 2 Apr 2021 14:33:18 +0200
+Subject: [PATCH] Fix mime type XZ after "Add checksum for XZ"
+
+---
+ magic/Magdir/compress | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/magic/Magdir/compress b/magic/Magdir/compress
+index 64d11a73..aef4bb49 100644
+--- a/magic/Magdir/compress
++++ b/magic/Magdir/compress
+@@ -265,14 +265,13 @@
+
+ # http://tukaani.org/xz/xz-file-format.txt
+ 0 ustring \xFD7zXZ\x00 XZ compressed data, checksum
++!:strength * 2
++!:mime application/x-xz
+ >7 byte&0xf 0x0 NONE
+ >7 byte&0xf 0x1 CRC32
+ >7 byte&0xf 0x4 CRC64
+ >7 byte&0xf 0xa SHA-256
+
+-!:strength * 2
+-!:mime application/x-xz
+-
+ # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
+ 0 string LRZI LRZIP compressed data
+ >4 byte x - version %d
+--
+2.31.1
+



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (77c76560c03b17c08256b723f09c1a15195ea2dd), Thomas Orgis, 05/08/2021

Archive powered by MHonArc 2.6.24.

Top of Page