From 424f663819ec59abc4edab03a667845835e57ac1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 11:52:52 +0200 Subject: Adding debian version 1:5.44-3. Signed-off-by: Daniel Baumann --- ...0-pandrew-add-bitcoin-and-leveldb-support.patch | 37 +++++++ ...gdc71304b.pyzip-improvements-fc-stegerman.patch | 23 +++++ ...ture-file-pkcs-7-signed-data-fc-stegerman.patch | 31 ++++++ ...improve-javascript-detection-fc-stegerman.patch | 103 +++++++++++++++++++ ...9e7.detect-android-apk-files-fc-stegerman.patch | 73 ++++++++++++++ ...g4c8ee2e7.detect-smali-files-fc-stegerman.patch | 16 +++ ...-art-baseline-profiles-found-in-apk-files.patch | 32 ++++++ ...-package-resource-table-arsc-fc-stegerman.patch | 30 ++++++ ...565d82.improve-apk-detection-fc-stegerman.patch | 47 +++++++++ ...f1f4b4.add-mime-type-to-html-fc-stegerman.patch | 15 +++ ...s-if-we-find-a-manifest-file-at-least-say.patch | 109 +++++++++++++++++++++ ...rease-strength-to-beat-targa-fc-stegerman.patch | 17 ++++ .../local.don-t-include-libs-in-build.patch | 17 ++++ debian/patches/local.extra-magic.patch | 15 +++ .../local.manpage-seccomp-is-disabled.patch | 18 ++++ ...al.support-local-definitions-in-etc-magic.patch | 92 +++++++++++++++++ debian/patches/series | 25 +++++ debian/patches/upstream.disable.att3b.patch | 43 ++++++++ debian/patches/upstream.mute-debug-warning.patch | 25 +++++ 19 files changed, 768 insertions(+) create mode 100644 debian/patches/1672082456.FILE5_44-5-g813b3304.pr-410-pandrew-add-bitcoin-and-leveldb-support.patch create mode 100644 debian/patches/1672518248.FILE5_44-9-gdc71304b.pyzip-improvements-fc-stegerman.patch create mode 100644 debian/patches/1673481589.FILE5_44-14-gbb955ca3.jar-manifest-signature-file-pkcs-7-signed-data-fc-stegerman.patch create mode 100644 debian/patches/1673481736.FILE5_44-15-ga2756aa5.improve-javascript-detection-fc-stegerman.patch create mode 100644 debian/patches/1673482012.FILE5_44-16-gb29519e7.detect-android-apk-files-fc-stegerman.patch create mode 100644 debian/patches/1673482186.FILE5_44-17-g4c8ee2e7.detect-smali-files-fc-stegerman.patch create mode 100644 debian/patches/1673482234.FILE5_44-18-g9fa5e784.detect-android-art-baseline-profiles-found-in-apk-files.patch create mode 100644 debian/patches/1673482275.FILE5_44-19-g4341ed61.detect-android-package-resource-table-arsc-fc-stegerman.patch create mode 100644 debian/patches/1673725413.FILE5_44-22-g6d565d82.improve-apk-detection-fc-stegerman.patch create mode 100644 debian/patches/1674058221.FILE5_44-23-gbaf1f4b4.add-mime-type-to-html-fc-stegerman.patch create mode 100644 debian/patches/1674058358.FILE5_44-24-gc4361a10.improve-detection-of-apk-files-if-we-find-a-manifest-file-at-least-say.patch create mode 100644 debian/patches/1674400026.FILE5_44-29-g1e4b7389.increase-strength-to-beat-targa-fc-stegerman.patch create mode 100644 debian/patches/local.don-t-include-libs-in-build.patch create mode 100644 debian/patches/local.extra-magic.patch create mode 100644 debian/patches/local.manpage-seccomp-is-disabled.patch create mode 100644 debian/patches/local.support-local-definitions-in-etc-magic.patch create mode 100644 debian/patches/series create mode 100644 debian/patches/upstream.disable.att3b.patch create mode 100644 debian/patches/upstream.mute-debug-warning.patch (limited to 'debian/patches') diff --git a/debian/patches/1672082456.FILE5_44-5-g813b3304.pr-410-pandrew-add-bitcoin-and-leveldb-support.patch b/debian/patches/1672082456.FILE5_44-5-g813b3304.pr-410-pandrew-add-bitcoin-and-leveldb-support.patch new file mode 100644 index 0000000..67bb590 --- /dev/null +++ b/debian/patches/1672082456.FILE5_44-5-g813b3304.pr-410-pandrew-add-bitcoin-and-leveldb-support.patch @@ -0,0 +1,37 @@ +Subject: PR/410: pandrew: Add bitcoin and leveldb support +Origin: FILE5_44-5-g813b3304 +Upstream-Author: Christos Zoulas +Date: Mon Dec 26 19:20:56 2022 +0000 + +--- a/magic/Magdir/crypto ++++ b/magic/Magdir/crypto +@@ -3,3 +3,29 @@ + # $File: crypto,v 1.2 2021/03/27 20:15:53 christos Exp $ + # crypto: file(1) magic for crypto formats + # ++# Bitcoin block files ++0 lelong 0xD9B4BEF9 Bitcoin ++>(4.l+40) lelong 0xD9B4BEF9 reverse block ++>>4 lelong x \b, size %u ++# normal block below ++>0 default x block ++>>4 lelong x \b, size %u ++>>8 lelong&0xE0000000 0x20000000 ++>>>8 lelong x \b, BIP9 0x%x ++>>8 lelong&0xE0000000 !0x20000000 ++>>>8 lelong x \b, version 0x%x ++>>76 ledate x \b, %s UTC ++# VarInt counter ++>>88 ubyte <0xfd \b, txcount %u ++>>88 ubyte 0xfd ++>>>89 leshort x \b, txcount %u ++>>88 ubyte 0xfe ++>>>89 lelong x \b, txcount %u ++>>88 ubyte 0xff ++>>>89 lequad x \b, txcount %llu ++!:ext dat ++# option to find more blocks in the file ++#>>(4.l+8) indirect x ; ++ ++# LevelDB ++-8 lequad 0xdb4775248b80fb57 LevelDB table data diff --git a/debian/patches/1672518248.FILE5_44-9-gdc71304b.pyzip-improvements-fc-stegerman.patch b/debian/patches/1672518248.FILE5_44-9-gdc71304b.pyzip-improvements-fc-stegerman.patch new file mode 100644 index 0000000..cef7d42 --- /dev/null +++ b/debian/patches/1672518248.FILE5_44-9-gdc71304b.pyzip-improvements-fc-stegerman.patch @@ -0,0 +1,23 @@ +Subject: Pyzip improvements (FC Stegerman) +Origin: FILE5_44-9-gdc71304b +Upstream-Author: Christos Zoulas +Date: Sat Dec 31 20:24:08 2022 +0000 + +--- a/magic/Magdir/archive ++++ b/magic/Magdir/archive +@@ -1876,9 +1876,14 @@ + # https://en.wikipedia.org/wiki/ZIP_(file_format)#End_of_central_directory_record_(EOCD) + # by Michal Gorny + -2 uleshort 0 +->&-22 string PK\005\006 Zip archive, with extra data prepended ++>&-22 string PK\005\006 ++# without #! ++>>0 string !#! Zip archive, with extra data prepended + !:mime application/zip + !:ext zip/cbz ++# with #! ++>>0 string/w #!\ a ++>>>&-1 string/T x %s script executable (Zip archive) + + # ACE archive (from http://www.wotsit.org/download.asp?f=ace) + # by Stefan `Sec` Zehl diff --git a/debian/patches/1673481589.FILE5_44-14-gbb955ca3.jar-manifest-signature-file-pkcs-7-signed-data-fc-stegerman.patch b/debian/patches/1673481589.FILE5_44-14-gbb955ca3.jar-manifest-signature-file-pkcs-7-signed-data-fc-stegerman.patch new file mode 100644 index 0000000..44537f9 --- /dev/null +++ b/debian/patches/1673481589.FILE5_44-14-gbb955ca3.jar-manifest-signature-file-pkcs-7-signed-data-fc-stegerman.patch @@ -0,0 +1,31 @@ +Subject: JAR Manifest & Signature File, PKCS#7 Signed Data (FC Stegerman) +Origin: FILE5_44-14-gbb955ca3 +Upstream-Author: Christos Zoulas +Date: Wed Jan 11 23:59:49 2023 +0000 + +--- a/magic/Magdir/der ++++ b/magic/Magdir/der +@@ -137,3 +137,10 @@ + >>>>&0 der seq + >>>>>&0 der obj_id3=550403 + >>>>>&0 der utf8_str=x \b, Subject=%s ++ ++# PKCS#7 Signed Data (e.g. JAR Signature Block File) ++# OID 1.2.840.113549.1.7.2 (2a864886f70d010702) ++# Reference: https://www.rfc-editor.org/rfc/rfc2315 ++0 der seq ++>&0 der obj_id9=2a864886f70d010702 DER Encoded PKCS#7 Signed Data ++!:ext RSA/DSA/EC +--- a/magic/Magdir/java ++++ b/magic/Magdir/java +@@ -43,3 +43,10 @@ + >6 leshort >0x00 \b, version %d + >4 leshort x \b.%d + !:mime application/x-java-image ++ ++# JAR Manifest & Signature File ++# Reference: https://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html ++0 string/t Manifest-Version:\x201.0 JAR Manifest ++!:ext MF ++0 string/t Signature-Version:\x201.0 JAR Signature File ++!:ext SF diff --git a/debian/patches/1673481736.FILE5_44-15-ga2756aa5.improve-javascript-detection-fc-stegerman.patch b/debian/patches/1673481736.FILE5_44-15-ga2756aa5.improve-javascript-detection-fc-stegerman.patch new file mode 100644 index 0000000..f0b5529 --- /dev/null +++ b/debian/patches/1673481736.FILE5_44-15-ga2756aa5.improve-javascript-detection-fc-stegerman.patch @@ -0,0 +1,103 @@ +Subject: Improve JavaScript detection (FC Stegerman) +Origin: FILE5_44-15-ga2756aa5 +Upstream-Author: Christos Zoulas +Date: Thu Jan 12 00:02:16 2023 +0000 + +--- a/magic/Magdir/javascript ++++ b/magic/Magdir/javascript +@@ -3,18 +3,68 @@ + # $File: javascript,v 1.4 2022/09/02 08:08:17 christos Exp $ + # javascript: magic for javascript and node.js scripts. + # +-0 string/w #!/bin/node Node.js script text executable ++0 string/tw #!/bin/node Node.js script executable + !:mime application/javascript +-0 string/w #!/usr/bin/node Node.js script text executable ++0 string/tw #!/usr/bin/node Node.js script executable + !:mime application/javascript +-0 string/w #!/bin/nodejs Node.js script text executable ++0 string/tw #!/bin/nodejs Node.js script executable + !:mime application/javascript +-0 string/w #!/usr/bin/nodejs Node.js script text executable +-!:mime application/javascript +-0 string #!/usr/bin/env\ node Node.js script text executable +-!:mime application/javascript +-0 string #!/usr/bin/env\ nodejs Node.js script text executable ++0 string/tw #!/usr/bin/nodejs Node.js script executable + !:mime application/javascript ++0 string/t #!/usr/bin/env\ node Node.js script executable ++!:mime application/javascript ++0 string/t #!/usr/bin/env\ nodejs Node.js script executable ++!:mime application/javascript ++ ++# JavaScript ++# The strength is increased to beat the C++ & HTML rules ++0 search "use\x20strict" JavaScript source ++!:strength +30 ++!:mime application/javascript ++!:ext js ++0 search 'use\x20strict' JavaScript source ++!:strength +30 ++!:mime application/javascript ++!:ext js ++0 regex module(\\.|\\[["'])exports.*= JavaScript source ++!:strength +30 ++!:mime application/javascript ++!:ext js ++0 regex \^(const|var|let).*=.*require\\( JavaScript source ++!:strength +30 ++!:mime application/javascript ++!:ext js ++0 regex \^export\x20(function|class|default|const|var|let|async)\x20 JavaScript source ++!:strength +30 ++!:mime application/javascript ++!:ext js ++0 regex \\((async\x20)?function[(\x20] JavaScript source ++!:strength +30 ++!:mime application/javascript ++!:ext js ++0 regex \^(import|export).*\x20from\x20 JavaScript source ++!:strength +30 ++!:mime application/javascript ++!:ext js ++0 regex \^(import|export)\x20["']\\./ JavaScript source ++!:strength +30 ++!:mime application/javascript ++!:ext js ++0 regex \^require\\(["'] JavaScript source ++!:strength +30 ++!:mime application/javascript ++!:ext js ++0 regex typeof.*[!=]== JavaScript source ++!:strength +30 ++!:mime application/javascript ++!:ext js ++ ++# React Native minified JavaScript ++0 search/128 __BUNDLE_START_TIME__= React Native minified JavaScript ++!:strength +30 ++!:mime application/javascript ++!:ext bundle/jsbundle ++ + # Hermes by Facebook https://hermesengine.dev/ + # https://github.com/facebook/hermes/blob/master/include/hermes/\ + # BCGen/HBC/BytecodeFileFormat.h#L24 +--- a/magic/Magdir/sgml ++++ b/magic/Magdir/sgml +@@ -50,6 +50,16 @@ + !:mime text/html + !:strength + 5 + ++# avoid misdetection as JavaScript ++0 string/cWt \ HTML document text ++!:mime text/html ++0 string/ct \