From fc2622f376ac1e030b4dc4dae101ff469e86c3db Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 4 May 2020 06:58:41 +0530 Subject: [PATCH] Relax dependency on net-ssh gem to allow new major version --- debian/control | 2 +- debian/patches/0485-relax-net-ssh.patch | 11 +++++++++++ debian/patches/series | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0485-relax-net-ssh.patch diff --git a/debian/control b/debian/control index 7a5ce193fb..c2f93036a2 100644 --- a/debian/control +++ b/debian/control @@ -309,7 +309,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # NTP client ruby-net-ntp, # SSH host key support - ruby-net-ssh (>= 1:5.2~), + ruby-net-ssh (>= 1:6.0~), ruby-sshkey (>= 2.0~), # Required for ED25519 SSH host key support ruby-ed25519 (>= 1.2~), diff --git a/debian/patches/0485-relax-net-ssh.patch b/debian/patches/0485-relax-net-ssh.patch new file mode 100644 index 0000000000..d44f68d6c2 --- /dev/null +++ b/debian/patches/0485-relax-net-ssh.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -397,7 +397,7 @@ + gem 'net-ntp' + + # SSH host key support +-gem 'net-ssh', '~> 5.2' ++gem 'net-ssh', '~> 6.0' + gem 'sshkey', '~> 2.0' + + # Required for ED25519 SSH host key support diff --git a/debian/patches/series b/debian/patches/series index 28eb197255..3a0636a042 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,6 +11,7 @@ 0480-embed-faraday-middleware-aws-signers-v4.patch 0482-remove-ee-only-gems.patch 0484-relax-asciidoctor-plantuml.patch +0485-relax-net-ssh.patch 0500-set-webpack-root.patch 0510-remove-dev-dependencies.patch 0520-add-system-lib-path-for-webpack.patch