diff -Nru ruby-net-ldap-0.16.1/debian/changelog ruby-net-ldap-0.16.1.new/debian/changelog --- ruby-net-ldap-0.16.1/debian/changelog 2018-03-13 02:49:14.000000000 -0300 +++ ruby-net-ldap-0.16.1.new/debian/changelog 2020-03-24 18:16:09.625650235 -0300 @@ -1,3 +1,12 @@ +ruby-net-ldap (0.16.1-1ubuntu1) focal; urgency=medium + + * d/p/0002-Do-not-use-keyword-parameter-in-tcp-call.patch: add patch to + avoid passing keyword parameter in tcp call, fixing a warning when it is + executed with ruby 2.7. This patch will fix a ruby-activeldap autopkgtest + regression (LP: #1868862). + + -- Lucas Kanashiro Tue, 24 Mar 2020 15:25:55 -0300 + ruby-net-ldap (0.16.1-1) unstable; urgency=medium * Team upload. diff -Nru ruby-net-ldap-0.16.1/debian/control ruby-net-ldap-0.16.1.new/debian/control --- ruby-net-ldap-0.16.1/debian/control 2018-03-13 02:48:14.000000000 -0300 +++ ruby-net-ldap-0.16.1.new/debian/control 2020-03-24 18:03:50.181876566 -0300 @@ -1,7 +1,8 @@ Source: ruby-net-ldap Section: ruby Priority: optional -Maintainer: Debian Ruby Extras Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Ruby Extras Maintainers Uploaders: Jérémy Lal Build-Depends: debhelper (>= 11~), gem2deb, diff -Nru ruby-net-ldap-0.16.1/debian/patches/0002-Do-not-use-keyword-parameter-in-tcp-call.patch ruby-net-ldap-0.16.1.new/debian/patches/0002-Do-not-use-keyword-parameter-in-tcp-call.patch --- ruby-net-ldap-0.16.1/debian/patches/0002-Do-not-use-keyword-parameter-in-tcp-call.patch 1969-12-31 21:00:00.000000000 -0300 +++ ruby-net-ldap-0.16.1.new/debian/patches/0002-Do-not-use-keyword-parameter-in-tcp-call.patch 2020-03-24 18:15:24.041659643 -0300 @@ -0,0 +1,29 @@ +From: Lucas Kanashiro +Date: Tue, 24 Mar 2020 15:10:20 -0300 +Subject: Do not use keyword parameter in tcp call + +Passing a keyword parameter is deprecated in ruby 2.7, the right way to +do it now is using '**'. This patch will avoid a warning when other +libraries call it. + +This patch was forwarded to upstream here: +https://github.com/ruby-ldap/ruby-net-ldap/pull/350 + +This patch fixes LP #1868862 +--- + lib/net/ldap/connection.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/net/ldap/connection.rb b/lib/net/ldap/connection.rb +index 61aacb5..af08637 100644 +--- a/lib/net/ldap/connection.rb ++++ b/lib/net/ldap/connection.rb +@@ -706,7 +706,7 @@ class Net::LDAP::Connection #:nodoc: + # Wrap around Socket.tcp to normalize with other Socket initializers + class DefaultSocket + def self.new(host, port, socket_opts = {}) +- Socket.tcp(host, port, socket_opts) ++ Socket.tcp(host, port, **socket_opts) + end + end + end # class Connection diff -Nru ruby-net-ldap-0.16.1/debian/patches/series ruby-net-ldap-0.16.1.new/debian/patches/series --- ruby-net-ldap-0.16.1/debian/patches/series 2018-03-13 02:45:16.000000000 -0300 +++ ruby-net-ldap-0.16.1.new/debian/patches/series 2020-03-24 18:15:24.065659637 -0300 @@ -1 +1,2 @@ fix-gemspec-git-usage.patch +0002-Do-not-use-keyword-parameter-in-tcp-call.patch