Bug #11619

Torbirdy patches need updating

Added by Anonymous 2016-08-04 05:45:44 . Updated 2016-09-20 16:47:42 .

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

100%

Feature Branch:
bugfix/11619-drop-upstreamed-torbirdy-patches
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Email Client
Deliverable for:
268

Description

Reported by bertagaz on tails-dev today:


Since the 2.5 release, it seems one of our Torbirdy patches are fuzzy, which
makes the build of devel (and any branch based on it) fail.
[...]

Here's the excerpt from the build logs:

P: Applying patch config/chroot_local-patches/torbirdy-0001-secure-autoconfig-compat.diff...
patching file usr/share/xul-ext/torbirdy/chrome/content/emailwizard.js
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 63.
Hunk #3 FAILED at 75.
Hunk #4 FAILED at 111.
Hunk #5 FAILED at 125.
5 out of 5 hunks FAILED -- saving rejects to file usr/share/xul-ext/torbirdy/chrome/content/emailwizard.js.rej
patching file usr/share/xul-ext/torbirdy/chrome/content/emailwizard.xul
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file usr/share/xul-ext/torbirdy/chrome/content/emailwizard.xul.rej
patching file usr/share/xul-ext/torbirdy/chrome/content/preferences.js
Hunk #1 FAILED at 37.
1 out of 1 hunk FAILED -- saving rejects to file usr/share/xul-ext/torbirdy/chrome/content/preferences.js.rej
patching file usr/share/xul-ext/torbirdy/components/torbirdy.js
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.

Subtasks

History

#1 Updated by Anonymous 2016-08-04 05:45:58

  • Target version set to Tails_2.6

#2 Updated by bertagaz 2016-08-04 06:01:22

Thanks! I should have opened that myself rather than an email. Let use this place now.

You asked about the Torbirdy version, it is the one from jessie-backports: xul-ext-torbirdy 0.2.0-1~bpo8+1. Seems to be a new upload, the last time the build worked (2 days ago), Torbirdy version from jessie-backports was xul-ext-torbirdy 0.1.4-1~bpo8+1. If needed I can try to refresh them, but I won’t handle the testing of it. :)

#3 Updated by Anonymous 2016-08-04 06:07:01

Correct, we’ve uploaded a backport of the most recent version of Torbirdy 2 days ago.
This version is supposed to contain many patches which we applied manually before in Tails.

Unfortunately there are still some Tails specific patches needed as far as I know. These mostly aim at hiding some options like Jondo etc.

I’m not available this afternoon, but we could also look into it together if you’re available over XMPP sometime.

#4 Updated by Anonymous 2016-08-04 06:08:34

  • Status changed from New to Confirmed

#5 Updated by bertagaz 2016-08-04 09:55:07

u wrote:
> I’m not available this afternoon, but we could also look into it together if you’re available over XMPP sometime.

Let’s do that! I’ll join when I’ll have some time.

#6 Updated by bertagaz 2016-08-06 04:19:29

  • Status changed from Confirmed to In Progress

u wrote:
> Correct, we’ve uploaded a backport of the most recent version of Torbirdy 2 days ago.
> This version is supposed to contain many patches which we applied manually before in Tails.

I’m just looking at it, and found that your pull request for the secure autoconfig patch has been merged and is in the new release. Congrats!

I’m trying to build a branch without it to see if that’s the only fix required, as it seems to likely be.

> Unfortunately there are still some Tails specific patches needed as far as I know. These mostly aim at hiding some options like Jondo etc.

Didn’t find a pull request for the POP one.
>
> I’m not available this afternoon, but we could also look into it together if you’re available over XMPP sometime.

#7 Updated by bertagaz 2016-08-06 04:52:01

bertagaz wrote:
> Didn’t find a pull request for the POP one.

Seems it’s also been merged, trying to build without this one too!

#8 Updated by bertagaz 2016-08-07 04:06:54

  • Assignee set to bertagaz
  • % Done changed from 0 to 20
  • Feature Branch set to bugfix/11619-drop-upstreamed-torbirdy-patches

Pushed a branch without the patches. Builds fine home with Feature #11351 merged in. I’ll push a branch with both so that I can fix the build of devel once Jenkins has given a try to it.

#9 Updated by bertagaz 2016-08-07 10:05:00

  • Status changed from In Progress to Fix committed
  • Assignee deleted (bertagaz)
  • % Done changed from 20 to 100
  • QA Check set to Pass

bertagaz wrote:
> Pushed a branch without the patches. Builds fine home with Feature #11351 merged in. I’ll push a branch with both so that I can fix the build of devel once Jenkins has given a try to it.

That’s bold, but after giving a try I didn’t see any regression of the autoconfig wizard compared to 2.4 or 2.5, so merged it to have devel branch build going blue again.

#10 Updated by intrigeri 2016-08-09 13:27:42

I don’t understand why brand new commits were created, instead of cherry-picking the existing ones I’ve pointed to on tails-dev@ (and that have a little bit more detailed commit messages). But whatever, thanks for fixing this! :)

#11 Updated by Anonymous 2016-08-18 11:51:38

Thanks for fixing this.

#12 Updated by anonym 2016-09-20 16:47:42

  • Status changed from Fix committed to Resolved

#13 Updated by Anonymous 2018-08-16 11:26:11

  • related to Bug #15387: The Mozilla auto_config database requires an unusable CAPTCHA for Torified requests added

#14 Updated by Anonymous 2018-08-16 11:26:17

  • related to deleted (Bug #15387: The Mozilla auto_config database requires an unusable CAPTCHA for Torified requests)