[arch-commits] Commit in metasploit/trunk (PKGBUILD)

[Levente Polyak]

    Date: Wednesday, June 1, 2022 @ 17:38:37
  Author: anthraxx
Revision: 1218325

upgpkg: metasploit 6.2.0-2: switch to ruby 3

Modified:
  metasploit/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-01 17:20:23 UTC (rev 1218324)
+++ PKGBUILD	2022-06-01 17:38:37 UTC (rev 1218325)
@@ -5,12 +5,12 @@
 
 pkgname=metasploit
 pkgver=6.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Advanced open-source platform for developing, testing, and using exploit code'
 url='https://www.metasploit.com/'
 arch=('x86_64')
 license=('BSD')
-depends=('ruby2.7' 'libpcap' 'postgresql-libs' 'sqlite' 'libxslt' 'libxml2' 'inetutils' 'git')
+depends=('ruby' 'ruby-bundler' 'libpcap' 'postgresql-libs' 'sqlite' 'libxslt' 'libxml2' 'inetutils' 'git')
 options=('!strip' '!emptydirs')
 source=(https://github.com/rapid7/metasploit-framework/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz)
 sha512sums=('98014297bc1601ebb8bfba2933607b709e5674f7f85f8e3934c82258d30c250ecdf49a6d99656894a6cec85d140bcd69ea47fd559d6ac44af36b44bdebfd6eee')
@@ -19,10 +19,11 @@
 prepare() {
   cd ${pkgname}-framework-${pkgver}
 
-  # https://github.com/bundler/bundler/issues/6882
+  # https://github.com/undler/bundler/issues/6882
   sed -e '/BUNDLED WITH/,+1d' -i Gemfile.lock
 
-  bundle-2.7 config build.nokogiri --use-system-libraries
+  bundle config build.nokogiri --use-system-libraries
+  bundle config set --local deployment 'true'
   sed 's|git ls-files|find -type f|' -i metasploit-framework.gemspec
 }
 
@@ -29,7 +30,7 @@
 build() {
   cd ${pkgname}-framework-${pkgver}
   CFLAGS+=" -I/usr/include/libxml2"
-  bundle-2.7 install -j"$(nproc)" --no-cache --deployment
+  bundle install -j"$(nproc)" --no-cache
   find vendor/bundle/ruby -exec chmod o+r '{}' \;
   find vendor/bundle/ruby \( -name gem_make.out -or -name mkmf.log \) -delete
 }
@@ -42,7 +43,7 @@
 
   for f in "${pkgdir}"/opt/${pkgname}/msf*; do
     local _msffile="${pkgdir}/usr/bin/`basename "${f}"`"
-    echo -e "#!/bin/sh\nBUNDLE_GEMFILE=/opt/${pkgname}/Gemfile exec bundle-2.7 exec ruby-2.7 /opt/${pkgname}/`basename "${f}"` \"\$@\"" > "${_msffile}"
+    echo -e "#!/bin/sh\nBUNDLE_GEMFILE=/opt/${pkgname}/Gemfile exec bundle exec ruby /opt/${pkgname}/`basename "${f}"` \"\$@\"" > "${_msffile}"
     chmod 755 "${_msffile}"
   done
 
@@ -49,7 +50,7 @@
   (cd "${pkgdir}/opt/${pkgname}"
     for f in tools/*/*.rb; do
       install -Dm 755 "${f}" ".${f}"
-      echo -e "#!/bin/sh\nBUNDLE_GEMFILE=/opt/${pkgname}/Gemfile exec bundle-2.7 exec ruby-2.7 /opt/${pkgname}/."${f}" \"\$@\"" > "${f}"
+      echo -e "#!/bin/sh\nBUNDLE_GEMFILE=/opt/${pkgname}/Gemfile exec bundle exec ruby /opt/${pkgname}/."${f}" \"\$@\"" > "${f}"
       chmod 755 "${f}"
     done
   )