mirror of
https://github.com/php/php-src.git
synced 2026-03-26 17:22:15 +01:00
34fa65a6c2
Upstream patch: 7a821aedc1
Fixes GH-8805.
Signed-off-by: Anatol Belski <ab@php.net>
(cherry picked from commit 8a2ebe069148909a00739c83e9bcc031734bf826)
54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
diff -ur Magdir.orig/fonts Magdir/fonts
|
|
--- Magdir.orig/fonts 2021-02-23 01:49:24.000000000 +0100
|
|
+++ Magdir/fonts 2022-09-18 14:07:14.233023271 +0200
|
|
@@ -384,11 +384,13 @@
|
|
|
|
# https://www.w3.org/TR/WOFF/
|
|
0 string wOFF Web Open Font Format
|
|
+!:mime font/woff
|
|
>0 use woff
|
|
>20 beshort x \b, version %d
|
|
>22 beshort x \b.%d
|
|
# https://www.w3.org/TR/WOFF2/
|
|
0 string wOF2 Web Open Font Format (Version 2)
|
|
+!:mime font/woff2
|
|
>0 use woff
|
|
#>20 belong x \b, totalCompressedSize %d
|
|
>24 beshort x \b, version %d
|
|
diff -ur Magdir.orig/mail.news Magdir/mail.news
|
|
--- Magdir.orig/mail.news 2021-03-31 01:47:28.000000000 +0200
|
|
+++ Magdir/mail.news 2021-04-05 19:41:55.168556972 +0200
|
|
@@ -1,5 +1,5 @@
|
|
#------------------------------------------------------------------------------
|
|
-# $File: mail.news,v 1.26 2021/03/21 14:37:03 christos Exp $
|
|
+# $File: mail.news,v 1.27 2021/04/05 16:36:14 christos Exp $
|
|
# mail.news: file(1) magic for mail and news
|
|
#
|
|
# Unfortunately, saved netnews also has From line added in some news software.
|
|
@@ -81,4 +81,4 @@
|
|
# File format spec: https://wiki.dovecot.org/Design/Dcrypt/#File_format
|
|
# From: Stephen Gildea
|
|
0 string CRYPTED\003\007 Dovecot encrypted message
|
|
->9 byte xu \b, dcrypt version %d
|
|
+>9 byte x \b, dcrypt version %d
|
|
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
|