Skip to content

Commit b283a53

Browse files
orlitzkyorlitzky
committed
ext/fileinfo/libmagic.patch: update
Run ext/fileinfo/generate_patch.sh to update PHP's patch against file-5.46. The diff of the diff is mostly timestamps, but it does include the recent redefinition of the "file_public" macro in libmagic/file.h. It also includes a hunk for 399cb4c where the patch re-roll was overlooked.
1 parent a79d4f4 commit b283a53

File tree

1 file changed

+51
-36
lines changed

1 file changed

+51
-36
lines changed

‎ext/fileinfo/libmagic.patch‎

Lines changed: 51 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
2-
--- libmagic.orig/apprentice.c 2024-11-27 16:37:00.000000000 +0100
3-
+++ libmagic/apprentice.c 2025-02-09 02:25:02.364884555 +0100
2+
--- libmagic.orig/apprentice.c 2024-11-27 10:37:00.000000000 -0500
3+
+++ libmagic/apprentice.c 2026-03-20 12:02:11.209343516 -0400
44
@@ -32,7 +32,7 @@
55
#include "file.h"
66

@@ -325,14 +325,14 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
325325
// Don't warn for DER
326326
if (mpa.type == FILE_DER)
327327
return 0;
328-
@@ -1151,6 +1075,7 @@
328+
@@ -1150,6 +1074,7 @@
329+
ma->mp->desc);
329330
file_mdump(ma->mp);
330331
file_mdump(mb->mp);
331332
+#endif
332333
return 0;
333334
}
334335
return x > 0 ? -1 : 1;
335-
}
336336
@@ -1303,7 +1228,7 @@
337337

338338
size_t incr = mset[i].max + ALLOC_INCR;
@@ -954,8 +954,8 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
954954
if (ma[j].cont_level == 0)
955955
break;
956956
diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
957-
--- libmagic.orig/ascmagic.c 2024-06-19 18:18:53.000000000 +0200
958-
+++ libmagic/ascmagic.c 2025-02-09 01:20:19.757840211 +0100
957+
--- libmagic.orig/ascmagic.c 2024-06-19 12:18:53.000000000 -0400
958+
+++ libmagic/ascmagic.c 2026-03-19 16:25:42.998672674 -0400
959959
@@ -96,7 +96,7 @@
960960
rv = file_ascmagic_with_encoding(ms, &bb,
961961
ubuf, ulen, code, type, text);
@@ -996,8 +996,8 @@ diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
996996
return rv;
997997
}
998998
diff -u libmagic.orig/buffer.c libmagic/buffer.c
999-
--- libmagic.orig/buffer.c 2024-06-19 18:18:53.000000000 +0200
1000-
+++ libmagic/buffer.c 2025-02-09 01:20:19.757910844 +0100
999+
--- libmagic.orig/buffer.c 2024-06-19 12:18:53.000000000 -0400
1000+
+++ libmagic/buffer.c 2026-03-19 16:25:42.998672674 -0400
10011001
@@ -31,19 +31,21 @@
10021002
#endif /* lint */
10031003

@@ -1055,8 +1055,8 @@ diff -u libmagic.orig/buffer.c libmagic/buffer.c
10551055
goto out;
10561056
}
10571057
diff -u libmagic.orig/cdf.c libmagic/cdf.c
1058-
--- libmagic.orig/cdf.c 2024-11-25 22:24:59.000000000 +0100
1059-
+++ libmagic/cdf.c 2025-02-09 01:25:00.187641434 +0100
1058+
--- libmagic.orig/cdf.c 2024-11-25 16:24:59.000000000 -0500
1059+
+++ libmagic/cdf.c 2026-03-19 16:25:42.998672674 -0400
10601060
@@ -43,7 +43,9 @@
10611061
#include <err.h>
10621062
#endif
@@ -1286,8 +1286,8 @@ diff -u libmagic.orig/cdf.c libmagic/cdf.c
12861286

12871287
#endif
12881288
diff -u libmagic.orig/cdf.h libmagic/cdf.h
1289-
--- libmagic.orig/cdf.h 2024-11-25 22:18:55.000000000 +0100
1290-
+++ libmagic/cdf.h 2025-02-09 01:23:35.871635744 +0100
1289+
--- libmagic.orig/cdf.h 2024-11-25 16:18:55.000000000 -0500
1290+
+++ libmagic/cdf.h 2026-03-19 16:25:42.990672671 -0400
12911291
@@ -37,8 +37,6 @@
12921292

12931293
#ifdef WIN32
@@ -1439,8 +1439,8 @@ diff -u libmagic.orig/cdf.h libmagic/cdf.h
14391439

14401440

14411441
diff -u libmagic.orig/compress.c libmagic/compress.c
1442-
--- libmagic.orig/compress.c 2024-11-10 17:52:27.000000000 +0100
1443-
+++ libmagic/compress.c 2025-02-09 01:59:42.978538071 +0100
1442+
--- libmagic.orig/compress.c 2024-11-10 11:52:27.000000000 -0500
1443+
+++ libmagic/compress.c 2026-03-20 12:02:11.209343516 -0400
14441444
@@ -64,13 +64,14 @@
14451445
#if defined(HAVE_SYS_TIME_H)
14461446
#include <sys/time.h>
@@ -1666,8 +1666,8 @@ diff -u libmagic.orig/compress.c libmagic/compress.c
16661666
#endif
16671667
+#endif
16681668
diff -u libmagic.orig/der.c libmagic/der.c
1669-
--- libmagic.orig/der.c 2024-11-25 23:31:53.000000000 +0100
1670-
+++ libmagic/der.c 2025-02-09 01:20:19.770853011 +0100
1669+
--- libmagic.orig/der.c 2024-11-25 17:31:53.000000000 -0500
1670+
+++ libmagic/der.c 2026-03-19 16:25:43.002672676 -0400
16711671
@@ -54,7 +54,9 @@
16721672
#include "magic.h"
16731673
#include "der.h"
@@ -1679,8 +1679,8 @@ diff -u libmagic.orig/der.c libmagic/der.c
16791679
#include <err.h>
16801680
#endif
16811681
diff -u libmagic.orig/der.h libmagic/der.h
1682-
--- libmagic.orig/der.h 2024-11-25 22:26:18.000000000 +0100
1683-
+++ libmagic/der.h 2023-04-09 22:21:58.195018580 +0200
1682+
--- libmagic.orig/der.h 2024-11-25 16:26:18.000000000 -0500
1683+
+++ libmagic/der.h 2026-03-19 16:25:43.006672678 -0400
16841684
@@ -24,5 +24,5 @@
16851685
* POSSIBILITY OF SUCH DAMAGE.
16861686
*/
@@ -1690,8 +1690,8 @@ diff -u libmagic.orig/der.h libmagic/der.h
16901690
+extern int der_offs(struct magic_set *, struct magic *, size_t);
16911691
+extern int der_cmp(struct magic_set *, struct magic *);
16921692
diff -u libmagic.orig/encoding.c libmagic/encoding.c
1693-
--- libmagic.orig/encoding.c 2024-10-29 21:56:48.000000000 +0100
1694-
+++ libmagic/encoding.c 2025-02-09 01:20:19.770879123 +0100
1693+
--- libmagic.orig/encoding.c 2024-10-29 16:56:48.000000000 -0400
1694+
+++ libmagic/encoding.c 2026-03-19 16:25:43.010672679 -0400
16951695
@@ -97,7 +97,7 @@
16961696
nbytes = ms->encoding_max;
16971697

@@ -1726,8 +1726,8 @@ diff -u libmagic.orig/encoding.c libmagic/encoding.c
17261726
return rv;
17271727
}
17281728
diff -u libmagic.orig/file.h libmagic/file.h
1729-
--- libmagic.orig/file.h 2024-11-27 16:37:00.000000000 +0100
1730-
+++ libmagic/file.h 2025-02-09 01:47:36.242811911 +0100
1729+
--- libmagic.orig/file.h 2024-11-27 10:37:00.000000000 -0500
1730+
+++ libmagic/file.h 2026-03-20 12:03:18.205380698 -0400
17311731
@@ -27,15 +27,13 @@
17321732
*/
17331733
/*
@@ -1767,6 +1767,21 @@ diff -u libmagic.orig/file.h libmagic/file.h
17671767

17681768
#define ENABLE_CONDITIONALS
17691769

1770+
@@ -109,12 +102,12 @@
1771+
1772+
#if HAVE_VISIBILITY
1773+
# if defined(WIN32)
1774+
-# define file_public __declspec(dllexport)
1775+
+# define file_public
1776+
# ifndef file_protected
1777+
# define file_protected
1778+
# endif
1779+
# else
1780+
-# define file_public __attribute__((__visibility__("default")))
1781+
+# define file_public __attribute__((__visibility__("hidden")))
1782+
# ifndef file_protected
1783+
# define file_protected __attribute__((__visibility__("hidden")))
1784+
# endif
17701785
@@ -179,7 +172,7 @@
17711786
#define MAXstring 128 /* max len of "string" types */
17721787

@@ -1936,8 +1951,8 @@ diff -u libmagic.orig/file.h libmagic/file.h
19361951
#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H) && !defined(QUICK)
19371952
#define QUICK
19381953
diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
1939-
--- libmagic.orig/fsmagic.c 2024-06-19 18:18:53.000000000 +0200
1940-
+++ libmagic/fsmagic.c 2025-02-09 01:20:19.770987982 +0100
1954+
--- libmagic.orig/fsmagic.c 2024-06-19 12:18:53.000000000 -0400
1955+
+++ libmagic/fsmagic.c 2026-03-19 16:25:43.006672678 -0400
19411956
@@ -66,26 +66,10 @@
19421957
# define minor(dev) ((dev) & 0xff)
19431958
#endif
@@ -2229,8 +2244,8 @@ diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
22292244
#ifndef __COHERENT__
22302245
case S_IFSOCK:
22312246
diff -u libmagic.orig/funcs.c libmagic/funcs.c
2232-
--- libmagic.orig/funcs.c 2024-06-19 18:18:53.000000000 +0200
2233-
+++ libmagic/funcs.c 2025-02-09 01:29:25.403659334 +0100
2247+
--- libmagic.orig/funcs.c 2024-06-19 12:18:53.000000000 -0400
2248+
+++ libmagic/funcs.c 2026-03-19 16:25:42.990672671 -0400
22342249
@@ -66,7 +66,7 @@
22352250
file_private void
22362251
file_clearbuf(struct magic_set *ms)
@@ -2592,8 +2607,8 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
25922607
file_protected int
25932608
file_clear_closexec(int fd) {
25942609
diff -u libmagic.orig/magic.c libmagic/magic.c
2595-
--- libmagic.orig/magic.c 2024-06-19 18:18:53.000000000 +0200
2596-
+++ libmagic/magic.c 2025-02-09 01:20:19.771155033 +0100
2610+
--- libmagic.orig/magic.c 2024-06-19 12:18:53.000000000 -0400
2611+
+++ libmagic/magic.c 2026-03-20 12:02:11.209343516 -0400
25972612
@@ -25,11 +25,6 @@
25982613
* SUCH DAMAGE.
25992614
*/
@@ -3066,8 +3081,8 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
30663081
}
30673082
return file_getbuffer(ms);
30683083
diff -u libmagic.orig/magic.h libmagic/magic.h
3069-
--- libmagic.orig/magic.h 2025-02-09 12:43:22.903059789 +0100
3070-
+++ libmagic/magic.h 2025-02-09 01:39:57.110146603 +0100
3084+
--- libmagic.orig/magic.h 2026-03-20 12:07:07.493507951 -0400
3085+
+++ libmagic/magic.h 2026-03-20 12:02:11.209343516 -0400
30713086
@@ -47,8 +47,6 @@
30723087
* extensions */
30733088
#define MAGIC_COMPRESS_TRANSP 0x2000000 /* Check inside compressed files
@@ -3109,8 +3124,8 @@ diff -u libmagic.orig/magic.h libmagic/magic.h
31093124
const char *magic_buffer(magic_t, const void *, size_t);
31103125

31113126
diff -u libmagic.orig/print.c libmagic/print.c
3112-
--- libmagic.orig/print.c 2024-10-06 19:04:42.000000000 +0200
3113-
+++ libmagic/print.c 2025-02-09 01:36:41.713156291 +0100
3127+
--- libmagic.orig/print.c 2024-10-06 13:04:42.000000000 -0400
3128+
+++ libmagic/print.c 2026-03-19 16:25:42.982672668 -0400
31143129
@@ -74,7 +74,7 @@
31153130
if (m->mask_op & FILE_OPINVERSE)
31163131
(void) fputc('~', stderr);
@@ -3187,8 +3202,8 @@ diff -u libmagic.orig/print.c libmagic/print.c
31873202
if (pp == NULL)
31883203
goto out;
31893204
diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
3190-
--- libmagic.orig/readcdf.c 2024-11-25 22:07:46.000000000 +0100
3191-
+++ libmagic/readcdf.c 2025-02-09 01:20:19.771337672 +0100
3205+
--- libmagic.orig/readcdf.c 2024-11-25 16:07:46.000000000 -0500
3206+
+++ libmagic/readcdf.c 2026-03-19 16:25:43.002672676 -0400
31923207
@@ -31,7 +31,9 @@
31933208

31943209
#include <assert.h>
@@ -3307,8 +3322,8 @@ diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
33073322
/* If we handled it already, return */
33083323
if (i != -1)
33093324
diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
3310-
--- libmagic.orig/softmagic.c 2024-11-27 16:37:00.000000000 +0100
3311-
+++ libmagic/softmagic.c 2025-02-09 01:21:46.845689318 +0100
3325+
--- libmagic.orig/softmagic.c 2024-11-27 10:37:00.000000000 -0500
3326+
+++ libmagic/softmagic.c 2026-03-19 16:25:42.986672670 -0400
33123327
@@ -32,7 +32,7 @@
33133328
#include "file.h"
33143329

0 commit comments

Comments
 (0)