Date: Thursday, April 5, 2018 @ 22:57:40 Author: anthraxx Revision: 314533
upgpkg: metasploit 4.16.49-1 Modified: metasploit/trunk/PKGBUILD Deleted: metasploit/trunk/metasploit-dont-restrict-aggregator.patch -------------------------------------------+ PKGBUILD | 15 ++----- metasploit-dont-restrict-aggregator.patch | 56 ---------------------------- 2 files changed, 4 insertions(+), 67 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-05 22:53:14 UTC (rev 314532) +++ PKGBUILD 2018-04-05 22:57:40 UTC (rev 314533) @@ -3,7 +3,7 @@ # Contributor: Tobias Veit - nIcE <m.on.key.tobi[at]gmail[dot]com> pkgname=metasploit -pkgver=4.16.45 +pkgver=4.16.49 pkgrel=1 pkgdesc='Advanced open-source platform for developing, testing, and using exploit code' url='https://www.metasploit.com/' @@ -10,22 +10,15 @@ arch=('x86_64') license=('BSD') depends=('ruby' 'libpcap' 'postgresql-libs' 'ruby-bundler' 'sqlite' 'libxslt' 'git') -optdepends=('ruby-pg: database support') options=('!strip' '!emptydirs') -source=(${pkgname}-${pkgver}.tar.gz::https://github.com/rapid7/metasploit-framework/archive/${pkgver}.tar.gz - metasploit-dont-restrict-aggregator.patch) -sha256sums=('16c9d2ff56e716847187fe3b1437b5a1a5a7e45530101b179199a815b6911796' - '28008fbc74852a0e939bde209a0faa715eae08a56b2e10c53e1535d50a727609') -sha512sums=('89c51d40484a42bea023f7289e1793def04b5184fa75ead25968bb4725a87398620f64d437e11d8f8a160b7c5e3649ca79a6743eb54e0416ffdf3a39f81b55ea' - 'fcc1d1f8f2f5f337de25d674571403d62c24501f91c04914e8a9d0960fe7f248f66b44ad83f014d8e30a5b394882bd35588f226b53cec607ddd122f133eaa361') +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/rapid7/metasploit-framework/archive/${pkgver}.tar.gz) +sha256sums=('b48b21714b04555c5f98a5bf407bcfd5d297c5f2e6b924ada56416df2c51616d') +sha512sums=('ab640e8a60178b16981b7881a879320bf48106869f46cd7058b7f386c7f9287dba364072df1d8fbf61f2472598dc4b1309df9c64a033971c2aa21ef98be8fb25') prepare() { cd ${pkgname}-framework-${pkgver} bundle config build.nokogiri --use-system-libraries sed 's|git ls-files|find -type f|' -i metasploit-framework.gemspec - patch -Rp1 < "${srcdir}/metasploit-dont-restrict-aggregator.patch" - sed "s|'grpc', '1.8.3'|'grpc', '1.10.0'|g" -i Gemfile - sed -r 's|(grpc \(.*)1.8.3\)|\11.10.0)|g' -i Gemfile.lock } build() { Deleted: metasploit-dont-restrict-aggregator.patch =================================================================== --- metasploit-dont-restrict-aggregator.patch 2018-04-05 22:53:14 UTC (rev 314532) +++ metasploit-dont-restrict-aggregator.patch 2018-04-05 22:57:40 UTC (rev 314533) @@ -1,56 +0,0 @@ -From bf6540585feaf9f404cdad3d8c242917531e8c2a Mon Sep 17 00:00:00 2001 -From: Jeffrey Martin <[email protected]> -Date: Fri, 19 Jan 2018 16:15:09 -0600 -Subject: [PATCH] lock google-protobuf and grpc on 4.x - ---- - Gemfile | 8 ++++++++ - Gemfile.lock | 4 +++- - 2 files changed, 11 insertions(+), 1 deletion(-) - -From 5458b58a74a035e141a939dff0a85eff1330bdae Mon Sep 17 00:00:00 2001 -From: Jeffrey Martin <[email protected]> -Date: Wed, 18 Oct 2017 13:21:02 -0500 -Subject: [PATCH] restrict aggregator on arm for now - ---- - Gemfile | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/Gemfile b/Gemfile -index 012578df9fc..b7b4351007a 100755 ---- a/Gemfile -+++ b/Gemfile -@@ -23,8 +23,14 @@ group :development do - 'x86-mingw32', 'x64-mingw32', - 'x86_64-linux', 'x86-linux', - 'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin')) -- gem 'google-protobuf', '3.5.1' -+ gem 'google-protobuf', '3.5.1' if [ -+ 'x86-mingw32', 'x64-mingw32', -+ 'x86_64-linux', 'x86-linux', -+ 'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin')) -- gem 'grpc', '1.8.3' -+ gem 'grpc', '1.8.3' if [ -+ 'x86-mingw32', 'x64-mingw32', -+ 'x86_64-linux', 'x86-linux', -+ 'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin')) - end - - group :development, :test do -diff --git a/Gemfile b/Gemfile -index 12b6341b41c..012578df9fc 100755 ---- a/Gemfile -+++ b/Gemfile -@@ -19,7 +19,10 @@ group :development do - # module documentation - gem 'octokit' - # Metasploit::Aggregator external session proxy -- gem 'metasploit-aggregator' -+ gem 'metasploit-aggregator' if [ -+ 'x86-mingw32', 'x64-mingw32', -+ 'x86_64-linux', 'x86-linux', -+ 'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin')) - gem 'google-protobuf', '3.5.1' - gem 'grpc', '1.8.3' - end
