mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
b7c5813c98
* Update libmagic to 5.45
This also cleans up magicdata.patch: changes that are already in upstream file
were removed from that patch file.
There are five (expected) test output changes.
All these were also checked with the file command.
- bug77961.phpt changes because there's now an early error-return in the
`if (ts == FILE_BADSIZE) {` branch.
- cve-2014-1943.phpt and cve-2014-1943-mb.phpt change because now the crafted
data is recognised as a simh file.
- bug71434.phpt now properly recognises it as a Python file.
- ext/fileinfo/tests/finfo_file_basic.phpt more specific mime type.
* Adjust memory requirement for s390x fileinfo run
The larger database causes a higher memory usage.
Similar to 962c082a5b.
* [ci skip] NEWS
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
diff -ur Magdir.orig/rpm Magdir/rpm
|
|
--- Magdir.orig/rpm 2021-02-23 01:49:24.000000000 +0100
|
|
+++ Magdir/rpm 2021-04-05 19:40:55.080911893 +0200
|
|
@@ -29,6 +29,7 @@
|
|
>>8 beshort 17 SuperH
|
|
>>8 beshort 18 Xtensa
|
|
>>8 beshort 255 noarch
|
|
+>>10 string x %s
|
|
|
|
#delta RPM Daniel Novotny (dnovotny@redhat.com)
|
|
0 string drpm Delta RPM
|
|
diff -ur Magdir.orig/securitycerts Magdir/securitycerts
|
|
--- Magdir.orig/securitycerts 2021-02-23 01:49:24.000000000 +0100
|
|
+++ Magdir/securitycerts 2021-04-05 19:40:55.080911893 +0200
|
|
@@ -4,3 +4,5 @@
|
|
0 search/1 -----BEGIN\ CERTIFICATE------ RFC1421 Security Certificate text
|
|
0 search/1 -----BEGIN\ NEW\ CERTIFICATE RFC1421 Security Certificate Signing Request text
|
|
0 belong 0xedfeedfe Sun 'jks' Java Keystore File data
|
|
+
|
|
+0 string \0volume_key volume_key escrow packet
|
|
diff --git a/magic/Magdir/sgml b/magic/Magdir/sgml
|
|
--- Magdir.orig/sgml
|
|
+++ Magdir/sgml
|
|
@@ -1,16 +1,17 @@
|
|
|
|
#------------------------------------------------------------------------------
|
|
-# $File: sgml,v 1.48 2023/01/18 16:10:21 christos Exp $
|
|
+# $File: sgml,v 1.49 2023/08/05 14:34:47 christos Exp $
|
|
# Type: SVG Vectorial Graphics
|
|
# From: Noel Torres <tecnico@ejerciciosresueltos.com>
|
|
-0 string \<?xml\ version=
|
|
+0 string/bt \<?xml\ version=
|
|
>14 regex ['"\ \t]*[0-9.]+['"\ \t]*
|
|
>>19 search/4096 \<svg SVG Scalable Vector Graphics image
|
|
+!:strength +50
|
|
!:mime image/svg+xml
|
|
!:ext svg
|
|
>>19 search/4096 \<gnc-v2 GnuCash file
|
|
!:mime application/x-gnucash
|
|
-0 string \<svg SVG Scalable Vector Graphics image
|
|
+0 string/bt \<svg SVG Scalable Vector Graphics image
|
|
!:mime image/svg+xml
|
|
!:ext svg
|