diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-04-01 23:15:56 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-01 23:15:56 +0100 |
| commit | 85a2a2153ef8027c2ba1be45143cd91914be0ad0 (patch) | |
| tree | ad0163abb9755ef7f76a919d9225f26559a27076 /dev-ruby/rmagick | |
| parent | 4de024ca2423b3aa77a91dd34ef0b70aff64f768 (diff) | |
gentoo auto-resync : 01:04:2023 - 23:15:55
Diffstat (limited to 'dev-ruby/rmagick')
| -rw-r--r-- | dev-ruby/rmagick/Manifest | 1 | ||||
| -rw-r--r-- | dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch | 30 |
2 files changed, 0 insertions, 31 deletions
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest index a17879c34796..19311fbde389 100644 --- a/dev-ruby/rmagick/Manifest +++ b/dev-ruby/rmagick/Manifest @@ -1,4 +1,3 @@ -AUX rmagick-4.2.5-empty-rpath.patch 1290 BLAKE2B a50b127e7570b86c6952066306d734dca816ec5390107c8466921d02292fe5eb886b5e90af0fbc1cf74d92ccd55d46afc8c409693551872c0a810ca50bcea21b SHA512 ffe4fdd582057b281a42497a78f09df523b5604a13b301db04481c2138b8c4ce6f62da61ec1f94f0134fdfe0ad664005f7fca70f6c0193167a12e1778ae2f093 DIST rmagick-4.3.0.tar.gz 1986554 BLAKE2B bf6afb0b19a98f45dd9f3a8261b67ad05ed774784e9fb19009a83c266c16362b4938acd8b0af6a07d3a37fb255fb5bee7a33b7f26c2c49460d546665a98a7871 SHA512 1b108d61b836bf382c9776badc45614ff88ca74176595765c3caba00cc6af0f955dd6f7649a9f97698832193d85292bc22ff0bf290d0bfbf9e8faa58b99b0b1c DIST rmagick-5.2.0.tar.gz 1991303 BLAKE2B 131e0a9ac1e56942b1281f1ce1a62c86e6997fcbc3f162fc4afea897831003bee2e010a27b6ab4f59331b720ff06d61c07b0ae9ce5327752658627adaab0ccad SHA512 9c7262db329869f33c6ae27980a86bd24b7a4a72d7b826eb3e75d28571d954ff5cba6c7ac86a0540663c9ddf2a8185ca3007d3c2ac5cc5339e4cc327e5f7910f EBUILD rmagick-4.3.0.ebuild 2366 BLAKE2B 0ad9a8c230f133d774d1363d2254cf8f2c4b8ee35a8337e51bc6850ea165f529b7938dc7ded1b7e023d9c3668cf8bf356ec428f31230eab98fb52a62676e642b SHA512 73924c8d1fd9c55a7b22ba1f1e422047d5f6877f891e53fbb8518c23a26abc6b391488c53978d20b2effc78e1d984e097f56bbf39461816a54e11d3b642e3f26 diff --git a/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch b/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch deleted file mode 100644 index 13defdd24099..000000000000 --- a/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit fef59858eaba843b876c5b5f253f623ddb4d0f1c -Author: Hans de Graaff <hans@degraaff.org> -Date: Sat Apr 23 08:54:42 2022 +0200 - - Guard against an empty rpath - - Some ImageMagick installations (e.g. on Gentoo Linux when installed - with the package manager) don't return any -L options in pkg-config. - Including an empty rpath is a security risk and should be avoided. - - Fixes #1332 - -diff --git a/ext/RMagick/extconf.rb b/ext/RMagick/extconf.rb -index 7b4ce1ad..3eef6cbd 100644 ---- a/ext/RMagick/extconf.rb -+++ b/ext/RMagick/extconf.rb -@@ -69,11 +69,12 @@ module RMagick - - libdir = `pkg-config --libs-only-L #{$magick_package}`.chomp.sub('-L', '') - ldflags = "#{ENV['LDFLAGS']} " + `pkg-config --libs #{$magick_package}`.chomp -+ rpath = libdir.empty? ? '' : "-Wl,-rpath,#{libdir}" - - # Save flags - $CPPFLAGS = "#{ENV['CPPFLAGS']} " + `pkg-config --cflags #{$magick_package}`.chomp - $LOCAL_LIBS = "#{ENV['LIBS']} " + `pkg-config --libs #{$magick_package}`.chomp -- $LDFLAGS = "#{ldflags} -Wl,-rpath,#{libdir}" -+ $LDFLAGS = "#{ldflags} #{rpath}" - - unless try_link("int main() { }") - # if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option |