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

[Levente Polyak]

    Date: Thursday, January 25, 2018 @ 22:00:22
  Author: anthraxx
Revision: 286964

upgpkg: metasploit 4.16.33-1

Modified:
  metasploit/trunk/PKGBUILD
  metasploit/trunk/metasploit-dont-restrict-aggregator.patch

-------------------------------------------+
 PKGBUILD                                  |   10 ++++----
 metasploit-dont-restrict-aggregator.patch |   35 ++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-25 21:32:28 UTC (rev 286963)
+++ PKGBUILD	2018-01-25 22:00:22 UTC (rev 286964)
@@ -3,7 +3,7 @@
 # Contributor: Tobias Veit - nIcE <m.on.key.tobi[at]gmail[dot]com>
 
 pkgname=metasploit
-pkgver=4.16.30
+pkgver=4.16.33
 pkgrel=1
 pkgdesc='Advanced open-source platform for developing, testing, and using exploit code'
 url='https://www.metasploit.com/'
@@ -14,10 +14,10 @@
 options=('!strip' '!emptydirs')
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/rapid7/metasploit-framework/archive/${pkgver}.tar.gz
         metasploit-dont-restrict-aggregator.patch)
-sha256sums=('bc44e8f65d7b4c7d7372c92e0ff22a1e53b9bee8b06b2b1b253b0da9eef3ab16'
-            'f1a6d0369f24eb622d23dd0fed428cf6404f74cfb0a8001af5d1e18df026d9f6')
-sha512sums=('1ba6d7bbb711fca0dad49b5b1ce36b807c2fd0eb423ea3015af6703ed4755e33d3c2bdf726699a158702fec217a608e62b5b71862e0dc68c7d45db01c4a46ef0'
-            '71611dd350a3f74b6ba61d1508b57d357de221bb676d25d96d5bbcd898e5cabb978ffb9c6c3b37559055fb886c11fe4fed64d8b701d1d94dfff057a32ed53b00')
+sha256sums=('09f777c172851967890b666f26778a8f9ee301d6089a5b06f44f212bbc2c530e'
+            '28008fbc74852a0e939bde209a0faa715eae08a56b2e10c53e1535d50a727609')
+sha512sums=('decf0ef3384bd8d3ce82fe97ed7a52b54de3a3a4eaa60b3748bf88ce61bcb2e7dc5e716999aee6ee6987f28599c011116242ea1b8a9a855fadabc9f98e971340'
+            'fcc1d1f8f2f5f337de25d674571403d62c24501f91c04914e8a9d0960fe7f248f66b44ad83f014d8e30a5b394882bd35588f226b53cec607ddd122f133eaa361')
 
 prepare() {
   cd ${pkgname}-framework-${pkgver}

Modified: metasploit-dont-restrict-aggregator.patch
===================================================================
--- metasploit-dont-restrict-aggregator.patch	2018-01-25 21:32:28 UTC (rev 286963)
+++ metasploit-dont-restrict-aggregator.patch	2018-01-25 22:00:22 UTC (rev 286964)
@@ -1,3 +1,13 @@
+From bf6540585feaf9f404cdad3d8c242917531e8c2a Mon Sep 17 00:00:00 2001
+From: Jeffrey Martin <Jeffrey_Martin at rapid7.com>
+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 <Jeffrey_Martin at rapid7.com>
 Date: Wed, 18 Oct 2017 13:21:02 -0500
@@ -8,6 +18,27 @@
  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
@@ -20,6 +51,6 @@
 +    '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
- 
- group :development, :test do