Merge ~utkarsh/ubuntu/+source/ruby2.7:merge-ruby2.7-impish into ubuntu/+source/ruby2.7:debian/sid

Proposed by Utkarsh Gupta
Status: Merged
Approved by: Lucas Kanashiro
Approved revision: 99f37903c1a285e359cd1e063fb74a9727a57572
Merge reported by: Bryce Harrington
Merged at revision: 99f37903c1a285e359cd1e063fb74a9727a57572
Proposed branch: ~utkarsh/ubuntu/+source/ruby2.7:merge-ruby2.7-impish
Merge into: ubuntu/+source/ruby2.7:debian/sid
Diff against target: 72 lines (+33/-2)
3 files modified
debian/changelog (+27/-0)
debian/control (+2/-1)
debian/rules (+4/-1)
Reviewer Review Type Date Requested Status
Lucas Kanashiro Approve
Canonical Server Team Pending
Canonical Server packageset reviewers Pending
Ubuntu Server Dev import team Pending
Review via email: mp+402253@code.launchpad.net

Description of the change

Hey,

This is a ruby2.7 merge from debian/sid, basically bumping from
2.7.2-4ubuntu1.1 in hirsute (and now impish) to 2.7.3-2ubuntu1 in impish.

All tests pass in Debian sid and the PPA could be found at:
https://launchpad.net/~utkarsh/+archive/ubuntu/experimental-dump

Let me know if there's anything else needed from my end, but otherwise
requesting you to review and please sponsor the upload. TIA! \o/

To post a comment you must log in.
Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

[Assigning it to Robie based on previous discussions]

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

I am personally interested in ruby, so I'll take a look at this MP.

Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

[Re-assigned to Lucas; unassigned Robie]

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

* Changelog:
  - [√] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
  - [√] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [√] dropped changes are ok to be dropped
  - [√] nothing else to drop
  - [√] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [√] no new patches added
  - [-] patches match what was proposed upstream
  - [-] patches correctly included in debian/patches/series
  - [-] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
  - [√] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

I did not investigate this LTO issue yet but we should check if this change would make sense to Debian, if it is harmless to Debian we can upstream this change and make it a sync again.

Apart from that, everything LGTM. Do you want me to sponsor this package?

review: Approve
Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

Hi Lucas,

Thanks a bunch for reviewing and approving!

> I did not investigate this LTO issue yet but we should check
> if this change would make sense to Debian, if it is harmless
> to Debian we can upstream this change and make it a sync again.

As soon as the SIGSEGV issue is fixed upstream (bug #17052), this
can be dropped from here and it'll eventually become a sync. So
probably just a matter of time, I guess.

> [...] Do you want me to sponsor this package?

Yes, please. Thank you! \o/

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

> As soon as the SIGSEGV issue is fixed upstream (bug #17052), this
> can be dropped from here and it'll eventually become a sync. So
> probably just a matter of time, I guess.

Of course but maybe it makes sense to check that, we do not know when the upstream will fix this bug, the last update of this bug was 9 months ago. I've been always trying to keep ruby as a sync which make our life much easier.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

Package uploaded, please follow its migration:

$ git push pkg upload/2.7.3-2ubuntu1
Enumerating objects: 22, done.
Counting objects: 100% (22/22), done.
Delta compression using up to 32 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (17/17), 2.16 KiB | 2.16 MiB/s, done.
Total 17 (delta 12), reused 12 (delta 8)
To ssh://git.launchpad.net/ubuntu/+source/ruby2.7
 * [new tag] upload/2.7.3-2ubuntu1 -> upload/2.7.3-2ubuntu1
$ dput ubuntu ../ruby2.7_2.7.3-2ubuntu1_source.changes
Checking signature on .changes
gpg: ../ruby2.7_2.7.3-2ubuntu1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../ruby2.7_2.7.3-2ubuntu1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ruby2.7_2.7.3-2ubuntu1.dsc: done.
  Uploading ruby2.7_2.7.3-2ubuntu1.debian.tar.xz: done.
  Uploading ruby2.7_2.7.3-2ubuntu1_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Bryce Harrington (bryce) wrote :

This has migrated

  - Current Version: 2.7.3-2ubuntu1
  - Proposed Version: None
  - Debian Version: 2.7.3-2
  - New Version: 2.7.3-2ubuntu1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 8a9a4b0..268efcd 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,14 @@
6+ruby2.7 (2.7.3-2ubuntu1) impish; urgency=medium
7+
8+ * Merge with Debian unstable. Remaining changes:
9+ - LTO appears to cause some issue to SEGV handler. Disable
10+ it for now. See https://bugs.ruby-lang.org/issues/17052.
11+ * Dropped changes:
12+ - debian/patches/CVE-2021-28965.patch: backport fixes from REXML.
13+ [Included in 2.7.3-1]
14+
15+ -- Utkarsh Gupta <utkarsh.gupta@canonical.com> Wed, 05 May 2021 18:26:16 +0530
16+
17 ruby2.7 (2.7.3-2) unstable; urgency=medium
18
19 * Revert upstream change that breaks building for 32-bit arm
20@@ -21,6 +32,22 @@ ruby2.7 (2.7.3-1) unstable; urgency=medium
21
22 -- Utkarsh Gupta <utkarsh@debian.org> Sat, 17 Apr 2021 20:12:52 +0530
23
24+ruby2.7 (2.7.2-4ubuntu1.1) hirsute-security; urgency=medium
25+
26+ * SECURITY UPDATE: XML round-trip vulnerability in REXML
27+ - debian/patches/CVE-2021-28965.patch: backport fixes from REXML
28+ 3.2.3.1.
29+ - CVE-2021-28965
30+
31+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 22 Apr 2021 14:27:19 -0400
32+
33+ruby2.7 (2.7.2-4ubuntu1) hirsute; urgency=medium
34+
35+ * LTO appears to cause some issue to SEGV handler. Disable it for now.
36+ See https://bugs.ruby-lang.org/issues/17052
37+
38+ -- Matthias Klose <doko@ubuntu.com> Tue, 23 Mar 2021 13:50:56 +0100
39+
40 ruby2.7 (2.7.2-4) unstable; urgency=medium
41
42 [ Antonio Terceiro ]
43diff --git a/debian/control b/debian/control
44index 1b21bc2..3470afb 100644
45--- a/debian/control
46+++ b/debian/control
47@@ -1,7 +1,8 @@
48 Source: ruby2.7
49 Section: ruby
50 Priority: optional
51-Maintainer: Debian Ruby Team <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
52+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
53+XSBC-Original-Maintainer: Debian Ruby Team <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
54 Uploaders: Antonio Terceiro <terceiro@debian.org>,
55 Lucas Kanashiro <kanashiro@debian.org>,
56 Utkarsh Gupta <utkarsh@debian.org>
57diff --git a/debian/rules b/debian/rules
58index c2d81ae..1401451 100755
59--- a/debian/rules
60+++ b/debian/rules
61@@ -59,7 +59,10 @@ configure_options += --with-dbm-type=gdbm_compat
62 configure_options += --with-compress-debug-sections=no
63
64 # hardening and other standard Debian build flags
65-export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
66+
67+# LTO appears to cause some issue to SEGV handler.
68+# https://bugs.ruby-lang.org/issues/17052
69+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow optimize=-lto
70 configure_options += $(shell dpkg-buildflags --export=configure)
71
72 # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93808

Subscribers

People subscribed via source and target branches