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

2018-04-05 Thread Levente Polyak via arch-commits 
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
===
--- PKGBUILD2018-04-05 22:53:14 UTC (rev 314532)
+++ PKGBUILD2018-04-05 22:57:40 UTC (rev 314533)
@@ -3,7 +3,7 @@
 # Contributor: Tobias Veit - nIcE 
 
 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 
-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 
-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

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

2018-01-25 Thread Levente Polyak via arch-commits 
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
===
--- PKGBUILD2018-01-25 21:32:28 UTC (rev 286963)
+++ PKGBUILD2018-01-25 22:00:22 UTC (rev 286964)
@@ -3,7 +3,7 @@
 # Contributor: Tobias Veit - nIcE 
 
 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=('decf0ef3384bd8d3ce82fe97ed7a52b54de3a3a4eaa60b3748bf88ce61bcb2e7dc5e716999aee6ee6987f28599c06242ea1b8a9a855fadabc9f98e971340'
+
'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 
+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 
 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

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

2017-11-05 Thread Levente Polyak 
Date: Sunday, November 5, 2017 @ 20:46:28
  Author: anthraxx
Revision: 265449

upgpkg: metasploit 4.16.15-1

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

---+
 PKGBUILD  |   12 
 metasploit-dont-restrict-aggregator.patch |   25 +
 2 files changed, 33 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-05 20:28:21 UTC (rev 265448)
+++ PKGBUILD2017-11-05 20:46:28 UTC (rev 265449)
@@ -3,7 +3,7 @@
 # Contributor: Tobias Veit - nIcE 
 
 pkgname=metasploit
-pkgver=4.16.11
+pkgver=4.16.15
 pkgrel=1
 pkgdesc='Advanced open-source platform for developing, testing, and using 
exploit code'
 url='https://www.metasploit.com/'
@@ -12,14 +12,18 @@
 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)
-sha256sums=('13ce7794bec989bcab6868c1f2d2c5f054b5ea0c167a9baf82fb3ed006a053d8')
-sha512sums=('5913962b85e3234fe1e75603b4075f9034c317224619b13f898b1fe5197ce1c7c0161344c9323a092be45184d0faa7a31c3da772c316c5a69b44f7ea90f81846')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/rapid7/metasploit-framework/archive/${pkgver}.tar.gz
+metasploit-dont-restrict-aggregator.patch)
+sha256sums=('441c07274f936fbea8f859157048dec4890ee6e80920c49d6c4306129ee00384'
+'f1a6d0369f24eb622d23dd0fed428cf6404f74cfb0a8001af5d1e18df026d9f6')
+sha512sums=('e8e612ceb80f8edec2cff745be9bfc57032770e24179b4613ef8331a2b48ebcd8eb8fea6f5beda0af98a8ceff62c89a63d5107b37738b2dc724dfe277f8a443f'
+
'71611dd350a3f74b6ba61d1508b57d357de221bb676d25d96d5bbcd898e5cabb978ffb9c6c3b37559055fb886c11fe4fed64d8b701d1d94dfff057a32ed53b00')
 
 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 -R -p1 < "${srcdir}/metasploit-dont-restrict-aggregator.patch"
 }
 
 build() {

Added: metasploit-dont-restrict-aggregator.patch
===
--- metasploit-dont-restrict-aggregator.patch   (rev 0)
+++ metasploit-dont-restrict-aggregator.patch   2017-11-05 20:46:28 UTC (rev 
265449)
@@ -0,0 +1,25 @@
+From 5458b58a74a035e141a939dff0a85eff1330bdae Mon Sep 17 00:00:00 2001
+From: Jeffrey Martin 
+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 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'))
+ end
+ 
+ group :development, :test do