Skip to content

Hide libmagic symbols by default on supported platforms #21472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orlitzky wants to merge 2 commits into
base: master
Choose a base branch
from
+19 −4
Open

Hide libmagic symbols by default on supported platforms #21472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa83463
ext/fileinfo/libmagic/file.h: hide "file_public" names by default
orlitzky Mar 20, 2026
a111375
ext/fileinfo/libmagic.patch: update
orlitzky Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions ext/fileinfo/libmagic.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1727,7 +1727,7 @@ diff -u libmagic.orig/encoding.c libmagic/encoding.c
}
diff -u libmagic.orig/file.h libmagic/file.h
--- libmagic.orig/file.h 2024-11-27 10:37:00.000000000 -0500
+++ libmagic/file.h 2026-03-25 08:13:23.336328498 -0400
+++ libmagic/file.h 2026-03-25 16:14:40.128668705 -0400
@@ -27,15 +27,13 @@
*/
/*
Expand Down Expand Up @@ -1767,6 +1767,21 @@ diff -u libmagic.orig/file.h libmagic/file.h

#define ENABLE_CONDITIONALS

@@ -109,12 +102,12 @@

#if HAVE_VISIBILITY
# if defined(WIN32)
-# define file_public __declspec(dllexport)
+# define file_public
# ifndef file_protected
# define file_protected
# endif
# else
-# define file_public __attribute__((__visibility__("default")))
+# define file_public __attribute__((__visibility__("hidden")))
# ifndef file_protected
# define file_protected __attribute__((__visibility__("hidden")))
# endif
@@ -179,7 +172,7 @@
#define MAXstring 128 /* max len of "string" types */

Expand Down Expand Up @@ -3075,7 +3090,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
}
return file_getbuffer(ms);
diff -u libmagic.orig/magic.h libmagic/magic.h
--- libmagic.orig/magic.h 2026-03-25 08:16:04.280413419 -0400
--- libmagic.orig/magic.h 2026-03-25 16:14:49.284673536 -0400
+++ libmagic/magic.h 2026-03-20 12:10:19.777614667 -0400
@@ -47,8 +47,6 @@
* extensions */
Expand Down
4 changes: 2 additions & 2 deletions ext/fileinfo/libmagic/file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@

#if HAVE_VISIBILITY
# if defined(WIN32)
# define file_public __declspec(dllexport)
# define file_public
# ifndef file_protected
# define file_protected
# endif
# else
# define file_public __attribute__((__visibility__("default")))
# define file_public __attribute__((__visibility__("hidden")))
# ifndef file_protected
# define file_protected __attribute__((__visibility__("hidden")))
# endif
Expand Down
Loading