Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

syncthing: 0.14.7 -> 0.14.15 (for NixOS 16.09) #21256

Merged
merged 6 commits into from
Dec 30, 2016
Merged

syncthing: 0.14.7 -> 0.14.15 (for NixOS 16.09) #21256

merged 6 commits into from
Dec 30, 2016

Conversation

jokogr
Copy link
Contributor

@jokogr jokogr commented Dec 18, 2016

Motivation for this change

There are two security vulnerabilities fixed in 0.14.14 and multiple minor bugs fixed in the rest of the versions. No notable API changes (besides how symlinks are treated due to the vulnerabilities).

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@jokogr, thanks for your PR! By analyzing the history of the files in this pull request, we identified @peterhoeg and @pshendry to be potential reviewers.

@jokogr
Copy link
Contributor Author

jokogr commented Dec 18, 2016

I didn't have a machine or VM with 16.09 in handy, so I couldn't test if it works. I am going to create a VM if needed.

@jokogr
Copy link
Contributor Author

jokogr commented Dec 18, 2016

I might need to update syncthing-gtk, this is why the test fails 😢

@grahamc
Copy link
Member

grahamc commented Dec 22, 2016

@jokogr I'd obviously like to merge this soon. Can you update syncthing-gtk?

Peter Hoeg and others added 6 commits December 27, 2016 23:09
@jokogr
syncthing: 0.14.7 -> 0.14.8
5e6b375 
(cherry picked from commit 0d183b3)
@jokogr
syncthin: 0.14.8 -> 0.14.11
d35f218 
(cherry picked from commit 8431345)
@jokogr
syncthing: 0.14.11 -> 0.14.12 (NixOS#20645)
85ada71 
(cherry picked from commit 3975f5b)
@jokogr
syncthing: 0.14.12 -> 0.14.13
7979adc 
(cherry picked from commit 58faa13)
@jokogr
syncthing: 0.14.13 -> 0.14.15
519031d 
(cherry picked from commit eb9fd3c)
@jokogr
syncthing: 0.14.15 -> 0.14.17
9723999 
(cherry picked from commit 474b359)
@jokogr jokogr force-pushed the u/syncthing-0.14.15-for-16.09 branch from 293041a to 9723999 Compare December 27, 2016 21:10
@jokogr
Copy link
Contributor Author

jokogr commented Dec 27, 2016

@grahamc Sorry for the wait, syncthing-gtk proved to be a bit more challenging... While I am waiting comments for #21446, let me see if the latest version (0.14.17) compiles

@jokogr
Copy link
Contributor Author

jokogr commented Dec 27, 2016

And it compiles! Apparently it was not syncthing-gtk at all, @grahamc please merge this.

If anyone wants to run syncthing-gtk on nixos-16.09, then we could cherry-pick the commit of #21446, but I leave it as it is for the time being, as I am not using it.

@grahamc
Copy link
Member

grahamc commented Dec 30, 2016

Thank you, @jokogr!

@grahamc grahamc merged commit 2ce4178 into NixOS:release-16.09 Dec 30, 2016
@jokogr jokogr deleted the u/syncthing-0.14.15-for-16.09 branch December 31, 2016 14:22
adrianpk added a commit to adrianpk/nixpkgs that referenced this pull request May 31, 2024
@adrianpk
Merge pull request NixOS#21256 from jokogr/u/syncthing-0.14.15-for-16.09
af8335f 
syncthing: 0.14.7 -> 0.14.15 (for NixOS 16.09)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
1.severity: security 8.has: package (update)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jokogr @mention-bot @grahamc @joachifm