Bug #11422

Make sure Torbirdy modifications on top of Fred's patchset get into Tails

Added by Anonymous 2016-05-16 07:30:37 . Updated 2016-08-18 11:53:11 .

Status:
Resolved
Priority:
Normal
Assignee:
Category:
Target version:
Tails_2.6
Start date:
2016-05-16
Due date:
% Done:

100%

Feature Branch:
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Email Client
Deliverable for:
280

Description

Hi,

the Torbirdy modifications by Fred have been merged and one commit has been done
on top
(https://github.com/ioerror/torbirdy/commit/602b5d8f7d342ec86f3494791e65ecc5bfd097a6)
which we must not forget to integrate into our patches. And also test it..

We might also want to integrate this commit prematurely eventually:
https://github.com/ioerror/torbirdy/commit/0f1d01af3ab0572f4ffc25bb67c1b03afc9591f5
But that’s optional and completely untested by me at least.

Subtasks

History

#1 Updated by anonym 2016-06-05 13:32:11

  • Deliverable for changed from 269 to SponsorS_Internal

#2 Updated by anonym 2016-06-05 13:33:33

  • Target version set to Tails_2.5

#3 Updated by intrigeri 2016-06-05 13:36:44

  • Status changed from New to Confirmed

#4 Updated by Anonymous 2016-07-05 02:49:20

I’ve prepared a new Debian package and backport. I’ll post here when they’ve been uploaded to the archives.

#5 Updated by intrigeri 2016-07-13 12:36:03

  • Target version changed from Tails_2.5 to Tails_2.6

This doesn’t look like point-release material to me.

#6 Updated by intrigeri 2016-07-22 09:54:11

I’m not 100% sure it’s related, but it does look like it: feature/stretch build is currently broken due to our custom patches not applying on top of Torbirdy 0.2.0-1, so I’ve dropped them: commit:da6ac8bba70b5c14fb9665a671b09c4b83a9aaa9 and commit:1a791ff141b76a79e66dfbe5e1899908fe616587. Please tell me if that’s OK, and if there’s part of these patches that we need to keep, then I would appreciate if someone could let me know how to update them on feature/stretch. Thanks!

#7 Updated by anonym 2016-08-18 11:53:11

  • Status changed from Confirmed to Resolved
  • Assignee deleted (anonym)
  • % Done changed from 0 to 100

intrigeri wrote:
> I’m not 100% sure it’s related, but it does look like it: feature/stretch build is currently broken due to our custom patches not applying on top of Torbirdy 0.2.0-1, so I’ve dropped them: commit:da6ac8bba70b5c14fb9665a671b09c4b83a9aaa9 and commit:1a791ff141b76a79e66dfbe5e1899908fe616587. Please tell me if that’s OK, and if there’s part of these patches that we need to keep, then I would appreciate if someone could let me know how to update them on feature/stretch. Thanks!

You did the right thing (cf. Bug #11619). All our Torbirdy modifications are now upstreamed and even in Debian. \o/