ruby-magic 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a066f36addb7d1c8cbe0858a67fa6a8e2103b3d365ab2d0ccda3027ea43a8ce
-  data.tar.gz: 3828bda59c9df6377991481d7f4fa9a8526e981804ff80dbb84aeba7eb316578
+  metadata.gz: 5ec6d5053457e958f459236e45b56c3e4f85dd16e8c09f119208619db7332982
+  data.tar.gz: 01bd34ae0c013438354e440ab533f2b8bce0bd693df874043181a365b1980fe3
 SHA512:
-  metadata.gz: 1ea5942f3c0f33f438f684437a3def3db633f18a279c84574f8a9ee0022d60e8852954b99ee32cc5ad7aa0fa5e10e1b1673e97575d72dfe28c862ac18476d551
-  data.tar.gz: 7ad49df412d72dd3d2b29e07509916e7aef46bf3058191019a290d07fed8792877fa623b9d327e4fa94fa21f49ef2fc8ad242777d3f398c53322a08413dd6a58
+  metadata.gz: d41cbbfec82e392dfe5db7d30d51814f852def72c09f766c4cf9f007272fb256fb4669db02963a8c7fc185c4ecbb83d22873e70fadc89fd63ed0098e5a7397f2
+  data.tar.gz: 8537e862c2b421ccf2d301d0a8811f02112f35c53061d3565d15601264e082e61184af80f866dc37a186101268c99684ada8b6949ab7feea81baf02e97f2dee3

data/CONTRIBUTORS.md

@@ -8,6 +8,8 @@ Ruby Magic Authors". Copyright is held by the original contributor according to
 the versioning history; see [LICENSE](LICENSE) file.
 
 
+- Mike Dalessio ([@flavorjones](https://github.com/flavorjones))
+- Igor Victor ([@gogainda](https://github.com/gogainda))
 - John Hawthorn ([@jhawthorn](https://github.com/jhawthorn))
 - Shinya Maeda ([@dosuken123](https://github.com/dosuken123))
 - Stan Hu ([@stanhu](https://github.com/stanhu))

data/dependencies.yml

@@ -0,0 +1,93 @@
+libmagic:
+  version: "5.39"
+  sha256: "f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1"
+  #  Manually verified checksum:
+  #
+  #    $ gpg --verify file-5.39.tar.gz.asc file-5.39.tar.gz
+  #    gpg: Signature made Mon Jun 15 02:06:08 2020 CEST
+  #    gpg:                using DSA key 0x71112AB16CB33B3A
+  #    gpg: Good signature from "Christos Zoulas (personal key) <christos@zoulas.com>" [unknown]
+  #    gpg:                 aka "Christos Zoulas (NetBSD key) <christos@netbsd.org>" [unknown]
+  #    gpg: WARNING: This key is not certified with a trusted signature!
+  #    gpg:          There is no indication that the signature belongs to the owner.
+  #    Primary key fingerprint: BE04 995B A8F9 0ED0 C0C1  76C4 7111 2AB1 6CB3 3B3A
+  #
+  #  Using this PGP signature:
+  #
+  #    -----BEGIN PGP PUBLIC KEY BLOCK-----
+  #    mQGiBEg60Q8RBAC89+Oyi+iU1dMftAqXKh9Ml2PDCRk+Q6gwSY2BwmnKrPYvLSx9/YApjDp4
+  #    BzhjaMCiDtDkbVDO3JuLQqUsCUWRJr9UxgfkQPMx3obkgoyCCvUcG5eK9CHeztjz5UK3jOzD
+  #    939UtupUXs+5z4dK1oAFFEL3sV6m5O4cuHyeWpjLCwCg9LYwmG2wIB65/2619W2kRMShDwkD
+  #    /1KweB5mmXdQCDpzSg02Q4kGOzWmN2Dpv5kvKd9Lj/qxkj5PFOJ56Rmm04K0lPE6AnDgvEeu
+  #    SqO8pkA8OY5IQNIjlgg3tshoMBRdsj9JLKv67smQXy01eQmadJWoiIZFuSLX7nrRLm3x3i1K
+  #    4/tcKorXoD5QBgOWaYFzkOcQ5jrwA/9tn0MEkkVqez88xGhOjq6jooRWrP2lhNWb+Q7ayEvW
+  #    9Wm9CYS0dXxlCCJfqBOc+cZo8iVVbqiOzwAQ7uAAUv8azuaeRWpOD7MSjkXjYtkPwZevEd6x
+  #    FKODaB2BDO4WMlxO9mp3Q/gPfrM41v9n33tYsAzQMW7c9W5mX/XH2Cv/57QyQ2hyaXN0b3Mg
+  #    Wm91bGFzIChOZXRCU0Qga2V5KSA8Y2hyaXN0b3NAbmV0YnNkLm9yZz6IXgQQEQgABgUCWcg8
+  #    UAAKCRCWb7A7gPrCzP43AP9pxzM85lwZxHRG8vPw16wWUYGcGW44g/u1zqavRUksvgD/fX1y
+  #    6+cj5kNEqp5bHgCvOJiSYADIUQaPTYbwMvnQ1IuIZAQTEQIAJAIbAwYLCQgHAwIDFQIDAxYC
+  #    AQIeAQIXgAUCV7RsLgUJIkWeFwAKCRBxESqxbLM7Oi/LAKC1PdNLcoP06p6nsGh4ApH0gkSl
+  #    fgCg7k7lwLPdN0djOMUPMFnqN+TYAoaIZAQTEQIAJAUCSDrTKgIbAwUJDwmcAAYLCQgHAwID
+  #    FQIDAxYCAQIeAQIXgAAKCRBxESqxbLM7OqXeAJ9tkhVpTsdkix5oWzsBCbU4vHO2CACfbd8k
+  #    PWR68VgvDK5RPQchyghfIZGJARwEEAECAAYFAlnOXIQACgkQWrHF/qWWAmTEhggAmTr9PxSU
+  #    wQ8dAvno6I30mDY+r4V2FaD+WvhITDV/CYfU4ImDCfknDC1x4f44YAgN94YQfnTmAixWLLk9
+  #    NhvgKWHg5Sq2p7S3hLe3hQHUu+4mHq2t+oBtiwnb+GPUAz3ko1hjQ2fN3nZdwKNA3P37NJuj
+  #    EiXOR1UsxO8TaTuf/mB+9vdrUpHsgRaZwYIJ7oszkRkr2V82QsMwgcIdnCPEVY7q+foi2DUF
+  #    UW3eujRLpW9M/NUXrA8f2wQZVaLNy+Zpai57uXW7bVRc82+uRDVwckhKq+YRpfRiD/JCWzKP
+  #    AJJfabUkKiA6NUe51aQJm64BUKh7p8ZR4qjCr/Roofsh9okCHAQQAQIABgUCWduxXQAKCRBm
+  #    Bw6ljCki37ulD/4iZ9hjimgichG5F5Ht2CfPx3Qm16QYjnuB2l7FZNPYlcThdNgjJjc4Wro3
+  #    jrcfj6KMTGXnkRuY7794co6z/U/x9sVz9wQYr0ugrJsVQeHRWbJGl2vFhOOtgj9hfJQM44nz
+  #    3ZZR4VDh/KU4njBhPR1Mzxoop1WBnWcE9RpTIyMlaB6RK9I8JGOpvNYzQaODnsG7z144G/3W
+  #    gIWZnjVVozv/szvtabd+L1N3hMPI2jNkmKWSGuZWdIIcPBEp2e9AYmb9mVhp8UanrMWVTUi0
+  #    q7Cc0Jw4tkTwXYaEeRcbbB87p+IV0an7o+m9e2hrdZJan276tDOFe+HgcZ4NiEM8LTcOBIHn
+  #    VWaRLwQD4AAB8zmMHiVTN3oUdQsYlZmHhBYv8Bkfzwi8JdxMq7V2zGntQnROl9Ust3qL8g28
+  #    xI/dzt396qupywaF/2bUKyZx/079Y3eEluPQlU+iof+hJ2roetJNwMzs/hTDLQgI4T8ZhsMO
+  #    MewZUVI59YrqjETR1U6+L9txmULgL16jBpLqvFBGhUOIDqjI5uxapEjCGy3inocjUeejy5iN
+  #    PehQwt2TKC2Exsyd02kJrPErYVcMLYbO90d2ykBItoSXsDcuOTgfyxpvxTUih4tHVf5B69Ht
+  #    HAPPYqSEfwlVazLnoe/z5KU2h415vcwuRuI1WU0ghdGFCMmH1rQ0Q2hyaXN0b3MgWm91bGFz
+  #    IChwZXJzb25hbCBrZXkpIDxjaHJpc3Rvc0B6b3VsYXMuY29tPoheBBARCAAGBQJZyDxEAAoJ
+  #    EJZvsDuA+sLMa3oA/Rub7s6Vp61CJ4kDTyfAJg0vL2Y6dqb0l1qZfg7kHWDTAQDK85IGzegN
+  #    dAftzh5ZBgOOByQ8C8nprbxQWNTKXwWBH4hkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4B
+  #    AheABQJXtGwxBQkiRZ4XAAoJEHERKrFsszs6XGUAn2mngFtwV1va2adBDUrx4ZpXHQNBAJ9w
+  #    EZ8bIqAmyTrAE8r0iOXe1bzWrIhkBBMRAgAkBQJIOtEPAhsDBQkPCZwABgsJCAcDAgMVAgMD
+  #    FgIBAh4BAheAAAoJEHERKrFsszs63YcAnRjURIBsnyKeY+f6jO8pVYx499LHAJwP4h+X2i+r
+  #    drCNiSYYVCYbkNjysokBHAQQAQIABgUCWc5chAAKCRBascX+pZYCZA6bCACAB7DFdL0DfXUU
+  #    +BTcJQXvlD9fKBoGmonUACPX/wq7phmnvJL0Btl1KJlcLuiu94PgLPXH4nWwpGnWG2Ogigqf
+  #    HxM4Jx6skqkBQI6npacTU1nSaIBW4hKZpo/6QvgjmO1wsSPemIvZ/8+ijfS5AHPh0gew3BFj
+  #    ESPvwWxxode3zDKD5n6g1vU4Id9i0OqjUUkUnCBy8pz6b/n3VuyYXM+OnMgZw+tXfYUJkf3v
+  #    15gWhXlmpeLCPdmSZ8NRy80lrY45EHra2lPx3RgX88AF3cgwLrKfjLRc1yuSZ1mipT+pI1Fs
+  #    uUe14XfXHiLM2ESp2HLDLmCY8lwYelmWPO76skwEiQIcBBABAgAGBQJZ27FdAAoJEGYHDqWM
+  #    KSLft9UP/3ZxzMkr2m8/itBLOBJbMlvCb5gfZLHrQV/GF9OIDDSdu0+4cbbVqeXyg4tEQHHi
+  #    8Gr9WZI3CgqWbJN66NkKnaPqZ4RE7a98h9AvRxWsGhBI+I8r8LTlsQQrhjUyEinsr7oqNP9M
+  #    SO7vicg6df5SuWmQxTrap8A1noX6O0djzJ9Ea721hCHDxGQ9nxCAPOIvS7lI06soNLuuTdp+
+  #    E+r1d3+saHGU6YK8GsnqFSTdxb9WBUJU8BQpcI9kL3iIGA8Azw6L5CFra9InCCQIjzHIbL/r
+  #    WLIJKxJicHJib009atUeLDCwmdaLHoqOkqOJIYrnbbEkPQunY6A68KkNx05N5p46eRwKxKA0
+  #    TJQAMyzdkCYKaiQe+pETwsyO89P9RK84P5wCG4jqSe29JW7VeuBOQDJ3khBN3whDu9s5gVlh
+  #    UGjIeLo85g7IIKTtv5fbopAUCjbVwccqws54PmiSqTy5OlOCbbYGDtoermnXME+sFcNRT8MI
+  #    ktWShC6GrF1BhVrS4ex9e6jsQxKQRMlab2bBeJ6rUXT/i8cnpJERViPspDvVgL7Oer+K2gep
+  #    uNa2DeCaNardaAYo2IYu985pqRZYJVTCydmX+Wlhfp12tzToW1/9QsLTvKUhuI0WB/cC839t
+  #    lJRXapfKjwjj91VEX7Y26vHWli5noHMSNIRlIjT5RqouuQQNBEg60jMQEADIcUV/L4XmXXqj
+  #    GvglW2ZAPn/FIm+N4GM/vTjxUXAc2ciiIsTDuO+1+e4sB9eN05rcvtTyt28W6N6hL8HfQIFq
+  #    5WEsd86vd+cSiBlisq1BglNgFiAfRy/guoLHiYnBlSdS6/Gab86zR4m6Bg1JZOcV0c9Irffv
+  #    5XLlT/LX45V46ju3PQSJYGboKdEaX4jUWcSQgUQ4+HyyP2DsWPyfrJj4sFA0T78b1ywsyKK2
+  #    OOv7KUQk/Hwq2C68aG6YlvvVKywucoSX2uk0ZnWjCCwgOtXxyHIysqAxcz9IPRbtJ3PjjScM
+  #    kv9NMrb5SDswwZy1vfL8s1sa8w7uZgXlpOaFb/yYMuzvwKRwJNxptVW0TTcZ8ADemRiHgDzJ
+  #    0MbXYcmSH8CXla746Bg7oXaCMPvfivOnIsj/6d3YZPT1enwBprgL3VqlWPA4fjWyMh6+BoHu
+  #    ak7Q4k2h2sSXo29tR6KXYbc+K+qUB+QrjGDkOL6JqN5nBLiu3H95B7ZEm8wDoYitDpt7ot9S
+  #    5ja+dcNyUu+XXUGXvc8SvzEmsDKMqxZSxvCyIfPhaFxVylLK02fhfXqpBImvZ6UmHOzylNlk
+  #    TqJzDG4LOOiC/knv7ypgr7VH8TJ2PD9p2IR79hKjnVGmYvTtZ132qda+erbNb/9wwAzOeG49
+  #    fgdiDSsUmvl15kEI+gBtZwADBQ/+PuZa9CEKryZpQ6hczzAN8oksk7MQaTBYdAd62zfaNa/Q
+  #    QID3P5I8FsdXMCcKRipP95cZY8ZQKjBGt7O26Ts955Q71QS58rCXxeLP9/mbpm3kCwXrAkZH
+  #    s2rH2awLOg6p8at2NJCn56AkldK1PyVtL0Qvl7nEOe+lcULqfLNEbGEgzev+ZK0v6So6lA2t
+  #    i8derF5XkIMzCFdjcC1reZvfwNnxd/pQzuMfZOfPjPD6OKaBEWnWNZscU/ucNkgQpv+M2hCA
+  #    paC3NaNiXl0TWsDp7981WSWnf6YZRTjLKyObdGmpo7Z+C9uVu2DbRlUiRAD3azBo4t03EZVB
+  #    XMo/1opuqxyU6FLVW0mxLI2wh2M1Jt/RAvXLm5/Z9zGnPqwAObxkA518e71QXyM+GQ+M8Kyp
+  #    PHr00oC+32PrKnFADI3s1oK5zMX0tjXb0voAgXTWNFsmi+efj7A3wt6G15ai70pOSTuFl9kb
+  #    BqmCI4NmD5wV+uIR/jcmTf7jZKX5QPjDSJddJ5EeAsPXtur0wFZ9JwPM2FyNaeL92BjRYQPW
+  #    C9vRtAUjJa2PSLofMDaEs+VD76WRI3E8kPIJiFeSqOLinclo1e41q3nyj5JBnwg50CwshW7g
+  #    w/bU+IbzL0eZFjJ7ftJ+Xi/vlGtfbxjuKuhyD2PM3DNf9uXmcIV4ldEJzwhw2KmITwQYEQIA
+  #    DwIbDAUCV7RsRgUJIkWdEAAKCRBxESqxbLM7OiJUAJ4y0+A//pOrp3rjo28Uyt34U+qRqwCe
+  #    NqiZtKbSqpUgcLmKNgot+mSEAmmITwQYEQIADwUCSDrSMwIbDAUJDwmcAAAKCRBxESqxbLM7
+  #    OnaqAJ0cUAs8+EPXqRYYbdu6ROINhExMkwCgpupi6uEG+b4yo6M+VlcQY7gl2DE=
+  #    =XrDo
+  #    -----END PGP PUBLIC KEY BLOCK-----

data/ext/magic/common.h

@@ -36,27 +36,27 @@ extern "C" {
 # include <ruby/io.h>
 #else
 # include <rubyio.h>
-#endif
+#endif /* HAVE_RUBY_IO_H */
 
-#if !defined(BIT)
-# define BIT(n) (1 << (n))
-#endif
+#define BIT(n) (1 << (n))
 
 #if !defined(UNUSED)
 # define UNUSED(x) (void)(x)
-#endif
+#endif /* UNUSED */
+
+#define ARRAY_SIZE(a) (int)(sizeof(a) / sizeof((a)[0]))
 
 #if defined(F_DUPFD_CLOEXEC)
 # define HAVE_F_DUPFD_CLOEXEC 1
-#endif
+#endif /* F_DUPFD_CLOEXEC */
 
 #if defined(O_CLOEXEC)
 # define HAVE_O_CLOEXEC 1
-#endif
+#endif /* O_CLOEXEC */
 
 #if defined(POSIX_CLOSE_RESTART)
 # define HAVE_POSIX_CLOSE_RESTART 1
-#endif
+#endif /* POSIX_CLOSE_RESTART */
 
 #define MAGIC_EXTENSION_SEPARATOR "/"
 #define MAGIC_CONTINUE_SEPARATOR "\n- "
@@ -65,15 +65,21 @@ extern "C" {
 # define MAGIC_STATUS_CHECK(x) x
 #else
 # define MAGIC_STATUS_CHECK(x) 1
-#endif
+#endif /* MAGIC_SYSTEM_LIBRARIES */
+
+#if !defined(MAGIC_CUSTOM_CHECK_TYPE)
+# define MAGIC_CHECK_RUBY_TYPE(o, t) Check_Type((o), (t))
+#else
+# define MAGIC_CHECK_RUBY_TYPE(o, t) magic_check_ruby_type((o), (t))
+#endif /* MAGIC_CUSTOM_CHECK_TYPE */
 
 #if !defined(MAGIC_NO_CHECK_CSV)
 # define MAGIC_NO_CHECK_CSV 0
-#endif
+#endif /* MAGIC_NO_CHECK_CSV */
 
 #if !defined(MAGIC_NO_CHECK_JSON)
 # define MAGIC_NO_CHECK_JSON 0
-#endif
+#endif /* MAGIC_NO_CHECK_JSON */
 
 #define DATA_P(x)    (RB_TYPE_P((x), T_DATA))
 #define BOOLEAN_P(x) (RB_TYPE_P((x), T_TRUE) || RB_TYPE_P((x), T_FALSE))
@@ -95,23 +101,30 @@ extern "C" {
 # define RVALUE_TYPE enum ruby_value_type
 #else
 # define RVALUE_TYPE int
-#endif
+#endif /* RUBY_API_VERSION_CODE > 20700 */
+
+#if RUBY_API_VERSION_CODE >= 20700
+# define HAVE_RUBY_GC_COMPACT 1
+# define MAGIC_GC_MARK(x) rb_gc_mark_movable((x))
+#else
+# define MAGIC_GC_MARK(x) rb_gc_mark((x))
+#endif /* RUBY_API_VERSION_CODE >= 20700 */
 
 #define CLASS_NAME(o) (NIL_P((o)) ? "nil" : rb_obj_classname((o)))
 
 #if !defined(T_INTEGER)
 # define T_INTEGER rb_cInteger
-#endif
+#endif /* T_INTEGER */
 
 #if !defined(HAVE_RB_IO_T)
 # define rb_io_t OpenFile
-#endif
+#endif /* HAVE_RB_IO_T */
 
 #if !defined(GetReadFile)
 # define FPTR_TO_FD(p) ((p)->fd)
 #else
 # define FPTR_TO_FD(p) (fileno(GetReadFile(p)))
-#endif
+#endif /* GetReadFile */
 
 #define NOGVL_FUNCTION (VALUE (*)(void *))
 
@@ -138,7 +151,8 @@ fake_blocking_region(VALUE (*f)(ANYARGS), void *data)
 }
 # define NOGVL(f, d) \
 	fake_blocking_region(NOGVL_FUNCTION(f), (d))
-#endif
+#endif /* HAVE_RB_THREAD_CALL_WITHOUT_GVL
+	  HAVE_RUBY_THREAD_H */
 
 #if defined(__cplusplus)
 }

data/ext/magic/extconf.rb

@@ -4,9 +4,6 @@ require 'find'
 require 'mkmf'
 require 'pathname'
 
-LIBMAGIC_TAG = '5.39'
-LIBIMAGE_SHA256 = 'f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1'
-
 # helpful constants
 PACKAGE_ROOT_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -81,6 +78,7 @@ def process_recipe(name, version, static_p, cross_p)
     # correct compiler prefix for cross build, but use host if not set.
     recipe.host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
     recipe.target = File.join(PACKAGE_ROOT_DIR, "ports")
+    recipe.patch_files = Dir[File.join(PACKAGE_ROOT_DIR, "patches", name, "*.patch")].sort
     recipe.configure_options << "--libdir=#{File.join(recipe.path, 'lib')}"
 
     yield recipe
@@ -91,6 +89,20 @@ def process_recipe(name, version, static_p, cross_p)
 
     recipe.configure_options.flatten!
 
+    recipe.configure_options.delete_if do |option|
+      case option
+      when /\A(\w+)=(.*)\z/
+        env[Regexp.last_match(1)] = if env.key?(Regexp.last_match(1))
+          concat_flags(env[Regexp.last_match(1)], Regexp.last_match(2))
+        else
+          Regexp.last_match(2)
+        end
+        true
+      else
+        false
+      end
+    end
+
     recipe.configure_options = [
       "--disable-silent-rules",
       "--disable-dependency-tracking",
@@ -117,11 +129,42 @@ def process_recipe(name, version, static_p, cross_p)
       ]
     end
 
+    if RbConfig::CONFIG['target_cpu'] == 'universal'
+      %w[CFLAGS LDFLAGS].each do |key|
+        unless env[key].include?('-arch')
+          env[key] = concat_flags(env[key], RbConfig::CONFIG['ARCH_FLAG'])
+        end
+      end
+    end
+
     recipe.configure_options += env.map do |key, value|
       "#{key}=#{value.strip}"
     end
 
-    recipe.cook
+    checkpoint = "#{recipe.target}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
+
+    if File.exist?(checkpoint)
+      message("Building Ruby Magic with a packaged version of #{name}-#{version}.\n")
+    else
+      message(<<~EOM)
+        ---------- IMPORTANT NOTICE ----------
+        Building Ruby Magic with a packaged version of #{name}-#{version}.
+        Configuration options: #{recipe.configure_options.shelljoin}
+      EOM
+
+      unless recipe.patch_files.empty?
+        message("The following patches are being applied:\n")
+
+        recipe.patch_files.each do |patch|
+          message("  - %s\n" % File.basename(patch))
+        end
+      end
+
+      recipe.cook
+
+      FileUtils.touch(checkpoint)
+    end
+
     recipe.activate
   end
 end
@@ -220,6 +263,10 @@ append_ldflags(ENV["LDFLAGS"].split) if ENV["LDFLAGS"]
 
 $LIBS = concat_flags($LIBS, ENV["LIBS"]) if ENV["LIBS"]
 
+if truffle?
+  $CPPFLAGS += " -DMAGIC_CUSTOM_CHECK_TYPE"
+end
+
 if config_system_libraries?
   message "Building ruby-magic using system libraries.\n"
 
@@ -229,16 +276,19 @@ if config_system_libraries?
 else
   message "Building ruby-magic using packaged libraries.\n"
 
+  require 'yaml'
+  dependencies = YAML.load_file(File.join(PACKAGE_ROOT_DIR, "dependencies.yml"))
+
   static_p = config_static?
   message "Static linking is #{static_p ? 'enabled' : 'disabled'}.\n"
   cross_build_p = config_cross_build?
   message "Cross build is #{cross_build_p ? 'enabled' : 'disabled'}.\n"
 
-  libmagic_recipe = process_recipe('libmagic', LIBMAGIC_TAG, static_p, cross_build_p) do |recipe|
+  libmagic_recipe = process_recipe('libmagic', dependencies["libmagic"]["version"], static_p, cross_build_p) do |recipe|
     recipe.files = [{
-                      url: "https://ruby-magic.s3.eu-central-1.amazonaws.com/file-#{recipe.version}.tar.gz",
-                      sha256: LIBIMAGE_SHA256
-                    }]
+      url: "https://ruby-magic.s3.nl-ams.scw.cloud/file-#{recipe.version}.tar.gz",
+      sha256: dependencies["libmagic"]["sha256"],
+    }]
   end
 
   $LIBPATH = [File.join(libmagic_recipe.path, 'lib')]

data/ext/magic/ruby-magic.c

@@ -4,60 +4,6 @@ extern "C" {
 
 #include "ruby-magic.h"
 
-static int rb_mgc_do_not_auto_load;
-static int rb_mgc_do_not_stop_on_error;
-static int rb_mgc_warning;
-
-static ID id_at_flags;
-static ID id_at_paths;
-
-static VALUE rb_cMagic = Qundef;
-
-static VALUE rb_mgc_eError = Qundef;
-static VALUE rb_mgc_eMagicError = Qundef;
-static VALUE rb_mgc_eLibraryError = Qundef;
-static VALUE rb_mgc_eParameterError = Qundef;
-static VALUE rb_mgc_eFlagsError = Qundef;
-static VALUE rb_mgc_eNotImplementedError = Qundef;
-
-void Init_magic(void);
-
-static VALUE magic_get_parameter_internal(void *data);
-static VALUE magic_set_parameter_internal(void *data);
-static VALUE magic_get_flags_internal(void *data);
-static VALUE magic_set_flags_internal(void *data);
-static VALUE magic_load_internal(void *data);
-static VALUE magic_load_buffers_internal(void *data);
-static VALUE magic_compile_internal(void *data);
-static VALUE magic_check_internal(void *data);
-static VALUE magic_file_internal(void *data);
-static VALUE magic_buffer_internal(void *data);
-static VALUE magic_descriptor_internal(void *data);
-static VALUE magic_close_internal(void *data);
-
-static void* nogvl_magic_load(void *data);
-static void* nogvl_magic_compile(void *data);
-static void* nogvl_magic_check(void *data);
-static void* nogvl_magic_file(void *data);
-static void* nogvl_magic_descriptor(void *data);
-
-static VALUE magic_allocate(VALUE klass);
-static void magic_mark(void *data);
-static void magic_free(void *data);
-static VALUE magic_exception_wrapper(VALUE value);
-static VALUE magic_exception(void *data);
-static void magic_library_close(void *data);
-static VALUE magic_library_error(VALUE klass, void *data);
-static VALUE magic_generic_error(VALUE klass, int magic_errno,
-				 const char *magic_error);
-static VALUE magic_lock(VALUE object, VALUE (*function)(ANYARGS),
-			void *data);
-static VALUE magic_unlock(VALUE object);
-static VALUE magic_return(void *data);
-static int magic_flags(VALUE object);
-static int magic_set_flags(VALUE object, VALUE value);
-static VALUE magic_set_paths(VALUE object, VALUE value);
-
 /*
  * call-seq:
  *    Magic.do_not_auto_load -> boolean
@@ -539,7 +485,7 @@ rb_mgc_load(VALUE object, VALUE arguments)
 				  klass, klass);
 	}
 
-	ma.flags = magic_flags(object);
+	ma.flags = magic_get_flags(object);
 
 	if (!RARRAY_EMPTY_P(arguments)) {
 		value = magic_join(arguments, CSTR2RVAL(":"));
@@ -614,7 +560,7 @@ rb_mgc_load_buffers(VALUE object, VALUE arguments)
 		sizes[i] = (size_t)RSTRING_LEN(value);
 	}
 
-	ma.flags = magic_flags(object);
+	ma.flags = magic_get_flags(object);
 	ma.type.buffers.count = count;
 	ma.type.buffers.pointers = pointers;
 	ma.type.buffers.sizes = sizes;
@@ -694,7 +640,7 @@ rb_mgc_compile(VALUE object, VALUE value)
 	MAGIC_CHECK_OPEN(object);
 	MAGIC_COOKIE(mo, ma.cookie);
 
-	ma.flags = magic_flags(object);
+	ma.flags = magic_get_flags(object);
 	ma.type.file.path = RVAL2CSTR(value);
 
 	MAGIC_SYNCHRONIZED(magic_compile_internal, &ma);
@@ -721,7 +667,7 @@ rb_mgc_check(VALUE object, VALUE value)
 	MAGIC_CHECK_OPEN(object);
 	MAGIC_COOKIE(mo, ma.cookie);
 
-	ma.flags = magic_flags(object);
+	ma.flags = magic_get_flags(object);
 	ma.type.file.path = RVAL2CSTR(value);
 
 	MAGIC_SYNCHRONIZED(magic_check_internal, &ma);
@@ -759,7 +705,7 @@ rb_mgc_file(VALUE object, VALUE value)
 		goto error;
 
 	ma.stop_on_errors = mo->stop_on_errors;
-	ma.flags = magic_flags(object);
+	ma.flags = magic_get_flags(object);
 	ma.type.file.path = RVAL2CSTR(value);
 
 	MAGIC_SYNCHRONIZED(magic_file_internal, &ma);
@@ -821,7 +767,7 @@ rb_mgc_buffer(VALUE object, VALUE value)
 
 	StringValue(value);
 
-	ma.flags = magic_flags(object);
+	ma.flags = magic_get_flags(object);
 	ma.type.buffers.pointers = (void **)RSTRING_PTR(value);
 	ma.type.buffers.sizes = (size_t *)RSTRING_LEN(value);
 
@@ -857,7 +803,7 @@ rb_mgc_descriptor(VALUE object, VALUE value)
 	MAGIC_CHECK_LOADED(object);
 	MAGIC_COOKIE(mo, ma.cookie);
 
-	ma.flags = magic_flags(object);
+	ma.flags = magic_get_flags(object);
 	ma.type.file.fd = NUM2INT(value);
 
 	MAGIC_SYNCHRONIZED(magic_descriptor_internal, &ma);
@@ -1142,6 +1088,34 @@ magic_descriptor_internal(void *data)
 	return (VALUE)NULL;
 }
 
+static inline void*
+magic_library_open(void)
+{
+	magic_t cookie;
+
+	cookie = magic_open_wrapper(MAGIC_NONE);
+	if (!cookie) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	return cookie;
+}
+
+static inline void
+magic_library_close(void *data)
+{
+	magic_object_t *mo = data;
+
+	assert(mo != NULL && \
+	       "Must be a valid pointer to `magic_object_t' type");
+
+	if (mo->cookie)
+		magic_close_wrapper(mo->cookie);
+
+	mo->cookie = NULL;
+}
+
 static VALUE
 magic_allocate(VALUE klass)
 {
@@ -1163,8 +1137,8 @@ magic_allocate(VALUE klass)
 	mo->database_loaded = 0;
 	mo->stop_on_errors = 0;
 
-	mo->cookie = magic_open_wrapper(MAGIC_NONE);
-	local_errno = ENOMEM;
+	mo->cookie = magic_library_open();
+	local_errno = errno;
 
 	if (!mo->cookie) {
 		ruby_xfree(mo);
@@ -1175,11 +1149,22 @@ magic_allocate(VALUE klass)
 				    E_MAGIC_LIBRARY_INITIALIZE);
 	}
 
-	return Data_Wrap_Struct(klass, magic_mark, magic_free, mo);
+	return TypedData_Wrap_Struct(klass, &rb_magic_type, mo);
 }
 
 static inline void
-magic_library_close(void *data)
+magic_mark(void *data)
+{
+	magic_object_t *mo = data;
+
+	assert(mo != NULL && \
+	       "Must be a valid pointer to `magic_object_t' type");
+
+	MAGIC_GC_MARK(mo->mutex);
+}
+
+static inline void
+magic_free(void *data)
 {
 	magic_object_t *mo = data;
 
@@ -1187,38 +1172,37 @@ magic_library_close(void *data)
 	       "Must be a valid pointer to `magic_object_t' type");
 
 	if (mo->cookie)
-		magic_close_wrapper(mo->cookie);
+		magic_library_close(data);
 
 	mo->cookie = NULL;
+	mo->mutex = Qundef;
+
+	ruby_xfree(mo);
 }
 
-static inline void
-magic_mark(void *data)
+static inline size_t
+magic_size(const void *data)
 {
-	magic_object_t *mo = data;
+	const magic_object_t *mo = data;
 
 	assert(mo != NULL && \
 	       "Must be a valid pointer to `magic_object_t' type");
 
-	rb_gc_mark(mo->mutex);
+	return sizeof(*mo);
 }
 
+#if defined(HAVE_RUBY_GC_COMPACT)
 static inline void
-magic_free(void *data)
+magic_compact(void *data)
 {
 	magic_object_t *mo = data;
 
 	assert(mo != NULL && \
 	       "Must be a valid pointer to `magic_object_t' type");
 
-	if (mo->cookie)
-		magic_library_close(data);
-
-	mo->cookie = NULL;
-	mo->mutex = Qundef;
-
-	ruby_xfree(mo);
+	mo->mutex = rb_gc_location(mo->mutex);
 }
+#endif /* HAVE_RUBY_GC_COMPACT */
 
 static inline VALUE
 magic_exception_wrapper(VALUE value)
@@ -1362,7 +1346,7 @@ magic_return(void *data)
 }
 
 static inline int
-magic_flags(VALUE object)
+magic_get_flags(VALUE object)
 {
 	return NUM2INT(rb_ivar_get(object, id_at_flags));
 }
@@ -1379,6 +1363,19 @@ magic_set_paths(VALUE object, VALUE value)
 	return rb_ivar_set(object, id_at_paths, value);
 }
 
+static const rb_data_type_t rb_magic_type = {
+	.wrap_struct_name = "magic",
+	.function = {
+		.dmark	  = magic_mark,
+		.dfree	  = magic_free,
+		.dsize	  = magic_size,
+#if defined(HAVE_RUBY_GC_COMPACT)
+		.dcompact = magic_compact,
+#endif /* HAVE_RUBY_GC_COMPACT */
+	},
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 void
 Init_magic(void)
 {

data/ext/magic/ruby-magic.h

@@ -11,7 +11,7 @@ extern "C" {
 #define MAGIC_SYNCHRONIZED(f, d) magic_lock(object, (f), (d))
 
 #define MAGIC_OBJECT(o) \
-	Data_Get_Struct(object, magic_object_t, (o))
+	TypedData_Get_Struct(object, magic_object_t, &rb_magic_type, (o))
 
 #define MAGIC_COOKIE(o, c) \
 	((c) = MAGIC_OBJECT((o))->cookie)
@@ -83,6 +83,7 @@ enum error {
 	E_NOT_ENOUGH_MEMORY,
 	E_ARGUMENT_MISSING,
 	E_ARGUMENT_TYPE_INVALID,
+	E_ARGUMENT_TYPE_UNKNOWN,
 	E_ARGUMENT_TYPE_ARRAY_EMPTY,
 	E_ARGUMENT_TYPE_ARRAY_STRINGS,
 	E_MAGIC_LIBRARY_INITIALIZE,
@@ -141,6 +142,7 @@ static const char *errors[] = {
 	[E_NOT_ENOUGH_MEMORY]		= "cannot allocate memory",
 	[E_ARGUMENT_MISSING]		= "wrong number of arguments (given %d, expected %d)",
 	[E_ARGUMENT_TYPE_INVALID]	= "wrong argument type %s (expected %s)",
+	[E_ARGUMENT_TYPE_UNKNOWN]	= "unknown type 0x%x (0x%x given)",
 	[E_ARGUMENT_TYPE_ARRAY_EMPTY]	= "arguments list cannot be empty (expected array of String)",
 	[E_ARGUMENT_TYPE_ARRAY_STRINGS]	= "wrong argument type %s in arguments list (expected String)",
 	[E_MAGIC_LIBRARY_INITIALIZE]	= "failed to initialize Magic library",
@@ -153,6 +155,93 @@ static const char *errors[] = {
 	NULL
 };
 
+#if defined(MAGIC_CUSTOM_CHECK_TYPE)
+static const char *ruby_types[] = {
+	"", /* Not an object */
+	[T_OBJECT]	= "Object",
+	[T_CLASS]	= "Class",
+	[T_MODULE]	= "Module",
+	[T_FLOAT]	= "Float",
+	[T_STRING]	= "String",
+	[T_REGEXP]	= "Regexp",
+	[T_ARRAY]	= "Array",
+	[T_HASH]	= "Hash",
+	[T_STRUCT]	= "Struct",
+	[T_BIGNUM]	= "Integer",
+	[T_FILE]	= "File",
+	"", /* Internal use */
+	[T_MATCH]	= "MatchData",
+	[T_COMPLEX]	= "Complex",
+	[T_RATIONAL]	= "Rational",
+	"", /* Internal use */
+	[T_NIL]		= "nil",
+	[T_TRUE]	= "true",
+	[T_FALSE]	= "false",
+	[T_SYMBOL]	= "Symbol",
+	[T_FIXNUM]	= "Integer",
+	"", /* Internal use */
+	NULL
+};
+
+static const char *
+magic_ruby_type_name(int type)
+{
+	const char *name;
+
+	if (type >= ARRAY_SIZE(ruby_types))
+		return NULL;
+
+	name = ruby_types[type];
+	if (name)
+		return name;
+
+	return NULL;
+}
+
+static const char *
+magic_ruby_class_name(VALUE object)
+{
+	const char *name = NULL;
+
+	if (NIL_P(object))
+		name = "nil";
+	else if (RB_TYPE_P(object, T_TRUE))
+		name = "true";
+	else if (RB_TYPE_P(object, T_FALSE))
+		name = "false";
+	else
+		name = CLASS_NAME(object);
+
+	return name;
+}
+
+void
+magic_check_ruby_type(VALUE object, int type)
+{
+	const char *name;
+	int object_type = TYPE(object);
+
+	if (object == Qundef)
+		rb_bug("invalid type leaked to the Ruby space");
+
+	if (object_type > T_MASK || object_type == T_DATA)
+		goto error;
+
+	if (object_type == type)
+		return;
+
+	name = magic_ruby_type_name(type);
+	if (name)
+		rb_raise(rb_eTypeError, error(E_ARGUMENT_TYPE_INVALID),
+			 magic_ruby_class_name(object),
+			 name);
+error:
+	rb_raise(rb_eTypeError, error(E_ARGUMENT_TYPE_UNKNOWN),
+		 object_type,
+		 type);
+}
+#endif /* MAGIC_CUSTOM_CHECK_TYPE */
+
 static inline VALUE
 magic_shift(VALUE v)
 {
@@ -233,7 +322,7 @@ magic_check_type(VALUE object, RVALUE_TYPE type)
 	if (type == T_FIXNUM && !RVAL2CBOOL(boolean))
 		MAGIC_ARGUMENT_TYPE_ERROR(object, rb_class2name(T_INTEGER));
 
-	Check_Type(object, type);
+	MAGIC_CHECK_RUBY_TYPE(object, type);
 }
 
 static inline void
@@ -250,10 +339,114 @@ magic_check_type_array_of_strings(VALUE object)
 	}
 }
 
+static int rb_mgc_do_not_auto_load;
+static int rb_mgc_do_not_stop_on_error;
+static int rb_mgc_warning;
+
+static ID id_at_flags;
+static ID id_at_paths;
+
+static VALUE rb_cMagic;
+
+static VALUE rb_mgc_eError;
+static VALUE rb_mgc_eMagicError;
+static VALUE rb_mgc_eLibraryError;
+static VALUE rb_mgc_eNotImplementedError;
+static VALUE rb_mgc_eParameterError;
+static VALUE rb_mgc_eFlagsError;
+
+static const rb_data_type_t rb_magic_type;
+
+void Init_magic(void);
+
+VALUE rb_mgc_get_do_not_auto_load_global(VALUE object);
+VALUE rb_mgc_set_do_not_auto_load_global(VALUE object, VALUE value);
+VALUE rb_mgc_get_do_not_stop_on_error_global(VALUE object);
+VALUE rb_mgc_set_do_not_stop_on_error_global(VALUE object, VALUE value);
+
+VALUE rb_mgc_initialize(VALUE object, VALUE arguments);
+
+VALUE rb_mgc_get_do_not_stop_on_error(VALUE object);
+VALUE rb_mgc_set_do_not_stop_on_error(VALUE object, VALUE value);
+
+VALUE rb_mgc_open_p(VALUE object);
+VALUE rb_mgc_close(VALUE object);
 VALUE rb_mgc_close_p(VALUE object);
+
+VALUE rb_mgc_get_paths(VALUE object);
+
+VALUE rb_mgc_get_parameter(VALUE object, VALUE tag);
+VALUE rb_mgc_set_parameter(VALUE object, VALUE tag, VALUE value);
+
+VALUE rb_mgc_get_flags(VALUE object);
+VALUE rb_mgc_set_flags(VALUE object, VALUE value);
+
 VALUE rb_mgc_load(VALUE object, VALUE arguments);
+VALUE rb_mgc_load_buffers(VALUE object, VALUE arguments);
+VALUE rb_mgc_load_p(VALUE object);
+
+VALUE rb_mgc_compile(VALUE object, VALUE arguments);
+VALUE rb_mgc_check(VALUE object, VALUE arguments);
+
+VALUE rb_mgc_file(VALUE object, VALUE value);
+VALUE rb_mgc_buffer(VALUE object, VALUE value);
 VALUE rb_mgc_descriptor(VALUE object, VALUE value);
 
+VALUE rb_mgc_version(VALUE object);
+
+static VALUE magic_get_parameter_internal(void *data);
+static VALUE magic_set_parameter_internal(void *data);
+
+static VALUE magic_get_flags_internal(void *data);
+static VALUE magic_set_flags_internal(void *data);
+
+static VALUE magic_load_internal(void *data);
+static VALUE magic_load_buffers_internal(void *data);
+
+static VALUE magic_compile_internal(void *data);
+static VALUE magic_check_internal(void *data);
+
+static VALUE magic_file_internal(void *data);
+static VALUE magic_buffer_internal(void *data);
+static VALUE magic_descriptor_internal(void *data);
+
+static VALUE magic_close_internal(void *data);
+
+static void* nogvl_magic_load(void *data);
+static void* nogvl_magic_compile(void *data);
+static void* nogvl_magic_check(void *data);
+static void* nogvl_magic_file(void *data);
+static void* nogvl_magic_descriptor(void *data);
+
+static void* magic_library_open(void);
+static void magic_library_close(void *data);
+
+static VALUE magic_allocate(VALUE klass);
+static void magic_mark(void *data);
+static void magic_free(void *data);
+static size_t magic_size(const void *data);
+#if defined(HAVE_RUBY_GC_COMPACT)
+static void magic_compact(void *data);
+#endif
+
+static VALUE magic_exception_wrapper(VALUE value);
+static VALUE magic_exception(void *data);
+
+static VALUE magic_library_error(VALUE klass, void *data);
+static VALUE magic_generic_error(VALUE klass, int magic_errno,
+				 const char *magic_error);
+
+static VALUE magic_lock(VALUE object, VALUE (*function)(ANYARGS),
+			void *data);
+static VALUE magic_unlock(VALUE object);
+
+static VALUE magic_return(void *data);
+
+static int magic_get_flags(VALUE object);
+static int magic_set_flags(VALUE object, VALUE value);
+
+static VALUE magic_set_paths(VALUE object, VALUE value);
+
 #if defined(__cplusplus)
 }
 #endif

data/lib/magic/version.rb

@@ -4,7 +4,7 @@ class Magic
   #
   # Current version of _Magic_.
   #
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.4.0'.freeze
 
   class << self
     #

data/patches/libmagic/0001-Don-t-attempt-to-build-tests-documentation-and-Python-bindings.patch

@@ -0,0 +1,44 @@
+From 0f2752ad4d7ea65c80d76493899aca67e90be524 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= <kw@linux.com>
+Date: Mon, 5 Apr 2021 16:51:59 +0000
+Subject: [PATCH] Don't attempt to build tests, documentation and Python
+ bindings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
+---
+ Makefile.am | 2 +-
+ Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2ab67ed..c7fafeb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
+ 
+ EXTRA_DIST = MAINT
+ 
+-SUBDIRS = src magic tests doc python
++SUBDIRS = src magic
+ 
+ # This variable must have 'exec' in its name, in order to be installed
+ # by 'install-exec' target (instead of default 'install-data')
+diff --git a/Makefile.in b/Makefile.in
+index e19b15e..dcb5ce6 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -358,7 +358,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+ EXTRA_DIST = MAINT
+-SUBDIRS = src magic tests doc python
++SUBDIRS = src magic
+ 
+ # This variable must have 'exec' in its name, in order to be installed
+ # by 'install-exec' target (instead of default 'install-data')
+-- 
+2.31.0
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-magic
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Krzysztof Wilczyński
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - kwilczynski-public.pem
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -42,6 +42,7 @@ files:
 - LICENSE
 - NOTICE
 - README.md
+- dependencies.yml
 - ext/magic/common.h
 - ext/magic/extconf.rb
 - ext/magic/functions.c
@@ -53,6 +54,8 @@ files:
 - lib/magic/core/file.rb
 - lib/magic/core/string.rb
 - lib/magic/version.rb
+- patches/libmagic/0001-Don-t-attempt-to-build-tests-documentation-and-Python-bindings.patch
+- ports/archives/file-5.39.tar.gz
 homepage: https://github.com/kwilczynski/ruby-magic
 licenses:
 - Apache-2.0