11diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
22--- libmagic.orig/apprentice.c 2023-07-17 16:38:35.000000000 +0200
3- +++ libmagic/apprentice.c 2024-02-15 19:28:46.036308654 +0100
3+ +++ libmagic/apprentice.c 2024-05-27 16:08:06.689332368 +0200
44@@ -48,7 +48,9 @@
55 #ifdef QUICK
66 #include <sys/mman.h>
@@ -870,7 +870,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
870870 break;
871871diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
872872--- libmagic.orig/ascmagic.c 2023-05-30 22:17:50.000000000 +0200
873- +++ libmagic/ascmagic.c 2024-02-15 19:28:46.036308654 +0100
873+ +++ libmagic/ascmagic.c 2024-05-27 16:08:06.689332368 +0200
874874@@ -96,7 +96,7 @@
875875 rv = file_ascmagic_with_encoding(ms, &bb,
876876 ubuf, ulen, code, type, text);
@@ -912,7 +912,7 @@ diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
912912 }
913913diff -u libmagic.orig/buffer.c libmagic/buffer.c
914914--- libmagic.orig/buffer.c 2023-07-02 14:48:39.000000000 +0200
915- +++ libmagic/buffer.c 2024-02-15 19:28:46.036308654 +0100
915+ +++ libmagic/buffer.c 2024-05-27 16:08:06.689332368 +0200
916916@@ -31,19 +31,21 @@
917917 #endif /* lint */
918918
@@ -971,7 +971,7 @@ diff -u libmagic.orig/buffer.c libmagic/buffer.c
971971 }
972972diff -u libmagic.orig/cdf.c libmagic/cdf.c
973973--- libmagic.orig/cdf.c 2022-09-24 22:56:49.000000000 +0200
974- +++ libmagic/cdf.c 2024-02-15 19:28:46.036308654 +0100
974+ +++ libmagic/cdf.c 2024-05-27 16:08:06.689332368 +0200
975975@@ -43,7 +43,9 @@
976976 #include <err.h>
977977 #endif
@@ -1202,7 +1202,7 @@ diff -u libmagic.orig/cdf.c libmagic/cdf.c
12021202 #endif
12031203diff -u libmagic.orig/cdf.h libmagic/cdf.h
12041204--- libmagic.orig/cdf.h 2022-09-24 22:56:49.000000000 +0200
1205- +++ libmagic/cdf.h 2024-02-07 10:04:46.577977135 +0100
1205+ +++ libmagic/cdf.h 2024-05-27 16:08:06.690332378 +0200
12061206@@ -37,8 +37,6 @@
12071207
12081208 #ifdef WIN32
@@ -1214,7 +1214,7 @@ diff -u libmagic.orig/cdf.h libmagic/cdf.h
12141214 #define timespec timeval
12151215diff -u libmagic.orig/compress.c libmagic/compress.c
12161216--- libmagic.orig/compress.c 2023-05-21 17:59:58.000000000 +0200
1217- +++ libmagic/compress.c 2024-02-15 19:28:46.036308654 +0100
1217+ +++ libmagic/compress.c 2024-05-27 16:08:06.690332378 +0200
12181218@@ -63,13 +63,14 @@
12191219 #if defined(HAVE_SYS_TIME_H)
12201220 #include <sys/time.h>
@@ -1333,7 +1333,7 @@ diff -u libmagic.orig/compress.c libmagic/compress.c
13331333+ #endif
13341334diff -u libmagic.orig/der.c libmagic/der.c
13351335--- libmagic.orig/der.c 2022-09-24 22:56:49.000000000 +0200
1336- +++ libmagic/der.c 2024-02-15 19:28:46.036308654 +0100
1336+ +++ libmagic/der.c 2024-05-27 16:08:06.690332378 +0200
13371337@@ -54,7 +54,9 @@
13381338 #include "magic.h"
13391339 #include "der.h"
@@ -1344,39 +1344,9 @@ diff -u libmagic.orig/der.c libmagic/der.c
13441344 #include <sys/stat.h>
13451345 #include <err.h>
13461346 #endif
1347- diff -u libmagic.orig/elfclass.h libmagic/elfclass.h
1348- --- libmagic.orig/elfclass.h 2022-09-24 22:56:49.000000000 +0200
1349- +++ libmagic/elfclass.h 2023-11-27 19:47:19.275556073 +0100
1350- @@ -41,7 +41,7 @@
1351- return toomany(ms, "program headers", phnum);
1352- flags |= FLAGS_IS_CORE;
1353- if (dophn_core(ms, clazz, swap, fd,
1354- - CAST(off_t, elf_getu(swap, elfhdr.e_phoff)), phnum,
1355- + CAST(zend_off_t, elf_getu(swap, elfhdr.e_phoff)), phnum,
1356- CAST(size_t, elf_getu16(swap, elfhdr.e_phentsize)),
1357- fsize, &flags, ¬ecount) == -1)
1358- return -1;
1359- @@ -56,7 +56,7 @@
1360- if (shnum > ms->elf_shnum_max)
1361- return toomany(ms, "section", shnum);
1362- if (dophn_exec(ms, clazz, swap, fd,
1363- - CAST(off_t, elf_getu(swap, elfhdr.e_phoff)), phnum,
1364- + CAST(zend_off_t, elf_getu(swap, elfhdr.e_phoff)), phnum,
1365- CAST(size_t, elf_getu16(swap, elfhdr.e_phentsize)),
1366- fsize, shnum, &flags, ¬ecount) == -1)
1367- return -1;
1368- @@ -66,7 +66,7 @@
1369- if (shnum > ms->elf_shnum_max)
1370- return toomany(ms, "section headers", shnum);
1371- if (doshn(ms, clazz, swap, fd,
1372- - CAST(off_t, elf_getu(swap, elfhdr.e_shoff)), shnum,
1373- + CAST(zend_off_t, elf_getu(swap, elfhdr.e_shoff)), shnum,
1374- CAST(size_t, elf_getu16(swap, elfhdr.e_shentsize)),
1375- fsize, elf_getu16(swap, elfhdr.e_machine),
1376- CAST(int, elf_getu16(swap, elfhdr.e_shstrndx)),
13771347diff -u libmagic.orig/encoding.c libmagic/encoding.c
13781348--- libmagic.orig/encoding.c 2022-12-26 18:31:56.000000000 +0100
1379- +++ libmagic/encoding.c 2024-02-15 19:28:46.036308654 +0100
1349+ +++ libmagic/encoding.c 2024-05-27 16:08:06.690332378 +0200
13801350@@ -97,7 +97,7 @@
13811351 nbytes = ms->encoding_max;
13821352
@@ -1412,7 +1382,7 @@ diff -u libmagic.orig/encoding.c libmagic/encoding.c
14121382 }
14131383diff -u libmagic.orig/file.h libmagic/file.h
14141384--- libmagic.orig/file.h 2023-07-27 21:40:22.000000000 +0200
1415- +++ libmagic/file.h 2024-02-15 19:50:18.840553550 +0100
1385+ +++ libmagic/file.h 2024-05-27 16:08:06.690332378 +0200
14161386@@ -27,15 +27,13 @@
14171387 */
14181388 /*
@@ -1613,7 +1583,7 @@ diff -u libmagic.orig/file.h libmagic/file.h
16131583 #define QUICK
16141584diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
16151585--- libmagic.orig/fsmagic.c 2023-07-27 21:33:24.000000000 +0200
1616- +++ libmagic/fsmagic.c 2024-02-15 19:28:46.036308654 +0100
1586+ +++ libmagic/fsmagic.c 2024-05-27 16:08:06.690332378 +0200
16171587@@ -66,26 +66,10 @@
16181588 # define minor(dev) ((dev) & 0xff)
16191589 #endif
@@ -1906,7 +1876,7 @@ diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
19061876 case S_IFSOCK:
19071877diff -u libmagic.orig/funcs.c libmagic/funcs.c
19081878--- libmagic.orig/funcs.c 2023-07-27 21:40:12.000000000 +0200
1909- +++ libmagic/funcs.c 2024-02-15 19:28:46.036308654 +0100
1879+ +++ libmagic/funcs.c 2024-05-27 16:08:06.690332378 +0200
19101880@@ -66,7 +66,7 @@
19111881 file_private void
19121882 file_clearbuf(struct magic_set *ms)
@@ -2252,7 +2222,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
22522222 file_clear_closexec(int fd) {
22532223diff -u libmagic.orig/magic.c libmagic/magic.c
22542224--- libmagic.orig/magic.c 2023-07-27 21:33:24.000000000 +0200
2255- +++ libmagic/magic.c 2024-02-15 19:28:46.036308654 +0100
2225+ +++ libmagic/magic.c 2024-05-27 16:08:06.691332388 +0200
22562226@@ -25,11 +25,6 @@
22572227 * SUCH DAMAGE.
22582228 */
@@ -2725,8 +2695,8 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
27252695 }
27262696 return file_getbuffer(ms);
27272697diff -u libmagic.orig/magic.h libmagic/magic.h
2728- --- libmagic.orig/magic.h 2024-02-15 19:52:41.323552388 +0100
2729- +++ libmagic/magic.h 2024-02-15 19:28:46.036308654 +0100
2698+ --- libmagic.orig/magic.h 2024-05-28 16:08:42.589182799 +0200
2699+ +++ libmagic/magic.h 2024-05-27 16:08:06.691332388 +0200
27302700@@ -47,8 +47,6 @@
27312701 * extensions */
27322702 #define MAGIC_COMPRESS_TRANSP 0x2000000 /* Check inside compressed files
@@ -2779,7 +2749,7 @@ diff -u libmagic.orig/magic.h libmagic/magic.h
27792749 int magic_getparam(magic_t, int, void *);
27802750diff -u libmagic.orig/print.c libmagic/print.c
27812751--- libmagic.orig/print.c 2023-07-27 20:04:45.000000000 +0200
2782- +++ libmagic/print.c 2024-02-15 19:28:46.036308654 +0100
2752+ +++ libmagic/print.c 2024-05-27 16:08:06.691332388 +0200
27832753@@ -73,7 +73,7 @@
27842754 if (m->mask_op & FILE_OPINVERSE)
27852755 (void) fputc('~', stderr);
@@ -2836,7 +2806,7 @@ diff -u libmagic.orig/print.c libmagic/print.c
28362806 goto out;
28372807diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
28382808--- libmagic.orig/readcdf.c 2023-02-09 18:43:53.000000000 +0100
2839- +++ libmagic/readcdf.c 2024-02-15 19:28:46.036308654 +0100
2809+ +++ libmagic/readcdf.c 2024-05-27 16:08:06.691332388 +0200
28402810@@ -31,7 +31,9 @@
28412811
28422812 #include <assert.h>
@@ -2956,7 +2926,7 @@ diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
29562926 if (i != -1)
29572927diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
29582928--- libmagic.orig/softmagic.c 2023-07-27 21:40:12.000000000 +0200
2959- +++ libmagic/softmagic.c 2024-02-15 19:28:46.036308654 +0100
2929+ +++ libmagic/softmagic.c 2024-05-27 16:08:06.691332388 +0200
29602930@@ -45,7 +45,7 @@
29612931 #include <time.h>
29622932 #include "der.h"
0 commit comments