From bff0aba576eacb964853440d3da6a6806503125b Mon Sep 17 00:00:00 2001 From: sumithemmadi Date: Sun, 17 Sep 2023 00:18:44 +0530 Subject: [PATCH 1/5] Updated install script to install in EndeavourOS --- Gemfile.lock | 85 +++++++++++++++++++++++++++------------------------- install | 2 +- 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d3512519a6..e9263bd259 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: https://rubygems.org/ specs: - activemodel (7.0.4.3) - activesupport (= 7.0.4.3) - activerecord (7.0.4.3) - activemodel (= 7.0.4.3) - activesupport (= 7.0.4.3) - activesupport (7.0.4.3) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) ansi (1.5.0) archive-zip (0.12.0) @@ -23,9 +23,9 @@ GEM timers (~> 4.1) async-dns (1.3.0) async-io (~> 1.15) - async-io (1.34.3) + async-io (1.36.0) async - browserstack-local (1.4.2) + browserstack-local (1.4.3) byebug (11.1.3) capybara (3.39.2) addressable @@ -38,7 +38,8 @@ GEM xpath (~> 3.2) coderay (1.1.3) concurrent-ruby (1.2.2) - console (1.16.2) + console (1.23.2) + fiber-annotation fiber-local curb (1.0.5) daemons (1.4.1) @@ -52,7 +53,8 @@ GEM espeak-ruby (1.1.0) event_emitter (0.2.6) eventmachine (1.2.7) - execjs (2.8.1) + execjs (2.9.1) + fiber-annotation (0.2.0) fiber-local (1.0.0) geckodriver-helper (0.24.0) archive-zip (~> 0.7) @@ -63,26 +65,27 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http_parser.rb (0.8.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) io-like (0.3.1) - irb (1.7.0) - reline (>= 0.3.0) + irb (1.8.1) + rdoc + reline (>= 0.3.8) json (2.6.3) language_server-protocol (3.17.0.3) matrix (0.4.2) maxmind-db (1.1.1) method_source (1.0.0) - mime-types (3.4.1) + mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) - mini_mime (1.1.2) - minitest (5.18.0) - mojo_magick (0.6.7) + mime-types-data (3.2023.0808) + mini_mime (1.1.5) + minitest (5.20.0) + mojo_magick (0.6.8) msfrpc-client (1.1.2) msgpack (~> 1) - msgpack (1.6.1) + msgpack (1.7.2) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) net-protocol (0.2.1) @@ -90,8 +93,8 @@ GEM net-smtp (0.3.3) net-protocol netrc (0.11.0) - nio4r (2.5.8) - nokogiri (1.15.2-x86_64-linux) + nio4r (2.5.9) + nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) otr-activerecord (2.1.2) activerecord (>= 4.0, < 7.1) @@ -110,12 +113,12 @@ GEM pry (>= 0.13, < 0.15) psych (5.1.0) stringio - public_suffix (5.0.1) - qr4r (0.6.1) + public_suffix (5.0.3) + qr4r (0.6.2) mojo_magick (~> 0.6.5) - rqrcode_core (~> 0.1) + rqrcode_core (~> 1.0) racc (1.7.1) - rack (2.2.7) + rack (2.2.8) rack-protection (3.0.6) rack rack-test (2.1.0) @@ -125,29 +128,29 @@ GEM rdoc (6.5.0) psych (>= 4.0.0) regexp_parser (2.8.1) - reline (0.3.5) + reline (0.3.8) io-console (~> 0.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) - rqrcode_core (0.2.0) + rexml (3.2.6) + rqrcode_core (1.2.0) rr (3.1.0) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-core (3.12.1) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.4) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-support (3.12.0) + rspec-support (3.12.1) rubocop (1.53.1) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -167,7 +170,7 @@ GEM rushover (0.3.0) json rest-client - selenium-webdriver (4.10.0) + selenium-webdriver (4.12.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -177,12 +180,12 @@ GEM rack-protection (= 3.0.6) tilt (~> 2.0) slack-notifier (2.4.0) - sqlite3 (1.6.1-x86_64-linux) - stringio (3.0.5) + sqlite3 (1.6.6-x86_64-linux) + stringio (3.0.8) sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - test-unit (3.5.7) + test-unit (3.6.1) power_assert test-unit-context (0.5.1) test-unit (>= 2.4.0) @@ -203,8 +206,8 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - tilt (2.1.0) - timeout (0.3.2) + tilt (2.3.0) + timeout (0.4.0) timers (4.3.5) tins (1.32.1) sync @@ -221,7 +224,7 @@ GEM websocket-client-simple (0.6.1) event_emitter websocket - xmlrpc (0.3.2) + xmlrpc (0.3.3) webrick xpath (3.2.0) nokogiri (~> 1.8) @@ -273,4 +276,4 @@ DEPENDENCIES xmlrpc (~> 0.3.2) BUNDLED WITH - 2.4.8 + 2.4.13 diff --git a/install b/install index 1aad6dbbb0..1431149bd1 100755 --- a/install +++ b/install @@ -89,7 +89,7 @@ install_linux() { DISTRO_ID=$(grep ID= /etc/os-release | grep -v "BUILD" | grep -v "IMAGE" | cut -d= -f2-) if [ "${DISTRO_ID}" = 'kali' ]; then Distro='Kali' - elif [ "${DISTRO_ID}" = 'arch' ] || [ "${DISTRO_ID}" = 'garuda' ] || [ "${DISTRO_ID}" = 'artix' ] || [ "${DISTRO_ID}" = 'manjaro' ] || [ "${DISTRO_ID}" = 'blackarch' ] || [ "${DISTRO_ID}" = 'arcolinux' ]; then + elif [ "${DISTRO_ID}" = 'arch' ] || [ "${DISTRO_ID}" = 'garuda' ] || [ "${DISTRO_ID}" = 'artix' ] || [ "${DISTRO_ID}" = 'manjaro' ] || [ "${DISTRO_ID}" = 'blackarch' ] || [ "${DISTRO_ID}" = 'arcolinux' ] || [ "${DISTRO_ID}" = '"endeavouros"' ]; then Distro='Arch' elif grep -Eqi '^ID.*suse' /etc/os-release; then Distro='SuSE' From 61528a408a2f30e0bfa1413a15ea36c3221fbe47 Mon Sep 17 00:00:00 2001 From: stephenakq <123925624+stephenakq@users.noreply.github.com> Date: Sat, 23 Sep 2023 06:15:40 +1000 Subject: [PATCH 2/5] Update install --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install b/install index 1431149bd1..8ea2c11472 100755 --- a/install +++ b/install @@ -89,7 +89,7 @@ install_linux() { DISTRO_ID=$(grep ID= /etc/os-release | grep -v "BUILD" | grep -v "IMAGE" | cut -d= -f2-) if [ "${DISTRO_ID}" = 'kali' ]; then Distro='Kali' - elif [ "${DISTRO_ID}" = 'arch' ] || [ "${DISTRO_ID}" = 'garuda' ] || [ "${DISTRO_ID}" = 'artix' ] || [ "${DISTRO_ID}" = 'manjaro' ] || [ "${DISTRO_ID}" = 'blackarch' ] || [ "${DISTRO_ID}" = 'arcolinux' ] || [ "${DISTRO_ID}" = '"endeavouros"' ]; then + elif [ "${DISTRO_ID}" = 'arch' ] || [ "${DISTRO_ID}" = 'garuda' ] || [ "${DISTRO_ID}" = 'artix' ] || [ "${DISTRO_ID}" = 'manjaro' ] || [ "${DISTRO_ID}" = 'blackarch' ] || [ "${DISTRO_ID}" = 'arcolinux' ] || [ "${DISTRO_ID}" = 'endeavouros' ]; then Distro='Arch' elif grep -Eqi '^ID.*suse' /etc/os-release; then Distro='SuSE' From 624176e6acd6c5497faa2f4f419d56a4146b8d99 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 23 Sep 2023 02:43:49 +0000 Subject: [PATCH 3/5] Made the quotes consistent --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install b/install index 1431149bd1..8ea2c11472 100755 --- a/install +++ b/install @@ -89,7 +89,7 @@ install_linux() { DISTRO_ID=$(grep ID= /etc/os-release | grep -v "BUILD" | grep -v "IMAGE" | cut -d= -f2-) if [ "${DISTRO_ID}" = 'kali' ]; then Distro='Kali' - elif [ "${DISTRO_ID}" = 'arch' ] || [ "${DISTRO_ID}" = 'garuda' ] || [ "${DISTRO_ID}" = 'artix' ] || [ "${DISTRO_ID}" = 'manjaro' ] || [ "${DISTRO_ID}" = 'blackarch' ] || [ "${DISTRO_ID}" = 'arcolinux' ] || [ "${DISTRO_ID}" = '"endeavouros"' ]; then + elif [ "${DISTRO_ID}" = 'arch' ] || [ "${DISTRO_ID}" = 'garuda' ] || [ "${DISTRO_ID}" = 'artix' ] || [ "${DISTRO_ID}" = 'manjaro' ] || [ "${DISTRO_ID}" = 'blackarch' ] || [ "${DISTRO_ID}" = 'arcolinux' ] || [ "${DISTRO_ID}" = 'endeavouros' ]; then Distro='Arch' elif grep -Eqi '^ID.*suse' /etc/os-release; then Distro='SuSE' From 272ca32e431e5296448c271b31d71455c6d1a8db Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 23 Sep 2023 02:51:20 +0000 Subject: [PATCH 4/5] Restore Gemfile.lock --- Gemfile.lock | 84 ++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e9263bd259..03268e5a08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: https://rubygems.org/ specs: - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activesupport (7.0.8) + activemodel (7.0.4.3) + activesupport (= 7.0.4.3) + activerecord (7.0.4.3) + activemodel (= 7.0.4.3) + activesupport (= 7.0.4.3) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) ansi (1.5.0) archive-zip (0.12.0) @@ -23,8 +23,9 @@ GEM timers (~> 4.1) async-dns (1.3.0) async-io (~> 1.15) - async-io (1.36.0) + async-io (1.34.3) async + base64 (0.1.1) browserstack-local (1.4.3) byebug (11.1.3) capybara (3.39.2) @@ -38,8 +39,7 @@ GEM xpath (~> 3.2) coderay (1.1.3) concurrent-ruby (1.2.2) - console (1.23.2) - fiber-annotation + console (1.16.2) fiber-local curb (1.0.5) daemons (1.4.1) @@ -53,8 +53,7 @@ GEM espeak-ruby (1.1.0) event_emitter (0.2.6) eventmachine (1.2.7) - execjs (2.9.1) - fiber-annotation (0.2.0) + execjs (2.8.1) fiber-local (1.0.0) geckodriver-helper (0.24.0) archive-zip (~> 0.7) @@ -65,7 +64,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http_parser.rb (0.8.0) - i18n (1.14.1) + i18n (1.12.0) concurrent-ruby (~> 1.0) io-console (0.6.0) io-like (0.3.1) @@ -77,15 +76,15 @@ GEM matrix (0.4.2) maxmind-db (1.1.1) method_source (1.0.0) - mime-types (3.5.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) - mini_mime (1.1.5) - minitest (5.20.0) - mojo_magick (0.6.8) + mime-types-data (3.2023.0218.1) + mini_mime (1.1.2) + minitest (5.18.0) + mojo_magick (0.6.7) msfrpc-client (1.1.2) msgpack (~> 1) - msgpack (1.7.2) + msgpack (1.6.1) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) net-protocol (0.2.1) @@ -93,8 +92,8 @@ GEM net-smtp (0.3.3) net-protocol netrc (0.11.0) - nio4r (2.5.9) - nokogiri (1.15.4-x86_64-linux) + nio4r (2.5.8) + nokogiri (1.15.2-x86_64-linux) racc (~> 1.4) otr-activerecord (2.1.2) activerecord (>= 4.0, < 7.1) @@ -113,12 +112,12 @@ GEM pry (>= 0.13, < 0.15) psych (5.1.0) stringio - public_suffix (5.0.3) - qr4r (0.6.2) + public_suffix (5.0.1) + qr4r (0.6.1) mojo_magick (~> 0.6.5) - rqrcode_core (~> 1.0) + rqrcode_core (~> 0.1) racc (1.7.1) - rack (2.2.8) + rack (2.2.7) rack-protection (3.0.6) rack rack-test (2.1.0) @@ -136,22 +135,23 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.2.6) - rqrcode_core (1.2.0) + rqrcode_core (0.2.0) rr (3.1.0) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) + rspec-core (3.12.1) rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-mocks (3.12.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rubocop (1.53.1) + rspec-support (3.12.0) + rubocop (1.56.3) + base64 (~> 0.1.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -159,7 +159,7 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) @@ -181,11 +181,11 @@ GEM tilt (~> 2.0) slack-notifier (2.4.0) sqlite3 (1.6.6-x86_64-linux) - stringio (3.0.8) + stringio (3.0.5) sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - test-unit (3.6.1) + test-unit (3.5.7) power_assert test-unit-context (0.5.1) test-unit (>= 2.4.0) @@ -206,8 +206,8 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - tilt (2.3.0) - timeout (0.4.0) + tilt (2.1.0) + timeout (0.3.2) timers (4.3.5) tins (1.32.1) sync @@ -224,7 +224,7 @@ GEM websocket-client-simple (0.6.1) event_emitter websocket - xmlrpc (0.3.3) + xmlrpc (0.3.2) webrick xpath (3.2.0) nokogiri (~> 1.8) @@ -245,7 +245,7 @@ DEPENDENCIES eventmachine (~> 1.2, >= 1.2.7) execjs (~> 2.8, >= 2.8.1) geckodriver-helper (~> 0.24.0) - irb (~> 1.7) + irb (~> 1.8) json maxmind-db (~> 1.1, >= 1.1.1) mime-types (~> 3.4, >= 3.4.1) @@ -261,13 +261,13 @@ DEPENDENCIES rdoc (~> 6.5) rest-client (~> 2.1.0) rspec (~> 3.12) - rubocop (~> 1.53.1) + rubocop (~> 1.56.3) rubyzip (~> 2.3) rushover (~> 0.3.0) - selenium-webdriver (~> 4.10) + selenium-webdriver (~> 4.12) sinatra (~> 3.0) slack-notifier (~> 2.4) - sqlite3 (~> 1.6, >= 1.6.1) + sqlite3 (~> 1.6) term-ansicolor test-unit-full (~> 0.0.5) thin (~> 1.8) @@ -276,4 +276,4 @@ DEPENDENCIES xmlrpc (~> 0.3.2) BUNDLED WITH - 2.4.13 + 2.4.8 From 654ce1affba1ef1ed8a1a8dcfc1f3aa392d35e94 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 23 Sep 2023 02:55:26 +0000 Subject: [PATCH 5/5] Bump xmlrpc gem version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d8b245eeed..7d313457d7 100644 --- a/Gemfile +++ b/Gemfile @@ -37,7 +37,7 @@ gem 'erubis', '~> 2.7' # Metasploit Integration extension group :ext_msf do gem 'msfrpc-client', '~> 1.1', '>= 1.1.2' - gem 'xmlrpc', '~> 0.3.2' + gem 'xmlrpc', '~> 0.3.3' end # Notifications extension