Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: ruby2.5

ruby2.5 (2.5.5-4ubuntu2) eoan; urgency=medium * No-change upload with strops.h and sys/strops.h removed in glibc. -- Matthias Klose <doko@ubuntu.com> Thu, 05 Sep 2019 13:40:19 +0200 ruby2.5 (2.5.5-4ubuntu1) eoan; urgency=low * Merge from Debian unstable. Remaining changes: - d/p/rubygems-2388.patch: Allow either Fetcher or OpenSSL exceptions when using invalid cert in rubygems testcase. - update the patch with the merged upstream PR: 2507 - various backports for better openssl support (formerly undocumented in changelog) + d/p/0001-openssl-buffering.rb-no-RS-when-output.patch + d/p/0006-Workaround-for-old-LibreSSL.patch -- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 30 Jul 2019 23:55:35 +0200

Modifications :
  1. Download patch debian/patches/0001-openssl-buffering.rb-no-RS-when-output.patch

    --- 2.5.5-4/debian/patches/0001-openssl-buffering.rb-no-RS-when-output.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.5.5-4ubuntu2/debian/patches/0001-openssl-buffering.rb-no-RS-when-output.patch 2019-01-21 12:59:42.000000000 +0000 @@ -0,0 +1,42 @@ +From 07decad25f969908f7b2cc97208548605e35c5db Mon Sep 17 00:00:00 2001 +From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> +Date: Thu, 25 Jan 2018 11:21:47 +0000 +Subject: [PATCH 1/9] openssl/buffering.rb: no RS when output + +* ext/openssl/lib/openssl/buffering.rb (do_write, puts): output + methods should not be affected by the input record separator. + +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e +--- + ext/openssl/lib/openssl/buffering.rb | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb +index 935f61f0ef..1f2b2a7e44 100644 +--- a/ext/openssl/lib/openssl/buffering.rb ++++ b/ext/openssl/lib/openssl/buffering.rb +@@ -316,8 +316,8 @@ def do_write(s) + @wbuffer << s + @wbuffer.force_encoding(Encoding::BINARY) + @sync ||= false +- if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/) +- remain = idx ? idx + $/.size : @wbuffer.length ++ if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex("\n") ++ remain = idx ? idx + 1 : @wbuffer.size + nwritten = 0 + while remain > 0 + str = @wbuffer[nwritten,remain] +@@ -409,9 +409,7 @@ def puts(*args) + end + args.each{|arg| + s << arg.to_s +- if $/ && /\n\z/ !~ s +- s << "\n" +- end ++ s.sub!(/(?<!\n)\z/, "\n") + } + do_write(s) + nil +-- +2.17.1 +
  2. Download patch debian/patches/rubygems-2388.patch

    --- 2.5.5-4/debian/patches/rubygems-2388.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.5.5-4ubuntu2/debian/patches/rubygems-2388.patch 2019-03-28 09:46:46.000000000 +0000 @@ -0,0 +1,26 @@ +From d9ed00405697f05d683b5d27a8417d207048996f Mon Sep 17 00:00:00 2001 +From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> +Date: Mon, 3 Dec 2018 12:01:26 +0000 +Subject: [PATCH] Fixed test fails against OpenSSL 1.1.1. + + * https://rubyci.org/logs/rubyci.s3.amazonaws.com/ubuntu/ruby-trunk/log/20181203T093003Z.fail.html.gz + * https://rubyci.org/logs/rubyci.s3.amazonaws.com/arch/ruby-trunk/log/20181203T090002Z.fail.html.gz + +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e +--- + lib/rubygems/remote_fetcher.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb +index 446bed3c72..639ea3c19d 100644 +--- a/lib/rubygems/remote_fetcher.rb ++++ b/lib/rubygems/remote_fetcher.rb +@@ -274,7 +274,7 @@ def fetch_path(uri, mtime = nil, head = false) + raise + rescue Timeout::Error + raise UnknownHostError.new('timed out', uri.to_s) +- rescue IOError, SocketError, SystemCallError => e ++ rescue IOError, SocketError, SystemCallError, OpenSSL::SSL::SSLError => e + if e.message =~ /getaddrinfo/ + raise UnknownHostError.new('no such name', uri.to_s) + else
  3. Download patch debian/patches/series

    --- 2.5.5-4/debian/patches/series 2019-07-30 12:41:10.000000000 +0000 +++ 2.5.5-4ubuntu2/debian/patches/series 2019-07-30 15:44:10.000000000 +0000 @@ -9,3 +9,6 @@ 0009-test-test_pair-fix-deadlock-in-test_connect_accept_n.patch 0010-test-use-larger-keys-for-SSL-tests.patch 0011-ia64-Don-t-clear-register_stack_start.patch +0001-openssl-buffering.rb-no-RS-when-output.patch +0006-Workaround-for-old-LibreSSL.patch +rubygems-2388.patch
  4. Download patch debian/patches/0006-Workaround-for-old-LibreSSL.patch

    --- 2.5.5-4/debian/patches/0006-Workaround-for-old-LibreSSL.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.5.5-4ubuntu2/debian/patches/0006-Workaround-for-old-LibreSSL.patch 2019-01-21 12:59:42.000000000 +0000 @@ -0,0 +1,27 @@ +From 162adb82d1fc1abb3ca0ba86d450709b3bd7e321 Mon Sep 17 00:00:00 2001 +From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> +Date: Wed, 30 May 2018 09:13:21 +0000 +Subject: [PATCH 6/9] Workaround for old LibreSSL + +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e +--- + ext/openssl/openssl_missing.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h +index debd25adea..da3248a7c8 100644 +--- a/ext/openssl/openssl_missing.h ++++ b/ext/openssl/openssl_missing.h +@@ -27,6 +27,9 @@ int ossl_EC_curve_nist2nid(const char *); + + #if !defined(HAVE_X509_STORE_CTX_GET0_STORE) + # define X509_STORE_CTX_get0_store(x) ((x)->ctx) ++#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL ++/* old LibreSSL provides this function but lacks the declaration */ ++X509_STORE *X509_STORE_CTX_get0_store(X509_STORE_CTX *xs); + #endif + + #if !defined(HAVE_SSL_IS_SERVER) +-- +2.17.1 +
  1. ruby2.5